diff --git a/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java b/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java index 1e2170b..c19c1ea 100644 --- a/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java +++ b/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java @@ -19,7 +19,7 @@ public class GUIChest extends GuiContainer { DIAMOND(238,256,"/cpw/mods/ironchest/sprites/diamondcontainer.png",IronChestType.DIAMOND), COPPER(184,184,"/cpw/mods/ironchest/sprites/coppercontainer.png",IronChestType.COPPER), SILVER(184,238,"/cpw/mods/ironchest/sprites/silvercontainer.png",IronChestType.SILVER), - CRYSTAL(184,238,"/cpw/mods/ironchest/sprites/silvercontainer.png",IronChestType.CRYSTAL); + CRYSTAL(238,256,"/cpw/mods/ironchest/sprites/diamondcontainer.png",IronChestType.CRYSTAL); private int xSize; private int ySize; diff --git a/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java index 5f34f6e..4008ba0 100644 --- a/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java +++ b/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import net.minecraft.src.ModelChest; import net.minecraft.src.RenderBlocks; -import net.minecraft.src.RenderManager; import net.minecraft.src.Tessellator; import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntitySpecialRenderer; @@ -30,7 +29,7 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { private RenderBlocks renderBlocks; private static float[][] shifts = { { 0.3F, 0.45F, 0.3F }, { 0.7F, 0.45F, 0.3F }, { 0.3F, 0.45F, 0.7F }, { 0.7F, 0.45F, 0.7F }, - { 0.3F, 0.1F, 0.3F }, { 0.7F, 0.1F, 0.3F }, { 0.3F, 0.1F, 0.7F }, { 0.7F, 0.1F, 0.7F }, { 0.5F, 0.35F, 0.5F }, }; + { 0.3F, 0.1F, 0.3F }, { 0.7F, 0.1F, 0.3F }, { 0.3F, 0.1F, 0.7F }, { 0.7F, 0.1F, 0.7F }, { 0.5F, 0.32F, 0.5F }, }; public TileEntityIronChestRenderer() { model = new ModelChest(); @@ -78,10 +77,6 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { if (tile.getType().isTransparent()) { random.setSeed(254L); - glPushMatrix(); - glDisable(2896 /* GL_LIGHTING */); - glEnable(32826 /* GL_RESCALE_NORMAL_EXT */); - glTranslatef((float) x, (float) y, (float) z); float shiftX; float shiftY; float shiftZ; @@ -92,8 +87,12 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { if (tile.getTopItemStacks()[1] == null) { shift = 8; blockScale = 0.2F; - spread = 0.25F; + spread = 0.22F; } + glPushMatrix(); + glDisable(2896 /* GL_LIGHTING */); + glEnable(32826 /* GL_RESCALE_NORMAL_EXT */); + glTranslatef((float) x, (float) y, (float) z); for (ItemStack item : tile.getTopItemStacks()) { if (shift > shifts.length) { break; @@ -109,8 +108,6 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(item.itemID); float localScale = blockScale; if (item.itemID < Block.blocksList.length) { - bindTextureByName("/terrain.png"); - ForgeHooksClient.overrideTexture(Block.blocksList[item.itemID]); int j = Block.blocksList[item.itemID].getRenderType(); if (j == 1 || j == 19 || j == 12 || j == 2) { localScale = 2 * blockScale; @@ -124,20 +121,27 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { glRotatef(timeD, 0.0F, 1.0F, 0.0F); if (miniBlocks > 0) { float minishiftX = ((random.nextFloat() * 2.0F - 1.0F) * spread) / localScale; - float minishiftY = ((random.nextFloat() * 2.0F - 1.0F) * spread) / localScale; + float minishiftY = ((random.nextFloat() * 2.0F - 1.0F) * spread * 0.9F) / localScale; float minishiftZ = ((random.nextFloat() * 2.0F - 1.0F) * spread) / localScale; glTranslatef(minishiftX, minishiftY, minishiftZ); } if (customRenderer != null) { + bindTextureByName("/terrain.png"); + ForgeHooksClient.overrideTexture(item.getItem()); ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, item.itemID, item.getItemDamage(), 1.0F); } else if (item.itemID < Block.blocksList.length && RenderBlocks.renderItemIn3d(Block.blocksList[item.itemID].getRenderType())) { + bindTextureByName("/terrain.png"); + ForgeHooksClient.overrideTexture(Block.blocksList[item.itemID]); renderBlocks.renderBlockAsItem(Block.blocksList[item.itemID], item.getItemDamage(), 1.0F); } else { int i = item.getIconIndex(); if (item.itemID >= Block.blocksList.length) { bindTextureByName("/gui/items.png"); ForgeHooksClient.overrideTexture(Item.itemsList[item.itemID]); + } else { + bindTextureByName("/terrain.png"); + ForgeHooksClient.overrideTexture(Block.blocksList[item.itemID]); } Tessellator tessellator = Tessellator.instance; float f5 = (float) ((i % 16) * 16 + 0) / 256F; diff --git a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java b/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java index 2c6ba11..9a4c8ec 100644 --- a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java +++ b/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java @@ -5,6 +5,7 @@ import static cpw.mods.ironchest.IronChestType.DIAMOND; import static cpw.mods.ironchest.IronChestType.GOLD; import static cpw.mods.ironchest.IronChestType.IRON; import static cpw.mods.ironchest.IronChestType.SILVER; +import static cpw.mods.ironchest.IronChestType.CRYSTAL; import net.minecraft.src.Block; import net.minecraft.src.ItemStack; @@ -15,7 +16,8 @@ public enum ChestChangerType { GOLDDIAMOND(GOLD,DIAMOND,"goldDiamondUpgrade","Gold to Diamond Chest Upgrade","GGG","msm","GGG"), COPPERSILVER(COPPER,SILVER,"copperSilverUpgrade","Copper to Silver Chest Upgrade","mmm","msm","mmm"), SILVERGOLD(SILVER,GOLD,"silverGoldUpgrade","Silver to Gold Chest Upgrade","mGm","GsG","mGm"), - COPPERIRON(COPPER,IRON,"copperIronUpgrade","Copper to Iron Chest Upgrade","mGm","GsG","mGm"); + COPPERIRON(COPPER,IRON,"copperIronUpgrade","Copper to Iron Chest Upgrade","mGm","GsG","mGm"), + DIAMONDCRYSTAL(DIAMOND,CRYSTAL,"diamondCrystalUpgrade", "Diamond to Crystal Chest Upgrade","GGG","GOG","GGG"); private IronChestType source; private IronChestType target; @@ -47,7 +49,7 @@ public enum ChestChangerType { } public void addRecipe() { - IronChestType.addRecipe(new ItemStack(item), recipe, 'm', target.mat,'s',source.mat,'G',Block.glass); + IronChestType.addRecipe(new ItemStack(item), recipe, 'm', target.mat,'s',source.mat,'G',Block.glass,'O',Block.obsidian); } public static void buildItems(Configuration cfg, int defaultId) { @@ -59,7 +61,7 @@ public enum ChestChangerType { public static void generateRecipe(IronChestType type) { for (ChestChangerType item: values()) { if (item.source==type || item.target==type) { - for (Object[] recipe : MinecraftForge.generateRecipes(item.recipe[0],item.recipe[1],item.recipe[2],'s',item.source.getMatList(),'m',item.target.getMatList(),'G',Block.glass)) { + for (Object[] recipe : MinecraftForge.generateRecipes(item.recipe[0],item.recipe[1],item.recipe[2],'s',item.source.getMatList(),'m',item.target.getMatList(),'G',Block.glass,'O',Block.obsidian)) { if (recipe[4]==null || recipe[6]==null) { continue; } diff --git a/IronChests2/common/cpw/mods/ironchest/IronChestType.java b/IronChests2/common/cpw/mods/ironchest/IronChestType.java index fc53f30..81de178 100644 --- a/IronChests2/common/cpw/mods/ironchest/IronChestType.java +++ b/IronChests2/common/cpw/mods/ironchest/IronChestType.java @@ -16,7 +16,7 @@ public enum IronChestType { DIAMOND(108, 12, true, "Diamond Chest", "guiDiamondChest", "diamondchest.png", 2, Item.diamond, TileEntityDiamondChest.class, "GGGmPmGGG", "GGGG4Gmmm"), COPPER(45, 9, false, "Copper Chest", "guiCopperChest", "copperchest.png", 3, null, TileEntityCopperChest.class, "mmmmCmmmm"), SILVER(72, 9, false, "Silver Chest", "guiSilverChest", "silverchest.png", 4, null, TileEntitySilverChest.class, "mmmm0mmmm", "mmmm3mmmm"), - CRYSTAL(72, 9, true, "Crystal Chest", "guiSilverChest", "crystalchest.png", 5, null, TileEntityCrystalChest.class, "GGGGCGGGG"); + CRYSTAL(108, 12, true, "Crystal Chest", "guiDiamondChest", "crystalchest.png", 5, null, TileEntityCrystalChest.class, "GGGGPGGGG"); int size; private int rowLength; public String friendlyName; diff --git a/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/block_textures.png b/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/block_textures.png index 0332d4a..c500c4f 100644 Binary files a/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/block_textures.png and b/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/block_textures.png differ diff --git a/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/item_textures.png b/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/item_textures.png index 905bf49..b710f59 100644 Binary files a/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/item_textures.png and b/IronChests2/faithful_texturepack/cpw/mods/ironchest/sprites/item_textures.png differ diff --git a/IronChests2/faithful_texturepack/faithful_texturesheet.xcf b/IronChests2/faithful_texturepack/faithful_texturesheet.xcf index f72f6d5..b9918d0 100644 Binary files a/IronChests2/faithful_texturepack/faithful_texturesheet.xcf and b/IronChests2/faithful_texturepack/faithful_texturesheet.xcf differ diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/block_textures.png b/IronChests2/resources/cpw/mods/ironchest/sprites/block_textures.png index 7804276..00f4e83 100644 Binary files a/IronChests2/resources/cpw/mods/ironchest/sprites/block_textures.png and b/IronChests2/resources/cpw/mods/ironchest/sprites/block_textures.png differ diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/crystalchest.png b/IronChests2/resources/cpw/mods/ironchest/sprites/crystalchest.png index 3d17565..a455ce8 100644 Binary files a/IronChests2/resources/cpw/mods/ironchest/sprites/crystalchest.png and b/IronChests2/resources/cpw/mods/ironchest/sprites/crystalchest.png differ diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png b/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png index fb279ef..81403d0 100644 Binary files a/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png and b/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png differ diff --git a/IronChests2/resources/texturesheet.xcf b/IronChests2/resources/texturesheet.xcf index 96a5df1..b25e6a0 100644 Binary files a/IronChests2/resources/texturesheet.xcf and b/IronChests2/resources/texturesheet.xcf differ