From ed2df512e4359e80737954f7f87180130365f68f Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 9 Mar 2013 16:27:20 -0500 Subject: [PATCH] Update for minecraft 1.5 --- .../cpw/mods/ironchest/BlockIronChest.java | 39 +++++++++++------- .../cpw/mods/ironchest/IronChestType.java | 32 +++++++++++++- .../mods/ironchest/client/ClientProxy.java | 2 - .../cpw/mods/ironchest/client/GUIChest.java | 14 +++---- .../{terrain => blocks}/copper_front.png | Bin .../{terrain => blocks}/copper_side.png | Bin .../{terrain => blocks}/copper_top.png | Bin .../{terrain => blocks}/crystal_front.png | Bin .../{terrain => blocks}/crystal_side.png | Bin .../{terrain => blocks}/crystal_top.png | Bin .../{terrain => blocks}/diamond_front.png | Bin .../{terrain => blocks}/diamond_side.png | Bin .../{terrain => blocks}/diamond_top.png | Bin .../{terrain => blocks}/gold_front.png | Bin .../{terrain => blocks}/gold_side.png | Bin .../textures/{terrain => blocks}/gold_top.png | Bin .../{terrain => blocks}/iron_front.png | Bin .../{terrain => blocks}/iron_side.png | Bin .../textures/{terrain => blocks}/iron_top.png | Bin .../{terrain => blocks}/obsidian_front.png | Bin .../{terrain => blocks}/obsidian_side.png | Bin .../{terrain => blocks}/obsidian_top.png | Bin .../{terrain => blocks}/silver_front.png | Bin .../{terrain => blocks}/silver_side.png | Bin .../{terrain => blocks}/silver_top.png | Bin 25 files changed, 62 insertions(+), 25 deletions(-) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/copper_front.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/copper_side.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/copper_top.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/crystal_front.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/crystal_side.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/crystal_top.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/diamond_front.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/diamond_side.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/diamond_top.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/gold_front.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/gold_side.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/gold_top.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/iron_front.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/iron_side.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/iron_top.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/obsidian_front.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/obsidian_side.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/obsidian_top.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/silver_front.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/silver_side.png (100%) rename IronChests2/resources/mods/ironchest/textures/{terrain => blocks}/silver_top.png (100%) diff --git a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java index 1b3fad6..186becd 100644 --- a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java @@ -18,6 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -38,6 +39,9 @@ public class BlockIronChest extends BlockContainer { private Random random; + @SideOnly(Side.CLIENT) + private Icon[][] icons; + public BlockIronChest(int id) { super(id, Material.iron); @@ -108,21 +112,17 @@ public class BlockIronChest extends BlockContainer { // } // } -// @Override -// public Icon getBlockTextureFromSideAndMetadata(int i, int j) -// { -// IronChestType typ = IronChestType.values()[j]; -// switch (i) -// { -// case 0: -// case 1: -// return typ.getTextureRow() * 16 + 1; -// case 3: -// return typ.getTextureRow() * 16 + 2; -// default: -// return typ.getTextureRow() * 16; -// } -// } + @SideOnly(Side.CLIENT) + @Override + public Icon getBlockTextureFromSideAndMetadata(int i, int j) + { + if (j < IronChestType.values().length) + { + IronChestType type = IronChestType.values()[j]; + return type.getIcon(i); + } + return null; + } @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer player, int i1, float f1, float f2, float f3) @@ -271,4 +271,13 @@ public class BlockIronChest extends BlockContainer { } + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + for (IronChestType typ: IronChestType.values()) + { + typ.makeIcons(par1IconRegister); + } + } } diff --git a/IronChests2/common/cpw/mods/ironchest/IronChestType.java b/IronChests2/common/cpw/mods/ironchest/IronChestType.java index a181384..d5acb8b 100644 --- a/IronChests2/common/cpw/mods/ironchest/IronChestType.java +++ b/IronChests2/common/cpw/mods/ironchest/IronChestType.java @@ -15,10 +15,14 @@ import java.util.ArrayList; import java.util.List; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraftforge.oredict.ShapedOreRecipe; public enum IronChestType { @@ -47,7 +51,7 @@ public enum IronChestType { this.rowLength = rowLength; this.tieredChest = tieredChest; this.friendlyName = friendlyName; - this.modelTexture = "/cpw/mods/ironchest/sprites/" + modelTexture; + this.modelTexture = "/mods/ironchest/textures/model/" + modelTexture; this.textureRow = textureRow; this.clazz = clazz; this.recipes = recipes; @@ -199,4 +203,30 @@ public enum IronChestType { return this == OBSIDIAN; } + @SideOnly(Side.CLIENT) + private Icon[] icons; + + @SideOnly(Side.CLIENT) + public void makeIcons(IconRegister par1IconRegister) + { + if (isValidForCreativeMode()) + { + icons = new Icon[3]; + int i = 0; + for (String s : sideNames) + { + icons[i++] = par1IconRegister.func_94245_a(String.format("ironchest:%s_%s",name().toLowerCase(),s)); + } + } + } + + @SideOnly(Side.CLIENT) + public Icon getIcon(int side) + { + + return icons[sideMapping[side]]; + } + + private static String[] sideNames = { "top", "front", "side" }; + private static int[] sideMapping = { 0, 0, 2, 1, 2, 2, 2 }; } diff --git a/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java b/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java index 06b0cff..a53360d 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java +++ b/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java @@ -26,8 +26,6 @@ public class ClientProxy extends CommonProxy { public void registerRenderInformation() { ChestItemRenderHelper.instance = new IronChestRenderHelper(); - MinecraftForgeClient.preloadTexture("/cpw/mods/ironchest/sprites/block_textures.png"); - MinecraftForgeClient.preloadTexture("/cpw/mods/ironchest/sprites/item_textures.png"); } @Override diff --git a/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java b/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java index 857859a..0027c3c 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java +++ b/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java @@ -22,13 +22,13 @@ import cpw.mods.ironchest.TileEntityIronChest; public class GUIChest extends GuiContainer { public enum GUI { - IRON(184, 202, "/cpw/mods/ironchest/sprites/ironcontainer.png", IronChestType.IRON), - GOLD(184, 256, "/cpw/mods/ironchest/sprites/goldcontainer.png", IronChestType.GOLD), - 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(238, 256, "/cpw/mods/ironchest/sprites/diamondcontainer.png", IronChestType.CRYSTAL), - OBSIDIAN(238, 256, "/cpw/mods/ironchest/sprites/diamondcontainer.png", IronChestType.OBSIDIAN); + IRON(184, 202, "/mods/ironchest/textures/gui/ironcontainer.png", IronChestType.IRON), + GOLD(184, 256, "/mods/ironchest/textures/gui/goldcontainer.png", IronChestType.GOLD), + DIAMOND(238, 256, "/mods/ironchest/textures/gui/diamondcontainer.png", IronChestType.DIAMOND), + COPPER(184, 184, "/mods/ironchest/textures/gui/coppercontainer.png", IronChestType.COPPER), + SILVER(184, 238, "/mods/ironchest/textures/gui/silvercontainer.png", IronChestType.SILVER), + CRYSTAL(238, 256, "/mods/ironchest/textures/gui/diamondcontainer.png", IronChestType.CRYSTAL), + OBSIDIAN(238, 256, "/mods/ironchest/textures/gui/diamondcontainer.png", IronChestType.OBSIDIAN); private int xSize; private int ySize; diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/copper_front.png b/IronChests2/resources/mods/ironchest/textures/blocks/copper_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/copper_front.png rename to IronChests2/resources/mods/ironchest/textures/blocks/copper_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/copper_side.png b/IronChests2/resources/mods/ironchest/textures/blocks/copper_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/copper_side.png rename to IronChests2/resources/mods/ironchest/textures/blocks/copper_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/copper_top.png b/IronChests2/resources/mods/ironchest/textures/blocks/copper_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/copper_top.png rename to IronChests2/resources/mods/ironchest/textures/blocks/copper_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/crystal_front.png b/IronChests2/resources/mods/ironchest/textures/blocks/crystal_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/crystal_front.png rename to IronChests2/resources/mods/ironchest/textures/blocks/crystal_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/crystal_side.png b/IronChests2/resources/mods/ironchest/textures/blocks/crystal_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/crystal_side.png rename to IronChests2/resources/mods/ironchest/textures/blocks/crystal_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/crystal_top.png b/IronChests2/resources/mods/ironchest/textures/blocks/crystal_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/crystal_top.png rename to IronChests2/resources/mods/ironchest/textures/blocks/crystal_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/diamond_front.png b/IronChests2/resources/mods/ironchest/textures/blocks/diamond_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/diamond_front.png rename to IronChests2/resources/mods/ironchest/textures/blocks/diamond_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/diamond_side.png b/IronChests2/resources/mods/ironchest/textures/blocks/diamond_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/diamond_side.png rename to IronChests2/resources/mods/ironchest/textures/blocks/diamond_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/diamond_top.png b/IronChests2/resources/mods/ironchest/textures/blocks/diamond_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/diamond_top.png rename to IronChests2/resources/mods/ironchest/textures/blocks/diamond_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/gold_front.png b/IronChests2/resources/mods/ironchest/textures/blocks/gold_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/gold_front.png rename to IronChests2/resources/mods/ironchest/textures/blocks/gold_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/gold_side.png b/IronChests2/resources/mods/ironchest/textures/blocks/gold_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/gold_side.png rename to IronChests2/resources/mods/ironchest/textures/blocks/gold_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/gold_top.png b/IronChests2/resources/mods/ironchest/textures/blocks/gold_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/gold_top.png rename to IronChests2/resources/mods/ironchest/textures/blocks/gold_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/iron_front.png b/IronChests2/resources/mods/ironchest/textures/blocks/iron_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/iron_front.png rename to IronChests2/resources/mods/ironchest/textures/blocks/iron_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/iron_side.png b/IronChests2/resources/mods/ironchest/textures/blocks/iron_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/iron_side.png rename to IronChests2/resources/mods/ironchest/textures/blocks/iron_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/iron_top.png b/IronChests2/resources/mods/ironchest/textures/blocks/iron_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/iron_top.png rename to IronChests2/resources/mods/ironchest/textures/blocks/iron_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_front.png b/IronChests2/resources/mods/ironchest/textures/blocks/obsidian_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/obsidian_front.png rename to IronChests2/resources/mods/ironchest/textures/blocks/obsidian_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_side.png b/IronChests2/resources/mods/ironchest/textures/blocks/obsidian_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/obsidian_side.png rename to IronChests2/resources/mods/ironchest/textures/blocks/obsidian_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_top.png b/IronChests2/resources/mods/ironchest/textures/blocks/obsidian_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/obsidian_top.png rename to IronChests2/resources/mods/ironchest/textures/blocks/obsidian_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/silver_front.png b/IronChests2/resources/mods/ironchest/textures/blocks/silver_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/silver_front.png rename to IronChests2/resources/mods/ironchest/textures/blocks/silver_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/silver_side.png b/IronChests2/resources/mods/ironchest/textures/blocks/silver_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/silver_side.png rename to IronChests2/resources/mods/ironchest/textures/blocks/silver_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/silver_top.png b/IronChests2/resources/mods/ironchest/textures/blocks/silver_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/terrain/silver_top.png rename to IronChests2/resources/mods/ironchest/textures/blocks/silver_top.png