Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
LemADEC 2017-05-06 15:58:30 +02:00
parent 2e09407f83
commit 7eed9dcce5
19 changed files with 40 additions and 40 deletions

4
src/main/java/cr0s/warpdrive/block/BlockLaser.java
View file

@ -67,9 +67,9 @@ public class BlockLaser extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityLaser) {
Commons.addChatMessage(entityPlayer, ((TileEntityLaser)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityLaser) tileEntity).getStatus());
return true;
}
}

2
src/main/java/cr0s/warpdrive/block/ItemBlockAbstractBase.java
View file

@ -68,7 +68,7 @@ public class ItemBlockAbstractBase extends ItemBlock {
if (nbtTagCompound != null) {
tileEntity.readFromNBT(nbtTagCompound);
}
return ((TileEntityAbstractBase)tileEntity).getStatus();
return ((TileEntityAbstractBase) tileEntity).getStatus();
} else {
return "";

2
src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java
View file

@ -161,7 +161,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
@Override
public String getStatus() {
String strEnergyStatus = getEnergyStatus();
final String strEnergyStatus = getEnergyStatus();
return super.getStatus()
+ (strEnergyStatus.isEmpty() ? "" : "\n" + strEnergyStatus);
}

4
src/main/java/cr0s/warpdrive/block/atomic/BlockAcceleratorControlPoint.java
View file

@ -45,10 +45,10 @@ public class BlockAcceleratorControlPoint extends BlockAbstractAccelerator imple
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityAcceleratorControlPoint) {
Commons.addChatMessage(entityPlayer, ((TileEntityAcceleratorControlPoint)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityAcceleratorControlPoint) tileEntity).getStatus());
return true;
}
}

4
src/main/java/cr0s/warpdrive/block/building/BlockShipScanner.java
View file

@ -70,9 +70,9 @@ public class BlockShipScanner extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityShipScanner) {
Commons.addChatMessage(entityPlayer, ((TileEntityShipScanner)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityShipScanner) tileEntity).getStatus());
return true;
}
}

4
src/main/java/cr0s/warpdrive/block/collection/BlockLaserTreeFarm.java
View file

@ -101,9 +101,9 @@ public class BlockLaserTreeFarm extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityLaserTreeFarm) {
Commons.addChatMessage(entityPlayer, ((TileEntityLaserTreeFarm)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityLaserTreeFarm) tileEntity).getStatus());
return true;
}
}

4
src/main/java/cr0s/warpdrive/block/collection/BlockMiningLaser.java
View file

@ -97,9 +97,9 @@ public class BlockMiningLaser extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityMiningLaser) {
Commons.addChatMessage(entityPlayer, ((TileEntityMiningLaser)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityMiningLaser) tileEntity).getStatus());
return true;
}
}

4
src/main/java/cr0s/warpdrive/block/detection/BlockCamera.java
View file

@ -62,9 +62,9 @@ public class BlockCamera extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityCamera) {
Commons.addChatMessage(entityPlayer, ((TileEntityCamera)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityCamera) tileEntity).getStatus());
return true;
}
}

6
src/main/java/cr0s/warpdrive/block/detection/BlockMonitor.java
View file

@ -50,13 +50,13 @@ public class BlockMonitor extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityMonitor) {
int videoChannel = ((TileEntityMonitor)tileEntity).getVideoChannel();
final int videoChannel = ((TileEntityMonitor) tileEntity).getVideoChannel();
CameraRegistryItem camera = WarpDrive.cameras.getCameraByVideoChannel(world, videoChannel);
if (camera == null || entityPlayer.isSneaking()) {
Commons.addChatMessage(entityPlayer, ((TileEntityMonitor)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityMonitor) tileEntity).getStatus());
return true;
} else {
Commons.addChatMessage(entityPlayer, StatCollector.translateToLocalFormatted("warpdrive.monitor.viewingCamera",

4
src/main/java/cr0s/warpdrive/block/detection/BlockRadar.java
View file

@ -98,9 +98,9 @@ public class BlockRadar extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityRadar) {
Commons.addChatMessage(entityPlayer, ((TileEntityRadar)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityRadar) tileEntity).getStatus());
return true;
}
}

2
src/main/java/cr0s/warpdrive/block/detection/TileEntityCloakingCore.java
View file

