From b4d5f85e4ee44cb297ecc721476f6aa3fc7cb11f Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 31 Jul 2015 11:46:05 -0400 Subject: [PATCH] Revert "Re-refixed TEBelljar" This reverts commit e242207d505018f4a3ff776ef8e268bfac6e94fa. --- .../common/block/BlockBelljar.java | 16 ++++++++-------- .../renderer/block/RenderCrystalBelljar.java | 6 +++--- .../{TEBelljar.java => TEBellJar.java} | 0 3 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/{TEBelljar.java => TEBellJar.java} (100%) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java index 6ed3c8c0..97cdc9e3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java @@ -23,7 +23,7 @@ import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainer; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; -import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; public class BlockBelljar extends BlockContainer { @@ -77,12 +77,12 @@ public class BlockBelljar extends BlockContainer { TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TEBelljar) + if (tile instanceof TEBellJar) { NBTTagCompound tag = stack.getTagCompound(); if (tag != null) { - ((TEBelljar) tile).readTankNBTOnPlace(tag); + ((TEBellJar) tile).readTankNBTOnPlace(tag); } } } @@ -90,7 +90,7 @@ public class BlockBelljar extends BlockContainer @Override public TileEntity createNewTileEntity(World world, int meta) { - return new TEBelljar(); + return new TEBellJar(); } @Override @@ -121,9 +121,9 @@ public class BlockBelljar extends BlockContainer public int getComparatorInputOverride(World world, BlockPos blockPos) { TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TEBelljar) + if (tile instanceof TEBellJar) { - return ((TEBelljar) tile).getRSPowerOutput(); + return ((TEBellJar) tile).getRSPowerOutput(); } return 15; } @@ -142,11 +142,11 @@ public class BlockBelljar extends BlockContainer TileEntity tile = world.getTileEntity(blockPos); - if (tile instanceof TEBelljar) + if (tile instanceof TEBellJar) { ItemStack drop = new ItemStack(this); NBTTagCompound tag = new NBTTagCompound(); - ((TEBelljar) tile).writeTankNBT(tag); + ((TEBellJar) tile).writeTankNBT(tag); drop.setTagCompound(tag); list.add(drop); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java index 2330212b..dd0212ff 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java @@ -14,7 +14,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack; import WayofTime.alchemicalWizardry.common.renderer.model.ModelCrystalBelljar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; public class RenderCrystalBelljar extends TileEntitySpecialRenderer { @@ -25,9 +25,9 @@ public class RenderCrystalBelljar extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int i) { - if (tileEntity instanceof TEBelljar) + if (tileEntity instanceof TEBellJar) { - TEBelljar tileAltar = (TEBelljar) tileEntity; + TEBellJar tileAltar = (TEBellJar) tileEntity; GL11.glPushMatrix(); GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/CrystalBelljar.png"); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBellJar.java similarity index 100% rename from src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBelljar.java rename to src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBellJar.java