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 2016-01-15 04:58:54 +01:00
parent d49bb546f9
commit 10b043e3c6
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/cr0s/warpdrive/EntityJump.java
View file

@ -1369,11 +1369,11 @@ public class EntityJump extends Entity {
@Override
public String toString() {
return String.format("%s/%d \'%s\' @ \'%s\' %.2f, %.2f, %.2f #%d", new Object[] {
return String.format("%s/%d \'%s\' @ \'%s\' %.2f, %.2f, %.2f #%d",
getClass().getSimpleName(), Integer.valueOf(getEntityId()),
shipCore == null ? "~NULL~" : (shipCore.uuid + ":" + shipCore.shipName),
worldObj == null ? "~NULL~" : worldObj.getWorldInfo().getWorldName(),
Double.valueOf(posX), Double.valueOf(posY), Double.valueOf(posZ),
Integer.valueOf(ticks)});
Integer.valueOf(ticks));
}
}

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

@ -132,10 +132,10 @@ public class TileEntityMonitor extends TileEntityAbstractInterfaced implements I
@Override
public String toString() {
return String.format("%s \'%d\' @ \'%s\' %d, %d, %d", new Object[] {
return String.format("%s %d @ \'%s\' %d, %d, %d",
getClass().getSimpleName(),
videoChannel,
worldObj == null ? "~NULL~" : worldObj.getWorldInfo().getWorldName(),
xCoord, yCoord, zCoord});
xCoord, yCoord, zCoord);
}
}

4
src/main/java/cr0s/warpdrive/data/CloakedArea.java
View file

@ -288,10 +288,10 @@ public class CloakedArea {
@Override
public String toString() {
return String.format("%s @ DIM%d %d, %d, %d (%d %d %d) -> (%d %d %d)", new Object[] {
return String.format("%s @ DIM%d %d, %d, %d (%d %d %d) -> (%d %d %d)",
getClass().getSimpleName(), Integer.valueOf(dimensionId),
Integer.valueOf(coreX), Integer.valueOf(coreY), Integer.valueOf(coreZ),
Integer.valueOf(minX), Integer.valueOf(minY), Integer.valueOf(minZ),
Integer.valueOf(maxX), Integer.valueOf(maxY), Integer.valueOf(maxZ) });
Integer.valueOf(maxX), Integer.valueOf(maxY), Integer.valueOf(maxZ) );
}
}

10
src/main/java/cr0s/warpdrive/data/JumpBlock.java
View file

@ -233,14 +233,14 @@ public class JumpBlock {
}
}
public static void NetworkHelper_updateTileEntityField(TileEntity te, String field) {
public static void NetworkHelper_updateTileEntityField(TileEntity tileEntity, String field) {
try {
if (NetworkManager_instance == null) {
NetworkHelper_init();
}
NetworkManager_updateTileEntityField.invoke(NetworkManager_instance, new Object[] { te, field });
} catch (Exception e) {
throw new RuntimeException(e);
NetworkManager_updateTileEntityField.invoke(NetworkManager_instance, tileEntity, field);
} catch (Exception exception) {
throw new RuntimeException(exception);
}
}
// IC2 support ends here
@ -342,7 +342,7 @@ public class JumpBlock {
if (block1 != Blocks.air) {
if (!c.worldObj.isRemote) {
block1.breakBlock(c.worldObj, l1, y, i2, block1, k1);
// After breakBlock a phantom TE might have been created with incorrect meta. This attempts to kill that phantom TE so the normal one can be create properly later
// After breakBlock a phantom TE might have been created with incorrect meta. This attempts to kill that phantom TE so the normal one can be created properly later
TileEntity te = c.getTileEntityUnsafe(x & 0x0F, y, z & 0x0F);
if (te != null && te.shouldRefresh(block1, c.getBlock(x & 0x0F, y, z & 0x0F), k1, c.getBlockMetadata(x & 0x0F, y, z & 0x0F), c.worldObj, l1, y, i2)) {
c.removeTileEntity(x & 0x0F, y, z & 0x0F);

2
src/main/java/cr0s/warpdrive/world/SpaceWorldGenerator.java
View file

@ -173,7 +173,7 @@ public class SpaceWorldGenerator implements IWorldGenerator {
if (WarpDriveConfig.LOGGING_WORLDGEN) {
WarpDrive.logger.info(String.format("Big asteroid: %.3f %.3f r %.3f r makes %3d, %3d, %3d",
new Object[] { Double.valueOf(binomial), Double.valueOf(bearing), Double.valueOf(yawn), Integer.valueOf(aX), Integer.valueOf(aY), Integer.valueOf(aZ) }));
Double.valueOf(binomial), Double.valueOf(bearing), Double.valueOf(yawn), Integer.valueOf(aX), Integer.valueOf(aY), Integer.valueOf(aZ) ));
}
// Place an asteroid