From 87ee823acbcf62017b71308aa23084621e8e2fa7 Mon Sep 17 00:00:00 2001 From: WORMSS Date: Thu, 11 Apr 2013 14:11:46 +0200 Subject: [PATCH 1/8] Changed to getUnlocalizedName2 Changed to getUnlocalizedName2 to remove the need to use substring and index of. --- ee3_common/com/pahimar/ee3/block/BlockEE.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee3_common/com/pahimar/ee3/block/BlockEE.java b/ee3_common/com/pahimar/ee3/block/BlockEE.java index 64ff8110..c267deab 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockEE.java +++ b/ee3_common/com/pahimar/ee3/block/BlockEE.java @@ -35,7 +35,7 @@ public abstract class BlockEE extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - blockIcon = iconRegister.registerIcon(Reference.MOD_ID.toLowerCase() + ":" + this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".") + 1)); + blockIcon = iconRegister.registerIcon(Reference.MOD_ID.toLowerCase() + ":" + this.getUnlocalizedName2())); } /** From ee82ac25287a4b133ebfef9e32361313d09696ad Mon Sep 17 00:00:00 2001 From: Telinc1 Date: Sat, 13 Apr 2013 13:08:38 +0300 Subject: [PATCH 2/8] Changed the bounding box of the Alchemical Chest. --- ee3_common/com/pahimar/ee3/block/BlockAlchemicalChest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ee3_common/com/pahimar/ee3/block/BlockAlchemicalChest.java b/ee3_common/com/pahimar/ee3/block/BlockAlchemicalChest.java index d8084711..c1feb173 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockAlchemicalChest.java +++ b/ee3_common/com/pahimar/ee3/block/BlockAlchemicalChest.java @@ -39,6 +39,7 @@ public class BlockAlchemicalChest extends BlockEE { super(id, Material.wood); this.setUnlocalizedName(Strings.ALCHEMICAL_CHEST_NAME); + this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); this.setCreativeTab(EquivalentExchange3.tabsEE3); } From a057b88c3d514aac960c3a0b0ddf4d9f55a4626f Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 16 Apr 2013 16:06:30 -0400 Subject: [PATCH 3/8] Working on a new block, the Glass Dome --- build_number.properties | 4 +- .../com/pahimar/ee3/EquivalentExchange3.java | 2 +- ...{BlockAludel.java => BlockAludelBase.java} | 6 +- ee3_common/com/pahimar/ee3/block/BlockEE.java | 2 +- .../com/pahimar/ee3/block/BlockGlassDome.java | 121 +++++++++++++++ .../com/pahimar/ee3/block/ModBlocks.java | 5 +- .../client/gui/inventory/GuiGlassDome.java | 56 +++++++ .../pahimar/ee3/client/model/ModelAludel.java | 53 +------ .../ee3/client/model/ModelCalcinator.java | 30 +--- .../ee3/client/model/ModelGlassDome.java | 22 +++ .../renderer/item/ItemAludelRenderer.java | 12 +- .../renderer/item/ItemCalcinatorRenderer.java | 6 +- .../renderer/item/ItemGlassDomeRenderer.java | 86 +++++++++++ .../TileEntityAlchemicalChestRenderer.java | 92 ++++++----- .../tileentity/TileEntityAludelRenderer.java | 48 +++++- .../TileEntityCalcinatorRenderer.java | 27 +++- .../TileEntityGlassDomeRenderer.java | 82 ++++++++++ .../configuration/ConfigurationHandler.java | 1 + .../ee3/core/helper/RedWaterHelper.java | 48 ------ .../pahimar/ee3/core/proxy/ClientProxy.java | 10 +- .../pahimar/ee3/core/proxy/CommonProxy.java | 14 +- .../ee3/inventory/ContainerGlassDome.java | 54 +++++++ ee3_common/com/pahimar/ee3/lib/BlockIds.java | 2 + ee3_common/com/pahimar/ee3/lib/GuiIds.java | 1 + ee3_common/com/pahimar/ee3/lib/Models.java | 1 + ee3_common/com/pahimar/ee3/lib/RenderIds.java | 1 + ee3_common/com/pahimar/ee3/lib/Strings.java | 3 + ee3_common/com/pahimar/ee3/lib/Textures.java | 2 + .../pahimar/ee3/tileentity/TileGlassDome.java | 145 ++++++++++++++++++ resources/mods/ee3/lang/en_US.xml | 2 + resources/mods/ee3/textures/blocks/aludel.png | Bin 4022 -> 3181 bytes .../mods/ee3/textures/blocks/glassDome.png | Bin 0 -> 293 bytes resources/mods/ee3/textures/gui/glassDome.png | Bin 0 -> 3818 bytes .../mods/ee3/textures/xcf/blocks/aludel.xcf | Bin 7048 -> 4584 bytes .../ee3/textures/xcf/blocks/glassDome.xcf | Bin 0 -> 1560 bytes .../mods/ee3/textures/xcf/gui/glassDome.xcf | Bin 0 -> 24117 bytes 36 files changed, 740 insertions(+), 198 deletions(-) rename ee3_common/com/pahimar/ee3/block/{BlockAludel.java => BlockAludelBase.java} (95%) create mode 100644 ee3_common/com/pahimar/ee3/block/BlockGlassDome.java create mode 100644 ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassDome.java create mode 100644 ee3_common/com/pahimar/ee3/client/model/ModelGlassDome.java create mode 100644 ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassDomeRenderer.java create mode 100644 ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java delete mode 100644 ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java create mode 100644 ee3_common/com/pahimar/ee3/inventory/ContainerGlassDome.java create mode 100644 ee3_common/com/pahimar/ee3/tileentity/TileGlassDome.java create mode 100644 resources/mods/ee3/textures/blocks/glassDome.png create mode 100644 resources/mods/ee3/textures/gui/glassDome.png create mode 100644 resources/mods/ee3/textures/xcf/blocks/glassDome.xcf create mode 100644 resources/mods/ee3/textures/xcf/gui/glassDome.xcf diff --git a/build_number.properties b/build_number.properties index 9d9ab956..beff438a 100644 --- a/build_number.properties +++ b/build_number.properties @@ -1,3 +1,3 @@ -#Fri, 12 Apr 2013 12:55:58 -0400 +#Tue, 16 Apr 2013 14:01:55 -0400 -build_number=5 +build_number=6 diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index 9d6dd310..cc88f0c2 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -157,7 +157,7 @@ public class EquivalentExchange3 { proxy.registerDrawBlockHighlightHandler(); // Initialize mod tile entities - proxy.initTileEntities(); + proxy.registerTileEntities(); // Initialize custom rendering and pre-load textures (Client only) proxy.initRenderingAndTextures(); diff --git a/ee3_common/com/pahimar/ee3/block/BlockAludel.java b/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java similarity index 95% rename from ee3_common/com/pahimar/ee3/block/BlockAludel.java rename to ee3_common/com/pahimar/ee3/block/BlockAludelBase.java index 299174c2..4847c2e9 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockAludel.java +++ b/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java @@ -26,7 +26,7 @@ import com.pahimar.ee3.tileentity.TileAludel; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class BlockAludel extends BlockEE { +public class BlockAludelBase extends BlockEE { /** * Is the random generator used by aludel to drop the inventory contents in @@ -34,13 +34,13 @@ public class BlockAludel extends BlockEE { */ private Random rand = new Random(); - public BlockAludel(int id) { + public BlockAludelBase(int id) { super(id, Material.rock); this.setUnlocalizedName(Strings.ALUDEL_NAME); this.setCreativeTab(EquivalentExchange3.tabsEE3); + this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F); this.setHardness(5F); - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.66F, 1.0F); } @Override diff --git a/ee3_common/com/pahimar/ee3/block/BlockEE.java b/ee3_common/com/pahimar/ee3/block/BlockEE.java index c267deab..e9d4e679 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockEE.java +++ b/ee3_common/com/pahimar/ee3/block/BlockEE.java @@ -35,7 +35,7 @@ public abstract class BlockEE extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - blockIcon = iconRegister.registerIcon(Reference.MOD_ID.toLowerCase() + ":" + this.getUnlocalizedName2())); + blockIcon = iconRegister.registerIcon(Reference.MOD_ID.toLowerCase() + ":" + this.getUnlocalizedName2()); } /** diff --git a/ee3_common/com/pahimar/ee3/block/BlockGlassDome.java b/ee3_common/com/pahimar/ee3/block/BlockGlassDome.java new file mode 100644 index 00000000..89e93a3f --- /dev/null +++ b/ee3_common/com/pahimar/ee3/block/BlockGlassDome.java @@ -0,0 +1,121 @@ +package com.pahimar.ee3.block; + +import java.util.Random; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.RenderIds; +import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.tileentity.TileGlassDome; + + +public class BlockGlassDome extends BlockEE { + + /** + * Is the random generator used by glass dome to drop the inventory contents in + * random directions. + */ + private Random rand = new Random(); + + public BlockGlassDome(int id) { + + super(id, Material.glass); + this.setUnlocalizedName(Strings.GLASS_DOME_NAME); + this.setCreativeTab(EquivalentExchange3.tabsEE3); + this.setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.66F, 0.875F); + this.setHardness(1.0F); + } + + @Override + public TileEntity createNewTileEntity(World world) { + + return new TileGlassDome(); + } + + @Override + public boolean renderAsNormalBlock() { + + return false; + } + + @Override + public boolean isOpaqueCube() { + + return false; + } + + @Override + public int getRenderType() { + + return RenderIds.glassDomeId; + } + + @Override + public void breakBlock(World world, int x, int y, int z, int id, int meta) { + + dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, id, meta); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + + if (player.isSneaking()) + return false; + else { + if (!world.isRemote) { + TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z); + + if (tileGlassDome != null) { + player.openGui(EquivalentExchange3.instance, GuiIds.GLASS_DOME, world, x, y, z); + } + } + + return true; + } + } + + private void dropInventory(World world, int x, int y, int z) { + + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + + if (!(tileEntity instanceof IInventory)) + return; + + IInventory inventory = (IInventory) tileEntity; + + for (int i = 0; i < inventory.getSizeInventory(); i++) { + + ItemStack itemStack = inventory.getStackInSlot(i); + + if (itemStack != null && itemStack.stackSize > 0) { + float dX = rand.nextFloat() * 0.8F + 0.1F; + float dY = rand.nextFloat() * 0.8F + 0.1F; + float dZ = rand.nextFloat() * 0.8F + 0.1F; + + EntityItem entityItem = new EntityItem(world, x + dX, y + dY, z + dZ, new ItemStack(itemStack.itemID, itemStack.stackSize, itemStack.getItemDamage())); + + if (itemStack.hasTagCompound()) { + entityItem.getEntityItem().setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); + } + + float factor = 0.05F; + entityItem.motionX = rand.nextGaussian() * factor; + entityItem.motionY = rand.nextGaussian() * factor + 0.2F; + entityItem.motionZ = rand.nextGaussian() * factor; + world.spawnEntityInWorld(entityItem); + itemStack.stackSize = 0; + } + } + } + +} diff --git a/ee3_common/com/pahimar/ee3/block/ModBlocks.java b/ee3_common/com/pahimar/ee3/block/ModBlocks.java index ad852ebb..ad5e2053 100644 --- a/ee3_common/com/pahimar/ee3/block/ModBlocks.java +++ b/ee3_common/com/pahimar/ee3/block/ModBlocks.java @@ -22,20 +22,23 @@ public class ModBlocks { public static Block calcinator; public static Block aludel; public static Block alchemicalChest; + public static Block glassDome; public static Block redWaterStill; public static Block redWaterFlowing; public static void init() { calcinator = new BlockCalcinator(BlockIds.CALCINATOR); - aludel = new BlockAludel(BlockIds.ALUDEL); + aludel = new BlockAludelBase(BlockIds.ALUDEL); alchemicalChest = new BlockAlchemicalChest(BlockIds.ALCHEMICAL_CHEST); + glassDome = new BlockGlassDome(BlockIds.GLASS_DOME); redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL); redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1); GameRegistry.registerBlock(calcinator, Strings.CALCINATOR_NAME); GameRegistry.registerBlock(aludel, Strings.ALUDEL_NAME); GameRegistry.registerBlock(alchemicalChest, Strings.ALCHEMICAL_CHEST_NAME); + GameRegistry.registerBlock(glassDome, Strings.GLASS_DOME_NAME); //GameRegistry.registerBlock(redWaterStill, Strings.RED_WATER_STILL_NAME); //GameRegistry.registerBlock(redWaterFlowing, Strings.RED_WATER_FLOWING_NAME); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassDome.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassDome.java new file mode 100644 index 00000000..6412c35c --- /dev/null +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassDome.java @@ -0,0 +1,56 @@ +package com.pahimar.ee3.client.gui.inventory; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + +import com.pahimar.ee3.inventory.ContainerGlassDome; +import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.lib.Textures; +import com.pahimar.ee3.tileentity.TileGlassDome; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Equivalent-Exchange-3 + * + * GuiGlassDome + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +@SideOnly(Side.CLIENT) +public class GuiGlassDome extends GuiContainer { + + private TileGlassDome tileGlassDome; + + public GuiGlassDome(InventoryPlayer inventoryPlayer, TileGlassDome tileGlassDome) { + + super(new ContainerGlassDome(inventoryPlayer, tileGlassDome)); + this.tileGlassDome = tileGlassDome; + xSize = 176; + ySize = 140; + } + + @Override + protected void drawGuiContainerForegroundLayer(int x, int y) { + + String containerName = tileGlassDome.isInvNameLocalized() ? tileGlassDome.getInvName() : StatCollector.translateToLocal(tileGlassDome.getInvName()); + fontRenderer.drawString(containerName, xSize / 2 - fontRenderer.getStringWidth(containerName) / 2, 6, 4210752); + fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), 8, ySize - 93, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture(Textures.GUI_GLASS_DOME); + int xStart = (width - xSize) / 2; + int yStart = (height - ySize) / 2; + this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); + } +} diff --git a/ee3_common/com/pahimar/ee3/client/model/ModelAludel.java b/ee3_common/com/pahimar/ee3/client/model/ModelAludel.java index 8ef914cd..e5fbd60c 100644 --- a/ee3_common/com/pahimar/ee3/client/model/ModelAludel.java +++ b/ee3_common/com/pahimar/ee3/client/model/ModelAludel.java @@ -1,17 +1,10 @@ package com.pahimar.ee3.client.model; -import net.minecraft.client.model.ModelBase; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; - -import org.lwjgl.opengl.GL11; import com.pahimar.ee3.lib.Models; -import com.pahimar.ee3.lib.Textures; -import com.pahimar.ee3.tileentity.TileAludel; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; * */ @SideOnly(Side.CLIENT) -public class ModelAludel extends ModelBase { +public class ModelAludel { private IModelCustom modelAludel; @@ -36,48 +29,6 @@ public class ModelAludel extends ModelBase { public void render() { - modelAludel.renderAll(); - } - - public void render(TileAludel aludel, double x, double y, double z) { - - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_LIGHTING); - - // Scale, Translate, Rotate - scaleTranslateRotate(x, y, z, aludel.getOrientation()); - - // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); - - // Render - this.render(); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); - } - - private void scaleTranslateRotate(double x, double y, double z, ForgeDirection orientation) { - - if (orientation == ForgeDirection.NORTH) { - GL11.glTranslated(x + 1, y, z); - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glRotatef(-90F, 1F, 0F, 0F); - } - else if (orientation == ForgeDirection.EAST) { - GL11.glTranslated(x + 1, y, z + 1); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(-90F, 1F, 0F, 0F); - } - else if (orientation == ForgeDirection.SOUTH) { - GL11.glTranslated(x, y, z + 1); - GL11.glRotatef(0F, 0F, 1F, 0F); - GL11.glRotatef(-90F, 1F, 0F, 0F); - } - else if (orientation == ForgeDirection.WEST) { - GL11.glTranslated(x, y, z); - GL11.glRotatef(-90F, 0F, 1F, 0F); - GL11.glRotatef(-90F, 1F, 0F, 0F); - } + modelAludel.renderPart("Base"); } } diff --git a/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java index 65311d53..03cc7927 100644 --- a/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java @@ -1,16 +1,10 @@ package com.pahimar.ee3.client.model; -import net.minecraft.client.model.ModelBase; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import org.lwjgl.opengl.GL11; - import com.pahimar.ee3.lib.Models; -import com.pahimar.ee3.lib.Textures; -import com.pahimar.ee3.tileentity.TileCalcinator; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; * */ @SideOnly(Side.CLIENT) -public class ModelCalcinator extends ModelBase { +public class ModelCalcinator { private IModelCustom modelCalcinator; @@ -37,26 +31,4 @@ public class ModelCalcinator extends ModelBase { modelCalcinator.renderAll(); } - - public void render(TileCalcinator calcinator, double x, double y, double z) { - - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_LIGHTING); - - // Scale, Translate, Rotate - GL11.glScalef(1.0F, 1.0F, 1.0F); - GL11.glTranslatef((float) x + 0.5F, (float) y + 0.0F, (float) z + 1.2F); - GL11.glRotatef(45F, 0F, 1F, 0F); - GL11.glRotatef(-90F, 1F, 0F, 0F); - - // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR); - - // Render - this.render(); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); - } - } diff --git a/ee3_common/com/pahimar/ee3/client/model/ModelGlassDome.java b/ee3_common/com/pahimar/ee3/client/model/ModelGlassDome.java new file mode 100644 index 00000000..1d576d1a --- /dev/null +++ b/ee3_common/com/pahimar/ee3/client/model/ModelGlassDome.java @@ -0,0 +1,22 @@ +package com.pahimar.ee3.client.model; + +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; + +import com.pahimar.ee3.lib.Models; + + +public class ModelGlassDome { + + private IModelCustom modelGlassDome; + + public ModelGlassDome() { + + modelGlassDome = AdvancedModelLoader.loadModel(Models.GLASS_DOME); + } + + public void render() { + + modelGlassDome.renderPart("Dome"); + } +} diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java index 80bff31e..21085560 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java @@ -24,11 +24,11 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ItemAludelRenderer implements IItemRenderer { - private ModelAludel aludelModel; + private ModelAludel modelAludel; public ItemAludelRenderer() { - aludelModel = new ModelAludel(); + modelAludel = new ModelAludel(); } @Override @@ -48,15 +48,15 @@ public class ItemAludelRenderer implements IItemRenderer { switch (type) { case ENTITY: { - renderAludel(-0.5F, 0.0F, 0.5F, 0.66F); + renderAludel(-0.5F, -0.38F, 0.5F, 1.0F); return; } case EQUIPPED: { - renderAludel(0.5F, 0.0F, 1.25F, 0.66F); + renderAludel(0.0F, 0.0F, 1.0F, 1.0F); return; } case INVENTORY: { - renderAludel(-1.0F, -1.2F, 0.0F, 0.85F); + renderAludel(-1.0F, -0.9F, 0.0F, 1.0F); return; } default: @@ -78,7 +78,7 @@ public class ItemAludelRenderer implements IItemRenderer { FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); // Render - aludelModel.render(); + modelAludel.render(); GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java index 87bc8061..9d9b037b 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java @@ -24,11 +24,11 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ItemCalcinatorRenderer implements IItemRenderer { - private ModelCalcinator calcinatorModel; + private ModelCalcinator modelCalcinator; public ItemCalcinatorRenderer() { - calcinatorModel = new ModelCalcinator(); + modelCalcinator = new ModelCalcinator(); } @Override @@ -78,7 +78,7 @@ public class ItemCalcinatorRenderer implements IItemRenderer { FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR); // Render - calcinatorModel.render(); + modelCalcinator.render(); GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassDomeRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassDomeRenderer.java new file mode 100644 index 00000000..9e1d4d3d --- /dev/null +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassDomeRenderer.java @@ -0,0 +1,86 @@ +package com.pahimar.ee3.client.renderer.item; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import com.pahimar.ee3.client.model.ModelGlassDome; +import com.pahimar.ee3.lib.Textures; + +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Equivalent-Exchange-3 + * + * ItemAludelRenderer + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +@SideOnly(Side.CLIENT) +public class ItemGlassDomeRenderer implements IItemRenderer { + + private ModelGlassDome modelGlassDome; + + public ItemGlassDomeRenderer() { + + modelGlassDome = new ModelGlassDome(); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + switch (type) { + case ENTITY: { + renderGlassDome(-0.5F, -1.2F, 0.5F, 1.4F); + return; + } + case EQUIPPED: { + renderGlassDome(-0.2F, -0.85F, 0.8F, 1.4F); + return; + } + case INVENTORY: { + renderGlassDome(-1.0F, -1.675F, 0.0F, 1.4F); + return; + } + default: + return; + } + } + + private void renderGlassDome(float x, float y, float z, float scale) { + + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_LIGHTING); + + // Scale, Translate, Rotate + GL11.glScalef(scale, scale, scale); + GL11.glTranslatef(x, y, z); + GL11.glRotatef(-90F, 1F, 0, 0); + + // Bind texture + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); + + // Render + modelGlassDome.render(); + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } +} diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java index 484fbf5d..9f3093a2 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java @@ -25,58 +25,56 @@ import cpw.mods.fml.relauncher.SideOnly; * */ @SideOnly(Side.CLIENT) -public class TileEntityAlchemicalChestRenderer extends - TileEntitySpecialRenderer { +public class TileEntityAlchemicalChestRenderer extends TileEntitySpecialRenderer { private ModelChest modelChest = new ModelChest(); - public void renderAlchemicalChest(TileAlchemicalChest tileAlchemicalChest, double x, double y, double z, float tick) { - - ForgeDirection direction = null; - - if (tileAlchemicalChest.getWorldObj() != null) { - direction = ForgeDirection.getOrientation(tileAlchemicalChest.getBlockMetadata()); - } - - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST); - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glTranslatef((float) x, (float) y + 1.0F, (float) z + 1.0F); - GL11.glScalef(1.0F, -1.0F, -1.0F); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - short angle = 0; - - if (direction != null) { - if (direction == ForgeDirection.NORTH) { - angle = 180; - } - else if (direction == ForgeDirection.SOUTH) { - angle = 0; - } - else if (direction == ForgeDirection.WEST) { - angle = 90; - } - else if (direction == ForgeDirection.EAST) { - angle = -90; - } - } - - GL11.glRotatef(angle, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - float adjustedLidAngle = tileAlchemicalChest.prevLidAngle + (tileAlchemicalChest.lidAngle - tileAlchemicalChest.prevLidAngle) * tick; - adjustedLidAngle = 1.0F - adjustedLidAngle; - adjustedLidAngle = 1.0F - adjustedLidAngle * adjustedLidAngle * adjustedLidAngle; - modelChest.chestLid.rotateAngleX = -(adjustedLidAngle * (float) Math.PI / 2.0F); - modelChest.renderAll(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { + + if (tileEntity instanceof TileAlchemicalChest) { + + TileAlchemicalChest tileAlchemicalChest = (TileAlchemicalChest) tileEntity; + ForgeDirection direction = null; - renderAlchemicalChest((TileAlchemicalChest) tileEntity, x, y, z, tick); + if (tileAlchemicalChest.getWorldObj() != null) { + direction = ForgeDirection.getOrientation(tileAlchemicalChest.getBlockMetadata()); + } + + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST); + GL11.glPushMatrix(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glTranslatef((float) x, (float) y + 1.0F, (float) z + 1.0F); + GL11.glScalef(1.0F, -1.0F, -1.0F); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + short angle = 0; + + if (direction != null) { + if (direction == ForgeDirection.NORTH) { + angle = 180; + } + else if (direction == ForgeDirection.SOUTH) { + angle = 0; + } + else if (direction == ForgeDirection.WEST) { + angle = 90; + } + else if (direction == ForgeDirection.EAST) { + angle = -90; + } + } + + GL11.glRotatef(angle, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + float adjustedLidAngle = tileAlchemicalChest.prevLidAngle + (tileAlchemicalChest.lidAngle - tileAlchemicalChest.prevLidAngle) * tick; + adjustedLidAngle = 1.0F - adjustedLidAngle; + adjustedLidAngle = 1.0F - adjustedLidAngle * adjustedLidAngle * adjustedLidAngle; + modelChest.chestLid.rotateAngleX = -(adjustedLidAngle * (float) Math.PI / 2.0F); + modelChest.renderAll(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } } } diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java index 48458878..0d3fa10f 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java @@ -1,11 +1,16 @@ package com.pahimar.ee3.client.renderer.tileentity; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; import com.pahimar.ee3.client.model.ModelAludel; +import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileAludel; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,7 +31,48 @@ public class TileEntityAludelRenderer extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { - modelAludel.render((TileAludel) tileEntity, x, y, z); + if (tileEntity instanceof TileAludel) { + + TileAludel tileAludel = (TileAludel) tileEntity; + + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_LIGHTING); + + // Scale, Translate, Rotate + scaleTranslateRotate(x, y, z, tileAludel.getOrientation()); + + // Bind texture + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); + + // Render + modelAludel.render(); + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } } + private void scaleTranslateRotate(double x, double y, double z, ForgeDirection orientation) { + + if (orientation == ForgeDirection.NORTH) { + GL11.glTranslated(x + 1, y, z); + GL11.glRotatef(180F, 0F, 1F, 0F); + GL11.glRotatef(-90F, 1F, 0F, 0F); + } + else if (orientation == ForgeDirection.EAST) { + GL11.glTranslated(x + 1, y, z + 1); + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glRotatef(-90F, 1F, 0F, 0F); + } + else if (orientation == ForgeDirection.SOUTH) { + GL11.glTranslated(x, y, z + 1); + GL11.glRotatef(0F, 0F, 1F, 0F); + GL11.glRotatef(-90F, 1F, 0F, 0F); + } + else if (orientation == ForgeDirection.WEST) { + GL11.glTranslated(x, y, z); + GL11.glRotatef(-90F, 0F, 1F, 0F); + GL11.glRotatef(-90F, 1F, 0F, 0F); + } + } } diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java index b13df5f0..f6b45806 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java @@ -3,9 +3,13 @@ package com.pahimar.ee3.client.renderer.tileentity; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import org.lwjgl.opengl.GL11; + import com.pahimar.ee3.client.model.ModelCalcinator; +import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileCalcinator; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,7 +30,26 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { - modelCalcinator.render((TileCalcinator) tileEntity, x, y, z); - } + if (tileEntity instanceof TileCalcinator) { + TileCalcinator tileCalcinator = (TileCalcinator) tileEntity; + + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_LIGHTING); + // Scale, Translate, Rotate + GL11.glScalef(1.0F, 1.0F, 1.0F); + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.0F, (float) z + 1.2F); + GL11.glRotatef(45F, 0F, 1F, 0F); + GL11.glRotatef(-90F, 1F, 0F, 0F); + + // Bind texture + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR); + + // Render + modelCalcinator.render(); + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } + } } diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java new file mode 100644 index 00000000..df413dae --- /dev/null +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java @@ -0,0 +1,82 @@ +package com.pahimar.ee3.client.renderer.tileentity; + +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import com.pahimar.ee3.client.model.ModelGlassDome; +import com.pahimar.ee3.lib.Textures; +import com.pahimar.ee3.tileentity.TileGlassDome; + +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Equivalent-Exchange-3 + * + * TileEntityCalcinatorRenderer + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +@SideOnly(Side.CLIENT) +public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer { + + private ModelGlassDome modelGlassDome = new ModelGlassDome(); + private final RenderItem customRenderItem; + + public TileEntityGlassDomeRenderer() { + customRenderItem = new RenderItem() { + public boolean shouldBob() { + return false; + }; + }; + + customRenderItem.setRenderManager(RenderManager.instance); + } + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { + + if (tileEntity instanceof TileGlassDome) { + TileGlassDome tileGlassDome = (TileGlassDome) tileEntity; + + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + + // Scale, Translate, Rotate + GL11.glScalef(1.0F, 1.0F, 1.0F); + GL11.glTranslatef((float) x + 0.5F, (float) y + (-1.0F), (float) z + 1.2F); + GL11.glRotatef(45F, 0F, 1F, 0F); + GL11.glRotatef(-90F, 1F, 0F, 0F); + + // Bind texture + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); + + // Render + modelGlassDome.render(); + + for (int i = 0; i < tileGlassDome.getSizeInventory(); i++) { + EntityItem entityItem = new EntityItem(tileGlassDome.worldObj, tileGlassDome.xCoord, tileGlassDome.yCoord, tileGlassDome.zCoord); + + if (tileGlassDome.getStackInSlot(i) != null) { + + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.VANILLA_ITEM_TEXTURE_SHEET); + entityItem.setEntityItemStack(tileGlassDome.getStackInSlot(i)); + customRenderItem.doRenderItem(entityItem, 0, 0, 0, 0, tick); + } + } + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } + } +} diff --git a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java index ad324463..ff5bd738 100644 --- a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java +++ b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java @@ -80,6 +80,7 @@ public class ConfigurationHandler { BlockIds.CALCINATOR = configuration.getBlock(Strings.CALCINATOR_NAME, BlockIds.CALCINATOR_DEFAULT).getInt(BlockIds.CALCINATOR_DEFAULT); BlockIds.ALUDEL = configuration.getBlock(Strings.ALUDEL_NAME, BlockIds.ALUDEL_DEFAULT).getInt(BlockIds.ALUDEL_DEFAULT); BlockIds.ALCHEMICAL_CHEST = configuration.getBlock(Strings.ALCHEMICAL_CHEST_NAME, BlockIds.ALCHEMICAL_CHEST_DEFAULT).getInt(BlockIds.ALCHEMICAL_CHEST_DEFAULT); + BlockIds.GLASS_DOME = configuration.getBlock(Strings.GLASS_DOME_NAME, BlockIds.GLASS_DOME_DEFAULT).getInt(BlockIds.GLASS_DOME_DEFAULT); BlockIds.RED_WATER_STILL = configuration.getBlock(Strings.RED_WATER_STILL_NAME, BlockIds.RED_WATER_STILL_DEFAULT).getInt(BlockIds.RED_WATER_STILL_DEFAULT); /* Block property configs */ diff --git a/ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java b/ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java deleted file mode 100644 index 7674cc8d..00000000 --- a/ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.pahimar.ee3.core.helper; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLiving; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -import com.pahimar.ee3.block.ModBlocks; -import com.pahimar.ee3.configuration.ConfigurationSettings; - -/** - * Equivalent-Exchange-3 - * - * RedWaterHelper - * - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public class RedWaterHelper { - - public static boolean handleRedWaterDetection(EntityLiving entity) { - - return isBlockInBB(entity.worldObj, entity.boundingBox, ModBlocks.redWaterFlowing) || isBlockInBB(entity.worldObj, entity.boundingBox, ModBlocks.redWaterStill); - } - - public static boolean isBlockInBB(World world, AxisAlignedBB par1AxisAlignedBB, Block block) { - - int minX = MathHelper.floor_double(par1AxisAlignedBB.minX - ConfigurationSettings.RED_WATER_RANGE_BASE * ConfigurationSettings.RED_WATER_RANGE_MODIFIER * 1.0D); - int maxX = MathHelper.floor_double(par1AxisAlignedBB.maxX + ConfigurationSettings.RED_WATER_RANGE_BASE * ConfigurationSettings.RED_WATER_RANGE_MODIFIER * 1.0D); - int minY = MathHelper.floor_double(par1AxisAlignedBB.minY - ConfigurationSettings.RED_WATER_RANGE_BASE * ConfigurationSettings.RED_WATER_RANGE_MODIFIER * 1.0D); - int maxY = MathHelper.floor_double(par1AxisAlignedBB.maxY + ConfigurationSettings.RED_WATER_RANGE_BASE * ConfigurationSettings.RED_WATER_RANGE_MODIFIER * 1.0D); - int minZ = MathHelper.floor_double(par1AxisAlignedBB.minZ - ConfigurationSettings.RED_WATER_RANGE_BASE * ConfigurationSettings.RED_WATER_RANGE_MODIFIER * 1.0D); - int maxZ = MathHelper.floor_double(par1AxisAlignedBB.maxZ + ConfigurationSettings.RED_WATER_RANGE_BASE * ConfigurationSettings.RED_WATER_RANGE_MODIFIER * 1.0D); - - for (int i = minX; i < maxX; ++i) { - for (int j = minY; j < maxY; ++j) { - for (int k = minZ; k < maxZ; ++k) { - Block currentBlock = Block.blocksList[world.getBlockId(i, j, k)]; - if (currentBlock != null && currentBlock.blockID == block.blockID) - return true; - } - } - } - return false; - } -} diff --git a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java index 7d986ac1..55c56e5b 100644 --- a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java @@ -13,9 +13,11 @@ import com.pahimar.ee3.client.audio.SoundHandler; import com.pahimar.ee3.client.renderer.item.ItemAlchemicalChestRenderer; import com.pahimar.ee3.client.renderer.item.ItemAludelRenderer; import com.pahimar.ee3.client.renderer.item.ItemCalcinatorRenderer; +import com.pahimar.ee3.client.renderer.item.ItemGlassDomeRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityAlchemicalChestRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityAludelRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer; +import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassDomeRenderer; import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler; import com.pahimar.ee3.core.handlers.KeyBindingHandler; import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler; @@ -31,6 +33,7 @@ import com.pahimar.ee3.tileentity.TileAlchemicalChest; import com.pahimar.ee3.tileentity.TileAludel; import com.pahimar.ee3.tileentity.TileCalcinator; import com.pahimar.ee3.tileentity.TileEE; +import com.pahimar.ee3.tileentity.TileGlassDome; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; @@ -88,20 +91,23 @@ public class ClientProxy extends CommonProxy { RenderIds.calcinatorRenderId = RenderingRegistry.getNextAvailableRenderId(); RenderIds.aludelRenderId = RenderingRegistry.getNextAvailableRenderId(); RenderIds.alchemicalChestRenderId = RenderingRegistry.getNextAvailableRenderId(); + RenderIds.glassDomeId = RenderingRegistry.getNextAvailableRenderId(); MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer()); MinecraftForgeClient.registerItemRenderer(BlockIds.ALUDEL, new ItemAludelRenderer()); MinecraftForgeClient.registerItemRenderer(BlockIds.ALCHEMICAL_CHEST, new ItemAlchemicalChestRenderer()); + MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_DOME, new ItemGlassDomeRenderer()); } @Override - public void initTileEntities() { + public void registerTileEntities() { - super.initTileEntities(); + super.registerTileEntities(); ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new TileEntityCalcinatorRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileAludel.class, new TileEntityAludelRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileAlchemicalChest.class, new TileEntityAlchemicalChestRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileGlassDome.class, new TileEntityGlassDomeRenderer()); } @Override diff --git a/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java index f74c3eee..2cbadc4f 100644 --- a/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java @@ -9,12 +9,14 @@ import com.pahimar.ee3.client.gui.inventory.GuiAlchemicalBag; import com.pahimar.ee3.client.gui.inventory.GuiAlchemicalChest; import com.pahimar.ee3.client.gui.inventory.GuiAludel; import com.pahimar.ee3.client.gui.inventory.GuiCalcinator; +import com.pahimar.ee3.client.gui.inventory.GuiGlassDome; import com.pahimar.ee3.client.gui.inventory.GuiPortableCrafting; import com.pahimar.ee3.client.gui.inventory.GuiPortableTransmutation; import com.pahimar.ee3.inventory.ContainerAlchemicalBag; import com.pahimar.ee3.inventory.ContainerAlchemicalChest; import com.pahimar.ee3.inventory.ContainerAludel; import com.pahimar.ee3.inventory.ContainerCalcinator; +import com.pahimar.ee3.inventory.ContainerGlassDome; import com.pahimar.ee3.inventory.ContainerPortableCrafting; import com.pahimar.ee3.inventory.ContainerPortableTransmutation; import com.pahimar.ee3.lib.GuiIds; @@ -22,6 +24,7 @@ import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.tileentity.TileAlchemicalChest; import com.pahimar.ee3.tileentity.TileAludel; import com.pahimar.ee3.tileentity.TileCalcinator; +import com.pahimar.ee3.tileentity.TileGlassDome; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; @@ -61,11 +64,12 @@ public class CommonProxy implements IGuiHandler { } - public void initTileEntities() { + public void registerTileEntities() { GameRegistry.registerTileEntity(TileCalcinator.class, Strings.TE_CALCINATOR_NAME); GameRegistry.registerTileEntity(TileAludel.class, Strings.TE_ALUDEL_NAME); GameRegistry.registerTileEntity(TileAlchemicalChest.class, Strings.TE_ALCHEMICAL_CHEST_NAME); + GameRegistry.registerTileEntity(TileGlassDome.class, Strings.TE_GLASS_DOME_NAME); } public void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit) { @@ -102,6 +106,10 @@ public class CommonProxy implements IGuiHandler { TileAludel tileAludel = (TileAludel) world.getBlockTileEntity(x, y, z); return new ContainerAludel(player.inventory, tileAludel); } + else if (ID == GuiIds.GLASS_DOME) { + TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z); + return new ContainerGlassDome(player.inventory, tileGlassDome); + } return null; } @@ -128,6 +136,10 @@ public class CommonProxy implements IGuiHandler { TileAludel tileAludel = (TileAludel) world.getBlockTileEntity(x, y, z); return new GuiAludel(player.inventory, tileAludel); } + else if (ID == GuiIds.GLASS_DOME) { + TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z); + return new GuiGlassDome(player.inventory, tileGlassDome); + } return null; } diff --git a/ee3_common/com/pahimar/ee3/inventory/ContainerGlassDome.java b/ee3_common/com/pahimar/ee3/inventory/ContainerGlassDome.java new file mode 100644 index 00000000..af17d571 --- /dev/null +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerGlassDome.java @@ -0,0 +1,54 @@ +package com.pahimar.ee3.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import com.pahimar.ee3.tileentity.TileAludel; +import com.pahimar.ee3.tileentity.TileGlassDome; + +/** + * Equivalent-Exchange-3 + * + * ContainerGlassDome + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +public class ContainerGlassDome extends Container { + + private final int PLAYER_INVENTORY_ROWS = 3; + private final int PLAYER_INVENTORY_COLUMNS = 9; + + public ContainerGlassDome(InventoryPlayer inventoryPlayer, TileGlassDome tileGlassDome) { + + this.addSlotToContainer(new Slot(tileGlassDome, TileAludel.INPUT_INVENTORY_INDEX, 80, 22)); + + // Add the player's inventory slots to the container + for (int inventoryRowIndex = 0; inventoryRowIndex < PLAYER_INVENTORY_ROWS; ++inventoryRowIndex) { + for (int inventoryColumnIndex = 0; inventoryColumnIndex < PLAYER_INVENTORY_COLUMNS; ++inventoryColumnIndex) { + this.addSlotToContainer(new Slot(inventoryPlayer, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 8 + inventoryColumnIndex * 18, 58 + inventoryRowIndex * 18)); + } + } + + // Add the player's action bar slots to the container + for (int actionBarSlotIndex = 0; actionBarSlotIndex < PLAYER_INVENTORY_COLUMNS; ++actionBarSlotIndex) { + this.addSlotToContainer(new Slot(inventoryPlayer, actionBarSlotIndex, 8 + actionBarSlotIndex * 18, 116)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer var1) { + + return true; + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + + return null; + } +} diff --git a/ee3_common/com/pahimar/ee3/lib/BlockIds.java b/ee3_common/com/pahimar/ee3/lib/BlockIds.java index 45052bca..fbb6bbd3 100644 --- a/ee3_common/com/pahimar/ee3/lib/BlockIds.java +++ b/ee3_common/com/pahimar/ee3/lib/BlockIds.java @@ -16,11 +16,13 @@ public class BlockIds { public static int RED_WATER_STILL_DEFAULT = 2453; public static int ALUDEL_DEFAULT = 2454; public static int ALCHEMICAL_CHEST_DEFAULT = 2455; + public static int GLASS_DOME_DEFAULT = 2456; /* Current block ids */ public static int CALCINATOR; public static int ALUDEL; public static int ALCHEMICAL_CHEST; public static int RED_WATER_STILL; + public static int GLASS_DOME; } diff --git a/ee3_common/com/pahimar/ee3/lib/GuiIds.java b/ee3_common/com/pahimar/ee3/lib/GuiIds.java index 71861b89..3c199e60 100644 --- a/ee3_common/com/pahimar/ee3/lib/GuiIds.java +++ b/ee3_common/com/pahimar/ee3/lib/GuiIds.java @@ -18,5 +18,6 @@ public class GuiIds { public static final int ALCHEMICAL_CHEST = 4; public static final int ALCHEMICAL_BAG = 5; public static final int SHARED_ALCHEMICAL_INVENTORY = 6; + public static final int GLASS_DOME = 7; } diff --git a/ee3_common/com/pahimar/ee3/lib/Models.java b/ee3_common/com/pahimar/ee3/lib/Models.java index 3a40b4c2..02ef18be 100644 --- a/ee3_common/com/pahimar/ee3/lib/Models.java +++ b/ee3_common/com/pahimar/ee3/lib/Models.java @@ -7,4 +7,5 @@ public class Models { public static final String ALUDEL = MODEL_LOCATION + "aludel.obj"; public static final String CALCINATOR = MODEL_LOCATION + "calcinator.obj"; + public static final String GLASS_DOME = MODEL_LOCATION + "aludel.obj"; } diff --git a/ee3_common/com/pahimar/ee3/lib/RenderIds.java b/ee3_common/com/pahimar/ee3/lib/RenderIds.java index 2e95e078..f8319ac6 100644 --- a/ee3_common/com/pahimar/ee3/lib/RenderIds.java +++ b/ee3_common/com/pahimar/ee3/lib/RenderIds.java @@ -14,4 +14,5 @@ public class RenderIds { public static int calcinatorRenderId; public static int aludelRenderId; public static int alchemicalChestRenderId; + public static int glassDomeId; } diff --git a/ee3_common/com/pahimar/ee3/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java index 119793ee..7d19a936 100644 --- a/ee3_common/com/pahimar/ee3/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -44,6 +44,7 @@ public class Strings { public static final String CALCINATOR_NAME = "calcinator"; public static final String ALUDEL_NAME = "aludel"; public static final String ALCHEMICAL_CHEST_NAME = "alchemicalChest"; + public static final String GLASS_DOME_NAME = "glassDome"; public static final String RED_WATER_STILL_NAME = "redWaterStill"; public static final String RED_WATER_FLOWING_NAME = "redWaterFlowing"; @@ -59,6 +60,7 @@ public class Strings { public static final String TE_CALCINATOR_NAME = "tileCalcinator"; public static final String TE_ALUDEL_NAME = "tileAludel"; public static final String TE_ALCHEMICAL_CHEST_NAME = "tileAlchemicalChest"; + public static final String TE_GLASS_DOME_NAME = "tileGlassDome"; /* Transmutation cost related constants */ public static final String TRANSMUTATION_COST = "_cost"; @@ -71,6 +73,7 @@ public class Strings { public static final String CONTAINER_ALUDEL_NAME = "container." + ALUDEL_NAME; public static final String CONTAINER_ALCHEMICAL_CHEST_NAME = "container." + ALCHEMICAL_CHEST_NAME; public static final String CONTAINER_ALCHEMICAL_BAG_NAME = "container." + ALCHEMICAL_BAG_NAME; + public static final String CONTAINER_GLASS_DOME_NAME = "container." + GLASS_DOME_NAME; public static final String CONTAINER_INVENTORY = "container.inventory"; public static final String CONTAINER_PORTABLE_CRAFTING = "container.crafting"; diff --git a/ee3_common/com/pahimar/ee3/lib/Textures.java b/ee3_common/com/pahimar/ee3/lib/Textures.java index cda51203..910ec231 100644 --- a/ee3_common/com/pahimar/ee3/lib/Textures.java +++ b/ee3_common/com/pahimar/ee3/lib/Textures.java @@ -31,11 +31,13 @@ public class Textures { public static final String GUI_SHARED_ALCHEMICAL_STORAGE = GUI_SHEET_LOCATION + "sharedAlchemicalStorage.png"; public static final String GUI_PORTABLE_CRAFTING = "/gui/crafting.png"; public static final String GUI_PORTABLE_TRANSMUTATION = GUI_SHEET_LOCATION + "portableTransmutation.png"; + public static final String GUI_GLASS_DOME = GUI_SHEET_LOCATION + "glassDome.png"; // Model textures public static final String MODEL_CALCINATOR = MODEL_SHEET_LOCATION + "calcinator.png"; public static final String MODEL_ALUDEL = MODEL_SHEET_LOCATION + "aludel.png"; public static final String MODEL_ALCHEMICAL_CHEST = MODEL_SHEET_LOCATION + "alchemicalChest.png"; + public static final String MODEL_GLASS_DOME = MODEL_SHEET_LOCATION + "aludel.png"; // Effect textures public static final String EFFECT_WORLD_TRANSMUTATION = EFFECTS_LOCATION + "noise.png"; diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileGlassDome.java b/ee3_common/com/pahimar/ee3/tileentity/TileGlassDome.java new file mode 100644 index 00000000..6e045f0e --- /dev/null +++ b/ee3_common/com/pahimar/ee3/tileentity/TileGlassDome.java @@ -0,0 +1,145 @@ +package com.pahimar.ee3.tileentity; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import com.pahimar.ee3.lib.Strings; + + +public class TileGlassDome extends TileEE implements IInventory { + + /** + * The ItemStacks that hold the items currently being used in the Glass Dome + */ + private ItemStack[] inventory; + + private final int INVENTORY_SIZE = 1; + + public static final int DISPLAY_SLOT_INVENTORY_INDEX = 0; + + public TileGlassDome() { + + inventory = new ItemStack[INVENTORY_SIZE]; + } + + @Override + public int getSizeInventory() { + + return inventory.length; + } + + @Override + public ItemStack getStackInSlot(int slot) { + + return inventory[slot]; + } + + @Override + public ItemStack decrStackSize(int slot, int amount) { + + ItemStack itemStack = getStackInSlot(slot); + if (itemStack != null) { + if (itemStack.stackSize <= amount) { + setInventorySlotContents(slot, null); + } + else { + itemStack = itemStack.splitStack(amount); + if (itemStack.stackSize == 0) { + setInventorySlotContents(slot, null); + } + } + } + + return itemStack; + } + + @Override + public ItemStack getStackInSlotOnClosing(int slot) { + + ItemStack itemStack = getStackInSlot(slot); + if (itemStack != null) { + setInventorySlotContents(slot, null); + } + return itemStack; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemStack) { + + inventory[slot] = itemStack; + if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) { + itemStack.stackSize = getInventoryStackLimit(); + } + } + + @Override + public String getInvName() { + + return this.hasCustomName() ? this.getCustomName() : Strings.CONTAINER_GLASS_DOME_NAME; + } + + @Override + public int getInventoryStackLimit() { + + return 64; + } + + @Override + public void openChest() { + + } + + @Override + public void closeChest() { + + } + + @Override + public void readFromNBT(NBTTagCompound nbtTagCompound) { + + super.readFromNBT(nbtTagCompound); + + // Read in the ItemStacks in the inventory from NBT + NBTTagList tagList = nbtTagCompound.getTagList("Items"); + inventory = new ItemStack[this.getSizeInventory()]; + for (int i = 0; i < tagList.tagCount(); ++i) { + NBTTagCompound tagCompound = (NBTTagCompound) tagList.tagAt(i); + byte slot = tagCompound.getByte("Slot"); + if (slot >= 0 && slot < inventory.length) { + inventory[slot] = ItemStack.loadItemStackFromNBT(tagCompound); + } + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtTagCompound) { + + super.writeToNBT(nbtTagCompound); + + // Write the ItemStacks in the inventory to NBT + NBTTagList tagList = new NBTTagList(); + for (int currentIndex = 0; currentIndex < inventory.length; ++currentIndex) { + if (inventory[currentIndex] != null) { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", (byte) currentIndex); + inventory[currentIndex].writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } + } + nbtTagCompound.setTag("Items", tagList); + } + + @Override + public boolean isInvNameLocalized() { + + return this.hasCustomName(); + } + + @Override + public boolean isStackValidForSlot(int i, ItemStack itemstack) { + + return true; + } +} diff --git a/resources/mods/ee3/lang/en_US.xml b/resources/mods/ee3/lang/en_US.xml index 4ddcea7a..eb57b46b 100644 --- a/resources/mods/ee3/lang/en_US.xml +++ b/resources/mods/ee3/lang/en_US.xml @@ -22,10 +22,12 @@ Calcinator Aludel Alchemical Chest + Glass Dome Calcinator Aludel Alchemical Chest Alchemical Bag + Glass Dome Equivalent Exchange 3 Initializing remote version check against remote version authority, located at Remote version check failed to initialize properly diff --git a/resources/mods/ee3/textures/blocks/aludel.png b/resources/mods/ee3/textures/blocks/aludel.png index 3ce33d8d3b6b6b8607e8e66988695358209daaec..e85ee8104293544a2f63efe87209679f0efe992b 100644 GIT binary patch delta 3167 zcmV-l450J2AMF@5iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVE_OC1ZP1_ zK>z@;j|==^1pojFIgvUWe@MrjmUmQC*A|D*y?1({%`gH|hTglt0MdJtUPWP;8DJ;_ z4l^{dA)*2iMMRn+NKnLp(NH8-M6nPQRImpm2q-ZaMN}+rM%Ih2ti1Q~^84egZ|$@9 zx%=$B&srA%lBX}1mj+7#kjfMAgFKw+5s^`J>;QlP9${Ff#{e35u39)87vVOh&UxnkS?~*ikKRgEM^!b zX1*vv5zC1=VUZ0!`z*4fnAxd3wur?!r?XSpV(u03woD;M#E7qm3p2T#ED_%lu||q8 zl`G;m;@DIUGXnq=e@Sc?a9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}Y zB~8euXQVS(9J=A3hxi`{{&gM(L7aFFpTiSHgo&n%%S#Zoo5$t~xM@5(m-nBV_z%PW zq{X=wiPHEHe^6tLfYfy=Kz{89C<+lE(fh?+|D$id_%I-TdEqLPi*x_)H~nY9rQ#)n zoA5c#B`Ac>67n+__r%W3O|GA z5P%R7e;T5S7$OYB1@T9ska&cTtVfEF3ZwyPMY@qbwx1%qjZ=)yB zuQ3=54Wo^*!gyjLF-e%Um=erBOdIALW)L%uf0@H#vGQ1btR2=L%ft$>h1e?WQS4dl z5OxCl21mrH;LLFDxF{SCmyfH!9l@Q!4dEtn3wSBKCf)|`k7wg^@TK@hd^i3&egeNh zkS1so>_C83pYk??@5*JW(Ig>h ze+TIh=^W`U=_Q#=)*?HSqsRjC4stX30{Id7jRZx)NWx2kEwMqOMxsMvNaDF9UQ$!i zNpiJhu4IMe3CZh{Gg5ddEh!f%rqp_=8mW^~BT{qH6lqgwf9X`|66qt-SEQ$8urgXQ zZZd3{0-1v{7i7jM2t}RZLSa!hQyM83e<>4G3{{)zMNOg>Q@^7QP-kUjWS7Z?$!5#e z$exxRr6DveninmFR!Tcg8>YQmqO`QdXKtffUuk1xHa2rKF-1}UypJgC^Oe>kV4 ztmL7Tu2iLTL1{*rrtGMkq+G6iMtNF=qGGSYRVi0FtMZgCOLwBD&@1V^^jTF!RZmr+ zYQ5@!>VlfKTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu76*gyjC_sqjXI5<8*3Ox8SgUgGyZ5|VUl9f zXma0F#?;$1-?ZEGcQZXRmRXJ2EpxKDyZHw5F7p@5^p|m#?O%4sf@0xkf3ek~$Kr#f zl_lS@)pFWO!z$LQ)@p=7Wdtxv7?-Wl*3Q-&tWR0LwXw7j*c`X{&DPL1+4hL-)N<|R zoaK$n$L-YYn0EDcqxN+BSo;I^qYkPLOos-C$BycbY{w?YNhe*WB&VZJ&z()2`OfXm z^DZ_n>s-#cBCZ~;MXm#Ge==^NZq;s&+|}F@+*{mdJuE!ddYtn_d-{0p@*MF}@?v>4 zd(C=Vd9U;C^&$BL`&9cp_SN&{`*!=me%^k&{T{5)T)|t>=@0z9{CE354A2f(6Yygo zCNLndCh$p+X;5BJUoa&&CiqD3>k#LV(vbV1I-$bQo-oO<=&{&C* z_u)5XKpCqtx&&0w&s4uqN4P~emT8|^lldkqEbBzJbT%)$KSwWTd(LF8d+xVuQEORi zd-7ECHsy`2b6Quw9$Fu_zGs8_hJpTWf0O*O{8yX9H+L5(6>KaR z-{P^QrBI@fUpTVWc5B@>)Hd$6f$iqotG0hEVi#R4HYu(seqX{Wx%!RiHe#iZ-bxL)`b?**v58SEusPAadYN$AfIhc9y zNn==J-?xl!o0}Axikm(h;vE`29CWz1*{Zquh~kmb7Pv*&GJQ1q=#B4Ozw2r>Y^`sj zwG|%&$Arh8ejoe&@Nu8xJtr6^T7S^|p|+jUUep0~f8=z`b|!X?c13m#p7cK1({0<` z{-e>4hfb-UsyQuty7Ua;Ou?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI z{-*2Ae@nN#Ze6>*;`ZQh=^oC;Q|`XFmw9jD{>BIB2SpF19#%Y3eAMu> z?$2$bmZPV~T*vw!2S2_)&KiIAOU5tnCkmdBpHxh$Og2xMO`V!{pT6;Q<CYBs z3V)UUwf4Er^B;b5{H=dBVs_#M|HY@@OJ2&qOg!{z*{hzpfVoGnQ(rI47rl{xbNDUe zZQr}_casZQ@3HSIKj?nw{^;}Z!Kc(upZ)~{nDhL)#OTui000JJOGiWi{{a60|De66 zlaV18e*gz`Nliru-2@O41vG?=Bj5l40i{VqK~y-)eUsa6;xG_~KT2Yo3?xXfVsq2I z`$EJb7fT*hL`|}KkL#ERyd7krC7-Lwkf7e9T+6VDaRj4@TGc82WqR+(YaKL*H zMbW1otQ?!>#!7Uks(wS7rc_l$I+;AMaPViI->^Od5kW>HPNx&crXdj_Uo6hrXvAi_ zWw~5(*zbEb$ugc25fTyRvl#&M*^ER45kYB9Ro5u35fNPHI~3koOC+5)ZA`xg_UHAL zfBk+>(=><(-Z?hg?U`j6`C>ujz3+?XokJT#VAfi+)>vzayJB85fG4FCN~xPJ1ZIrE zIfpT(-*e4?O9sK8v$oIR*Yh*wZpVB!<88A+X-(T{t@kLcFJ17?p|r+3cVj6Xk9+pE z*|6K~D9Vx_^ErvgWfH5pChgW6HXiq^QFwo+C`+7k6lHm~&~yU=;JwFM%U3K+U$3<- zQJAn$q_%DOjy?R`aO>ZX4-yfMS1;W&6~|;*cIj3e^B-A84QJjKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000ExNkl!QIsuNl|`%wB8m}4g0aV*k2tpr&%Mly4M|!>Inu~;&z!mM`FQU;)`Sp( zuV@8%Q>)cDK0an`ZB0FV^5n^vPvEDA4{b0p8owt+@GJ-;&(**u)!a{{-Tno*Xy(| zE;w#BdH??XpxuQ6wQ7~}__#_UCliS`)`nUX17`1&wp2{}li<3pW7{^iZKLZt$IT|~ ziwo-YdYS{W!bKYm5F-*{w<|>ZumM1MW|p0U2CEBm>~_Vq;Q4%hDB%L? zs*0uJ@Du<|Rt~Up&`7Q|faG&I^P5b@OaS12fm072q9ELdp&3$HiVq{VErbu zzIv`UEfhWu9LE%viUV@Rnve=ww1N3qMSdZKAg(?JSFMwY1VKQpTIIOe1fb)2sXhDs zK2a1=t5ykufLu(XPnvU6^BaVJ;Q3wY5cge4JXfN)$!(`~B1-C1f0krS#-4jK}p;D>fx-MPM zWADWa^&R;6x8IXMBy}Lk{G*XlA@sX0F$X4!lIzzx}-;7^&qR@6-k|eB@%L+6}On~at)R6Bc@F-4H*L8I-V=D2x z1pvo!aBQ1?zfafmC^`;Pw{8L8*fuApr`)-7hxX;A@|DNNt{qX7=ui?|k2{*QT+wlu zoR|P$a$jBk*`BRlf<>8eC1Xv?qTo1=+QhUhoOs@c zM@L*dky5x(zME`wbCXBw>&PBdN~Mu;hG{Br0BvDmLC8;UH&JQUXXtvWYD3rAfBpJ@ ce~$kh0HKBU&6|fReE!lvI6;RN#5=* z4F5rJ!QSPQfg+p*9+AZi40_5S%viD1z6>bHUgGKN%6^wcKv3M|pWWLmpwJ>u7sn8b z(`SRNxf%?3YI*Y>Ny;2K8eGBX|C;rP^Nx<@bb-R`xk{cntc8XFC+6?@uJJ+p^S$;P z(q*!zB_|zbaB%7CnDb?O>CQhN8GdE*ZD+L+_`G!M&U5LS7Kh&*-loUUuxQP_hv{eL zOqcoaNrmN@PO*%!PU!ztbE*&h5s5ZR{JM3{iKw7s67tg~N6(+CR~op+y)eOF`;=GW hwD1z&xBosf`Zu&J-BO&^8v=AKgQu&X%Q~loCIF_DZZ7}; literal 0 HcmV?d00001 diff --git a/resources/mods/ee3/textures/gui/glassDome.png b/resources/mods/ee3/textures/gui/glassDome.png new file mode 100644 index 0000000000000000000000000000000000000000..fc0673b725e6199955940258179c2883508558bb GIT binary patch literal 3818 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 KY1du1kNyvf@~lt* literal 0 HcmV?d00001 diff --git a/resources/mods/ee3/textures/xcf/blocks/aludel.xcf b/resources/mods/ee3/textures/xcf/blocks/aludel.xcf index 5f8652b77f2188775590d06b282673823808a5db..63e0158aee9abc9bacc506ea2b45ce398eb56c22 100644 GIT binary patch delta 892 zcmc(cu}cFn6vi)D6-0|5cIaZk#VpC-U;}qODhGj*>4A$w2xuZg4_pMdTOAeu68{gK zySfOD4!Q`ZerYYVI=BcXg-$pf`UGn|p6k{QTfNQi z*S0oe?rV)-A!azs{o(nsAKvUXud0=)AxWBd-@Fav9_Dk+=Xh_pmt!uK%5$Zpqy?%E z6fIJHs0IszI?D%3gZCIdO3o#G63;Bt2YNX-v-Y+BoRQ!Qti|=wJ-$P1x`5BXj{}=+4ZYY)exV`07Mtd!t=py22C_ z;YeWKyvQdqzBB$RRpfw3&Uhjl7W6`?UQa3UgFfxe(hK;6;5%r!~*evKR=2#&;DE=sQN@2u@ItZCZJM53x63DQ`ms`qW3n8V=48_e@P{9|; ztB*?m63IU>|A222g*=L~;(}5(wlmYY$M3mG=Eqv_Np^P6%}vhto_p@e{Y)mu?|t*( z<R=ZEd<@9;IlX#Z3mOE>xgcIp1nmk*;O`|)`6 zIM4+J)NZKBqao3w`Y2%E(8+{(A6nSCxbBrx6RwnJ=YmyPD%tJMQBpQ zPtlpCgYizS*%?m|V@;wqCBJxXDZ!#SiQ4LE{^Dt9GC}eKUM81elA7tP&h%-*sd9lz zg&;E(Bp|4kI^(5IQjzAomI+sbQY>tzT-@#R4H|~cPz|wW>tM0x95fG9A1CuTloFK}avsJ+2j;<_y>7RM zfIS?EhM{zu?y(Gqq;pv{+J%A6Q`d1^2=-(s_qKf>6LVLmpcAEMDd3p<8G3-(L+ zS7Q?`5bg_1j0{Zo7^5+}?_+L%c$Q7+wLk>m3AhAU zf#hXKx7U8N-K(o}!Yk>!zT4ML7rrjglFbtlyJU+(NE9nqF6Q)!L1u zH6{bOPy1pYOma^%>1}z;q`s~^X0qVT=p|>NEXc!Nr1;%DegGmn`p zB|GB+G1eq%Q=*wUdmZ0naR4gCtO<_ zOxn6xGP%4br?`WtH#asjY4ewBbsztm$z%=6E%3OpK^oXxHH|qq_$}YqVI`+a9CMsQ z@Nyhgo~xWxUhi={B6*Kf!k7SC(AZG3nvuDFJPL*H9t~oS$eh45-vAMVmLNi+HYFNF zmhcQ1URyoMj3>eTrkd(ia?i?_6wY;qmYQoPAj|oEwCa z@a21J&TFfYbtuayLzh#PuK@a0;I-S)QS{)8N1u&5AK(A{Q+_GH+k*ZytA6t2qt^9% ut?G>5Jzj@dFnr#E@c_PDeXf3jPNye|(>`8=^M@~udWXU0Fd=hUkJ diff --git a/resources/mods/ee3/textures/xcf/blocks/glassDome.xcf b/resources/mods/ee3/textures/xcf/blocks/glassDome.xcf new file mode 100644 index 0000000000000000000000000000000000000000..1dd13197aea7184cca7c1e74e2840d4a763c3d96 GIT binary patch literal 1560 zcmcgsy>in)5Z;q)GO*#8RpC`Q>qavjFeAYLXDga~;>{ndIii-Of+mP}3$`_p*5m@Sq; z->Shfz6yi0H)nP=80Ri^3g}e>RPw>U4Tj#WZo+XgkArjRh2W+s=wgH0d9n_Y`S@eB zV*Fw{T}A7fAfx{dRgrxtpMzWK3sL(*JZL$1KF7}ca1$*#>G1=r1K|@lkgl_N=Yg}K zh)ni${rD-M+Pyfg?p@60g8@7xUY4RB>A_YAVka`aq zZjqr~KBH8nmH;#u2Ry=%M<{uOAxg>!IZ>HcEigjP4V;S+$~-S6f)PrLP@;9|DCcNt zrO9WkNL61EMyTsmBh(GI$nXd?pJA?YO8^>--3Z-%_60CS&Awo+&INm26j~w}owTR# z(V{wjq{vF64c0OUZ=~LzS h|NKXUAYcd}YDF!jl~8cS1(%9e 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 literal 0 HcmV?d00001 From ab60c1c28fdcc0597c428809246dc5cdefeed2bd Mon Sep 17 00:00:00 2001 From: pahimar Date: Wed, 17 Apr 2013 00:02:48 -0400 Subject: [PATCH 4/8] More work on making the items in the Glass Dome render "better," still more to do. Also stripped out owner from TileEE data since we don't have a use for it right now. --- ee3_common/com/pahimar/ee3/block/BlockEE.java | 1 - .../ee3/client/model/ModelCalcinator.java | 5 +++ .../TileEntityCalcinatorRenderer.java | 6 ++- .../TileEntityGlassDomeRenderer.java | 31 ++++++++++++--- .../pahimar/ee3/core/proxy/ClientProxy.java | 3 +- .../pahimar/ee3/core/proxy/CommonProxy.java | 2 +- ee3_common/com/pahimar/ee3/lib/Strings.java | 1 - .../ee3/network/packet/PacketTileUpdate.java | 14 +++---- .../ee3/tileentity/TileCalcinator.java | 8 +++- .../com/pahimar/ee3/tileentity/TileEE.java | 39 ++++--------------- 10 files changed, 56 insertions(+), 54 deletions(-) diff --git a/ee3_common/com/pahimar/ee3/block/BlockEE.java b/ee3_common/com/pahimar/ee3/block/BlockEE.java index e9d4e679..db52fc33 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockEE.java +++ b/ee3_common/com/pahimar/ee3/block/BlockEE.java @@ -66,7 +66,6 @@ public abstract class BlockEE extends BlockContainer { ((TileEE) world.getBlockTileEntity(x, y, z)).setCustomName(itemStack.getDisplayName()); } - ((TileEE) world.getBlockTileEntity(x, y, z)).setOwner(entityLiving.getEntityName()); ((TileEE) world.getBlockTileEntity(x, y, z)).setOrientation(direction); } } diff --git a/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java index 03cc7927..a77036f9 100644 --- a/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java @@ -31,4 +31,9 @@ public class ModelCalcinator { modelCalcinator.renderAll(); } + + public void renderPart(String partName) { + + modelCalcinator.renderPart(partName); + } } diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java index f6b45806..c408acce 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java @@ -46,7 +46,11 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer { FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR); // Render - modelCalcinator.render(); + modelCalcinator.renderPart("Calcinator"); + + if (tileCalcinator.getStackInSlot(TileCalcinator.DUST_INVENTORY_INDEX) != null) { + modelCalcinator.renderPart("Dust"); + } GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java index df413dae..6ec90f09 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java @@ -30,8 +30,12 @@ public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer { private ModelGlassDome modelGlassDome = new ModelGlassDome(); private final RenderItem customRenderItem; + private EntityItem ghostEntityItem; public TileEntityGlassDomeRenderer() { + + ghostEntityItem = null; + customRenderItem = new RenderItem() { public boolean shouldBob() { return false; @@ -47,9 +51,10 @@ public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer { if (tileEntity instanceof TileGlassDome) { TileGlassDome tileGlassDome = (TileGlassDome) tileEntity; - GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); + + GL11.glPushMatrix(); // Scale, Translate, Rotate GL11.glScalef(1.0F, 1.0F, 1.0F); @@ -63,20 +68,34 @@ public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer { // Render modelGlassDome.render(); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); for (int i = 0; i < tileGlassDome.getSizeInventory(); i++) { - EntityItem entityItem = new EntityItem(tileGlassDome.worldObj, tileGlassDome.xCoord, tileGlassDome.yCoord, tileGlassDome.zCoord); + + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.1F, (float) z + 0.5F); + GL11.glScalef(0.5F, 0.5F, 0.5F); + + if (ghostEntityItem == null) { + ghostEntityItem = new EntityItem(tileGlassDome.worldObj, tileGlassDome.xCoord, tileGlassDome.yCoord, tileGlassDome.zCoord); + } if (tileGlassDome.getStackInSlot(i) != null) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.VANILLA_ITEM_TEXTURE_SHEET); - entityItem.setEntityItemStack(tileGlassDome.getStackInSlot(i)); - customRenderItem.doRenderItem(entityItem, 0, 0, 0, 0, tick); + ghostEntityItem.setEntityItemStack(tileGlassDome.getStackInSlot(i)); + + if (ghostEntityItem.getEntityItem() != null) { + ghostEntityItem.onUpdate(); + customRenderItem.doRenderItem(ghostEntityItem, 0, 0, 0, 0, 0); + } } + } + GL11.glPopMatrix(); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + } } } diff --git a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java index 55c56e5b..26f319d2 100644 --- a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java @@ -117,7 +117,7 @@ public class ClientProxy extends CommonProxy { } @Override - public void handleTileEntityPacket(int x, int y, int z, ForgeDirection orientation, short state, String owner, String customName) { + public void handleTileEntityPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName) { TileEntity tileEntity = FMLClientHandler.instance().getClient().theWorld.getBlockTileEntity(x, y, z); @@ -125,7 +125,6 @@ public class ClientProxy extends CommonProxy { if (tileEntity instanceof TileEE) { ((TileEE) tileEntity).setOrientation(orientation); ((TileEE) tileEntity).setState(state); - ((TileEE) tileEntity).setOwner(owner); ((TileEE) tileEntity).setCustomName(customName); } } diff --git a/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java index 2cbadc4f..1a250955 100644 --- a/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java @@ -80,7 +80,7 @@ public class CommonProxy implements IGuiHandler { } - public void handleTileEntityPacket(int x, int y, int z, ForgeDirection orientation, short state, String player, String customName) { + public void handleTileEntityPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName) { } diff --git a/ee3_common/com/pahimar/ee3/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java index 7d19a936..b71abeab 100644 --- a/ee3_common/com/pahimar/ee3/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -35,7 +35,6 @@ public class Strings { public static final String NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN = "itemAlchemicalBagGuiOpen"; public static final String NBT_ITEM_DISPLAY = "display"; public static final String NBT_ITEM_COLOR = "color"; - public static final String NBT_TE_OWNER_KEY = "teOwner"; public static final String NBT_TE_STATE_KEY = "teState"; public static final String NBT_TE_CUSTOM_NAME = "CustomName"; public static final String NBT_TE_DIRECTION_KEY = "teDirection"; diff --git a/ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java b/ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java index 0f4e3fd9..266137f2 100644 --- a/ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java @@ -25,8 +25,7 @@ public class PacketTileUpdate extends PacketEE { public int x, y, z; public byte orientation; - public short state; - public String owner; + public byte state; public String customName; public PacketTileUpdate() { @@ -34,7 +33,7 @@ public class PacketTileUpdate extends PacketEE { super(PacketTypeHandler.TILE, true); } - public PacketTileUpdate(int x, int y, int z, ForgeDirection orientation, short state, String owner, String customName) { + public PacketTileUpdate(int x, int y, int z, ForgeDirection orientation, byte state, String customName) { super(PacketTypeHandler.TILE, true); this.x = x; @@ -42,7 +41,6 @@ public class PacketTileUpdate extends PacketEE { this.z = z; this.orientation = (byte) orientation.ordinal(); this.state = state; - this.owner = owner; this.customName = customName; } @@ -53,8 +51,7 @@ public class PacketTileUpdate extends PacketEE { data.writeInt(y); data.writeInt(z); data.writeByte(orientation); - data.writeShort(state); - data.writeUTF(owner); + data.writeByte(state); data.writeUTF(customName); } @@ -65,15 +62,14 @@ public class PacketTileUpdate extends PacketEE { y = data.readInt(); z = data.readInt(); orientation = data.readByte(); - state = data.readShort(); - owner = data.readUTF(); + state = data.readByte(); customName = data.readUTF(); } @Override public void execute(INetworkManager manager, Player player) { - EquivalentExchange3.proxy.handleTileEntityPacket(x, y, z, ForgeDirection.getOrientation(orientation), state, owner, customName); + EquivalentExchange3.proxy.handleTileEntityPacket(x, y, z, ForgeDirection.getOrientation(orientation), state, customName); } } diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java index 299c2e3e..e6b4b6e1 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java @@ -22,10 +22,16 @@ public class TileCalcinator extends TileEE implements IInventory { * The ItemStacks that hold the items currently being used in the Calcinator */ private ItemStack[] inventory; + + private final int INVENTORY_SIZE = 3; + + public static final int FUEL_INVENTORY_INDEX = 0; + public static final int INPUT_INVENTORY_INDEX = 1; + public static final int DUST_INVENTORY_INDEX = 2; public TileCalcinator() { - inventory = new ItemStack[3]; + inventory = new ItemStack[INVENTORY_SIZE]; } /** diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileEE.java b/ee3_common/com/pahimar/ee3/tileentity/TileEE.java index 29a4129f..d3b2c2d8 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileEE.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileEE.java @@ -22,15 +22,13 @@ import com.pahimar.ee3.network.packet.PacketTileUpdate; public class TileEE extends TileEntity { private ForgeDirection orientation; - private short state; - private String owner; + private byte state; private String customName; public TileEE() { orientation = ForgeDirection.SOUTH; state = 0; - owner = ""; customName = ""; } @@ -54,26 +52,11 @@ public class TileEE extends TileEntity { return state; } - public void setState(short state) { + public void setState(byte state) { this.state = state; } - public String getOwner() { - - return owner; - } - - public boolean hasOwner() { - - return owner != null && owner.length() > 0; - } - - public void setOwner(String owner) { - - this.owner = owner; - } - public boolean hasCustomName() { return customName != null && customName.length() > 0; @@ -88,10 +71,10 @@ public class TileEE extends TileEntity { this.customName = customName; } - + public boolean isUseableByPlayer(EntityPlayer player) { - return owner.equals(player.username); + return true; } @Override @@ -104,11 +87,7 @@ public class TileEE extends TileEntity { } if (nbtTagCompound.hasKey(Strings.NBT_TE_STATE_KEY)) { - state = nbtTagCompound.getShort(Strings.NBT_TE_STATE_KEY); - } - - if (nbtTagCompound.hasKey(Strings.NBT_TE_OWNER_KEY)) { - owner = nbtTagCompound.getString(Strings.NBT_TE_OWNER_KEY); + state = nbtTagCompound.getByte(Strings.NBT_TE_STATE_KEY); } if (nbtTagCompound.hasKey(Strings.NBT_TE_CUSTOM_NAME)) { @@ -122,11 +101,7 @@ public class TileEE extends TileEntity { super.writeToNBT(nbtTagCompound); nbtTagCompound.setByte(Strings.NBT_TE_DIRECTION_KEY, (byte) orientation.ordinal()); - nbtTagCompound.setShort(Strings.NBT_TE_STATE_KEY, state); - - if (hasOwner()) { - nbtTagCompound.setString(Strings.NBT_TE_OWNER_KEY, owner); - } + nbtTagCompound.setByte(Strings.NBT_TE_STATE_KEY, state); if (this.hasCustomName()) { nbtTagCompound.setString(Strings.NBT_TE_CUSTOM_NAME, customName); @@ -136,7 +111,7 @@ public class TileEE extends TileEntity { @Override public Packet getDescriptionPacket() { - return PacketTypeHandler.populatePacket(new PacketTileUpdate(xCoord, yCoord, zCoord, orientation, state, owner, customName)); + return PacketTypeHandler.populatePacket(new PacketTileUpdate(xCoord, yCoord, zCoord, orientation, state, customName)); } } From 9b3426e088038a072d649d9f7eee493cba6b82d7 Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 18 Apr 2013 15:48:14 -0400 Subject: [PATCH 5/8] Moving --- ee3_common/com/pahimar/ee3/EquivalentExchange3.java | 2 +- ee3_common/com/pahimar/ee3/lib/Reference.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index cc88f0c2..a31974d1 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -65,7 +65,7 @@ import cpw.mods.fml.relauncher.Side; name = Reference.MOD_NAME, version = Reference.VERSION_NUMBER, dependencies = Reference.DEPENDENCIES, - certificateFingerprint = Reference.FINGERPRINT) + certificateFingerprint = "@FINGERPRINT@") @NetworkMod( channels = { Reference.CHANNEL_NAME }, clientSideRequired = true, diff --git a/ee3_common/com/pahimar/ee3/lib/Reference.java b/ee3_common/com/pahimar/ee3/lib/Reference.java index c07e3f29..2ef883e6 100644 --- a/ee3_common/com/pahimar/ee3/lib/Reference.java +++ b/ee3_common/com/pahimar/ee3/lib/Reference.java @@ -20,7 +20,6 @@ public class Reference { public static final String VERSION_NUMBER = "@VERSION@ (build @BUILD_NUMBER@)"; public static final String CHANNEL_NAME = MOD_ID; public static final String DEPENDENCIES = "required-after:Forge@[7.7.1.650,)"; - public static final String FINGERPRINT = "@FINGERPRINT@"; public static final int SECOND_IN_TICKS = 20; public static final int SHIFTED_ID_RANGE_CORRECTION = 256; public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy"; From 4bb5278d4d4add03ad7c6e784adc1b7530d8d637 Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 18 Apr 2013 16:14:58 -0400 Subject: [PATCH 6/8] Moving back, and correcting some things in the build file --- build.xml | 74 ++++++++++--------- .../com/pahimar/ee3/EquivalentExchange3.java | 2 +- ee3_common/com/pahimar/ee3/lib/Reference.java | 1 + 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/build.xml b/build.xml index dff5473b..35508f3e 100644 --- a/build.xml +++ b/build.xml @@ -1,25 +1,28 @@ - + - + + + + + + + - - - - - - - + + + + @@ -43,31 +46,15 @@ - - - - - - - - - - - - - - - - - - + + - - - + + - + + @@ -79,8 +66,29 @@ - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index a31974d1..cc88f0c2 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -65,7 +65,7 @@ import cpw.mods.fml.relauncher.Side; name = Reference.MOD_NAME, version = Reference.VERSION_NUMBER, dependencies = Reference.DEPENDENCIES, - certificateFingerprint = "@FINGERPRINT@") + certificateFingerprint = Reference.FINGERPRINT) @NetworkMod( channels = { Reference.CHANNEL_NAME }, clientSideRequired = true, diff --git a/ee3_common/com/pahimar/ee3/lib/Reference.java b/ee3_common/com/pahimar/ee3/lib/Reference.java index 2ef883e6..16d91c58 100644 --- a/ee3_common/com/pahimar/ee3/lib/Reference.java +++ b/ee3_common/com/pahimar/ee3/lib/Reference.java @@ -20,6 +20,7 @@ public class Reference { public static final String VERSION_NUMBER = "@VERSION@ (build @BUILD_NUMBER@)"; public static final String CHANNEL_NAME = MOD_ID; public static final String DEPENDENCIES = "required-after:Forge@[7.7.1.650,)"; + public static final String FINGERPRINT = "@FINGERPRINT@"; public static final int SECOND_IN_TICKS = 20; public static final int SHIFTED_ID_RANGE_CORRECTION = 256; public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy"; From d5bc8d927be1b47be8518a7574d94cd50be4331f Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 18 Apr 2013 18:48:21 -0400 Subject: [PATCH 7/8] Exclude XCF files from the jar file when building. Fixes Issue 313. --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 35508f3e..020890ce 100644 --- a/build.xml +++ b/build.xml @@ -63,7 +63,7 @@ - + @@ -84,7 +84,7 @@ - + From 390a637b89fb3587cfd76c9e6738036b09ab81da Mon Sep 17 00:00:00 2001 From: pahimar Date: Fri, 19 Apr 2013 11:34:45 -0400 Subject: [PATCH 8/8] It's amazing how much you have to change when you want to rename something :-p --- .../com/pahimar/ee3/EquivalentExchange3.java | 18 +---- ...lockGlassDome.java => BlockGlassBell.java} | 27 ++++---- .../com/pahimar/ee3/block/ModBlocks.java | 6 +- .../{GuiGlassDome.java => GuiGlassBell.java} | 20 +++--- .../ee3/client/model/ModelCalcinator.java | 4 +- ...odelGlassDome.java => ModelGlassBell.java} | 11 ++- ...nderer.java => ItemGlassBellRenderer.java} | 24 +++---- .../TileEntityAlchemicalChestRenderer.java | 4 +- .../tileentity/TileEntityAludelRenderer.java | 8 +-- .../TileEntityCalcinatorRenderer.java | 4 +- ....java => TileEntityGlassBellRenderer.java} | 63 +++++++++--------- .../configuration/ConfigurationHandler.java | 2 +- .../ee3/core/helper/VersionHelper.java | 5 +- .../pahimar/ee3/core/proxy/ClientProxy.java | 12 ++-- .../pahimar/ee3/core/proxy/CommonProxy.java | 20 +++--- ...GlassDome.java => ContainerGlassBell.java} | 10 +-- .../com/pahimar/ee3/item/ItemMiniumStone.java | 3 +- ee3_common/com/pahimar/ee3/lib/BlockIds.java | 4 +- ee3_common/com/pahimar/ee3/lib/GuiIds.java | 2 +- ee3_common/com/pahimar/ee3/lib/Models.java | 2 +- ee3_common/com/pahimar/ee3/lib/Reference.java | 2 +- ee3_common/com/pahimar/ee3/lib/RenderIds.java | 2 +- ee3_common/com/pahimar/ee3/lib/Strings.java | 8 +-- ee3_common/com/pahimar/ee3/lib/Textures.java | 4 +- .../ee3/network/PacketTypeHandler.java | 9 +-- .../ee3/tileentity/TileCalcinator.java | 4 +- .../com/pahimar/ee3/tileentity/TileEE.java | 2 +- ...{TileGlassDome.java => TileGlassBell.java} | 9 ++- resources/mods/ee3/lang/en_US.xml | 4 +- resources/mods/ee3/models/aludel.obj | 4 +- .../blocks/{glassDome.png => glassBell.png} | Bin .../gui/{glassDome.png => glassBell.png} | Bin .../blocks/{glassDome.xcf => glassBell.xcf} | Bin .../xcf/gui/{glassDome.xcf => glassBell.xcf} | Bin 34 files changed, 141 insertions(+), 156 deletions(-) rename ee3_common/com/pahimar/ee3/block/{BlockGlassDome.java => BlockGlassBell.java} (85%) rename ee3_common/com/pahimar/ee3/client/gui/inventory/{GuiGlassDome.java => GuiGlassBell.java} (66%) rename ee3_common/com/pahimar/ee3/client/model/{ModelGlassDome.java => ModelGlassBell.java} (51%) rename ee3_common/com/pahimar/ee3/client/renderer/item/{ItemGlassDomeRenderer.java => ItemGlassBellRenderer.java} (73%) rename ee3_common/com/pahimar/ee3/client/renderer/tileentity/{TileEntityGlassDomeRenderer.java => TileEntityGlassBellRenderer.java} (68%) rename ee3_common/com/pahimar/ee3/inventory/{ContainerGlassDome.java => ContainerGlassBell.java} (85%) rename ee3_common/com/pahimar/ee3/tileentity/{TileGlassDome.java => TileGlassBell.java} (96%) rename resources/mods/ee3/textures/blocks/{glassDome.png => glassBell.png} (100%) rename resources/mods/ee3/textures/gui/{glassDome.png => glassBell.png} (100%) rename resources/mods/ee3/textures/xcf/blocks/{glassDome.xcf => glassBell.xcf} (100%) rename resources/mods/ee3/textures/xcf/gui/{glassDome.xcf => glassBell.xcf} (100%) diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index cc88f0c2..786ca2ff 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -59,26 +59,14 @@ import cpw.mods.fml.relauncher.Side; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ - -@Mod( - modid = Reference.MOD_ID, - name = Reference.MOD_NAME, - version = Reference.VERSION_NUMBER, - dependencies = Reference.DEPENDENCIES, - certificateFingerprint = Reference.FINGERPRINT) -@NetworkMod( - channels = { Reference.CHANNEL_NAME }, - clientSideRequired = true, - serverSideRequired = false, - packetHandler = PacketHandler.class) +@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.VERSION_NUMBER, dependencies = Reference.DEPENDENCIES, certificateFingerprint = Reference.FINGERPRINT) +@NetworkMod(channels = { Reference.CHANNEL_NAME }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) public class EquivalentExchange3 { @Instance(Reference.MOD_ID) public static EquivalentExchange3 instance; - @SidedProxy( - clientSide = Reference.CLIENT_PROXY_CLASS, - serverSide = Reference.SERVER_PROXY_CLASS) + @SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.SERVER_PROXY_CLASS) public static CommonProxy proxy; public static CreativeTabs tabsEE3 = new CreativeTabEE3(CreativeTabs.getNextID(), Reference.MOD_ID); diff --git a/ee3_common/com/pahimar/ee3/block/BlockGlassDome.java b/ee3_common/com/pahimar/ee3/block/BlockGlassBell.java similarity index 85% rename from ee3_common/com/pahimar/ee3/block/BlockGlassDome.java rename to ee3_common/com/pahimar/ee3/block/BlockGlassBell.java index 89e93a3f..ae44646d 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockGlassDome.java +++ b/ee3_common/com/pahimar/ee3/block/BlockGlassBell.java @@ -15,30 +15,29 @@ import com.pahimar.ee3.EquivalentExchange3; import com.pahimar.ee3.lib.GuiIds; import com.pahimar.ee3.lib.RenderIds; import com.pahimar.ee3.lib.Strings; -import com.pahimar.ee3.tileentity.TileGlassDome; +import com.pahimar.ee3.tileentity.TileGlassBell; - -public class BlockGlassDome extends BlockEE { +public class BlockGlassBell extends BlockEE { /** - * Is the random generator used by glass dome to drop the inventory contents in - * random directions. + * Is the random generator used by glass bell to drop the inventory contents + * in random directions. */ private Random rand = new Random(); - - public BlockGlassDome(int id) { + + public BlockGlassBell(int id) { super(id, Material.glass); - this.setUnlocalizedName(Strings.GLASS_DOME_NAME); + this.setUnlocalizedName(Strings.GLASS_BELL_NAME); this.setCreativeTab(EquivalentExchange3.tabsEE3); this.setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.66F, 0.875F); this.setHardness(1.0F); } - + @Override public TileEntity createNewTileEntity(World world) { - return new TileGlassDome(); + return new TileGlassBell(); } @Override @@ -56,7 +55,7 @@ public class BlockGlassDome extends BlockEE { @Override public int getRenderType() { - return RenderIds.glassDomeId; + return RenderIds.glassBellId; } @Override @@ -73,10 +72,10 @@ public class BlockGlassDome extends BlockEE { return false; else { if (!world.isRemote) { - TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z); + TileGlassBell tileGlassBell = (TileGlassBell) world.getBlockTileEntity(x, y, z); - if (tileGlassDome != null) { - player.openGui(EquivalentExchange3.instance, GuiIds.GLASS_DOME, world, x, y, z); + if (tileGlassBell != null) { + player.openGui(EquivalentExchange3.instance, GuiIds.GLASS_BELL, world, x, y, z); } } diff --git a/ee3_common/com/pahimar/ee3/block/ModBlocks.java b/ee3_common/com/pahimar/ee3/block/ModBlocks.java index ad5e2053..dec713c2 100644 --- a/ee3_common/com/pahimar/ee3/block/ModBlocks.java +++ b/ee3_common/com/pahimar/ee3/block/ModBlocks.java @@ -22,7 +22,7 @@ public class ModBlocks { public static Block calcinator; public static Block aludel; public static Block alchemicalChest; - public static Block glassDome; + public static Block glassBell; public static Block redWaterStill; public static Block redWaterFlowing; @@ -31,14 +31,14 @@ public class ModBlocks { calcinator = new BlockCalcinator(BlockIds.CALCINATOR); aludel = new BlockAludelBase(BlockIds.ALUDEL); alchemicalChest = new BlockAlchemicalChest(BlockIds.ALCHEMICAL_CHEST); - glassDome = new BlockGlassDome(BlockIds.GLASS_DOME); + glassBell = new BlockGlassBell(BlockIds.GLASS_BELL); redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL); redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1); GameRegistry.registerBlock(calcinator, Strings.CALCINATOR_NAME); GameRegistry.registerBlock(aludel, Strings.ALUDEL_NAME); GameRegistry.registerBlock(alchemicalChest, Strings.ALCHEMICAL_CHEST_NAME); - GameRegistry.registerBlock(glassDome, Strings.GLASS_DOME_NAME); + GameRegistry.registerBlock(glassBell, Strings.GLASS_BELL_NAME); //GameRegistry.registerBlock(redWaterStill, Strings.RED_WATER_STILL_NAME); //GameRegistry.registerBlock(redWaterFlowing, Strings.RED_WATER_FLOWING_NAME); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassDome.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java similarity index 66% rename from ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassDome.java rename to ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java index 6412c35c..1333a49b 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassDome.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java @@ -6,10 +6,10 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.inventory.ContainerGlassDome; +import com.pahimar.ee3.inventory.ContainerGlassBell; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; -import com.pahimar.ee3.tileentity.TileGlassDome; +import com.pahimar.ee3.tileentity.TileGlassBell; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,21 +17,21 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Equivalent-Exchange-3 * - * GuiGlassDome + * GuiGlassBell * * @author pahimar * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ @SideOnly(Side.CLIENT) -public class GuiGlassDome extends GuiContainer { +public class GuiGlassBell extends GuiContainer { - private TileGlassDome tileGlassDome; + private TileGlassBell tileGlassBell; - public GuiGlassDome(InventoryPlayer inventoryPlayer, TileGlassDome tileGlassDome) { + public GuiGlassBell(InventoryPlayer inventoryPlayer, TileGlassBell tileGlassBell) { - super(new ContainerGlassDome(inventoryPlayer, tileGlassDome)); - this.tileGlassDome = tileGlassDome; + super(new ContainerGlassBell(inventoryPlayer, tileGlassBell)); + this.tileGlassBell = tileGlassBell; xSize = 176; ySize = 140; } @@ -39,7 +39,7 @@ public class GuiGlassDome extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int x, int y) { - String containerName = tileGlassDome.isInvNameLocalized() ? tileGlassDome.getInvName() : StatCollector.translateToLocal(tileGlassDome.getInvName()); + String containerName = tileGlassBell.isInvNameLocalized() ? tileGlassBell.getInvName() : StatCollector.translateToLocal(tileGlassBell.getInvName()); fontRenderer.drawString(containerName, xSize / 2 - fontRenderer.getStringWidth(containerName) / 2, 6, 4210752); fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), 8, ySize - 93, 4210752); } @@ -48,7 +48,7 @@ public class GuiGlassDome extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_GLASS_DOME); + mc.renderEngine.bindTexture(Textures.GUI_GLASS_BELL); int xStart = (width - xSize) / 2; int yStart = (height - ySize) / 2; this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java index a77036f9..8cf9d33f 100644 --- a/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java @@ -31,9 +31,9 @@ public class ModelCalcinator { modelCalcinator.renderAll(); } - + public void renderPart(String partName) { - + modelCalcinator.renderPart(partName); } } diff --git a/ee3_common/com/pahimar/ee3/client/model/ModelGlassDome.java b/ee3_common/com/pahimar/ee3/client/model/ModelGlassBell.java similarity index 51% rename from ee3_common/com/pahimar/ee3/client/model/ModelGlassDome.java rename to ee3_common/com/pahimar/ee3/client/model/ModelGlassBell.java index 1d576d1a..124e0b86 100644 --- a/ee3_common/com/pahimar/ee3/client/model/ModelGlassDome.java +++ b/ee3_common/com/pahimar/ee3/client/model/ModelGlassBell.java @@ -5,18 +5,17 @@ import net.minecraftforge.client.model.IModelCustom; import com.pahimar.ee3.lib.Models; +public class ModelGlassBell { -public class ModelGlassDome { + private IModelCustom modelGlassBell; - private IModelCustom modelGlassDome; + public ModelGlassBell() { - public ModelGlassDome() { - - modelGlassDome = AdvancedModelLoader.loadModel(Models.GLASS_DOME); + modelGlassBell = AdvancedModelLoader.loadModel(Models.GLASS_BELL); } public void render() { - modelGlassDome.renderPart("Dome"); + modelGlassBell.renderPart("Bell"); } } diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassDomeRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java similarity index 73% rename from ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassDomeRenderer.java rename to ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java index 9e1d4d3d..4ef73dba 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassDomeRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java @@ -5,7 +5,7 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.client.model.ModelGlassDome; +import com.pahimar.ee3.client.model.ModelGlassBell; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; @@ -15,20 +15,20 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Equivalent-Exchange-3 * - * ItemAludelRenderer + * ItemGlassBellRenderer * * @author pahimar * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ @SideOnly(Side.CLIENT) -public class ItemGlassDomeRenderer implements IItemRenderer { +public class ItemGlassBellRenderer implements IItemRenderer { - private ModelGlassDome modelGlassDome; + private ModelGlassBell modelGlassBell; - public ItemGlassDomeRenderer() { + public ItemGlassBellRenderer() { - modelGlassDome = new ModelGlassDome(); + modelGlassBell = new ModelGlassBell(); } @Override @@ -48,15 +48,15 @@ public class ItemGlassDomeRenderer implements IItemRenderer { switch (type) { case ENTITY: { - renderGlassDome(-0.5F, -1.2F, 0.5F, 1.4F); + renderGlassBell(-0.5F, -1.2F, 0.5F, 1.4F); return; } case EQUIPPED: { - renderGlassDome(-0.2F, -0.85F, 0.8F, 1.4F); + renderGlassBell(-0.2F, -0.85F, 0.8F, 1.4F); return; } case INVENTORY: { - renderGlassDome(-1.0F, -1.675F, 0.0F, 1.4F); + renderGlassBell(-1.0F, -1.675F, 0.0F, 1.4F); return; } default: @@ -64,7 +64,7 @@ public class ItemGlassDomeRenderer implements IItemRenderer { } } - private void renderGlassDome(float x, float y, float z, float scale) { + private void renderGlassBell(float x, float y, float z, float scale) { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); @@ -75,10 +75,10 @@ public class ItemGlassDomeRenderer implements IItemRenderer { GL11.glRotatef(-90F, 1F, 0, 0); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL); // Render - modelGlassDome.render(); + modelGlassBell.render(); GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java index 9f3093a2..dff09bba 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java @@ -31,9 +31,9 @@ public class TileEntityAlchemicalChestRenderer extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { - + if (tileEntity instanceof TileAlchemicalChest) { - + TileAlchemicalChest tileAlchemicalChest = (TileAlchemicalChest) tileEntity; ForgeDirection direction = null; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java index 0d3fa10f..5459f843 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java @@ -1,11 +1,11 @@ package com.pahimar.ee3.client.renderer.tileentity; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import org.lwjgl.opengl.GL11; + import com.pahimar.ee3.client.model.ModelAludel; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileAludel; @@ -32,9 +32,9 @@ public class TileEntityAludelRenderer extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { if (tileEntity instanceof TileAludel) { - + TileAludel tileAludel = (TileAludel) tileEntity; - + GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java index c408acce..f8770e88 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java @@ -32,7 +32,7 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer { if (tileEntity instanceof TileCalcinator) { TileCalcinator tileCalcinator = (TileCalcinator) tileEntity; - + GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); @@ -47,7 +47,7 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer { // Render modelCalcinator.renderPart("Calcinator"); - + if (tileCalcinator.getStackInSlot(TileCalcinator.DUST_INVENTORY_INDEX) != null) { modelCalcinator.renderPart("Dust"); } diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java similarity index 68% rename from ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java rename to ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java index 6ec90f09..045c5b61 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassDomeRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java @@ -8,9 +8,9 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.client.model.ModelGlassDome; +import com.pahimar.ee3.client.model.ModelGlassBell; import com.pahimar.ee3.lib.Textures; -import com.pahimar.ee3.tileentity.TileGlassDome; +import com.pahimar.ee3.tileentity.TileGlassBell; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; @@ -19,83 +19,86 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Equivalent-Exchange-3 * - * TileEntityCalcinatorRenderer + * TileEntityGlassBellRenderer * * @author pahimar * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ @SideOnly(Side.CLIENT) -public class TileEntityGlassDomeRenderer extends TileEntitySpecialRenderer { +public class TileEntityGlassBellRenderer extends TileEntitySpecialRenderer { - private ModelGlassDome modelGlassDome = new ModelGlassDome(); + private ModelGlassBell modelGlassBell = new ModelGlassBell(); private final RenderItem customRenderItem; private EntityItem ghostEntityItem; - - public TileEntityGlassDomeRenderer() { - + + public TileEntityGlassBellRenderer() { + ghostEntityItem = null; - + customRenderItem = new RenderItem() { + + @Override public boolean shouldBob() { + return false; }; }; - + customRenderItem.setRenderManager(RenderManager.instance); } @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { - if (tileEntity instanceof TileGlassDome) { - TileGlassDome tileGlassDome = (TileGlassDome) tileEntity; - + if (tileEntity instanceof TileGlassBell) { + TileGlassBell tileGlassBell = (TileGlassBell) tileEntity; + GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); - + GL11.glPushMatrix(); // Scale, Translate, Rotate GL11.glScalef(1.0F, 1.0F, 1.0F); - GL11.glTranslatef((float) x + 0.5F, (float) y + (-1.0F), (float) z + 1.2F); + GL11.glTranslatef((float) x + 0.5F, (float) y + -1.0F, (float) z + 1.2F); GL11.glRotatef(45F, 0F, 1F, 0F); GL11.glRotatef(-90F, 1F, 0F, 0F); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL); // Render - modelGlassDome.render(); - + modelGlassBell.render(); + GL11.glPopMatrix(); - + GL11.glPushMatrix(); - for (int i = 0; i < tileGlassDome.getSizeInventory(); i++) { - + for (int i = 0; i < tileGlassBell.getSizeInventory(); i++) { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.1F, (float) z + 0.5F); GL11.glScalef(0.5F, 0.5F, 0.5F); - + if (ghostEntityItem == null) { - ghostEntityItem = new EntityItem(tileGlassDome.worldObj, tileGlassDome.xCoord, tileGlassDome.yCoord, tileGlassDome.zCoord); + ghostEntityItem = new EntityItem(tileGlassBell.worldObj, tileGlassBell.xCoord, tileGlassBell.yCoord, tileGlassBell.zCoord); } - - if (tileGlassDome.getStackInSlot(i) != null) { - - ghostEntityItem.setEntityItemStack(tileGlassDome.getStackInSlot(i)); - + + if (tileGlassBell.getStackInSlot(i) != null) { + + ghostEntityItem.setEntityItemStack(tileGlassBell.getStackInSlot(i)); + if (ghostEntityItem.getEntityItem() != null) { ghostEntityItem.onUpdate(); customRenderItem.doRenderItem(ghostEntityItem, 0, 0, 0, 0, 0); } } - + } GL11.glPopMatrix(); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_LIGHTING); - + } } } diff --git a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java index ff5bd738..f4a04043 100644 --- a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java +++ b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java @@ -80,7 +80,7 @@ public class ConfigurationHandler { BlockIds.CALCINATOR = configuration.getBlock(Strings.CALCINATOR_NAME, BlockIds.CALCINATOR_DEFAULT).getInt(BlockIds.CALCINATOR_DEFAULT); BlockIds.ALUDEL = configuration.getBlock(Strings.ALUDEL_NAME, BlockIds.ALUDEL_DEFAULT).getInt(BlockIds.ALUDEL_DEFAULT); BlockIds.ALCHEMICAL_CHEST = configuration.getBlock(Strings.ALCHEMICAL_CHEST_NAME, BlockIds.ALCHEMICAL_CHEST_DEFAULT).getInt(BlockIds.ALCHEMICAL_CHEST_DEFAULT); - BlockIds.GLASS_DOME = configuration.getBlock(Strings.GLASS_DOME_NAME, BlockIds.GLASS_DOME_DEFAULT).getInt(BlockIds.GLASS_DOME_DEFAULT); + BlockIds.GLASS_BELL = configuration.getBlock(Strings.GLASS_BELL_NAME, BlockIds.GLASS_BELL_DEFAULT).getInt(BlockIds.GLASS_BELL_DEFAULT); BlockIds.RED_WATER_STILL = configuration.getBlock(Strings.RED_WATER_STILL_NAME, BlockIds.RED_WATER_STILL_DEFAULT).getInt(BlockIds.RED_WATER_STILL_DEFAULT); /* Block property configs */ diff --git a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java index 9540d715..2728dd2e 100644 --- a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java @@ -109,10 +109,11 @@ public class VersionHelper implements Runnable { } } } - + private static String getVersionForCheck() { + String[] versionTokens = Reference.VERSION_NUMBER.split(" "); - + if (versionTokens.length >= 1) { return versionTokens[0]; } diff --git a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java index 26f319d2..63cb82cb 100644 --- a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java @@ -13,11 +13,11 @@ import com.pahimar.ee3.client.audio.SoundHandler; import com.pahimar.ee3.client.renderer.item.ItemAlchemicalChestRenderer; import com.pahimar.ee3.client.renderer.item.ItemAludelRenderer; import com.pahimar.ee3.client.renderer.item.ItemCalcinatorRenderer; -import com.pahimar.ee3.client.renderer.item.ItemGlassDomeRenderer; +import com.pahimar.ee3.client.renderer.item.ItemGlassBellRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityAlchemicalChestRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityAludelRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer; -import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassDomeRenderer; +import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassBellRenderer; import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler; import com.pahimar.ee3.core.handlers.KeyBindingHandler; import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler; @@ -33,7 +33,7 @@ import com.pahimar.ee3.tileentity.TileAlchemicalChest; import com.pahimar.ee3.tileentity.TileAludel; import com.pahimar.ee3.tileentity.TileCalcinator; import com.pahimar.ee3.tileentity.TileEE; -import com.pahimar.ee3.tileentity.TileGlassDome; +import com.pahimar.ee3.tileentity.TileGlassBell; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; @@ -91,12 +91,12 @@ public class ClientProxy extends CommonProxy { RenderIds.calcinatorRenderId = RenderingRegistry.getNextAvailableRenderId(); RenderIds.aludelRenderId = RenderingRegistry.getNextAvailableRenderId(); RenderIds.alchemicalChestRenderId = RenderingRegistry.getNextAvailableRenderId(); - RenderIds.glassDomeId = RenderingRegistry.getNextAvailableRenderId(); + RenderIds.glassBellId = RenderingRegistry.getNextAvailableRenderId(); MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer()); MinecraftForgeClient.registerItemRenderer(BlockIds.ALUDEL, new ItemAludelRenderer()); MinecraftForgeClient.registerItemRenderer(BlockIds.ALCHEMICAL_CHEST, new ItemAlchemicalChestRenderer()); - MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_DOME, new ItemGlassDomeRenderer()); + MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_BELL, new ItemGlassBellRenderer()); } @Override @@ -107,7 +107,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new TileEntityCalcinatorRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileAludel.class, new TileEntityAludelRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileAlchemicalChest.class, new TileEntityAlchemicalChestRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(TileGlassDome.class, new TileEntityGlassDomeRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileGlassBell.class, new TileEntityGlassBellRenderer()); } @Override diff --git a/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java index 1a250955..1d6d97cd 100644 --- a/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java @@ -9,14 +9,14 @@ import com.pahimar.ee3.client.gui.inventory.GuiAlchemicalBag; import com.pahimar.ee3.client.gui.inventory.GuiAlchemicalChest; import com.pahimar.ee3.client.gui.inventory.GuiAludel; import com.pahimar.ee3.client.gui.inventory.GuiCalcinator; -import com.pahimar.ee3.client.gui.inventory.GuiGlassDome; +import com.pahimar.ee3.client.gui.inventory.GuiGlassBell; import com.pahimar.ee3.client.gui.inventory.GuiPortableCrafting; import com.pahimar.ee3.client.gui.inventory.GuiPortableTransmutation; import com.pahimar.ee3.inventory.ContainerAlchemicalBag; import com.pahimar.ee3.inventory.ContainerAlchemicalChest; import com.pahimar.ee3.inventory.ContainerAludel; import com.pahimar.ee3.inventory.ContainerCalcinator; -import com.pahimar.ee3.inventory.ContainerGlassDome; +import com.pahimar.ee3.inventory.ContainerGlassBell; import com.pahimar.ee3.inventory.ContainerPortableCrafting; import com.pahimar.ee3.inventory.ContainerPortableTransmutation; import com.pahimar.ee3.lib.GuiIds; @@ -24,7 +24,7 @@ import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.tileentity.TileAlchemicalChest; import com.pahimar.ee3.tileentity.TileAludel; import com.pahimar.ee3.tileentity.TileCalcinator; -import com.pahimar.ee3.tileentity.TileGlassDome; +import com.pahimar.ee3.tileentity.TileGlassBell; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; @@ -69,7 +69,7 @@ public class CommonProxy implements IGuiHandler { GameRegistry.registerTileEntity(TileCalcinator.class, Strings.TE_CALCINATOR_NAME); GameRegistry.registerTileEntity(TileAludel.class, Strings.TE_ALUDEL_NAME); GameRegistry.registerTileEntity(TileAlchemicalChest.class, Strings.TE_ALCHEMICAL_CHEST_NAME); - GameRegistry.registerTileEntity(TileGlassDome.class, Strings.TE_GLASS_DOME_NAME); + GameRegistry.registerTileEntity(TileGlassBell.class, Strings.TE_GLASS_BELL_NAME); } public void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit) { @@ -106,9 +106,9 @@ public class CommonProxy implements IGuiHandler { TileAludel tileAludel = (TileAludel) world.getBlockTileEntity(x, y, z); return new ContainerAludel(player.inventory, tileAludel); } - else if (ID == GuiIds.GLASS_DOME) { - TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z); - return new ContainerGlassDome(player.inventory, tileGlassDome); + else if (ID == GuiIds.GLASS_BELL) { + TileGlassBell tileGlassBell = (TileGlassBell) world.getBlockTileEntity(x, y, z); + return new ContainerGlassBell(player.inventory, tileGlassBell); } return null; @@ -136,9 +136,9 @@ public class CommonProxy implements IGuiHandler { TileAludel tileAludel = (TileAludel) world.getBlockTileEntity(x, y, z); return new GuiAludel(player.inventory, tileAludel); } - else if (ID == GuiIds.GLASS_DOME) { - TileGlassDome tileGlassDome = (TileGlassDome) world.getBlockTileEntity(x, y, z); - return new GuiGlassDome(player.inventory, tileGlassDome); + else if (ID == GuiIds.GLASS_BELL) { + TileGlassBell tileGlassBell = (TileGlassBell) world.getBlockTileEntity(x, y, z); + return new GuiGlassBell(player.inventory, tileGlassBell); } return null; diff --git a/ee3_common/com/pahimar/ee3/inventory/ContainerGlassDome.java b/ee3_common/com/pahimar/ee3/inventory/ContainerGlassBell.java similarity index 85% rename from ee3_common/com/pahimar/ee3/inventory/ContainerGlassDome.java rename to ee3_common/com/pahimar/ee3/inventory/ContainerGlassBell.java index af17d571..cf28ead6 100644 --- a/ee3_common/com/pahimar/ee3/inventory/ContainerGlassDome.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerGlassBell.java @@ -7,25 +7,25 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import com.pahimar.ee3.tileentity.TileAludel; -import com.pahimar.ee3.tileentity.TileGlassDome; +import com.pahimar.ee3.tileentity.TileGlassBell; /** * Equivalent-Exchange-3 * - * ContainerGlassDome + * ContainerGlassBell * * @author pahimar * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class ContainerGlassDome extends Container { +public class ContainerGlassBell extends Container { private final int PLAYER_INVENTORY_ROWS = 3; private final int PLAYER_INVENTORY_COLUMNS = 9; - public ContainerGlassDome(InventoryPlayer inventoryPlayer, TileGlassDome tileGlassDome) { + public ContainerGlassBell(InventoryPlayer inventoryPlayer, TileGlassBell tileGlassBell) { - this.addSlotToContainer(new Slot(tileGlassDome, TileAludel.INPUT_INVENTORY_INDEX, 80, 22)); + this.addSlotToContainer(new Slot(tileGlassBell, TileAludel.INPUT_INVENTORY_INDEX, 80, 22)); // Add the player's inventory slots to the container for (int inventoryRowIndex = 0; inventoryRowIndex < PLAYER_INVENTORY_ROWS; ++inventoryRowIndex) { diff --git a/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java index 86481f41..f518a600 100644 --- a/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java @@ -24,8 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class ItemMiniumStone extends ItemEE - implements ITransmutationStone, IKeyBound { +public class ItemMiniumStone extends ItemEE implements ITransmutationStone, IKeyBound { public ItemMiniumStone(int id) { diff --git a/ee3_common/com/pahimar/ee3/lib/BlockIds.java b/ee3_common/com/pahimar/ee3/lib/BlockIds.java index fbb6bbd3..74ae7a79 100644 --- a/ee3_common/com/pahimar/ee3/lib/BlockIds.java +++ b/ee3_common/com/pahimar/ee3/lib/BlockIds.java @@ -16,13 +16,13 @@ public class BlockIds { public static int RED_WATER_STILL_DEFAULT = 2453; public static int ALUDEL_DEFAULT = 2454; public static int ALCHEMICAL_CHEST_DEFAULT = 2455; - public static int GLASS_DOME_DEFAULT = 2456; + public static int GLASS_BELL_DEFAULT = 2456; /* Current block ids */ public static int CALCINATOR; public static int ALUDEL; public static int ALCHEMICAL_CHEST; public static int RED_WATER_STILL; - public static int GLASS_DOME; + public static int GLASS_BELL; } diff --git a/ee3_common/com/pahimar/ee3/lib/GuiIds.java b/ee3_common/com/pahimar/ee3/lib/GuiIds.java index 3c199e60..771bb125 100644 --- a/ee3_common/com/pahimar/ee3/lib/GuiIds.java +++ b/ee3_common/com/pahimar/ee3/lib/GuiIds.java @@ -18,6 +18,6 @@ public class GuiIds { public static final int ALCHEMICAL_CHEST = 4; public static final int ALCHEMICAL_BAG = 5; public static final int SHARED_ALCHEMICAL_INVENTORY = 6; - public static final int GLASS_DOME = 7; + public static final int GLASS_BELL = 7; } diff --git a/ee3_common/com/pahimar/ee3/lib/Models.java b/ee3_common/com/pahimar/ee3/lib/Models.java index 02ef18be..fc29299f 100644 --- a/ee3_common/com/pahimar/ee3/lib/Models.java +++ b/ee3_common/com/pahimar/ee3/lib/Models.java @@ -7,5 +7,5 @@ public class Models { public static final String ALUDEL = MODEL_LOCATION + "aludel.obj"; public static final String CALCINATOR = MODEL_LOCATION + "calcinator.obj"; - public static final String GLASS_DOME = MODEL_LOCATION + "aludel.obj"; + public static final String GLASS_BELL = MODEL_LOCATION + "aludel.obj"; } diff --git a/ee3_common/com/pahimar/ee3/lib/Reference.java b/ee3_common/com/pahimar/ee3/lib/Reference.java index 16d91c58..c07e3f29 100644 --- a/ee3_common/com/pahimar/ee3/lib/Reference.java +++ b/ee3_common/com/pahimar/ee3/lib/Reference.java @@ -20,7 +20,7 @@ public class Reference { public static final String VERSION_NUMBER = "@VERSION@ (build @BUILD_NUMBER@)"; public static final String CHANNEL_NAME = MOD_ID; public static final String DEPENDENCIES = "required-after:Forge@[7.7.1.650,)"; - public static final String FINGERPRINT = "@FINGERPRINT@"; + public static final String FINGERPRINT = "@FINGERPRINT@"; public static final int SECOND_IN_TICKS = 20; public static final int SHIFTED_ID_RANGE_CORRECTION = 256; public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy"; diff --git a/ee3_common/com/pahimar/ee3/lib/RenderIds.java b/ee3_common/com/pahimar/ee3/lib/RenderIds.java index f8319ac6..0cb617e1 100644 --- a/ee3_common/com/pahimar/ee3/lib/RenderIds.java +++ b/ee3_common/com/pahimar/ee3/lib/RenderIds.java @@ -14,5 +14,5 @@ public class RenderIds { public static int calcinatorRenderId; public static int aludelRenderId; public static int alchemicalChestRenderId; - public static int glassDomeId; + public static int glassBellId; } diff --git a/ee3_common/com/pahimar/ee3/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java index b71abeab..2ad3fc12 100644 --- a/ee3_common/com/pahimar/ee3/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -43,7 +43,7 @@ public class Strings { public static final String CALCINATOR_NAME = "calcinator"; public static final String ALUDEL_NAME = "aludel"; public static final String ALCHEMICAL_CHEST_NAME = "alchemicalChest"; - public static final String GLASS_DOME_NAME = "glassDome"; + public static final String GLASS_BELL_NAME = "glassBell"; public static final String RED_WATER_STILL_NAME = "redWaterStill"; public static final String RED_WATER_FLOWING_NAME = "redWaterFlowing"; @@ -52,14 +52,14 @@ public class Strings { public static final String INERT_STONE_NAME = "stoneInert"; public static final String MINIUM_STONE_NAME = "stoneMinium"; public static final String PHILOSOPHERS_STONE_NAME = "stonePhilosophers"; - public static final String ALCHEMICAL_DUST_NAME = "dustAlchemical"; + public static final String ALCHEMICAL_DUST_NAME = "alchemicalDust"; public static final String ALCHEMICAL_BAG_NAME = "alchemicalBag"; /* TileEntity name constants */ public static final String TE_CALCINATOR_NAME = "tileCalcinator"; public static final String TE_ALUDEL_NAME = "tileAludel"; public static final String TE_ALCHEMICAL_CHEST_NAME = "tileAlchemicalChest"; - public static final String TE_GLASS_DOME_NAME = "tileGlassDome"; + public static final String TE_GLASS_BELL_NAME = "tileGlassBell"; /* Transmutation cost related constants */ public static final String TRANSMUTATION_COST = "_cost"; @@ -72,7 +72,7 @@ public class Strings { public static final String CONTAINER_ALUDEL_NAME = "container." + ALUDEL_NAME; public static final String CONTAINER_ALCHEMICAL_CHEST_NAME = "container." + ALCHEMICAL_CHEST_NAME; public static final String CONTAINER_ALCHEMICAL_BAG_NAME = "container." + ALCHEMICAL_BAG_NAME; - public static final String CONTAINER_GLASS_DOME_NAME = "container." + GLASS_DOME_NAME; + public static final String CONTAINER_GLASS_BELL_NAME = "container." + GLASS_BELL_NAME; public static final String CONTAINER_INVENTORY = "container.inventory"; public static final String CONTAINER_PORTABLE_CRAFTING = "container.crafting"; diff --git a/ee3_common/com/pahimar/ee3/lib/Textures.java b/ee3_common/com/pahimar/ee3/lib/Textures.java index 910ec231..88951857 100644 --- a/ee3_common/com/pahimar/ee3/lib/Textures.java +++ b/ee3_common/com/pahimar/ee3/lib/Textures.java @@ -31,13 +31,13 @@ public class Textures { public static final String GUI_SHARED_ALCHEMICAL_STORAGE = GUI_SHEET_LOCATION + "sharedAlchemicalStorage.png"; public static final String GUI_PORTABLE_CRAFTING = "/gui/crafting.png"; public static final String GUI_PORTABLE_TRANSMUTATION = GUI_SHEET_LOCATION + "portableTransmutation.png"; - public static final String GUI_GLASS_DOME = GUI_SHEET_LOCATION + "glassDome.png"; + public static final String GUI_GLASS_BELL = GUI_SHEET_LOCATION + "glassBell.png"; // Model textures public static final String MODEL_CALCINATOR = MODEL_SHEET_LOCATION + "calcinator.png"; public static final String MODEL_ALUDEL = MODEL_SHEET_LOCATION + "aludel.png"; public static final String MODEL_ALCHEMICAL_CHEST = MODEL_SHEET_LOCATION + "alchemicalChest.png"; - public static final String MODEL_GLASS_DOME = MODEL_SHEET_LOCATION + "aludel.png"; + public static final String MODEL_GLASS_BELL = MODEL_SHEET_LOCATION + "aludel.png"; // Effect textures public static final String EFFECT_WORLD_TRANSMUTATION = EFFECTS_LOCATION + "noise.png"; diff --git a/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java b/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java index ada7d4a3..f4bc215a 100644 --- a/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java +++ b/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java @@ -25,12 +25,9 @@ import com.pahimar.ee3.network.packet.PacketTileUpdate; * */ public enum PacketTypeHandler { - KEY(PacketKeyPressed.class), - TILE(PacketTileUpdate.class), - REQUEST_EVENT(PacketRequestEvent.class), - SPAWN_PARTICLE(PacketSpawnParticle.class), - SOUND_EVENT(PacketSoundEvent.class), - ITEM_UPDATE(PacketItemUpdate.class); + KEY(PacketKeyPressed.class), TILE(PacketTileUpdate.class), REQUEST_EVENT( + PacketRequestEvent.class), SPAWN_PARTICLE(PacketSpawnParticle.class), SOUND_EVENT( + PacketSoundEvent.class), ITEM_UPDATE(PacketItemUpdate.class); private Class clazz; diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java index e6b4b6e1..c0bd8266 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java @@ -22,9 +22,9 @@ public class TileCalcinator extends TileEE implements IInventory { * The ItemStacks that hold the items currently being used in the Calcinator */ private ItemStack[] inventory; - + private final int INVENTORY_SIZE = 3; - + public static final int FUEL_INVENTORY_INDEX = 0; public static final int INPUT_INVENTORY_INDEX = 1; public static final int DUST_INVENTORY_INDEX = 2; diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileEE.java b/ee3_common/com/pahimar/ee3/tileentity/TileEE.java index d3b2c2d8..cb684654 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileEE.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileEE.java @@ -71,7 +71,7 @@ public class TileEE extends TileEntity { this.customName = customName; } - + public boolean isUseableByPlayer(EntityPlayer player) { return true; diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileGlassDome.java b/ee3_common/com/pahimar/ee3/tileentity/TileGlassBell.java similarity index 96% rename from ee3_common/com/pahimar/ee3/tileentity/TileGlassDome.java rename to ee3_common/com/pahimar/ee3/tileentity/TileGlassBell.java index 6e045f0e..b1af9738 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileGlassDome.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileGlassBell.java @@ -7,11 +7,10 @@ import net.minecraft.nbt.NBTTagList; import com.pahimar.ee3.lib.Strings; - -public class TileGlassDome extends TileEE implements IInventory { +public class TileGlassBell extends TileEE implements IInventory { /** - * The ItemStacks that hold the items currently being used in the Glass Dome + * The ItemStacks that hold the items currently being used in the Glass Bell */ private ItemStack[] inventory; @@ -19,7 +18,7 @@ public class TileGlassDome extends TileEE implements IInventory { public static final int DISPLAY_SLOT_INVENTORY_INDEX = 0; - public TileGlassDome() { + public TileGlassBell() { inventory = new ItemStack[INVENTORY_SIZE]; } @@ -77,7 +76,7 @@ public class TileGlassDome extends TileEE implements IInventory { @Override public String getInvName() { - return this.hasCustomName() ? this.getCustomName() : Strings.CONTAINER_GLASS_DOME_NAME; + return this.hasCustomName() ? this.getCustomName() : Strings.CONTAINER_GLASS_BELL_NAME; } @Override diff --git a/resources/mods/ee3/lang/en_US.xml b/resources/mods/ee3/lang/en_US.xml index eb57b46b..732e695f 100644 --- a/resources/mods/ee3/lang/en_US.xml +++ b/resources/mods/ee3/lang/en_US.xml @@ -22,12 +22,12 @@ Calcinator Aludel Alchemical Chest - Glass Dome + Glass Bell Calcinator Aludel Alchemical Chest Alchemical Bag - Glass Dome + Glass Bell Equivalent Exchange 3 Initializing remote version check against remote version authority, located at Remote version check failed to initialize properly diff --git a/resources/mods/ee3/models/aludel.obj b/resources/mods/ee3/models/aludel.obj index b8840c24..68d5104e 100644 --- a/resources/mods/ee3/models/aludel.obj +++ b/resources/mods/ee3/models/aludel.obj @@ -421,7 +421,7 @@ f 30/21/16 56/107/16 55/113/16 # 136 faces # -# object Dome +# object Bell # v 0.3768 0.3768 1.6600 @@ -517,7 +517,7 @@ vt 0.2188 0.7500 0.9239 vt 0.2188 0.6250 0.9239 # 32 texture coords -g Dome +g Bell f 83/116/74 84/117/74 85/118/74 f 85/118/74 86/119/74 83/116/74 f 87/120/75 88/121/75 89/122/75 diff --git a/resources/mods/ee3/textures/blocks/glassDome.png b/resources/mods/ee3/textures/blocks/glassBell.png similarity index 100% rename from resources/mods/ee3/textures/blocks/glassDome.png rename to resources/mods/ee3/textures/blocks/glassBell.png diff --git a/resources/mods/ee3/textures/gui/glassDome.png b/resources/mods/ee3/textures/gui/glassBell.png similarity index 100% rename from resources/mods/ee3/textures/gui/glassDome.png rename to resources/mods/ee3/textures/gui/glassBell.png diff --git a/resources/mods/ee3/textures/xcf/blocks/glassDome.xcf b/resources/mods/ee3/textures/xcf/blocks/glassBell.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/blocks/glassDome.xcf rename to resources/mods/ee3/textures/xcf/blocks/glassBell.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/glassDome.xcf b/resources/mods/ee3/textures/xcf/gui/glassBell.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/glassDome.xcf rename to resources/mods/ee3/textures/xcf/gui/glassBell.xcf