@ -370,7 +370,7 @@ public class TileEntityCloakingCore extends TileEntityAbstractEnergy {
return super.getStatus();
}
String unlocalizedStatus;
final String unlocalizedStatus;
if (!isValid) {
unlocalizedStatus = "warpdrive.cloakingCore.invalidAssembly";
} else if (!isEnabled) {

2
src/main/java/cr0s/warpdrive/block/energy/TileEntityIC2reactorLaserMonitor.java
View file

@ -192,7 +192,7 @@ public class TileEntityIC2reactorLaserMonitor extends TileEntityAbstractEnergy {
return super.getStatus();
}
Set<IReactor> reactors = findReactors();
final Set<IReactor> reactors = findReactors();
if (reactors != null && !reactors.isEmpty()) {
return super.getStatus()
+ StatCollector.translateToLocalFormatted("warpdrive.IC2reactorLaserMonitor.multipleReactors",

4
src/main/java/cr0s/warpdrive/block/forcefield/TileEntityAbstractForceField.java
View file

@ -91,14 +91,14 @@ public class TileEntityAbstractForceField extends TileEntityAbstractEnergy imple
if (WarpDriveConfig.LOGGING_VIDEO_CHANNEL) {
WarpDrive.logger.info(this + " Beam frequency set from " + beamFrequency + " to " + parBeamFrequency);
}
if (worldObj != null) {
if (hasWorldObj()) {
ForceFieldRegistry.removeFromRegistry(this);
}
beamFrequency = parBeamFrequency;
vRGB = IBeamFrequency.getBeamColor(beamFrequency);
}
markDirty();
if (worldObj != null) {
if (hasWorldObj()) {
ForceFieldRegistry.updateInRegistry(this);
}
}

6
src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java
View file

@ -817,7 +817,7 @@ public class TileEntityForceFieldProjector extends TileEntityAbstractForceField
cache_forceFieldSetup = null;
isDirty.set(true);
markDirty();
if (worldObj != null) {
if (hasWorldObj()) {
destroyForceField(false);
}
}
@ -1057,8 +1057,8 @@ public class TileEntityForceFieldProjector extends TileEntityAbstractForceField
// Common OC/CC methods
private Object[] state() { // isConnected, isPowered, shape
int energy = energy_getEnergyStored();
String status = getStatus();
final int energy = energy_getEnergyStored();
final String status = getStatusHeaderInPureText();
return new Object[] { status, isEnabled, isConnected, isPowered, getShape().name(), energy };
}

4
src/main/java/cr0s/warpdrive/block/movement/BlockLift.java
View file

@ -92,9 +92,9 @@ public class BlockLift extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityLift) {
Commons.addChatMessage(entityPlayer, ((TileEntityLift)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityLift) tileEntity).getStatus());
return true;
}
}

6
src/main/java/cr0s/warpdrive/block/movement/BlockShipController.java
View file

@ -105,12 +105,12 @@ public class BlockShipController extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityShipController) {
if (entityPlayer.isSneaking()) {
Commons.addChatMessage(entityPlayer, ((TileEntityShipController)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityShipController) tileEntity).getStatus());
} else {
Commons.addChatMessage(entityPlayer, ((TileEntityShipController)tileEntity).attachPlayer(entityPlayer));
Commons.addChatMessage(entityPlayer, ((TileEntityShipController) tileEntity).attachPlayer(entityPlayer));
}
return true;
}

4
src/main/java/cr0s/warpdrive/block/movement/BlockShipCore.java
View file

@ -131,9 +131,9 @@ public class BlockShipCore extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityShipCore) {
Commons.addChatMessage(entityPlayer, ((TileEntityShipCore)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityShipCore) tileEntity).getStatus());
return true;
}
}

4
src/main/java/cr0s/warpdrive/block/movement/BlockTransporter.java
View file

@ -53,9 +53,9 @@ public class BlockTransporter extends BlockAbstractContainer {
}
if (entityPlayer.getHeldItem() == null) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityTransporter) {
Commons.addChatMessage(entityPlayer, ((TileEntityTransporter)tileEntity).getStatus());
Commons.addChatMessage(entityPlayer, ((TileEntityTransporter) tileEntity).getStatus());
return true;
}
}

10
src/main/java/cr0s/warpdrive/block/movement/TileEntityShipController.java
View file

@ -122,7 +122,7 @@ public class TileEntityShipController extends TileEntityAbstractInterfaced {
if (mode >= 0 && mode <= modes.length) {
this.mode = modes[mode];
markDirty();
if (WarpDriveConfig.LOGGING_JUMP && worldObj != null) {
if (WarpDriveConfig.LOGGING_JUMP && hasWorldObj()) {
WarpDrive.logger.info(this + " Mode set to " + this.mode + " (" + this.mode.getCode() + ")");
}
}
@ -139,7 +139,7 @@ public class TileEntityShipController extends TileEntityAbstractInterfaced {
direction = parDirection;
}
markDirty();
if (WarpDriveConfig.LOGGING_JUMP && worldObj != null) {
if (WarpDriveConfig.LOGGING_JUMP && hasWorldObj()) {
WarpDrive.logger.info(this + " Direction set to " + direction);
}
}
@ -149,7 +149,7 @@ public class TileEntityShipController extends TileEntityAbstractInterfaced {
moveUp = parMoveUp;
moveRight = parMoveRight;
markDirty();
if (WarpDriveConfig.LOGGING_JUMP && worldObj != null) {
if (WarpDriveConfig.LOGGING_JUMP && hasWorldObj()) {
WarpDrive.logger.info(this + " Movement set to " + moveFront + " front, " + moveUp + " up, " + moveRight + " right");
}
}
@ -157,7 +157,7 @@ public class TileEntityShipController extends TileEntityAbstractInterfaced {
private void setRotationSteps(final byte parRotationSteps) {
rotationSteps = (byte) ((parRotationSteps + 4) % 4);
markDirty();
if (WarpDriveConfig.LOGGING_JUMP && worldObj != null) {
if (WarpDriveConfig.LOGGING_JUMP && hasWorldObj()) {
WarpDrive.logger.info(this + " RotationSteps set to " + rotationSteps);
}
}
@ -372,7 +372,7 @@ public class TileEntityShipController extends TileEntityAbstractInterfaced {
private void setDistance(final int distance) {
this.distance = Math.max(1, Math.min(getMaxJumpDistance(), distance));
if (WarpDriveConfig.LOGGING_JUMP && worldObj != null) {
if (WarpDriveConfig.LOGGING_JUMP && hasWorldObj()) {
WarpDrive.logger.info(this + " Jump distance set to " + distance);
}
}