From d5dc5bf328f0c57b426f2cf6f8b290a1e548a093 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 31 Oct 2015 17:02:34 -0400 Subject: [PATCH] Changed TEBelljar to TEBellJar --- .../alchemicalWizardry/AlchemicalWizardry.java | 4 ++-- .../alchemicalWizardry/client/ClientProxy.java | 4 ++-- .../common/block/BlockBelljar.java | 16 ++++++++-------- .../renderer/block/RenderCrystalBelljar.java | 6 +++--- .../block/itemRender/TEBellJarItemRenderer.java | 4 ++-- .../common/rituals/RitualEffectDemonPortal.java | 4 ++-- .../{TEBelljar.java => TEBellJar.java} | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) rename src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/{TEBelljar.java => TEBellJar.java} (98%) diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index cfb57144..ec1f894b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -256,7 +256,7 @@ import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry; import WayofTime.alchemicalWizardry.common.thread.CommandDownloadGAPI; import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit; import WayofTime.alchemicalWizardry.common.tileEntity.TECrucible; import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart; @@ -855,7 +855,7 @@ public class AlchemicalWizardry GameRegistry.registerTileEntity(TESchematicSaver.class, "containerSchematicSaver"); GameRegistry.registerTileEntity(TESpectralBlock.class, "containerSpectralBlock"); GameRegistry.registerTileEntity(TEReagentConduit.class, "containerReagentConduit"); - GameRegistry.registerTileEntity(TEBelljar.class, "containerBellJar"); + GameRegistry.registerTileEntity(TEBellJar.class, "containerBellJar"); GameRegistry.registerTileEntity(TEAlchemicCalcinator.class, "containerAlchemicCalcinator"); GameRegistry.registerTileEntity(TEDemonChest.class, "containerDemonChest"); GameRegistry.registerTileEntity(TEMimicBlock.class, "containerMimic"); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java index ed00a62d..9c1112ff 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java @@ -87,7 +87,7 @@ import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderMeteor; import WayofTime.alchemicalWizardry.common.thread.GAPIChecker; import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal; @@ -164,7 +164,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.bindTileEntitySpecialRenderer(TEMasterStone.class, new RenderMasterStone()); } ClientRegistry.bindTileEntitySpecialRenderer(TEAlchemicCalcinator.class, new RenderAlchemicCalcinator()); - ClientRegistry.bindTileEntitySpecialRenderer(TEBelljar.class, new RenderCrystalBelljar()); + ClientRegistry.bindTileEntitySpecialRenderer(TEBellJar.class, new RenderCrystalBelljar()); //Item Renderer stuff MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockConduit), new TEConduitItemRenderer()); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java index 1ac4397b..e04354f3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java @@ -19,7 +19,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; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -77,12 +77,12 @@ public class BlockBelljar extends BlockContainer { TileEntity tile = world.getTileEntity(x, y, z); - 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 @@ -127,9 +127,9 @@ public class BlockBelljar extends BlockContainer public int getComparatorInputOverride(World world, int x, int y, int z, int meta) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TEBelljar) + if (tile instanceof TEBellJar) { - return ((TEBelljar) tile).getRSPowerOutput(); + return ((TEBellJar) tile).getRSPowerOutput(); } return 15; } @@ -148,11 +148,11 @@ public class BlockBelljar extends BlockContainer TileEntity tile = world.getTileEntity(x, y, z); - 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 10e53fd4..b37b9391 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java @@ -4,7 +4,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; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -24,9 +24,9 @@ public class RenderCrystalBelljar extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f) { - 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/renderer/block/itemRender/TEBellJarItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEBellJarItemRenderer.java index faedc1ec..b9826145 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEBellJarItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEBellJarItemRenderer.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; import cpw.mods.fml.client.FMLClientHandler; public class TEBellJarItemRenderer implements IItemRenderer @@ -35,7 +35,7 @@ public class TEBellJarItemRenderer implements IItemRenderer GL11.glPopMatrix(); GL11.glPopMatrix(); - ReagentContainerInfo[] info = TEBelljar.getContainerInfoFromItem(item); + ReagentContainerInfo[] info = TEBellJar.getContainerInfoFromItem(item); if (info.length >= 1 && info[0] != null) { ReagentStack reagentStack = info[0].reagent; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java index 1be6984a..ae468585 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java @@ -21,7 +21,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; public class RitualEffectDemonPortal extends RitualEffect { @@ -139,7 +139,7 @@ public class RitualEffectDemonPortal extends RitualEffect for(Int3 pos : jarLocations) { - if(!(ritualStone.getWorld().getTileEntity(x + pos.xCoord, y + pos.yCoord, z + pos.zCoord) instanceof TEBelljar)) + if(!(ritualStone.getWorld().getTileEntity(x + pos.xCoord, y + pos.yCoord, z + pos.zCoord) instanceof TEBellJar)) { return false; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBellJar.java similarity index 98% rename from src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBelljar.java rename to src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBellJar.java index f29acb16..1126762a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEBellJar.java @@ -11,9 +11,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants; -public class TEBelljar extends TEReagentConduit +public class TEBellJar extends TEReagentConduit { - public TEBelljar() + public TEBellJar() { super(1, 16000); this.maxConnextions = 1;