diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index e69eec2..a02c88d 100644 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/IronChestType.java @@ -13,14 +13,14 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; public enum IronChestType { - IRON(54, 9, true, "Iron Chest", "ironchest.png", 0, Arrays.asList("ingotIron", "ingotRefinedIron"), TileEntityIronChest.class, "mmmmPmmmm", "mGmG3GmGm"), - GOLD(81, 9, true, "Gold Chest", "goldchest.png", 1, Arrays.asList("ingotGold"), TileEntityGoldChest.class, "mmmmPmmmm", "mGmG4GmGm"), - DIAMOND(108, 12, true, "Diamond Chest", "diamondchest.png", 2, Arrays.asList("gemDiamond"), TileEntityDiamondChest.class, "GGGmPmGGG", "GGGG4Gmmm"), - COPPER(45, 9, false, "Copper Chest", "copperchest.png", 3, Arrays.asList("ingotCopper"), TileEntityCopperChest.class, "mmmmCmmmm"), - SILVER(72, 9, false, "Silver Chest", "silverchest.png", 4, Arrays.asList("ingotSilver"), TileEntitySilverChest.class, "mmmm3mmmm", "mGmG0GmGm"), - CRYSTAL(108, 12, true, "Crystal Chest", "crystalchest.png", 5, Arrays.asList("blockGlass"), TileEntityCrystalChest.class, "GGGGPGGGG"), - OBSIDIAN(108, 12, false, "Obsidian Chest", "obsidianchest.png", 6, Arrays.asList("obsidian"), TileEntityObsidianChest.class, "mmmm2mmmm"), - DIRTCHEST9000(1, 1, false, "Dirt Chest 9000", "dirtchest.png",7,Arrays.asList("dirt"), TileEntityDirtChest.class,Item.getItemFromBlock(Blocks.dirt),"mmmmCmmmm"), + IRON(54, 9, true, "Iron Chest", "chest_iron.png", 0, Arrays.asList("ingotIron", "ingotRefinedIron"), TileEntityIronChest.class, "mmmmPmmmm", "mGmG3GmGm"), + GOLD(81, 9, true, "Gold Chest", "chest_gold.png", 1, Arrays.asList("ingotGold"), TileEntityGoldChest.class, "mmmmPmmmm", "mGmG4GmGm"), + DIAMOND(108, 12, true, "Diamond Chest", "chest_diamond.png", 2, Arrays.asList("gemDiamond"), TileEntityDiamondChest.class, "GGGmPmGGG", "GGGG4Gmmm"), + COPPER(45, 9, false, "Copper Chest", "chest_copper.png", 3, Arrays.asList("ingotCopper"), TileEntityCopperChest.class, "mmmmCmmmm"), + SILVER(72, 9, false, "Silver Chest", "chest_silver.png", 4, Arrays.asList("ingotSilver"), TileEntitySilverChest.class, "mmmm3mmmm", "mGmG0GmGm"), + CRYSTAL(108, 12, true, "Crystal Chest", "chest_crystal.png", 5, Arrays.asList("blockGlass"), TileEntityCrystalChest.class, "GGGGPGGGG"), + OBSIDIAN(108, 12, false, "Obsidian Chest", "chest_obsidian.png", 6, Arrays.asList("obsidian"), TileEntityObsidianChest.class, "mmmm2mmmm"), + DIRTCHEST9000(1, 1, false, "Dirt Chest 9000", "chest_dirt.png", 7, Arrays.asList("dirt"), TileEntityDirtChest.class, Item.getItemFromBlock(Blocks.dirt), "mmmmCmmmm"), WOOD(0, 0, false, "", "", -1, Arrays.asList("plankWood"), null); int size; private int rowLength; diff --git a/src/main/java/cpw/mods/ironchest/client/GUIChest.java b/src/main/java/cpw/mods/ironchest/client/GUIChest.java index 79cd934..46c0d21 100644 --- a/src/main/java/cpw/mods/ironchest/client/GUIChest.java +++ b/src/main/java/cpw/mods/ironchest/client/GUIChest.java @@ -13,15 +13,15 @@ import cpw.mods.ironchest.TileEntityIronChest; public class GUIChest extends GuiContainer { public enum ResourceList { - IRON(new ResourceLocation("ironchest", "textures/gui/ironcontainer.png")), - COPPER(new ResourceLocation("ironchest", "textures/gui/coppercontainer.png")), - SILVER(new ResourceLocation("ironchest", "textures/gui/silvercontainer.png")), - GOLD(new ResourceLocation("ironchest", "textures/gui/goldcontainer.png")), - DIAMOND(new ResourceLocation("ironchest", "textures/gui/diamondcontainer.png")), - DIRT(new ResourceLocation("ironchest", "textures/gui/dirtcontainer.png")); + IRON(new ResourceLocation("ironchest", "textures/gui/gui_chest_iron.png")), + COPPER(new ResourceLocation("ironchest", "textures/gui/gui_chest_copper.png")), + SILVER(new ResourceLocation("ironchest", "textures/gui/gui_chest_silver.png")), + GOLD(new ResourceLocation("ironchest", "textures/gui/gui_chest_gold.png")), + DIAMOND(new ResourceLocation("ironchest", "textures/gui/gui_chest_diamond.png")), + DIRT(new ResourceLocation("ironchest", "textures/gui/gui_chest_dirt.png")); public final ResourceLocation location; private ResourceList(ResourceLocation loc) { - this.location = loc; + location = loc; } } public enum GUI { @@ -79,8 +79,7 @@ public class GUIChest extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - // new "bind tex" - this.mc.getTextureManager().bindTexture(type.guiResourceList.location); + mc.getTextureManager().bindTexture(type.guiResourceList.location); int x = (width - xSize) / 2; int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/src/main/resources/assets/ironchest/textures/blocks/copper.png b/src/main/resources/assets/ironchest/textures/blocks/copper.png index 09a8488..d98191c 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/copper.png and b/src/main/resources/assets/ironchest/textures/blocks/copper.png differ diff --git a/src/main/resources/assets/ironchest/textures/blocks/crystal.png b/src/main/resources/assets/ironchest/textures/blocks/crystal.png index ce8ef63..1b1a72b 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/crystal.png and b/src/main/resources/assets/ironchest/textures/blocks/crystal.png differ diff --git a/src/main/resources/assets/ironchest/textures/blocks/diamond.png b/src/main/resources/assets/ironchest/textures/blocks/diamond.png index 08c3bb5..e87ff6a 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/diamond.png and b/src/main/resources/assets/ironchest/textures/blocks/diamond.png differ diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png index a92c5f1..8f77d16 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png and b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png differ diff --git a/src/main/resources/assets/ironchest/textures/blocks/gold.png b/src/main/resources/assets/ironchest/textures/blocks/gold.png index a29e9f3..c557c87 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/gold.png and b/src/main/resources/assets/ironchest/textures/blocks/gold.png differ diff --git a/src/main/resources/assets/ironchest/textures/blocks/iron.png b/src/main/resources/assets/ironchest/textures/blocks/iron.png index 30efea4..12ad0af 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/iron.png and b/src/main/resources/assets/ironchest/textures/blocks/iron.png differ diff --git a/src/main/resources/assets/ironchest/textures/blocks/obsidian.png b/src/main/resources/assets/ironchest/textures/blocks/obsidian.png index 4f531cc..ffee510 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/obsidian.png and b/src/main/resources/assets/ironchest/textures/blocks/obsidian.png differ diff --git a/src/main/resources/assets/ironchest/textures/blocks/silver.png b/src/main/resources/assets/ironchest/textures/blocks/silver.png index 9439036..b8cfa6c 100644 Binary files a/src/main/resources/assets/ironchest/textures/blocks/silver.png and b/src/main/resources/assets/ironchest/textures/blocks/silver.png differ diff --git a/src/main/resources/assets/ironchest/textures/gui/coppercontainer.png b/src/main/resources/assets/ironchest/textures/gui/coppercontainer.png deleted file mode 100644 index 2fdb824..0000000 Binary files a/src/main/resources/assets/ironchest/textures/gui/coppercontainer.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/gui/diamondcontainer.png b/src/main/resources/assets/ironchest/textures/gui/diamondcontainer.png deleted file mode 100644 index b53f472..0000000 Binary files a/src/main/resources/assets/ironchest/textures/gui/diamondcontainer.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/gui/dirtcontainer.png b/src/main/resources/assets/ironchest/textures/gui/dirtcontainer.png deleted file mode 100644 index 44667e1..0000000 Binary files a/src/main/resources/assets/ironchest/textures/gui/dirtcontainer.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/gui/goldcontainer.png b/src/main/resources/assets/ironchest/textures/gui/goldcontainer.png deleted file mode 100644 index 27f506f..0000000 Binary files a/src/main/resources/assets/ironchest/textures/gui/goldcontainer.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/gui/gui_chest_copper.png b/src/main/resources/assets/ironchest/textures/gui/gui_chest_copper.png new file mode 100644 index 0000000..4d30fe1 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/gui/gui_chest_copper.png differ diff --git a/src/main/resources/assets/ironchest/textures/gui/gui_chest_diamond.png b/src/main/resources/assets/ironchest/textures/gui/gui_chest_diamond.png new file mode 100644 index 0000000..fdb8b3e Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/gui/gui_chest_diamond.png differ diff --git a/src/main/resources/assets/ironchest/textures/gui/gui_chest_dirt.png b/src/main/resources/assets/ironchest/textures/gui/gui_chest_dirt.png new file mode 100644 index 0000000..265026b Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/gui/gui_chest_dirt.png differ diff --git a/src/main/resources/assets/ironchest/textures/gui/gui_chest_gold.png b/src/main/resources/assets/ironchest/textures/gui/gui_chest_gold.png new file mode 100644 index 0000000..3e7e469 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/gui/gui_chest_gold.png differ diff --git a/src/main/resources/assets/ironchest/textures/gui/gui_chest_iron.png b/src/main/resources/assets/ironchest/textures/gui/gui_chest_iron.png new file mode 100644 index 0000000..31ec2f1 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/gui/gui_chest_iron.png differ diff --git a/src/main/resources/assets/ironchest/textures/gui/gui_chest_silver.png b/src/main/resources/assets/ironchest/textures/gui/gui_chest_silver.png new file mode 100644 index 0000000..8b1d8c6 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/gui/gui_chest_silver.png differ diff --git a/src/main/resources/assets/ironchest/textures/gui/ironcontainer.png b/src/main/resources/assets/ironchest/textures/gui/ironcontainer.png deleted file mode 100644 index 1c48eed..0000000 Binary files a/src/main/resources/assets/ironchest/textures/gui/ironcontainer.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/gui/silvercontainer.png b/src/main/resources/assets/ironchest/textures/gui/silvercontainer.png deleted file mode 100644 index 65179f2..0000000 Binary files a/src/main/resources/assets/ironchest/textures/gui/silvercontainer.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png b/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png index 7bb2159..b5be2e3 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png b/src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png index de87597..fb48636 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png b/src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png index 68caa0c..d5bc6b3 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png b/src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png index dd1a36d..9ad5430 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png b/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png index 028e2d8..57fb236 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png b/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png index 65cf6ae..1f64db6 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png b/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png index d3cad2e..d22f6b8 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png b/src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png index 4273a54..cbbd9fa 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png b/src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png index e6e62bb..6f6243f 100644 Binary files a/src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png and b/src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/model/copperchest.png b/src/main/resources/assets/ironchest/textures/model/copperchest.png deleted file mode 100644 index a008864..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/copperchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/model/crystalchest.png b/src/main/resources/assets/ironchest/textures/model/crystalchest.png deleted file mode 100644 index a455ce8..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/crystalchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/model/diamondchest.png b/src/main/resources/assets/ironchest/textures/model/diamondchest.png deleted file mode 100644 index 64020b5..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/diamondchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/model/dirtchest.png b/src/main/resources/assets/ironchest/textures/model/dirtchest.png deleted file mode 100644 index 168e179..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/dirtchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/model/goldchest.png b/src/main/resources/assets/ironchest/textures/model/goldchest.png deleted file mode 100644 index 7f18468..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/goldchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/model/ironchest.png b/src/main/resources/assets/ironchest/textures/model/ironchest.png deleted file mode 100644 index df883ff..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/ironchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/model/obsidianchest.png b/src/main/resources/assets/ironchest/textures/model/obsidianchest.png deleted file mode 100644 index 4f0657a..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/obsidianchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/model/silverchest.png b/src/main/resources/assets/ironchest/textures/model/silverchest.png deleted file mode 100644 index 780becd..0000000 Binary files a/src/main/resources/assets/ironchest/textures/model/silverchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_copper.png b/src/main/resources/assets/ironchest/textures/models/chest_copper.png new file mode 100644 index 0000000..c12166a Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_copper.png differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_crystal.png b/src/main/resources/assets/ironchest/textures/models/chest_crystal.png new file mode 100644 index 0000000..fb76f19 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_crystal.png differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_diamond.png b/src/main/resources/assets/ironchest/textures/models/chest_diamond.png new file mode 100644 index 0000000..a4a2349 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_diamond.png differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_dirt.png b/src/main/resources/assets/ironchest/textures/models/chest_dirt.png new file mode 100644 index 0000000..2cf0a90 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_dirt.png differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_gold.png b/src/main/resources/assets/ironchest/textures/models/chest_gold.png new file mode 100644 index 0000000..62447fa Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_gold.png differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_iron.png b/src/main/resources/assets/ironchest/textures/models/chest_iron.png new file mode 100644 index 0000000..c9d3412 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_iron.png differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_obsidian.png b/src/main/resources/assets/ironchest/textures/models/chest_obsidian.png new file mode 100644 index 0000000..6ef6ec0 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_obsidian.png differ diff --git a/src/main/resources/assets/ironchest/textures/models/chest_silver.png b/src/main/resources/assets/ironchest/textures/models/chest_silver.png new file mode 100644 index 0000000..6434ad8 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/models/chest_silver.png differ