diff --git a/src/main/java/cr0s/warpdrive/WarpDrive.java b/src/main/java/cr0s/warpdrive/WarpDrive.java index 4da5d361..98766a12 100644 --- a/src/main/java/cr0s/warpdrive/WarpDrive.java +++ b/src/main/java/cr0s/warpdrive/WarpDrive.java @@ -566,13 +566,14 @@ public class WarpDrive { GameRegistry.registerBlock(blockWeaponController, ItemBlockAbstractBase.class, "blockWeaponController"); GameRegistry.registerTileEntity(TileEntityWeaponController.class, MODID + ":blockWeaponController"); - // COMPONENT ITEMS + // component items itemComponent = new ItemComponent(); GameRegistry.registerItem(itemComponent, "itemComponent"); itemShipToken = new ItemShipToken(); GameRegistry.registerItem(itemShipToken, "itemShipToken"); + // warp armor itemWarpArmor = new ItemArmor[4]; for (int armorPart = 0; armorPart < 4; armorPart++) { itemWarpArmor[armorPart] = new ItemWarpArmor(armorMaterial, 3, armorPart); diff --git a/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java b/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java index 97a37c71..374d9fb4 100644 --- a/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java +++ b/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java @@ -500,7 +500,8 @@ public class TileEntityShipScanner extends TileEntityAbstractInterfaced implemen } if (!(block instanceof BlockShipCore)) { - world.newExplosion(null, x, y, z, 1, false, false); + world.newExplosion(null, x, y, z, + 1, false, false); reason.append(String.format("§cDeployment area occupied by %s.\nCan't deploy new ship at (%d %d %d)", block.getLocalizedName(), x, y, z)); @@ -509,10 +510,12 @@ public class TileEntityShipScanner extends TileEntityAbstractInterfaced implemen final TileEntity tileEntity = world.getTileEntity(x, y, z); if (!(tileEntity instanceof TileEntityShipCore)) { - reason.append(String.format("§cDeployment area occupied with invalid tile entity %s.\nContact an admin for help at (%d %d %d)", - block, x, y, z)); + reason.append(String.format("§cDeployment area occupied with invalid tile entity %s for ship core.\nContact an admin for help at (%d %d %d)", + tileEntity, + x, y, z)); WarpDrive.logger.error(reason.toString()); - world.newExplosion(null, x, y, z, 1, false, false); + world.newExplosion(null, x, y, z, + 1, false, false); return false; } diff --git a/src/main/java/cr0s/warpdrive/data/CloakManager.java b/src/main/java/cr0s/warpdrive/data/CloakManager.java index a1a37a33..e97831a0 100644 --- a/src/main/java/cr0s/warpdrive/data/CloakManager.java +++ b/src/main/java/cr0s/warpdrive/data/CloakManager.java @@ -144,7 +144,7 @@ public class CloakManager { } } - // call is inserted by ASM + @SuppressWarnings("unused") // Core mod @SideOnly(Side.CLIENT) public static boolean onBlockChange(final int x, final int y, final int z, final Block block, final int metadata, final int flag) { if (block != Blocks.air) { @@ -161,7 +161,7 @@ public class CloakManager { return Minecraft.getMinecraft().theWorld.setBlock(x, y, z, block, metadata, flag); } - // call is inserted by ASM + @SuppressWarnings("unused") // Core mod @SideOnly(Side.CLIENT) public static void onFillChunk(final Chunk chunk) { if (cloaks == null) { diff --git a/src/main/java/cr0s/warpdrive/network/MessageBeamEffect.java b/src/main/java/cr0s/warpdrive/network/MessageBeamEffect.java index 0c5aee6c..8607e62f 100644 --- a/src/main/java/cr0s/warpdrive/network/MessageBeamEffect.java +++ b/src/main/java/cr0s/warpdrive/network/MessageBeamEffect.java @@ -25,6 +25,7 @@ public class MessageBeamEffect implements IMessage, IMessageHandler