From fadcf82673dc51b629ccd16964b9a06a26b25478 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 14 Dec 2014 21:31:41 +0000 Subject: [PATCH] Fix some non-critical errors/warnings, probably didn't break anything --- .../info/jbcs/minecraft/chisel/block/BlockVoidstone.java | 4 ++-- .../chisel/block/tileentity/TileEntityPresent.java | 4 ++-- .../info/jbcs/minecraft/chisel/carving/CarvableHelper.java | 6 +++--- .../minecraft/chisel/client/render/tile/RenderPresent.java | 2 +- .../jbcs/minecraft/chisel/compat/MarbleCompatibility.java | 2 +- .../jbcs/minecraft/chisel/inventory/ContainerPresent.java | 2 +- .../java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java | 4 ---- .../info/jbcs/minecraft/chisel/utils/GeneralClient.java | 3 --- .../java/info/jbcs/minecraft/chisel/utils/GuiHandler.java | 2 +- 9 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java index 3a1f1258..0edfc2bf 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; public class BlockVoidstone extends Block implements ICarvable{ public CarvableHelper carverHelper; - public static IIcon iconParticle; + public IIcon iconParticle; public BlockVoidstone() { super(Material.rock); @@ -30,7 +30,7 @@ public class BlockVoidstone extends Block implements ICarvable{ public void registerBlockIcons(IIconRegister icon){ iconParticle = icon.registerIcon(Chisel.MOD_ID + ":voidstone/particles/star"); } - + @Override public void randomDisplayTick(World world, int x, int y, int z, Random random) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java index 2d3faaac..662419be 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java @@ -120,8 +120,8 @@ public class TileEntityPresent extends TileEntityChest { if (!worldObj.isRemote && numPlayersUsing != 0 && (+xCoord + yCoord + zCoord) % 200 == 0) { numPlayersUsing = 0; f = 5.0F; - List list = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord - f, yCoord - f, zCoord - f, (xCoord + 1) + f, (yCoord + 1) + f, (zCoord + 1) + f)); - Iterator iterator = list.iterator(); + List list = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord - f, yCoord - f, zCoord - f, (xCoord + 1) + f, (yCoord + 1) + f, (zCoord + 1) + f)); + Iterator iterator = list.iterator(); while (iterator.hasNext()) { EntityPlayer player = (EntityPlayer) iterator.next(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index 99885ca4..1b5e6caa 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -287,14 +287,14 @@ public class CarvableHelper registerBlock(block, name, ItemCarvable.class); } - void registerBlock(Block block, String name, Class cl) + void registerBlock(Block block, String name, Class cl) { block.setBlockName(name); GameRegistry.registerBlock(block, cl, name); chiselBlocks.add(block); } - public void register(Block block, String name, Class cl) + public void register(Block block, String name, Class cl) { registerBlock(block, name, cl); @@ -417,7 +417,7 @@ public class CarvableHelper } } - public void registerSubBlocks(Block block, CreativeTabs tabs, List list) + public void registerSubBlocks(Block block, CreativeTabs tabs, List list) { for(CarvableVariation variation : variations) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java index db558990..e08f5487 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java @@ -19,7 +19,7 @@ public class RenderPresent extends TileEntityChestRenderer { private ModelChest doubleChest = new ModelLargeChest(); //TODO: this will be changed so it actually chescks after I have crate textures :) - private boolean isChristmas = true; + //private boolean isChristmas = true; public RenderPresent() { diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java index 0890be05..7712f15d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java @@ -10,7 +10,7 @@ public class MarbleCompatibility abstract class ClassCompat { - Class cl; + Class cl; public ClassCompat(String name) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java index cf39a481..eee7e9ca 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java @@ -13,7 +13,7 @@ public class ContainerPresent extends ContainerChest { lower = chest; rows = chest.getSizeInventory() / 9; chest.openInventory(); - int a = (rows - 4) * 18, b, c; + int a = (rows - 4) * 18; for (int d = 0; d < rows; d++) { for (int e = 0; e < 9; e++) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java index ed9c00b8..f25e73e7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java @@ -29,11 +29,7 @@ public class ItemUpgrade extends Item{ public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int size, float hitX, float hitY, float hitZ){ if(world.isRemote) return false; TileEntity tile = world.getTileEntity(x, y, z); - TileEntityAutoChisel autoChisel; - if(tile != null && tile instanceof TileEntityAutoChisel){ - TileEntityAutoChisel autoChisel1 = (TileEntityAutoChisel) tile; - //TODO: Finish the switch with upgrade } return true; } diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java index 11f74e79..4c1bccc8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java @@ -5,7 +5,6 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.item.EntityItem; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -13,8 +12,6 @@ import net.minecraft.world.World; public class GeneralClient { public static Random rand = new Random(); - private static EntityItem ghostItem; - public static void playChiselSound(World world, int x, int y, int z, String sound) { Minecraft.getMinecraft().theWorld.playSound(x + 0.5, y + 0.5, z + 0.5, sound, 0.3f + 0.7f * rand.nextFloat(), 0.6f + 0.4f * rand.nextFloat(), true); diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java index 0dbb157d..d5532d7a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -public abstract class GuiHandler implements Comparable +public abstract class GuiHandler implements Comparable { static ArrayList items = new ArrayList();