From 1de52b15d13581f864709496cea7e2f5667fa29e Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 20:25:57 +0100 Subject: [PATCH 01/13] Added some helpful scripts --- scripts/setup.bat | 2 ++ scripts/setup.sh | 1 + scripts/setupw.bat | 2 ++ scripts/setupw.sh | 1 + 4 files changed, 6 insertions(+) create mode 100644 scripts/setup.bat create mode 100644 scripts/setup.sh create mode 100644 scripts/setupw.bat create mode 100644 scripts/setupw.sh diff --git a/scripts/setup.bat b/scripts/setup.bat new file mode 100644 index 0000000..85d8863 --- /dev/null +++ b/scripts/setup.bat @@ -0,0 +1,2 @@ +gradle setupDecompWorkspace +gradle eclipse \ No newline at end of file diff --git a/scripts/setup.sh b/scripts/setup.sh new file mode 100644 index 0000000..a2c40ef --- /dev/null +++ b/scripts/setup.sh @@ -0,0 +1 @@ +gradle setupDecompWorkspace && gradle eclipse \ No newline at end of file diff --git a/scripts/setupw.bat b/scripts/setupw.bat new file mode 100644 index 0000000..bb72ee5 --- /dev/null +++ b/scripts/setupw.bat @@ -0,0 +1,2 @@ +gradlew setupDecompWorkspace +gradlew eclipse \ No newline at end of file diff --git a/scripts/setupw.sh b/scripts/setupw.sh new file mode 100644 index 0000000..19f3bcf --- /dev/null +++ b/scripts/setupw.sh @@ -0,0 +1 @@ +bash gradlew setupDecompWorkspace && bash gradlew eclipse \ No newline at end of file From 22f76a72614e649844863c46fe28d573f88f4a9c Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 20:34:00 +0100 Subject: [PATCH 02/13] Updated Git config files --- .gitattributes | 11 +++++++++++ .gitignore | 30 ++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..19fa4f2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +# Set default behaviour, in case users don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files we want to always be normalized and converted to native line endings on checkout. +*.md text +*.info text +*.txt text + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary diff --git a/.gitignore b/.gitignore index 8eef75c..fb705af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,28 @@ -build/ -.classpath -.project -.gradle/ -eclipse/ +gnore Gradle cache files & directories bin/ +build/ + +## Exclusive to IronChests repo/ -/run/ +run/ + +## Forge +forge-*.txt + +## Eclipse +eclipse/ +.classpath +.gradle/ +.project .settings/ -#IDEA files from Gradle -.idea/ + +## Idea +.idea /*.iml /*.ipr /*.iws + +# Ignore OS cache files & directories +*.DS_Store +_MACOSX +Thumbs.db From 9abfea9566d3054b231951dfd0f042e8361cfe6e Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 20:57:08 +0100 Subject: [PATCH 03/13] Removed unnecessary variables and methods --- .../cpw/mods/ironchest/BlockIronChest.java | 27 ++++----------- .../java/cpw/mods/ironchest/CommonProxy.java | 2 -- .../mods/ironchest/ContainerIronChest.java | 3 +- .../java/cpw/mods/ironchest/IronChest.java | 12 ++----- .../mods/ironchest/IronChestAIOcelotSit.java | 22 ------------- .../ironchest/MappableItemStackWrapper.java | 33 ------------------- .../ironchest/OcelotsSitOnChestsHandler.java | 30 ----------------- .../cpw/mods/ironchest/PacketHandler.java | 2 ++ .../mods/ironchest/TileEntityIronChest.java | 1 - src/main/java/cpw/mods/ironchest/Version.java | 7 +--- .../client/TileEntityIronChestRenderer.java | 16 +++------ 11 files changed, 18 insertions(+), 137 deletions(-) delete mode 100644 src/main/java/cpw/mods/ironchest/IronChestAIOcelotSit.java delete mode 100644 src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java delete mode 100644 src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java diff --git a/src/main/java/cpw/mods/ironchest/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/BlockIronChest.java index da4c957..80c2858 100644 --- a/src/main/java/cpw/mods/ironchest/BlockIronChest.java +++ b/src/main/java/cpw/mods/ironchest/BlockIronChest.java @@ -17,8 +17,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.google.common.collect.Lists; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -38,6 +36,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.google.common.collect.Lists; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -45,9 +46,6 @@ public class BlockIronChest extends BlockContainer { private Random random; - @SideOnly(Side.CLIENT) - private IIcon[][] icons; - public BlockIronChest() { super(Material.iron); @@ -58,13 +56,10 @@ public class BlockIronChest extends BlockContainer { setCreativeTab(CreativeTabs.tabDecorations); } - /** - * Overridden by {@link #createTileEntity(World, int)} - */ @Override - public TileEntity createNewTileEntity(World w, int i) + public TileEntity createNewTileEntity(World world, int meta) { - return null; + return IronChestType.makeEntity(meta); } @Override @@ -86,13 +81,7 @@ public class BlockIronChest extends BlockContainer { } @Override - public TileEntity createTileEntity(World world, int metadata) - { - return IronChestType.makeEntity(metadata); - } - @SideOnly(Side.CLIENT) - @Override public IIcon getIcon(int i, int j) { if (j < IronChestType.values().length) @@ -112,6 +101,7 @@ public class BlockIronChest extends BlockContainer { items.add(stack); return items; } + @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer player, int i1, float f1, float f2, float f3) { @@ -228,7 +218,6 @@ public class BlockIronChest extends BlockContainer { } @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { @@ -272,7 +261,6 @@ public class BlockIronChest extends BlockContainer { return 0; } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) @@ -283,11 +271,10 @@ public class BlockIronChest extends BlockContainer { } } - private static final ForgeDirection[] validRotationAxes = new ForgeDirection[] { UP, DOWN }; @Override public ForgeDirection[] getValidRotations(World worldObj, int x, int y, int z) { - return validRotationAxes; + return new ForgeDirection[] { UP, DOWN }; } @Override diff --git a/src/main/java/cpw/mods/ironchest/CommonProxy.java b/src/main/java/cpw/mods/ironchest/CommonProxy.java index 9b82146..9d35829 100644 --- a/src/main/java/cpw/mods/ironchest/CommonProxy.java +++ b/src/main/java/cpw/mods/ironchest/CommonProxy.java @@ -18,12 +18,10 @@ import cpw.mods.fml.common.network.IGuiHandler; public class CommonProxy implements IGuiHandler { public void registerRenderInformation() { - } public void registerTileEntitySpecialRenderer(IronChestType typ) { - } @Override diff --git a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java index 92f111d..96830d6 100644 --- a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java +++ b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java @@ -101,8 +101,7 @@ public class ContainerIronChest extends Container { { for (int playerInvCol = 0; playerInvCol < 9; playerInvCol++) { - addSlotToContainer(new Slot(playerInventory, playerInvCol + playerInvRow * 9 + 9, leftCol + playerInvCol * 18, ySize - (4 - playerInvRow) * 18 - - 10)); + addSlotToContainer(new Slot(playerInventory, playerInvCol + playerInvRow * 9 + 9, leftCol + playerInvCol * 18, ySize - (4 - playerInvRow) * 18 - 10)); } } diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index 9cf3e85..be4115e 100644 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -12,14 +12,15 @@ package cpw.mods.ironchest; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; + import org.apache.logging.log4j.Level; + import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; @@ -73,16 +74,7 @@ public class IronChest { ChestChangerType.generateRecipes(); NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy); proxy.registerRenderInformation(); -// if (OCELOTS_SITONCHESTS) -// { -// MinecraftForge.EVENT_BUS.register(new OcelotsSitOnChestsHandler()); -// } MinecraftForge.EVENT_BUS.register(this); } - @EventHandler - public void modsLoaded(FMLPostInitializationEvent evt) - { - } - } diff --git a/src/main/java/cpw/mods/ironchest/IronChestAIOcelotSit.java b/src/main/java/cpw/mods/ironchest/IronChestAIOcelotSit.java deleted file mode 100644 index 51c2aa3..0000000 --- a/src/main/java/cpw/mods/ironchest/IronChestAIOcelotSit.java +++ /dev/null @@ -1,22 +0,0 @@ -package cpw.mods.ironchest; - -import net.minecraft.entity.ai.EntityAIOcelotSit; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.world.World; - -public class IronChestAIOcelotSit extends EntityAIOcelotSit { - public IronChestAIOcelotSit(EntityOcelot par1EntityOcelot, float par2) - { - super(par1EntityOcelot, par2); - } - -/* @Override - protected boolean func_151486_a(World world, int x, int y, int z) - { - if (world.getBlock(x, y, z) == IronChest.ironChestBlock) - { - return true; - } - return super.func_151486_a(world, x, y, z); - } -*/} diff --git a/src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java b/src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java deleted file mode 100644 index 95a8a40..0000000 --- a/src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package cpw.mods.ironchest; - -import net.minecraft.item.ItemStack; - -public class MappableItemStackWrapper { - private ItemStack wrap; - - public MappableItemStackWrapper(ItemStack toWrap) - { - wrap = toWrap; - } - - @Override - public boolean equals(Object obj) - { - if (!(obj instanceof MappableItemStackWrapper)) return false; - MappableItemStackWrapper isw = (MappableItemStackWrapper) obj; - if (wrap.getHasSubtypes()) - { - return isw.wrap.isItemEqual(wrap); - } - else - { - return isw.wrap == wrap; - } - } - - @Override - public int hashCode() - { - return System.identityHashCode(wrap); - } -} diff --git a/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java b/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java deleted file mode 100644 index 3e3283e..0000000 --- a/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package cpw.mods.ironchest; - -import java.util.List; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.entity.ai.EntityAIOcelotSit; -import net.minecraft.entity.ai.EntityAITasks; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraftforge.event.entity.living.LivingEvent; - -public class OcelotsSitOnChestsHandler { - @SubscribeEvent - public void changeSittingTaskForOcelots(LivingEvent.LivingUpdateEvent evt) - { - if (evt.entityLiving.ticksExisted < 5 && evt.entityLiving instanceof EntityOcelot) - { - EntityOcelot ocelot = (EntityOcelot) evt.entityLiving; - @SuppressWarnings("unchecked") - List tasks = ocelot.tasks.taskEntries; - - for (int i = 0; i < tasks.size(); i++) - { - EntityAITasks.EntityAITaskEntry task = tasks.get(i); - if (task.priority == 6 && (task.action instanceof EntityAIOcelotSit) && !(task.action instanceof IronChestAIOcelotSit)) - { - task.action = new IronChestAIOcelotSit(ocelot, 0.4F); - } - } - } - } -} diff --git a/src/main/java/cpw/mods/ironchest/PacketHandler.java b/src/main/java/cpw/mods/ironchest/PacketHandler.java index 8c8aa05..175ee14 100644 --- a/src/main/java/cpw/mods/ironchest/PacketHandler.java +++ b/src/main/java/cpw/mods/ironchest/PacketHandler.java @@ -13,7 +13,9 @@ package cpw.mods.ironchest; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; + import java.util.EnumMap; + import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java index be2481b..618235e 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java @@ -527,6 +527,5 @@ public class TileEntityIronChest extends TileEntity implements IInventory { public void removeAdornments() { - } } diff --git a/src/main/java/cpw/mods/ironchest/Version.java b/src/main/java/cpw/mods/ironchest/Version.java index 791e78d..605f7c8 100644 --- a/src/main/java/cpw/mods/ironchest/Version.java +++ b/src/main/java/cpw/mods/ironchest/Version.java @@ -9,12 +9,7 @@ package cpw.mods.ironchest; import java.util.Properties; public class Version { - private static String major; - private static String minor; - private static String rev; - private static String build; - @SuppressWarnings("unused") - private static String mcversion; + private static String major, minor, rev, build, mcversion; static void init(Properties properties) { diff --git a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java index 3749e26..8269032 100644 --- a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java +++ b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java @@ -18,11 +18,11 @@ import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glRotatef; import static org.lwjgl.opengl.GL11.glScalef; import static org.lwjgl.opengl.GL11.glTranslatef; -import java.util.HashMap; + import java.util.Map; import java.util.Random; + import net.minecraft.client.model.ModelChest; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -30,17 +30,15 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.primitives.SignedBytes; + import cpw.mods.ironchest.IronChestType; -import cpw.mods.ironchest.MappableItemStackWrapper; import cpw.mods.ironchest.TileEntityIronChest; public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { - @SuppressWarnings("unused") - private static Map renderList = new HashMap(); - private static Map locations; static { Builder builder = ImmutableMap.builder(); @@ -49,11 +47,8 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { } locations = builder.build(); } + private Random random; - - @SuppressWarnings("unused") - private RenderBlocks renderBlocks; - private RenderItem itemRenderer; 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 }, @@ -63,7 +58,6 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { { model = new ModelChest(); random = new Random(); - renderBlocks = new RenderBlocks(); itemRenderer = new RenderItem() { @Override public byte getMiniBlockCount(ItemStack stack, byte original) { From a560211cc6f6be165e85e48df26727ec1945574e Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 21:08:45 +0100 Subject: [PATCH 04/13] Migrated in-text license statement to an individual file --- LICENSE.txt | 5 +++++ .../cpw/mods/ironchest/BlockIronChest.java | 11 ---------- .../cpw/mods/ironchest/ChestChangerType.java | 6 ------ .../java/cpw/mods/ironchest/CommonProxy.java | 10 ---------- .../mods/ironchest/ContainerIronChest.java | 10 ---------- .../java/cpw/mods/ironchest/IronChest.java | 10 ---------- .../cpw/mods/ironchest/IronChestType.java | 10 ---------- .../cpw/mods/ironchest/ItemChestChanger.java | 12 ----------- .../cpw/mods/ironchest/ItemIronChest.java | 10 ---------- .../cpw/mods/ironchest/PacketHandler.java | 11 ---------- .../mods/ironchest/TileEntityCopperChest.java | 20 ++++--------------- .../ironchest/TileEntityCrystalChest.java | 19 ++++-------------- .../ironchest/TileEntityDiamondChest.java | 19 ++++-------------- .../mods/ironchest/TileEntityDirtChest.java | 3 ++- .../mods/ironchest/TileEntityGoldChest.java | 20 ++++--------------- .../mods/ironchest/TileEntityIronChest.java | 10 ---------- .../ironchest/TileEntityObsidianChest.java | 10 ++++------ .../mods/ironchest/TileEntitySilverChest.java | 19 ++++-------------- src/main/java/cpw/mods/ironchest/Version.java | 6 ------ .../mods/ironchest/client/ClientProxy.java | 10 ---------- .../cpw/mods/ironchest/client/GUIChest.java | 10 ---------- .../client/IronChestRenderHelper.java | 10 ---------- .../client/TileEntityIronChestRenderer.java | 10 ---------- 23 files changed, 31 insertions(+), 230 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..648667a --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,5 @@ +Copyright (c) 2012-14 cpw + +All rights reserved. This program and the accompanying materials +are made available under the terms of the GNU Public License v3.0, +which are available at http://www.gnu.org/licenses/gpl.html diff --git a/src/main/java/cpw/mods/ironchest/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/BlockIronChest.java index 80c2858..ccfb530 100644 --- a/src/main/java/cpw/mods/ironchest/BlockIronChest.java +++ b/src/main/java/cpw/mods/ironchest/BlockIronChest.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import static net.minecraftforge.common.util.ForgeDirection.DOWN; @@ -43,7 +33,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockIronChest extends BlockContainer { - private Random random; public BlockIronChest() diff --git a/src/main/java/cpw/mods/ironchest/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/ChestChangerType.java index 65dd56a..9c19c8c 100644 --- a/src/main/java/cpw/mods/ironchest/ChestChangerType.java +++ b/src/main/java/cpw/mods/ironchest/ChestChangerType.java @@ -1,9 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. All rights reserved. This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * Contributors: cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import static cpw.mods.ironchest.IronChestType.COPPER; diff --git a/src/main/java/cpw/mods/ironchest/CommonProxy.java b/src/main/java/cpw/mods/ironchest/CommonProxy.java index 9d35829..af38477 100644 --- a/src/main/java/cpw/mods/ironchest/CommonProxy.java +++ b/src/main/java/cpw/mods/ironchest/CommonProxy.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java index 96830d6..d9fe63d 100644 --- a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java +++ b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index be4115e..afbea12 100644 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index 0c7a7d3..7435262 100644 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/IronChestType.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import java.util.ArrayList; diff --git a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java index 0677f08..466992f 100644 --- a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java +++ b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,7 +14,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class ItemChestChanger extends Item { - private ChestChangerType type; public ItemChestChanger(ChestChangerType type) @@ -36,7 +25,6 @@ public class ItemChestChanger extends Item { setCreativeTab(CreativeTabs.tabMisc); } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) diff --git a/src/main/java/cpw/mods/ironchest/ItemIronChest.java b/src/main/java/cpw/mods/ironchest/ItemIronChest.java index 0b3b8e2..7c74444 100644 --- a/src/main/java/cpw/mods/ironchest/ItemIronChest.java +++ b/src/main/java/cpw/mods/ironchest/ItemIronChest.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import net.minecraft.block.Block; diff --git a/src/main/java/cpw/mods/ironchest/PacketHandler.java b/src/main/java/cpw/mods/ironchest/PacketHandler.java index 175ee14..d60e3a5 100644 --- a/src/main/java/cpw/mods/ironchest/PacketHandler.java +++ b/src/main/java/cpw/mods/ironchest/PacketHandler.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import io.netty.buffer.ByteBuf; @@ -30,7 +20,6 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Handles the packet wrangling for IronChest * @author cpw - * */ public enum PacketHandler { INSTANCE; diff --git a/src/main/java/cpw/mods/ironchest/TileEntityCopperChest.java b/src/main/java/cpw/mods/ironchest/TileEntityCopperChest.java index f8ececf..b5b72bc 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityCopperChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityCopperChest.java @@ -1,19 +1,7 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; public class TileEntityCopperChest extends TileEntityIronChest { - public TileEntityCopperChest() - { - super(IronChestType.COPPER); - } - -} + public TileEntityCopperChest() { + super(IronChestType.COPPER); + } +} \ No newline at end of file diff --git a/src/main/java/cpw/mods/ironchest/TileEntityCrystalChest.java b/src/main/java/cpw/mods/ironchest/TileEntityCrystalChest.java index 24288ec..3ed64fa 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityCrystalChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityCrystalChest.java @@ -1,18 +1,7 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; public class TileEntityCrystalChest extends TileEntityIronChest { - public TileEntityCrystalChest() - { - super(IronChestType.CRYSTAL); - } -} + public TileEntityCrystalChest() { + super(IronChestType.CRYSTAL); + } +} \ No newline at end of file diff --git a/src/main/java/cpw/mods/ironchest/TileEntityDiamondChest.java b/src/main/java/cpw/mods/ironchest/TileEntityDiamondChest.java index f1e8078..3a8411d 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityDiamondChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityDiamondChest.java @@ -1,18 +1,7 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; public class TileEntityDiamondChest extends TileEntityIronChest { - public TileEntityDiamondChest() - { - super(IronChestType.DIAMOND); - } -} + public TileEntityDiamondChest() { + super(IronChestType.DIAMOND); + } +} \ No newline at end of file diff --git a/src/main/java/cpw/mods/ironchest/TileEntityDirtChest.java b/src/main/java/cpw/mods/ironchest/TileEntityDirtChest.java index a7608c0..fe6fc52 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityDirtChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityDirtChest.java @@ -20,8 +20,9 @@ public class TileEntityDirtChest extends TileEntityIronChest { pages.appendTag(new NBTTagString(StatCollector.translateToLocal("book.ironchest:dirtchest9000.page5"))); dirtChest9000GuideBook.setTagInfo("pages", pages); } + public TileEntityDirtChest() { - super(IronChestType.DIRTCHEST9000); + super(IronChestType.DIRTCHEST9000); } @Override diff --git a/src/main/java/cpw/mods/ironchest/TileEntityGoldChest.java b/src/main/java/cpw/mods/ironchest/TileEntityGoldChest.java index fc531e2..2b2e4cb 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityGoldChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityGoldChest.java @@ -1,19 +1,7 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; public class TileEntityGoldChest extends TileEntityIronChest { - - public TileEntityGoldChest() - { - super(IronChestType.GOLD); - } -} + public TileEntityGoldChest() { + super(IronChestType.GOLD); + } +} \ No newline at end of file diff --git a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java index 618235e..cdba525 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import java.util.Arrays; diff --git a/src/main/java/cpw/mods/ironchest/TileEntityObsidianChest.java b/src/main/java/cpw/mods/ironchest/TileEntityObsidianChest.java index 5f03eb9..fed9039 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityObsidianChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityObsidianChest.java @@ -1,9 +1,7 @@ package cpw.mods.ironchest; public class TileEntityObsidianChest extends TileEntityIronChest { - - public TileEntityObsidianChest() - { - super(IronChestType.OBSIDIAN); - } -} + public TileEntityObsidianChest() { + super(IronChestType.OBSIDIAN); + } +} \ No newline at end of file diff --git a/src/main/java/cpw/mods/ironchest/TileEntitySilverChest.java b/src/main/java/cpw/mods/ironchest/TileEntitySilverChest.java index 439d266..5fd4e13 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntitySilverChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntitySilverChest.java @@ -1,18 +1,7 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; public class TileEntitySilverChest extends TileEntityIronChest { - public TileEntitySilverChest() - { - super(IronChestType.SILVER); - } -} + public TileEntitySilverChest() { + super(IronChestType.SILVER); + } +} \ No newline at end of file diff --git a/src/main/java/cpw/mods/ironchest/Version.java b/src/main/java/cpw/mods/ironchest/Version.java index 605f7c8..b93fd34 100644 --- a/src/main/java/cpw/mods/ironchest/Version.java +++ b/src/main/java/cpw/mods/ironchest/Version.java @@ -1,9 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. All rights reserved. This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * Contributors: cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest; import java.util.Properties; diff --git a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java index 1885523..c1737cc 100644 --- a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java +++ b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest.client; import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; diff --git a/src/main/java/cpw/mods/ironchest/client/GUIChest.java b/src/main/java/cpw/mods/ironchest/client/GUIChest.java index 345791b..79cd934 100644 --- a/src/main/java/cpw/mods/ironchest/client/GUIChest.java +++ b/src/main/java/cpw/mods/ironchest/client/GUIChest.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest.client; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java b/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java index 36b5534..5780cda 100644 --- a/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java +++ b/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest.client; import java.util.Map; diff --git a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java index 8269032..1c4aae5 100644 --- a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java +++ b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - * - * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ package cpw.mods.ironchest.client; import static org.lwjgl.opengl.GL11.glColor4f; From 33a406311f475e73d65a5fb7b53594587ef13e9d Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 21:13:13 +0100 Subject: [PATCH 05/13] Removed unnecessary slot stuff --- .../mods/ironchest/ContainerIronChest.java | 6 +++--- .../cpw/mods/ironchest/IronChestType.java | 14 ++----------- .../cpw/mods/ironchest/ValidatingSlot.java | 21 ------------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 src/main/java/cpw/mods/ironchest/ValidatingSlot.java diff --git a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java index d9fe63d..a4f99c7 100644 --- a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java +++ b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java @@ -1,12 +1,12 @@ package cpw.mods.ironchest; +import invtweaks.api.container.ChestContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import invtweaks.api.container.ChestContainer; @ChestContainer(isLargeChest = true) public class ContainerIronChest extends Container { @@ -75,13 +75,13 @@ public class ContainerIronChest extends Container { protected void layoutContainer(IInventory playerInventory, IInventory chestInventory, IronChestType type, int xSize, int ySize) { if (type == IronChestType.DIRTCHEST9000) { - addSlotToContainer(type.makeSlot(chestInventory, 0, 12 + 4 * 18, 8 + 2 * 18)); + addSlotToContainer(new Slot(chestInventory, 0, 12 + 4 * 18, 8 + 2 * 18)); } else { for (int chestRow = 0; chestRow < type.getRowCount(); chestRow++) { for (int chestCol = 0; chestCol < type.getRowLength(); chestCol++) { - addSlotToContainer(type.makeSlot(chestInventory, chestCol + chestRow * type.getRowLength(), 12 + chestCol * 18, 8 + chestRow * 18)); + addSlotToContainer(new Slot(chestInventory, chestCol + chestRow * type.getRowLength(), 12 + chestCol * 18, 8 + chestRow * 18)); } } } diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index 7435262..8c1bb73 100644 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/IronChestType.java @@ -3,11 +3,10 @@ package cpw.mods.ironchest; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagByte; @@ -94,10 +93,6 @@ public enum IronChestType { return null; } - public static void registerTranslations() - { - } - public static void registerBlocksAndRecipes(BlockIronChest blockResult) { ItemStack previous = new ItemStack(Blocks.chest); @@ -229,22 +224,17 @@ public enum IronChestType { @SideOnly(Side.CLIENT) public IIcon 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 }; - public Slot makeSlot(IInventory chestInventory, int index, int x, int y) - { - return new ValidatingSlot(chestInventory, index, x, y, this); - } - public boolean acceptsStack(ItemStack itemstack) { return itemFilter == null || itemstack == null || itemstack.getItem() == itemFilter; } + public void adornItemDrop(ItemStack item) { if (this == DIRTCHEST9000) diff --git a/src/main/java/cpw/mods/ironchest/ValidatingSlot.java b/src/main/java/cpw/mods/ironchest/ValidatingSlot.java deleted file mode 100644 index f0348c9..0000000 --- a/src/main/java/cpw/mods/ironchest/ValidatingSlot.java +++ /dev/null @@ -1,21 +0,0 @@ -package cpw.mods.ironchest; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class ValidatingSlot extends Slot { - private IronChestType type; - - public ValidatingSlot(IInventory par1iInventory, int par2, int par3, int par4, IronChestType type) - { - super(par1iInventory, par2, par3, par4); - this.type = type; - } - - @Override - public boolean isItemValid(ItemStack par1ItemStack) - { - return type.acceptsStack(par1ItemStack); - } -} From 717c3f5fccd0f5667ce1fc38ba127b01328fa2f9 Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 21:48:20 +0100 Subject: [PATCH 06/13] Updated formatting outlined by attributes --- build.gradle | 392 +++++++++++++++++++++++++-------------------------- gradlew.bat | 180 +++++++++++------------ 2 files changed, 286 insertions(+), 286 deletions(-) diff --git a/build.gradle b/build.gradle index a24a928..6ce4cb8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,196 +1,196 @@ -// This sets us up for building a forge project - you need all of these -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -// Apply the forge plugin - this adds all the magic for automatically obfuscating, deobfuscating etc -apply plugin: 'forge' - -// This is a simple flatdir repository for "uploadArchives" when you don't have a remote repo to target -repositories { - flatDir { - name "fileRepo" - dirs "repo" - } -} -// IronChest uses git tagging to mark major versions. This sets up the project version to that version data -def versionInfo = getGitVersion() -version = "${versionInfo['IronChest.version']}" - -// This is our group. I'm cpw.mods -group= "cpw.mods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -// This is our actual project within the group. Note: FML has "fml" here. But this is ironchest. -archivesBaseName = "ironchest" - -// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here -minecraft { - version = "1.7.10-10.13.0.1150" -} - -// This wrangles the resources for the jar files- stuff like textures and languages -processResources -{ - // we're omitting the .xcf files - they're development only - exclude '**/*.xcf' - // we only want to do search/replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } - - // generate version.properties file from the git version data earlier - doLast { - def propsFile = new File(destinationDir, 'version.properties') - def properties = new Properties() - properties.putAll(versionInfo) - properties['IronChest.build.mcversion'] = project.minecraft.version - properties.store(propsFile.newWriter(), null) - } -} - -// this sets our output jar to have a 'tag' of 'universal' on it -// It also adds the minecraft version in a custom version name -// The result is files named ---universal.jar -jar { - classifier = 'universal' - version = "${project.minecraft.version}-${project.version}" - -} - -println "FISHBUM ${jar.version}" - -// Add in a source jar for people, should they desire to download such a thing -task sourceJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'src' - version = "${project.minecraft.version}-${project.version}" -} - -// Add in an mcp named jar, for those who wish to run in a development environment (assuming mcp naming matches) -task deobfJar(type: Jar) { - from sourceSets.main.output - classifier = 'deobf' - version = "${project.minecraft.version}-${project.version}" -} - -// Tell the artifact system about our extra jars -artifacts { - archives sourceJar, deobfJar -} - -// Configure an upload task. this is setup for uploading to files.minecraftforge.net. There are other examples around -uploadArchives { - dependsOn 'reobf' - repositories { - if (project.hasProperty("filesmaven")) { - logger.info('Publishing to files server') - - mavenDeployer { - configuration = configurations.deployJars - - repository(url: project.filesmaven.url) { - authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key) - } - - // This is just the pom data for the maven repo - pom { - groupId = project.group - // Force the maven upload to use the - syntax preferred at files - version = "${project.minecraft.version}-${project.version}" - artifactId = project.archivesBaseName - project { - name project.archivesBaseName - packaging 'jar' - description 'IronChest' - url 'https://github.com/cpw/IronChest' - - scm { - url 'https://github.com/progwml6/IronChest' - connection 'scm:git:git://github.com/progwml6/IronChest.git' - developerConnection 'scm:git:git@github.com:progwml6/IronChest.git' - } - - issueManagement { - system 'github' - url 'https://github.com/progwml6/IronChest/issues' - } - - licenses { - license { - name 'GNU Public License (GPL), Version 3.0' - url 'http://www.gnu.org/licenses/gpl-3.0.txt' - distribution 'repo' - } - } - - developers { - developer { - id 'cpw' - name 'cpw' - roles { role 'developer' } - } - } - } - } - } - } else { - logger.info('Publishing to repo folder') - - mavenDeployer { - pom.version = "${project.minecraft.version}-${project.version}" - repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath()) - } - } - } -} - -// This is a special task for pulling the version information from git and the environment (for BUILD_NUMBER) -def getGitVersion() -{ - def out = [:] - - // call git command. - def outStream = new ByteArrayOutputStream() - def result = exec { - executable = 'git' - args = [ 'describe', '--long', "--match=[^(jenkins)]*"] - standardOutput = outStream - } - - def fullVersion = outStream.toString().trim() - def matcher = fullVersion =~ /(\d+).(\d+)-(\d+)-(.*)/ - - def maj = matcher[0][1] - def min = matcher[0][2] - def rev = matcher[0][3] - def bn = System.getenv("BUILD_NUMBER") ?: "1" - - out['IronChest.build.major.number'] = maj.toString() - out['IronChest.build.minor.number'] = min.toString() - out['IronChest.build.revision.number'] = rev.toString() - out['IronChest.build.githash'] = matcher[0][4].toString() - out['IronChest.build.number' ] = bn.toString() - out['IronChest.version' ] = "${maj}.${min}.${rev}.${bn}".toString() - - return out -} +// This sets us up for building a forge project - you need all of these +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } +} + +// Apply the forge plugin - this adds all the magic for automatically obfuscating, deobfuscating etc +apply plugin: 'forge' + +// This is a simple flatdir repository for "uploadArchives" when you don't have a remote repo to target +repositories { + flatDir { + name "fileRepo" + dirs "repo" + } +} +// IronChest uses git tagging to mark major versions. This sets up the project version to that version data +def versionInfo = getGitVersion() +version = "${versionInfo['IronChest.version']}" + +// This is our group. I'm cpw.mods +group= "cpw.mods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +// This is our actual project within the group. Note: FML has "fml" here. But this is ironchest. +archivesBaseName = "ironchest" + +// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here +minecraft { + version = "1.7.10-10.13.0.1150" +} + +// This wrangles the resources for the jar files- stuff like textures and languages +processResources +{ + // we're omitting the .xcf files - they're development only + exclude '**/*.xcf' + // we only want to do search/replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + + // generate version.properties file from the git version data earlier + doLast { + def propsFile = new File(destinationDir, 'version.properties') + def properties = new Properties() + properties.putAll(versionInfo) + properties['IronChest.build.mcversion'] = project.minecraft.version + properties.store(propsFile.newWriter(), null) + } +} + +// this sets our output jar to have a 'tag' of 'universal' on it +// It also adds the minecraft version in a custom version name +// The result is files named ---universal.jar +jar { + classifier = 'universal' + version = "${project.minecraft.version}-${project.version}" + +} + +println "FISHBUM ${jar.version}" + +// Add in a source jar for people, should they desire to download such a thing +task sourceJar(type: Jar) { + from sourceSets.main.allSource + classifier = 'src' + version = "${project.minecraft.version}-${project.version}" +} + +// Add in an mcp named jar, for those who wish to run in a development environment (assuming mcp naming matches) +task deobfJar(type: Jar) { + from sourceSets.main.output + classifier = 'deobf' + version = "${project.minecraft.version}-${project.version}" +} + +// Tell the artifact system about our extra jars +artifacts { + archives sourceJar, deobfJar +} + +// Configure an upload task. this is setup for uploading to files.minecraftforge.net. There are other examples around +uploadArchives { + dependsOn 'reobf' + repositories { + if (project.hasProperty("filesmaven")) { + logger.info('Publishing to files server') + + mavenDeployer { + configuration = configurations.deployJars + + repository(url: project.filesmaven.url) { + authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key) + } + + // This is just the pom data for the maven repo + pom { + groupId = project.group + // Force the maven upload to use the - syntax preferred at files + version = "${project.minecraft.version}-${project.version}" + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging 'jar' + description 'IronChest' + url 'https://github.com/cpw/IronChest' + + scm { + url 'https://github.com/progwml6/IronChest' + connection 'scm:git:git://github.com/progwml6/IronChest.git' + developerConnection 'scm:git:git@github.com:progwml6/IronChest.git' + } + + issueManagement { + system 'github' + url 'https://github.com/progwml6/IronChest/issues' + } + + licenses { + license { + name 'GNU Public License (GPL), Version 3.0' + url 'http://www.gnu.org/licenses/gpl-3.0.txt' + distribution 'repo' + } + } + + developers { + developer { + id 'cpw' + name 'cpw' + roles { role 'developer' } + } + } + } + } + } + } else { + logger.info('Publishing to repo folder') + + mavenDeployer { + pom.version = "${project.minecraft.version}-${project.version}" + repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath()) + } + } + } +} + +// This is a special task for pulling the version information from git and the environment (for BUILD_NUMBER) +def getGitVersion() +{ + def out = [:] + + // call git command. + def outStream = new ByteArrayOutputStream() + def result = exec { + executable = 'git' + args = [ 'describe', '--long', "--match=[^(jenkins)]*"] + standardOutput = outStream + } + + def fullVersion = outStream.toString().trim() + def matcher = fullVersion =~ /(\d+).(\d+)-(\d+)-(.*)/ + + def maj = matcher[0][1] + def min = matcher[0][2] + def rev = matcher[0][3] + def bn = System.getenv("BUILD_NUMBER") ?: "1" + + out['IronChest.build.major.number'] = maj.toString() + out['IronChest.build.minor.number'] = min.toString() + out['IronChest.build.revision.number'] = rev.toString() + out['IronChest.build.githash'] = matcher[0][4].toString() + out['IronChest.build.number' ] = bn.toString() + out['IronChest.version' ] = "${maj}.${min}.${rev}.${bn}".toString() + + return out +} diff --git a/gradlew.bat b/gradlew.bat index aec9973..8a0b282 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 2a127a0871e698c722ad658942b6d89303bb5cc9 Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 21:48:47 +0100 Subject: [PATCH 07/13] Refined item drop logic --- .../cpw/mods/ironchest/BlockIronChest.java | 70 ++++++++----------- .../cpw/mods/ironchest/ItemChestChanger.java | 5 +- .../mods/ironchest/TileEntityIronChest.java | 13 +--- 3 files changed, 33 insertions(+), 55 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/BlockIronChest.java index ccfb530..c674ad2 100644 --- a/src/main/java/cpw/mods/ironchest/BlockIronChest.java +++ b/src/main/java/cpw/mods/ironchest/BlockIronChest.java @@ -33,15 +33,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockIronChest extends BlockContainer { - private Random random; - public BlockIronChest() { super(Material.iron); setBlockName("IronChest"); setHardness(3.0F); setBlockBounds(0.0625F, 0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); - random = new Random(); setCreativeTab(CreativeTabs.tabDecorations); } @@ -96,17 +93,7 @@ public class BlockIronChest extends BlockContainer { { TileEntity te = world.getTileEntity(i, j, k); - if (te == null || !(te instanceof TileEntityIronChest)) - { - return true; - } - - if (world.isSideSolid(i, j + 1, k, ForgeDirection.DOWN)) - { - return true; - } - - if (world.isRemote) + if (te == null || !(te instanceof TileEntityIronChest) || world.isSideSolid(i, j + 1, k, ForgeDirection.DOWN) || world.isRemote) { return true; } @@ -166,42 +153,43 @@ public class BlockIronChest extends BlockContainer { if (tileentitychest != null) { tileentitychest.removeAdornments(); - dropContent(0, tileentitychest, world, tileentitychest.xCoord, tileentitychest.yCoord, tileentitychest.zCoord); + dropItems(0, tileentitychest, world, tileentitychest.xCoord, tileentitychest.yCoord, tileentitychest.zCoord); } super.breakBlock(world, i, j, k, i1, i2); } - public void dropContent(int newSize, IInventory chest, World world, int xCoord, int yCoord, int zCoord) + public void dropItems(int newSize, IInventory chest, World world, int i, int j, int k) { - for (int l = newSize; l < chest.getSizeInventory(); l++) + for (int i1 = 0; i1 < chest.getSizeInventory(); ++i1) { - ItemStack itemstack = chest.getStackInSlot(l); - if (itemstack == null) + Random rand = new Random(); + ItemStack is = chest.getStackInSlot(i1); + + if (is != null) { - continue; - } - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - float f2 = random.nextFloat() * 0.8F + 0.1F; - while (itemstack.stackSize > 0) - { - int i1 = random.nextInt(21) + 10; - if (i1 > itemstack.stackSize) + EntityItem entityitem; + + for (float f = rand.nextFloat() * 0.8F + 0.1F; is.stackSize > 0; world.spawnEntityInWorld(entityitem)) { - i1 = itemstack.stackSize; + int j1 = rand.nextInt(21) + 10; + + if (j1 > is.stackSize) + { + j1 = is.stackSize; + } + + is.stackSize -= j1; + entityitem = new EntityItem(world, (double)((float)i + f), (double)((float)j + f), (double)((float)k + f), new ItemStack(is.getItem(), j1, is.getItemDamage())); + float f2 = 0.05F; + entityitem.motionX = (double)((float)rand.nextGaussian() * f2); + entityitem.motionY = (double)((float)rand.nextGaussian() * f2 + 0.2F); + entityitem.motionZ = (double)((float)rand.nextGaussian() * f2); + + if (is.hasTagCompound()) + { + entityitem.getEntityItem().setTagCompound((NBTTagCompound)is.getTagCompound().copy()); + } } - itemstack.stackSize -= i1; - EntityItem entityitem = new EntityItem(world, (float) xCoord + f, (float) yCoord + (newSize > 0 ? 1 : 0) + f1, (float) zCoord + f2, - new ItemStack(itemstack.getItem(), i1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float) random.nextGaussian() * f3; - entityitem.motionY = (float) random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float) random.nextGaussian() * f3; - if (itemstack.hasTagCompound()) - { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); - } - world.spawnEntityInWorld(entityitem); } } } diff --git a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java index 466992f..c3e58b1 100644 --- a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java +++ b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java @@ -64,7 +64,7 @@ public class ItemChestChanger extends Item { ItemStack[] chestContents = ObfuscationReflectionHelper.getPrivateValue(TileEntityChest.class, tec, 0); System.arraycopy(chestContents, 0, newchest.chestContents, 0, Math.min(newSize, chestContents.length)); BlockIronChest block = IronChest.ironChestBlock; - block.dropContent(newSize, tec, world, tec.xCoord, tec.yCoord, tec.zCoord); + block.dropItems(newSize, tec, world, tec.xCoord, tec.yCoord, tec.zCoord); newchest.setFacing((byte) tec.getBlockMetadata()); newchest.sortTopStacks(); for (int i = 0; i < Math.min(newSize, chestContents.length); i++) @@ -75,8 +75,7 @@ public class ItemChestChanger extends Item { world.setBlock(X, Y, Z, Blocks.air, 0, 3); // Force the Chest TE to reset it's knowledge of neighbouring blocks tec.updateContainingBlockInfo(); - // Force the Chest TE to update any neighbours so they update next - // tick + // Force the Chest TE to update any neighbours so they update next tick tec.checkForAdjacentChests(); // And put in our block instead world.setBlock(X, Y, Z, block, newchest.getType().ordinal(), 3); diff --git a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java index cdba525..a27a942 100644 --- a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java +++ b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java @@ -373,11 +373,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory { public TileEntityIronChest applyUpgradeItem(ItemChestChanger itemChestChanger) { - if (numUsingPlayers > 0) - { - return null; - } - if (!itemChestChanger.getType().canUpgrade(this.getType())) + if (numUsingPlayers > 0 || !itemChestChanger.getType().canUpgrade(this.getType())) { return null; } @@ -385,7 +381,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory { int newSize = newEntity.chestContents.length; System.arraycopy(chestContents, 0, newEntity.chestContents, 0, Math.min(newSize, chestContents.length)); BlockIronChest block = IronChest.ironChestBlock; - block.dropContent(newSize, this, this.worldObj, this.xCoord, this.yCoord, this.zCoord); + block.dropItems(newSize, this, this.worldObj, this.xCoord, this.yCoord, this.zCoord); newEntity.setFacing(facing); newEntity.sortTopStacks(); newEntity.ticksSinceSync = -1; @@ -488,11 +484,6 @@ public class TileEntityIronChest extends TileEntity implements IInventory { } } - public void setMaxStackSize(int size) - { - - } - @Override public boolean isItemValidForSlot(int i, ItemStack itemstack) { From 2b93d37be3d3e4947a94ec446cf8871890e4d162 Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 22:09:39 +0100 Subject: [PATCH 08/13] Simplified block icon assignment --- .../cpw/mods/ironchest/BlockIronChest.java | 35 +++++++++--------- .../cpw/mods/ironchest/IronChestType.java | 30 --------------- .../blocks/{copper_top.png => copper.png} | Bin .../textures/blocks/copper_front.png | Bin 679 -> 0 bytes .../ironchest/textures/blocks/copper_side.png | Bin 661 -> 0 bytes .../blocks/{crystal_top.png => crystal.png} | Bin .../textures/blocks/crystal_front.png | Bin 396 -> 0 bytes .../textures/blocks/crystal_side.png | Bin 396 -> 0 bytes .../blocks/{diamond_top.png => diamond.png} | Bin .../textures/blocks/diamond_front.png | Bin 762 -> 0 bytes .../textures/blocks/diamond_side.png | Bin 719 -> 0 bytes ...irtchest9000_top.png => dirtchest9000.png} | Bin .../textures/blocks/dirtchest9000_front.png | Bin 3194 -> 0 bytes .../textures/blocks/dirtchest9000_side.png | Bin 3202 -> 0 bytes .../blocks/{gold_top.png => gold.png} | Bin .../ironchest/textures/blocks/gold_front.png | Bin 784 -> 0 bytes .../ironchest/textures/blocks/gold_side.png | Bin 726 -> 0 bytes .../blocks/{iron_top.png => iron.png} | Bin .../ironchest/textures/blocks/iron_front.png | Bin 787 -> 0 bytes .../ironchest/textures/blocks/iron_side.png | Bin 726 -> 0 bytes .../blocks/{obsidian_top.png => obsidian.png} | Bin .../textures/blocks/obsidian_front.png | Bin 586 -> 0 bytes .../textures/blocks/obsidian_side.png | Bin 593 -> 0 bytes .../blocks/{silver_top.png => silver.png} | Bin .../textures/blocks/silver_front.png | Bin 625 -> 0 bytes .../ironchest/textures/blocks/silver_side.png | Bin 608 -> 0 bytes 26 files changed, 18 insertions(+), 47 deletions(-) rename src/main/resources/assets/ironchest/textures/blocks/{copper_top.png => copper.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/copper_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/copper_side.png rename src/main/resources/assets/ironchest/textures/blocks/{crystal_top.png => crystal.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/crystal_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/crystal_side.png rename src/main/resources/assets/ironchest/textures/blocks/{diamond_top.png => diamond.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/diamond_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/diamond_side.png rename src/main/resources/assets/ironchest/textures/blocks/{dirtchest9000_top.png => dirtchest9000.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_side.png rename src/main/resources/assets/ironchest/textures/blocks/{gold_top.png => gold.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/gold_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/gold_side.png rename src/main/resources/assets/ironchest/textures/blocks/{iron_top.png => iron.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/iron_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/iron_side.png rename src/main/resources/assets/ironchest/textures/blocks/{obsidian_top.png => obsidian.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/obsidian_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/obsidian_side.png rename src/main/resources/assets/ironchest/textures/blocks/{silver_top.png => silver.png} (100%) delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/silver_front.png delete mode 100644 src/main/resources/assets/ironchest/textures/blocks/silver_side.png diff --git a/src/main/java/cpw/mods/ironchest/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/BlockIronChest.java index c674ad2..49b82f7 100644 --- a/src/main/java/cpw/mods/ironchest/BlockIronChest.java +++ b/src/main/java/cpw/mods/ironchest/BlockIronChest.java @@ -33,6 +33,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockIronChest extends BlockContainer { + @SideOnly(Side.CLIENT) + public static IIcon icon[] = new IIcon[IronChestType.values().length]; + public BlockIronChest() { super(Material.iron); @@ -68,14 +71,22 @@ public class BlockIronChest extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int j) + public void registerBlockIcons(IIconRegister r) { - if (j < IronChestType.values().length) - { - IronChestType type = IronChestType.values()[j]; - return type.getIcon(i); - } - return null; + for (IronChestType type : IronChestType.values()) + { + if (type.isValidForCreativeMode()) + { + icon[type.ordinal()] = r.registerIcon("ironchest:" + type.name().toLowerCase()); + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) + { + return icon[meta]; } @Override @@ -238,16 +249,6 @@ public class BlockIronChest extends BlockContainer { return 0; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) - { - for (IronChestType typ: IronChestType.values()) - { - typ.makeIcons(par1IconRegister); - } - } - @Override public ForgeDirection[] getValidRotations(World worldObj, int x, int y, int z) { diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index 8c1bb73..e69eec2 100644 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/IronChestType.java @@ -4,17 +4,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagByte; -import net.minecraft.util.IIcon; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public enum IronChestType { IRON(54, 9, true, "Iron Chest", "ironchest.png", 0, Arrays.asList("ingotIron", "ingotRefinedIron"), TileEntityIronChest.class, "mmmmPmmmm", "mGmG3GmGm"), @@ -204,32 +200,6 @@ public enum IronChestType { return this == OBSIDIAN; } - @SideOnly(Side.CLIENT) - private IIcon[] icons; - - @SideOnly(Side.CLIENT) - public void makeIcons(IIconRegister par1IconRegister) - { - if (isValidForCreativeMode()) - { - icons = new IIcon[3]; - int i = 0; - for (String s : sideNames) - { - icons[i++] = par1IconRegister.registerIcon(String.format("ironchest:%s_%s",name().toLowerCase(),s)); - } - } - } - - @SideOnly(Side.CLIENT) - public IIcon 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 }; - public boolean acceptsStack(ItemStack itemstack) { return itemFilter == null || itemstack == null || itemstack.getItem() == itemFilter; diff --git a/src/main/resources/assets/ironchest/textures/blocks/copper_top.png b/src/main/resources/assets/ironchest/textures/blocks/copper.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/copper_top.png rename to src/main/resources/assets/ironchest/textures/blocks/copper.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/copper_front.png b/src/main/resources/assets/ironchest/textures/blocks/copper_front.png deleted file mode 100644 index 8ca415c5ae6d61aff4d347b0793ca30e2bb4dd86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 679 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lvott z6XJTX)@^UO{j<|spPbnE$JRYMwBo_O#V;@JdwF5c?JZO8?VR)Y$m)B$=HA^t zvM=sLcjWQT@M9gJ|NsBzz8+);bS-0&x4Vn!y=^zMfgH{PkH}&M25w;x zW@MN(M*=9g(bL5-MB;Mnx!Xcb3L*}H`l206r!5g#7&&X2M#sPZ+e=H9vEM$-oPN+C z;+oa%O>^SkrR{cRkf^@l+VW$!trZJ{BA;@J&CxG1EGmp24E#8E$NcndV7T%6!Nn7W zLFS)5^;%9a8vWOs)F9BXNPwX~-Ba7^Wp`LaW#(QI1O$~b=8 zhAC^Wd|nuow$qTO>OtB(OO^xfcKVBdtT@AT!97(C>Rd$4i#D zMwB?`=jNv7l`uFLr6!i7rYMwWmSiZnd-?{1H}Z)C6{&(0r2wU@lEEq%j0_Bobq#>X zGQ`l-%GAQj&_vh3)XKns?cL{26b-rgDVb@NPz{E45bDP46hOx7_4S6Fo+k-*%fF5l$aLa z6XJTX)@^UO{j<|spPbnE$JRYMwBo_O#V;@JdwF5ci}Snh?V5Xc`;1qY58mHB z|Mr$Cw>M9Ies;&B!z=IYob&YLru%yq+}bqp*2W2UwobjVw(I)pjw{O=FE6gSIKS-T zypl@`D=#mqzA(4={Op2rGjh&O%Q`b9{mkUl)00w8^(UO@i9S0uJSXW)|qW{#O$BVJUv!ia(=Ag%WdKiMf72V^Xdgo=Ijdcxx$TGyx)XLPt%FsmDz|_jXfbHGq zP81Ef`6-!cl~4_ax<*DJhK5!~25=4KTTjLVH3))iNXyJg%}dNpwJHHJ7>wf$b~*D` Q0wozdUHx3vIVCg!0L|wRIRF3v diff --git a/src/main/resources/assets/ironchest/textures/blocks/crystal_top.png b/src/main/resources/assets/ironchest/textures/blocks/crystal.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/crystal_top.png rename to src/main/resources/assets/ironchest/textures/blocks/crystal.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/crystal_front.png b/src/main/resources/assets/ironchest/textures/blocks/crystal_front.png deleted file mode 100644 index c517953ddb7edec136d3813b967ff3a42ed5bfd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#Ks7)k|4ie28U-i(m6ET1IZHC zh!W@g+}zZ>5(ej@)Wnk16ovB4k_-iRPv3y>Mm}+%B2|#06rhwiMgp(B|rv)X}nRu0iowWNd`|>KbLh*2~7Y9cWCVZ diff --git a/src/main/resources/assets/ironchest/textures/blocks/crystal_side.png b/src/main/resources/assets/ironchest/textures/blocks/crystal_side.png deleted file mode 100644 index 842cc18f2af1361649fa194d602a0fb79a42e563..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#Ks7)k|4ie28U-i(m6ET1IZHC zh!W@g+}zZ>5(ej@)Wnk16ovB4k_-iRPv3y>Mm}+%B2|#06rhwiMgp(B|rv)X}rO{bH%5Dk_?`%elF{r5}E)L>1nJ0 diff --git a/src/main/resources/assets/ironchest/textures/blocks/diamond_top.png b/src/main/resources/assets/ironchest/textures/blocks/diamond.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/diamond_top.png rename to src/main/resources/assets/ironchest/textures/blocks/diamond.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/diamond_front.png b/src/main/resources/assets/ironchest/textures/blocks/diamond_front.png deleted file mode 100644 index d5e6373d56347150c0c93bfcb1ab63acee9aaabf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lz156 z6XMFa_zA4cneKtUF(` zY=6yh=pFlkx2(I~uo=4rhT!WHAE+w=f7ZGR&GI0Tevy>Eak7aXI$faj_-?0f&nWVjHx>lGZnf?sn`y8FGb0eSJnd!>$(^ttQ%w>~K`lg+Gx)x-%CVA?HulhMFDqrEnta~BRZ~eBX zn`Fo@Tp-GR_+o|8+_SvRN*?!%;fJbb%fe%*Pdb9)uO2uKu1DomT>zHtY~VFi|&qIn4% z9~cb-dFER%wXg_zTy{}#(E3{+@{8%v5qWh!{+dld4@s7|MwB?`=jNv7l`uFLr6!i7 zrYMwWmSiZnd-?{1H}Z)C6{&(0r2wU@lEEq%j0_Bobq#>XGQ`l-%GAQj&_vh3)XKns z?cL{26b-rgDVb@NPz{E45bDP46hOx7_4S6Fo+k-*%fF5l-L{K z6XMFa_zAF`{tMK(;pg-zXyK$?fK!i@r$22Pkt!g`=)UBoBZ8xhR=Vf zKm4xp;G4{?uaY;u2w(mzaQ+kT>5n|8KJcIY$angqz`0M{Cq8f;d(UzB9mm0U?EBxc z?R(3%_YK>gH>^8fvuuCOap)cUfw!!?-mva?&9e0s%eGg{n_seQdBwcxCG*CY|NsA= z_2Sh`php;!yxm>wJX07R138=p9+AZi4BWyX%*Zfnjs#F}pQnpsh{WaCb0@``40u>C z1Qlp>M6t^-h>E7K2uR`h@PB{mE57(mCw87xYAIPP=u|4|wesR?{x*)Dnfo_oz>&6OoPc2oaZzmW1P%hHEyvIYZrNedIw4iBIcWHF( zVUSt6#*pJe!>dhA%d{95wn^RE7RGTQ>wkY%{Fyrv5#CeezX5$BS>hT|;+&tGo0?a` z;9QiNSdyBeP@Y+mq2TW68xY>eCk|Ak3R08;l(I?&t6(rPFf`UR03yo}LsKhL3oAnt zT?11q0|T~qpF2@BIal$@O1TaS?83{1OWYyF311? diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_top.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_top.png rename to src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_front.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_front.png deleted file mode 100644 index 4e1e1fdd307ba264954c8c52e8d9d20737923625..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3194 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 diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_side.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_side.png deleted file mode 100644 index ebda19fd06b24959429d20ffb2f6fc6d9220cad6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3202 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 diff --git a/src/main/resources/assets/ironchest/textures/blocks/gold_top.png b/src/main/resources/assets/ironchest/textures/blocks/gold.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/gold_top.png rename to src/main/resources/assets/ironchest/textures/blocks/gold.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/gold_front.png b/src/main/resources/assets/ironchest/textures/blocks/gold_front.png deleted file mode 100644 index 56f1d4d40b6c7d64b5bba0328e15744b87f44581..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 784 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lz1E9 z6XM$1$xvCxaO+LL&DY*HUOHZTZgKUQ$)(3y=N~BD|5SAEL)N{IS=V1Wo_`>J^eW$x zYka3~i(h$aaORHW$(te%K3Cm-7q;U#%c2bo^VTq|-OafFJm-lULdUN1AGyqXEak7aXI$f^{OTZfwqUN zCS6A&E*xo5?PTT7=tx?VlM=4!yz~F-nMdbe_Qf;eg59>{LahOoP4j^?cevi`QZs8o-T#E?j1&9Q#>=R7H@kT zVRmTG&H|t2OY*miV%Z;-@BDOa-t)h?*KS`GOWb_>Ex-Hxzw`YV#W|jz{`n$4LZd>! zjgcwYj=S)Q(-BVhjztDd7J@NLB%G!(%LzU4M@O1TaS?83{1OPP=Hje-R diff --git a/src/main/resources/assets/ironchest/textures/blocks/gold_side.png b/src/main/resources/assets/ironchest/textures/blocks/gold_side.png deleted file mode 100644 index f06fb4f7ea158ed4505c76a3217a4e7b816ba7cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 726 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lsFvV z6XM$1$xvCxaO+LL&DY*HUOHZTZgKUQ$)(3y=N~BD|5SAEL)P8*$!G3Jp1djY;B(c5 zhbm|9N*}w*f8;Xnop&*ppXi>xEq>yL(CxQjH(t4(yDxw0mgwP2JcllFAH2YI_MYtV zYl26w@a;d#vF8-qwj(T?_A#y9$+%_*vl12+{?6T8{>-23`^ECELzJje-*>L zl??M%Fw9-fFl#ZxjD-x-7ceYd$FOh>!|WvtGZ!&ToyRb3KEvcW3{&PZOq$IwX%@r8 znGFB`|G&q%80a+y#w2fd7l(g0V{QOBoCO|{#S9GG!XV7ZFl&wkP;kGei(`ny<=At_ znVJlE8Xg7}h_J3@W`A&uH#91><>SBn)GuxIMZbzT70;SDt@zg)l(ps7Ts@}bXZclI zuD*@tFxxyc^IJx>!ImE!2UB`_R~pW=>U&zivQ|>@m(TU*$C6IQp8p)%a<$}bugp2~ zb^GsDaqRx9Xu;-KU?s2L&VA@-)!w^@J#6NkkI-tl{#(>7f1-w@dS;J;i;9qq*V0Wf zN=q^)IZe}E$;AWovN-1|8|D@!t`)DDRtYUwv-Q9GR{mQF67w#3UsM5lMY6;-qQp5r zH#aq}gu%HeHL)Z$MWH;iBtya7(>EZzkxv|`NEM_g1t?{e3|7HlWMF8lYXC%+A%><_ zrWRI)Cb|ZuRt5%a?>={;Xvob^$xN$+YB1C_G72#?v@$Y)Ybf7(G9IWw5M)DIW=?8e dVs5Hc36Q~H7;mui_-&B&44$rjF6*2UngDe%88iR@ diff --git a/src/main/resources/assets/ironchest/textures/blocks/iron_top.png b/src/main/resources/assets/ironchest/textures/blocks/iron.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/iron_top.png rename to src/main/resources/assets/ironchest/textures/blocks/iron.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/iron_front.png b/src/main/resources/assets/ironchest/textures/blocks/iron_front.png deleted file mode 100644 index a3db41521c65e2e73f9afd518f4c8cdb807b95c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l=u+f z6XM#|)mK&Da{KMOTW{XpeD(VJi4k@n9(?|M|Kq3opFZ7q_4>lYhsUm6 zKYIQ8nLBr{K6`%l?!8mDZa@6;<<9%}J5QWkym8a~wd>aH*?Zu^#gjL09lv(t=#^_X zU%x(j_3EPa>s$Kz>pD6n&Y8Pm@4iD9FWq_f{^sj9=N~*gef!Rl%U2Iyx^n2^<#YER zoVb4T*wyO?&Ry7h`t0_j$2adkv~JhlwLAB0+HS<=ip1own%tgy)EL^%|{ia20H_TbOa@OMI)8;RpzF^6exeKSxTQqsj zg2}VzPntFF|NsB<&wES;`kgV!+ug-KFU`>t$l)yTh%9Dc;1&j9Muu5)B!GhFJzX3_ zBreCEi;Qk^5NZF&7~)dAeT{_9X;B?rLvx8lwn)Cy-~U_4>VK_0clCXJF~?3{C6};u zCpX1tgvdb^-|yYKHTQS^_PhDtICdX?SWy&H_RVHK zcgq7Ii+8Q9O}`VLC>uQ6B;c;+GN+(LgG;$X_@HZ-Vv6MhMaOwZ8YVb#xlVMN$C%Pu z@_)q_{)#<{y!J2L5`bQlEOCt}an8@pP0cG|a4t$sEJ;mKD945bDP46hOx7_4S6Fo+k-*%fF5lsFvV z6XM#|)mK&Da{KMOTW{XpeD(VJi4k@n9(?|M|Kq27A3mPFd+*e(+Yi5d zx%lYuxqJ7IU%PSi%C)=iKU{hG?983JCvV=m^X~o4*Kf{0czF8uog$t(8bH= z?mswj{pPW&*AJY#u=n)Y?MIJq-hXJ_uDxq_?%BBa!1~?$HtjpOdi$=GTedIVuzB&i zjSE(hamd#kWbjkWni`H(KvvlRG#mlG7Up#%mk|}c+PMx=C z@|*>eXV0HBYu^9={~zsjlK^^$G0EHA#o^!0m>WP2XMsm#F#`j)FbFd;%$fsIvES3h zF+}2W?78DiO$Iy-4}%IsSl2SMKRCu48kO4e@n3%Gm$v$%UqzgXXHA?|{Ob+M+Hz~I z9#itO{HiTi-$rwoZJwF=Eu-3C%MXr&DLuU_4QE>QJuP5aE2;R)=lb(wNhf2^e~xXr zTJpA6=A8Mu{dcQ4cK=nhU~??6lGktNKJ>F{@7=>5HuKI$XtiAbE$Ws(QA1Kavq!;2 zMaaf$>82Q^C7F|)rfIL_;#s(cL7a1y4RZ?<*NWFntArM;+4|poEB~zoiFud2FRB2& zB3a@ZQR1ARo128bg=d#Wzp$PzxDn%Fo diff --git a/src/main/resources/assets/ironchest/textures/blocks/obsidian_top.png b/src/main/resources/assets/ironchest/textures/blocks/obsidian.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/obsidian_top.png rename to src/main/resources/assets/ironchest/textures/blocks/obsidian.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/obsidian_front.png b/src/main/resources/assets/ironchest/textures/blocks/obsidian_front.png deleted file mode 100644 index ed1ef0d947338e7c9effca7c006bf4d4a1d5cd6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2yAjF;}# z{Q(L}mbgZgIOpf)rskC}I2WZRmZYXAlxLP?D7bt2281{Ai31f$ffNPjrgnPbV&Ok^(rG_tLmt<~flF14XWCd@uAJi6 zts&&0qtT(ty|0P2{z!cBqbaMn%_71B-~2ds-7n}As&g3o5L=Hktj zIk)8mdJ2_RtjOarn)6*+!RNEqv%SZA3)wW^26;tZ+Aa~LU*>Dke#GmUJj*98#%Go) zVMd~%D_oBTN%3B1Dcl@lvRLMCm)(oD&6i|iFRlKvM@_@{#NmdMcKt8zv-B{E%NtZ2 z<8NR7z_DW5Cp(#kpEA0{mo_EnOWeHwcAoPL4GE|9rA%8K=U5l9mc_^%;!rs?Ptqsk z+dL)rgxs)sn`er%m&$%no!zrXY;KY3ynDxQi?8}olocsvE4^)IIltSrnUWmkFKf7%-uO$?r{elF{r5}E*9!Q8_D diff --git a/src/main/resources/assets/ironchest/textures/blocks/obsidian_side.png b/src/main/resources/assets/ironchest/textures/blocks/obsidian_side.png deleted file mode 100644 index dc8d227eb9c8e438cddddbc293bfbbcdb7d564b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmV-X0004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00009 za7bBm000XT000XT0n*)m`~Uy|8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X z4i^9b02*{fSaefwW^{L9a%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004eNkl3j0)bSDgcvFYCT0f2z{KC-U-Q@&6&vF8%DOxIzFwcQ z);3Kuo6XLnh=?&pYn|u$X0s{F5)+xv=Y8MvQek-C8&f4X=R`*5hAgv>H?JrOSynzB z-W5WSF>>6$VS}pbs%k+b`ZV0u^~%}>NG5d@DY?eDSnYvx9?#416AuvSQU#Ho(|fPJ zqR{J~l3xBlfEg&{{o1)RkR|~ltuYpbk>XTkmI>^sx~?M$nYArgEv{+3_q(Q98&jae zPofAtu=MW$9S#O6^N-GLfia=;@EX3j$aBGtuftDqraohez~1x22VJppY8=Dnqyd1| zVNg5-Y{$dN?;K^9MNuf$BlZ1rF_dLPVis)KUi}JygPs;cS7B+Df?0$d)MdD|+w9d8 frRzF+QA&LSk)KHy<3b}!00000NkvXXu0mjfJ9hDl diff --git a/src/main/resources/assets/ironchest/textures/blocks/silver_top.png b/src/main/resources/assets/ironchest/textures/blocks/silver.png similarity index 100% rename from src/main/resources/assets/ironchest/textures/blocks/silver_top.png rename to src/main/resources/assets/ironchest/textures/blocks/silver.png diff --git a/src/main/resources/assets/ironchest/textures/blocks/silver_front.png b/src/main/resources/assets/ironchest/textures/blocks/silver_front.png deleted file mode 100644 index 3a8a37e3322188e2b48337718c1eae48d72f4e05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&A~v z32~jiVEUvv6R%vqa_QQ|i&rmPxN`o?#WN?)p15)Q#`Rm*4<0*s?DVm7m(LwPbNuj$ z!#D5Tyms^2&iy;qY+kc+!^(|2Hts*Nf7QlSvlh>qHhsD`Cy<+`}C2JNhUcG4f`eln&Eu6n%{{R2~V^-%r0lI`S$=lsU z^VIfM6(EPRz$3Dlfq`2Xgc%uT&5-~K&i8b243W4Td+wr8lY#(iK!;F_w{GhpAKl20 z|Mzd`_T?{4Zo=Ijdcxx$TGyx z)XLPt%FsmDz|_jXfbHGqP81Ef`6-!cl~4_ax<*DJhK5!~25=4KTTjLVH3))iNXyJg g%}dNpwJHHJ7);`g0+}i<03{hbUHx3vIVCg!0HN*r<^TWy diff --git a/src/main/resources/assets/ironchest/textures/blocks/silver_side.png b/src/main/resources/assets/ironchest/textures/blocks/silver_side.png deleted file mode 100644 index d4df07738c55bf926f233ebfd1b0bd5ae8766fe2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lqd@D z32~jiVEUvv6R%vqa_QQ|i&rmPxN`o?#WN?)p15)Q#`Rm*kDoby_{8CxcWxd$cJSKG zYiBQ=J$CxofujfZAK8EC_@UhgcWv9dZS$_p8+UBnv~$yj?Hkr@UAKDE>Qx(8tysTe z$(qHBS1($*Vde7m%NDI#xNzly`77rC|No!w?8|vT+ZmI*-Ca}1 z9Bz^P$UQL3oO9t6yMB$Qd)qQX7H_$>$SIqrCCqELV0FM zhJw4NZ$Nk>pEyvFDo9ZZP|7M9tb)PFz|dIN0EjF@3{9;}EvyVpbPY_c3=G)beeOij zkei>9nN|taV5nqKJWzum$cD7coYcI;+*GR)AcMgq-e5nE Date: Sun, 3 Aug 2014 22:40:52 +0100 Subject: [PATCH 09/13] Minified and renamed resources --- .../java/cpw/mods/ironchest/IronChestType.java | 16 ++++++++-------- .../cpw/mods/ironchest/client/GUIChest.java | 17 ++++++++--------- .../ironchest/textures/blocks/copper.png | Bin 546 -> 226 bytes .../ironchest/textures/blocks/crystal.png | Bin 382 -> 106 bytes .../ironchest/textures/blocks/diamond.png | Bin 572 -> 232 bytes .../textures/blocks/dirtchest9000.png | Bin 3212 -> 250 bytes .../assets/ironchest/textures/blocks/gold.png | Bin 572 -> 250 bytes .../assets/ironchest/textures/blocks/iron.png | Bin 572 -> 229 bytes .../ironchest/textures/blocks/obsidian.png | Bin 604 -> 264 bytes .../ironchest/textures/blocks/silver.png | Bin 527 -> 205 bytes .../ironchest/textures/gui/coppercontainer.png | Bin 3677 -> 0 bytes .../textures/gui/diamondcontainer.png | Bin 3826 -> 0 bytes .../ironchest/textures/gui/dirtcontainer.png | Bin 3588 -> 0 bytes .../ironchest/textures/gui/goldcontainer.png | Bin 4242 -> 0 bytes .../textures/gui/gui_chest_copper.png | Bin 0 -> 370 bytes .../textures/gui/gui_chest_diamond.png | Bin 0 -> 429 bytes .../ironchest/textures/gui/gui_chest_dirt.png | Bin 0 -> 357 bytes .../ironchest/textures/gui/gui_chest_gold.png | Bin 0 -> 407 bytes .../ironchest/textures/gui/gui_chest_iron.png | Bin 0 -> 379 bytes .../textures/gui/gui_chest_silver.png | Bin 0 -> 397 bytes .../ironchest/textures/gui/ironcontainer.png | Bin 3724 -> 0 bytes .../ironchest/textures/gui/silvercontainer.png | Bin 3818 -> 0 bytes .../textures/items/copperIronUpgrade.png | Bin 480 -> 237 bytes .../textures/items/copperSilverUpgrade.png | Bin 480 -> 237 bytes .../textures/items/diamondCrystalUpgrade.png | Bin 418 -> 201 bytes .../textures/items/diamondObsidianUpgrade.png | Bin 466 -> 215 bytes .../textures/items/goldDiamondUpgrade.png | Bin 480 -> 240 bytes .../textures/items/ironGoldUpgrade.png | Bin 526 -> 244 bytes .../textures/items/silverGoldUpgrade.png | Bin 526 -> 236 bytes .../textures/items/woodCopperUpgrade.png | Bin 542 -> 300 bytes .../textures/items/woodIronUpgrade.png | Bin 540 -> 288 bytes .../ironchest/textures/model/copperchest.png | Bin 4073 -> 0 bytes .../ironchest/textures/model/crystalchest.png | Bin 4096 -> 0 bytes .../ironchest/textures/model/diamondchest.png | Bin 4094 -> 0 bytes .../ironchest/textures/model/dirtchest.png | Bin 6110 -> 0 bytes .../ironchest/textures/model/goldchest.png | Bin 4284 -> 0 bytes .../ironchest/textures/model/ironchest.png | Bin 4295 -> 0 bytes .../ironchest/textures/model/obsidianchest.png | Bin 2042 -> 0 bytes .../ironchest/textures/model/silverchest.png | Bin 3934 -> 0 bytes .../ironchest/textures/models/chest_copper.png | Bin 0 -> 600 bytes .../textures/models/chest_crystal.png | Bin 0 -> 278 bytes .../textures/models/chest_diamond.png | Bin 0 -> 617 bytes .../ironchest/textures/models/chest_dirt.png | Bin 0 -> 1091 bytes .../ironchest/textures/models/chest_gold.png | Bin 0 -> 789 bytes .../ironchest/textures/models/chest_iron.png | Bin 0 -> 771 bytes .../textures/models/chest_obsidian.png | Bin 0 -> 741 bytes .../ironchest/textures/models/chest_silver.png | Bin 0 -> 553 bytes 47 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 src/main/resources/assets/ironchest/textures/gui/coppercontainer.png delete mode 100644 src/main/resources/assets/ironchest/textures/gui/diamondcontainer.png delete mode 100644 src/main/resources/assets/ironchest/textures/gui/dirtcontainer.png delete mode 100644 src/main/resources/assets/ironchest/textures/gui/goldcontainer.png create mode 100644 src/main/resources/assets/ironchest/textures/gui/gui_chest_copper.png create mode 100644 src/main/resources/assets/ironchest/textures/gui/gui_chest_diamond.png create mode 100644 src/main/resources/assets/ironchest/textures/gui/gui_chest_dirt.png create mode 100644 src/main/resources/assets/ironchest/textures/gui/gui_chest_gold.png create mode 100644 src/main/resources/assets/ironchest/textures/gui/gui_chest_iron.png create mode 100644 src/main/resources/assets/ironchest/textures/gui/gui_chest_silver.png delete mode 100644 src/main/resources/assets/ironchest/textures/gui/ironcontainer.png delete mode 100644 src/main/resources/assets/ironchest/textures/gui/silvercontainer.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/copperchest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/crystalchest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/diamondchest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/dirtchest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/goldchest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/ironchest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/obsidianchest.png delete mode 100644 src/main/resources/assets/ironchest/textures/model/silverchest.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_copper.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_crystal.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_diamond.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_dirt.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_gold.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_iron.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_obsidian.png create mode 100644 src/main/resources/assets/ironchest/textures/models/chest_silver.png 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 09a84886bc2e187d872f7213611e06eec16085e5..d98191c84738065ff6505144d8ab1240167789b8 100644 GIT binary patch delta 210 zcmZ3)@`!PQL_G^L0|Ud`yN`l^lw5#Mi0i>xw`ZrfK0mwT>B&tmFYI}BY5$XB>+bKG zduPj(hX!Gembu{`t)dbPI#0tDnm{ Hr-UW|R1;1H literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lyD93 z32{AG>-PBAx+lliKRL1S+3BrMPi}gCcE^kJyI)?|^Z3Z>2m2Pkytwbx<%9Qj&3$xu z<-MJA?rxv)@ZhrhdluZ@GUe8$iMKXR`2YWZj$xWC&_Ko{Z+925nu{wWfgH{PkH}&M z25w;xW@MN(M*=9=>FMGaB5^sj-+C8Sf;UEKBP2(iR;nCB+;3+62fPet>an1bm+#Zhi@7T1QTzo z8*~eN|8h-RPS++#Y}u3ru3M&cTj&2abhx_u>*D$8u0E^ReA?4@ufDiPbN#=n`gimH zGr733YGfAhegQg4vcxr_#5q4VH#M(>!MP|ku_QG`p**uBL&4qCHz2%`PaLR76{IKy zC}oulR>5FoU}&ss07RA{hNf1g7FLEPx(23J1_o^JK6j#M$jwj5Osj-yFw`|N3NbXa xGBSW`DBpTA9;iVOWJ6kJPHJ9aZmLxYkilRaZ+O@9rfkD+aR|!b51^9%x0%^v@PugBcZ3eMQg8YIR9G=}s19F5sT^vI= mt|$NaKYwB4L=Tn_9tNHj+}uu@do}`P89ZJ6T-G@yGywn%pBW!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#aiAhqkfIczlvOfV1%r`+p|P$35Lt#8np&A!SQ(n=8kkxc z7_hzj+=-$gH$NpatrDuiP}j&P#L&>n$N;XPeCx@0pawyZ4QZJf7=Hu<0002(-QrRJ001FSOjJbyqvT5Q`%m%vQuF*@_xwff`dak- zSM>ZX<@h`6`XS%;nxKb(0001jNkl{zt`?g{|Z!Wjid SCcg^+000045bDP46hOx7_4S6Fo+k-*%fF5ln4y) z32|jy{KV<)FPC?}Jm3HJ|M=VI<8RLozXL!0c7OLPv$nc2qP=E>KO zcfN1Ycs}E0Y0mSR3k%t|@AzbKfByTwpY3nxv2`)2gsTFbC|TkfQR1ARo128bg=d#Wzp$PzOFx9#M diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png index a92c5f17eb6c7855a2f9baa3a6f7fd454b5b81e4..8f77d1613b15c1110894e6d722679a7830aa4fe2 100644 GIT binary patch delta 233 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 delta 590 zcmV-U0 zfP?@5`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u010qNS#tmY3labT3lag+-G2N4 z000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0Dk}g8gxZibW?9;ba!EL zWdKlNX>N2bPDNB8b~7$DE-^4L^m3s900D2x}oOtw)(#9Eu@d0Cd5 z&8Dtvo=BEu!+$VfX?S=)sLm5adQRsCF4j7c!TTLh4K@bB$y#wPd?%=?$jJBO&0A#Q zJ{CpIoj8VXjGCrh&u_tQc~JEzUrt{9`Z1$>rfu6)8GqggtjpOol!M<}TX8w=U%}Jy zLv#;^Ktv#Vj04uG<(I2FqKR~vf@Hv0LxgCz zElUAW8)lbc(j3wR&kvs{gLND}!Ut`xV50U-W~~gfha?8k6P#2XV+~+t|m<$IjEv z!N$P~gA#K9003}FL_t&t*FBCg3WY!nM6)2jpX@(?NiLuU>=$wX8?m*qxAXc&5T{9C z-V8&Zey%ASs4y$kcPbFDYEMN3Fi)#aqFNuu45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z32~jiVETnC=PzEpaOv8`E7z}FyLs*Ut?TD5pF45(#EsiGZr-_h{LJyQm(CtLeeCdw z!>2EtK6vclfujfZAKCx^|NnlWnVo}?8-`Ablc`wlW_n(^j^XLCFe&S&X$SuEE2Xu;LiEBiObAE1a zYF-J0b5UwyNotBhd1gt5g1e`0KzJjcI8c!)NKpz<$|@PGg2BkZ&{)?1h%7@4O|48V ztPD+b4NR>J4A|a%?nKd$o1c=IRteQ$sB2^tVrXb(WB}JtzV&20P=g@IhP2F_)V##p cRI3sogTW-;@C3JJ7EqGG)78&qol`;+04ig{9{>OV 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 2fdb824efcb80fa10626b46874f548ffd7e92fcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3677 zcmc(hXHe8lw#NS>X~-D_93%-ilB48dh8!hHmdt>NM2UifWZ@-91_wcfAxn^fAt*_r zWQju%h9DsDN)VK^xV!h=y1Vzo{cx*pcXjotQ`P4@&#$YiI{uD(QaaU)9J)<7tSynwbQGs6La(y#1SPWp%R&mgs7fT zOp~o}zeM7jiM@rbJBl_?CI)W zS`mRoQ1E#Jbl^H?Zoe~L5O5r>sCbK~jqE)D3L2*b18w?wZDQAAFK9R6IW{0v6sXNV z^|me;#RR}YlHkPvOap{MXY-o?1;l{;fRiHuxFZbM3p`mH2Td_mqH+KxjXiV4@3*Sx)}fcAa%vTEd~)g$)?i^DGIMhgPQf8<)>}+64p$ss z>)25Wq$tnxS2uQu-R@BqJUU8nt)+$40|gti=KJ2i*{Bz$;AUo4S5~HVy5QCh{pMlk z$PT+U^Rov(!xc}D4!^u#=8KT9jnE`M{?hU3K(FZ9@N@Dg$GNp+&C>?Ti&MxrPnWhM z&H~CrFkr^Y8@+Fz&A0|o%Kf(U4}D#tkp9G_Y6CV^RVqK~=TwTKxK__+Gwn2dOIQ>C@U zjh~rvnQ1}xlzgwq#oA~zr7H9S5>HQKS~SJeBWjJ5K2y~ra3!+rQ5vr(N1Xk|bCX#L z@Tlk9pRCeqyruemKmp5`=A!&5<3-pyWpw}PlS z{?KW-CXkpRLcNV#hBy$;<-n<`Wua$bFs)U>b&XGoewJL8oG8kuLx3l(ME4zk6aCMw ztBw-lu@+iFyps&cjG}a*afmKiK8ARNga9t(igwK#(=moIjj@NuycQX0LON z=SvDr>7|pc;FX0~fb~^pTTL6HDW$C zu%Y=i>nqVgAQg2Cb7W5(Qjjh0D%n*eTj15V*?Prn;|Xj%red<`7^MTSlWe+CCs)U>p$xNM<}(rn*sz%;q^o=I4hhMA-Zp_Ke{X1Q4z`p%XKhY7M& zp(M5pS>k1?@+RE!ES}V|Q?Jty@y4j2#*Wa^%|+?NRu?41?Ll20^C&{Pi@#=Y=5YYD zIr|LKoS;-zS}2E*)R8o=Gu}^kRUso}`y9XUHy~dZ#ANM z`*=2z-m)Egf zf`7Xsv*W%KJNNRF)XSUsmXdxWoxO-JMysPLlrJ;HJQgd$4H1SB$oh3&Q76$<^UA5} zhN8f-BZpm9i-;$@7tR+U7oz|MbpwPX zijPo@u)cC~9P*g^Lz0R--sMN_%(iM`0Zx@!HTh}f)7AD$ZnxfVDV5wu>)Au8L+&)u zcf!9;j*vO5IV5z3Qwc=JMw`c|BzebKu#bvoNe7P3A^aBAeyL@uE#x7^4dvbn>qtYD z%S7%g&dN4PHK}xqxLSUius~aAKhV7@s?pk`T(8E!u1A9b7on zaS)ARDHUN5lFx+c#TndA|5KF?TEdceV~;WLMiNDE2c!eZBRVQG8aIuwfpQw`X+iZv zo_|Yikq+kjC|M-5ii;8`O=;1i)|=0h&u7UE;PRAEl5Z7{e4d)(125y&Ps1WNk!!92 z0~IdOwdWrnCNzk0W{~xH)TLCASPD~M;l*D~tpul_WVJ{abJq`p@%?g{<@vV;w?EbO z<5Of`?7qC%X6Rs8dX6oM(KQ!_Sgf^H+?T6W^a;jO5SU4B#oQ&WP;7jLg?dgHmT#M9 zRfV_mhv<7m+-vWD+FlRx*rGI}Sd9+bnw#3THM9`5T&#Ea6@%tbW{!VW#e`?gVtz6$ zI2W|a5$o0eA!jcAU1@n2&Ux5%%ynaJK{(%czY7whw=(<3+Ou z1@X<1SOo6%2gSw~7fj#Kpn{6&8`A^RU#2oUWApV6Q^yZScQ`^@en@?rz+1N*ohkRd z$D4u7^e0>=Tu!u4>W);Z;>$LUGfzBiD-Aq-wtI-ih|b7(X|Pkc&l8X_B~#<%$y-~R zG(FefpQCpJg{ftz&Hi}Nz0B*a7QC`?M80^$Ni9DckQiFAL^ggs0D^>w-iPPzb#1GMYD<=f0J<^W5~`R6I``H|%MC(VSa_ zv+=;~gtXR&x*lzCO8emXxae%NZHw(KzPqEF z^L<~Cr1-sqyC>W2fpdY7-Pen>hAWS`o(NvJ{j51O8Nr;Sv8AP55EEtZpE^kj<1c@h zq>j3pYQV+sSu;1B0)O;tdUdzAWGI& zQ#B2m-JTnD-`8P^9?eN9`zG@_PBpBNuABxZwCWBf2L<~&zZtDKd_1EvEqlF|)4*Uc zlXyKPjQG*@&$UA5=W=})pXCzT5|mHB`^oGphQ6u{x^hg9THoI=DRe(NQ7TFwBYgjp z@6QfKlu9@q00U4DA5Wh4G~k6#X=yrBirs6S))y6~wkGU$I6;DTu&&!l?z#L50q3m* z+l-gMrSK~N7~uN1;IAB{q=`(73c=nZewsX6(X3|@i$nU@dr zv(has|AGFRlmJ@*{g3s)|LWo2c6oSkyBfk8@lC3Mz%ycC2&_`Zd4KOV@b6LQ+Wq~p zCkB2y`R~DBIr%RC0{bxp*IXH;e#kk3_98$Vs4yz>^aAZ&v;?_b*T0^t}dt z3J)&3T?%OgzZ++S{k+0s(^A7Y??d0K@E@)JDdxX)p=cVx&KMj7Yx0O5Y;~#TpBPU| zH*XY_w*@3s*99DB g)R%AT|6)`eU(w)BON6+#p8hVUt!|)J1-F0tH=0mC;s5{u 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 b53f47299173ac9ea4e8c7f6271a880e41ad3909..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3826 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 Hb$t3S1AP45 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 27f506fa5e5c0a2523c2fc2d0fe96880babe607b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4242 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 SZuyc3(&y>w=d#Wzp$P!5uXhsw literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fdb8b3eb322ac22dabb334c7a29a5a3665793a50 GIT binary patch literal 429 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJBz$e5NNOyO4A3JvJ|NsBy z=H@_dXlUrJpde2mi?JlgFPOpM*^M+H+s)I(F{I+w+q=G5hXN#6FZjebWSd_Inq!_R zuCRk);S0Vq|E529(&#U;XhOwb%knS0Ec`Jo+)kHFW;%3IQN+kVz0cstsW? zbTB{ae$iy}(^!lBQ&B_c$)YunqYiBPlkhBA7OH}ueMY%zvaFaOgn!^Lqt2oVR;Xm5 zLyaKsvzPzPZBCwMT$2P51v*2^j`P5am)Zw%F0uzP&dQZPaq;zk^G2C{b^MQ?Z#IuS R^XfWCsi&)-%Q~loCIBq-iIo5V literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..265026b7b573dab7e999bb82bb9e9bab9c37eb86 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJBz$e5NNFO_Pth>AW|NsBy z=H@_dXlUrd^$$9MEXI-`zhDN3XE)M-oPVA!jv*Dd-rm{B+3XjL%(7->r3w|s2i6wY|oCE|7o0(=Aik`PR3E`rUT}-z$OK-n?QP0Y=^0=Qn3q;aF zYJp_%_qlx;f>7gScoPIe>sg^%uQFa04}5jxKJWH(yc@cpN>(wid8FHLH~KTf^gP`V rHHAIbgP#7|R;?L2LB(?t94(o%&&ege`l^FP3CJ){S3j3^P6`@6ivvns^Pv(7e8g!{*w<0F_Pe>(@oT&rxgTe~DWM4fG--m= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..31ec2f143cc4fc1c7441c1029c84d14ba651afc1 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJBz$e5NNOyO4A3JvJ|NsBy z=H@_dXlUrJpde2mi?JlgFPOpM*^M+HTg21FF{I+w+q)Y%4+TiHUc7G6@QA7F#_Sht zd)Iu5w?Qb$R=%F!qXXYhTGtZAe~xZoZX+ zd99oRm&M)X-;8a`{xfY0zCKe<7HAz19Js{LUiZrA^5V@M5CMj1Y#TZrsY5v(%sPvH za6&nc7`ip;m>`@6ivvns^Pv(7d>#6W;$Q#WdiTaI#xO&OsDq3^{82GM7$-sSs6SM> z0Q(W~i|fDEgTe~DWM4fq=|V6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8b1d8c60a4092fe13a4072642a04f4c5501f044b GIT binary patch literal 397 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJBz$e5NNOyO4A3JvJ|NsBy z=H@_dXlUrJpde2mi?JlgFPOpM*^M+HTg}tOF{I+w+q)Y%4+TiHUc7G6@QA7F#_Sht zd`@6ivvns^Pv(7d^oi<{80L}^HS^wXByShrrbJCJo`z%i$d;LqS Q{0vB`r>mdKI;Vst0FT&&^8f$< literal 0 HcmV?d00001 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 1c48eed884beaa01c6fb6bf6b22efbddcc2efcd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3724 zcmbVPS5#D47JUUJ6gelMkR%|IW0MPt93@Fsa)IQ~M8PV_ViQENg`kpy1Su$D5d;JQ z0f|MBEGWe;cyNgKW`T|4`%=fo<^G>Oik7q6%Xe2 zRCVK!Pj$VG86X_SstHK?6kY*N5^9||&ip9`qjnl~buephUL0X!BJweVks$da(n;cF z&KHT1FXJBd9W8{tbRTa%SRFX6n^0OS-$mCB5#u1_=~@y-Qb_U=Rd$+Bkv(1A3(LYV z6e*7nKnaH4FnXH*-iSvDYK6bKiP@{2A6 zNe{q66IBZVm<9-m&g3-#^1y&yzoWwva7zfV<9o0=3Lw#kSz#c+`Y9&^C@%%zpmUB> z16<{S@}b+0)By`ofZj#7OBR?E0z|dVU9^CzdH^>_O;!Uy$N^EKxab=II1I4s<>n3s zqOt&bjU97^Z#OHc*96X$%BoSo^2n;AtRX_a#OCJ0?EHh;OgHJJ?FsC&VZt3DSuElx zNvcn~?*Sk$h2gy0-IL%!%F4k(=|l|WU7?LOqBAZBho#e%p)wyB04xMV44(>$)Luo( z6CpiMUtHe;yWSzo`}H8frG^St2js0!oA3HuXrrE=jGdZVSzeyh=~A_}?=ufSMReT7 znV)$4h)_5_*#FeJ$b%BMMQMT$KXts{(<@*bdO{NAFteJZd0bC+b_^Zm>e6<=S_sfD z8PWPCs%1ak6))h5SABBh?e&o}r^R`}BSNKlDWK|}5-2Q1sMyw#@VhP_wM77K@c;mJ zn!MXT@U{b4?gN;X$W|~BXgfPmegO4k8j1T4`{p*^a zGd>gU1(8$4FhusmA^2Hxn2DJYEJ4h#GxZ8tMiW?iOhskHzGSXtQDu3XSqNYR?lYwH zk*4XS@usl~h?tg?7M9MHl9}zA^_wP@+%XBS)G(7USt=pxtoK`k)<|Rkkg%_Eaq2~R2Ogcz|{Rffu_t8 zXj6h>X-U2;TtY{}yw-U4sf#l4Ql{_Wvj78S4v4ZQM)K zGtw=}w91UiG{3Y+S8f)e3tQBiERRr>Dm^-UHhh|hq`@obHIpfm*&@;+Mtw!O{Yv3d z_X5`ZCbgh8ucEEY+}1nDTs`lixsaB%pKReGC#EN!Ka2J?$t{R#$$5zI4;_ z6`&$L_-{sV+fEp~z&_1BV<9R9JFM_>Oyf5Vs>g2KHcLE9p530^FL{Z0IeB&UH}to% zjrFmGHwxwTkR1nm3TE`*NkqjPF=IyQ^( zueYSP+_qw8p1+rTek0dX!v8~OFZ`3y%CIuo^E6TS`SJ)uxFHHrx5h2vD3W4cF;P`t z5L9|#zs;odUCHnHlG2ib%$)d~<=yu(xcc7ue#1`h+`G~9@CV#yPG_NK!$1-8ItW1+ zk5WNd6C53e-sfyfRF=a#f3KO^RC%0-Rbfy`dRXyrrM-gFwfAds1?Rz9=3vU88)fvZ zh|l96i0xPH6FMWv`J!W^&0~}kec~*x4vS?-1r5)@{pZzws->&VEeaxG$!Pg0V7RZBVbQ!$7Q#HveR zf4OsX&FNdOgnAM7G~##ewaMjIEQLrhs)e6Tt@tMdh-(ne<}Pgm@qM!CWw|#8Hs9Cw z;ge;aZ9hNTr0t+xc!DX2(KQ!>TCBE|-;=FT@D0I}E-_rW8FQPcT%q9+M!<8-ux!&j zqcWm}H&ovpb*H`WVS63O{R^2H=}L6?mzjx8TSE&G%lSI{pD}1wC5HG%mGpR~42B1j z{4>ETtg+sGZCNu<-;|VfVV#CtMqJic=Y(>tDbq_cRx>EQD5j?0P|V+cv$_9W9WRnG zz>jZ=#K5sH+Y}m_or~TL4#+E;zB1i2{b?$_H8NXgKXK?ayu}*U{9W?v7~Z=1;6&+N zE8Yxbra$H~=6s}mRC}OY8DF}7n11AGTVdeoyV*lHLU=;VO^KPnejJ02D4H54jo0-*?~$UW8UootO9 zlk6jF2kS<|_e#U#8*`z@n)qu}&me%KO9X(>IjHsU_tjRaa58CWB1nkt{SLn2 zDvrz$I6YLkI2AX3!>%Z|&U!68@L`UT)K7)VpUq+Kygv0ifWUqbaCQ6YjY>{c?`}i4 zOOL?-7@!7V7ioVBF0s$J!Z4sy^p!7L=UFjSo~<*f4CfxpXalbCk3!caz$yva)=Bd2 zgJ^{3CgZmnAj?pI12|WM0D$~GxWr(@=gFfpl=}@3ry?wr2^APhz<(DOl^_%NLSC34 zg!tbx|Khr&{QzP@eU+?-D+&`#xq0=d=b>|fJ|^mg#oy4M6BA%_p#S{&AIN1v0XTII z`GL(_NeQsPY`iaxYY`uE=ZacGup?jN5?6B2f35$V;<6{G4^6Luzx>DZ&FIxY8}Ri1 zD}hHN1T1t;X85NCr*GD;=au0C6RTS?(nr_yYrdR&IOv@h>|C}Hs<)6lGOa;(Dtj@`v|EcG(+o&$g9JR@2kJuCt^(Os; zw55)2_FK*LU;SU!a2fmyDXGW#v~2h?WRChWO#YdW*VOai&Tf`*pX{1*F5(({z)x_p zNJfHTq*)eY1tRqY=B19~k` Aj{pDw 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 65179f2a98efe9dd2ec5767084150ef3f11fc6a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3818 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 diff --git a/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png b/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png index 7bb215937bcfe3c5e4820ec26540800a914e008f..b5be2e396c233ebf6cdfbb93af678c20ef5f0f7b 100644 GIT binary patch delta 209 zcmV;?051RF1MLBjB!53pOjJbx0054lq0EzIy>~y>qIbN9UC7$p(Bk9Q>FTwAQ^C{J zxXR0~!NRAxx}UMKn5wIiq@|9FhOTZp#g%TSbxduE(N+Ke00DGTPE!Ct=GbNc003M` zL_t&-(_P9}7JwiOL{SDTNC(~jS|!p>ynpi&u|ROp_-)M!PD+Bcj|MXU#u$Kt`V?4e z+g)wshI4KNDP`W_z3<_w@`Dh<{HS)s745bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|eG3-edh_<`^B3nIKDzMe@rhfvPu{+B;L_!Tm#^$Cw_lfMwd2(3?I%xNTU35@ zYTo*Tht5n+?dxva(;mBg=dP{w!OKg1=5O3IW7X>ED_2cgvUK9&CIA2bkL5aM1vHwm zB*-tA!Qt7BG!Q4r+ucQG4vQl@ki%Kv5n0T@z%2~Ij105pNB{-1JY5_^Brb=ZeJ#`= zAmSDn|DvfY$m{+8c@u?xw~y>qIbN9UDMXn+uqya<>Iw}Q_RoI z!^Xq9y}GisvZ}4Bqo$*spq-A3hOTZp#g%TSbxhFX-d+Fz00DGTPE!Ct=GbNc003M` zL_t&-(_P9}7JwiOL{SDTNC(~jS|!p>ynpi&u|ROp_-)M!PD+Bcj|MXU#u$Kt`V?4e z+g)wshI4KNDP`W_z3<_w@`Dh<{HS)s745bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|Gv~~F`r_$>#}97Zy>hQ6{hmIb)wy6B* z)Vy7Lcb%D>+SlE-r#*Jl)=gXMgO`{3tXjKj@v_B>mM)sRVD6mxbN>JT|1-}lA80gV zNswPKgTu2MX&_FLx4VnX92Q4*AcwQSBeIx*fm;}a85w5HkpK#2dAc};NL&s*`&y_$ zK*TLD{zX$)kk|YF^Ck-YZcm(R+&n?XLv~h_gQhNPPw}xj$J<*s>M;CD z%0xUkr|sG==HxS*4n_SwBo@w|(7^COFXsXhC%9DbQNdrV?VdeplA#~#L#$!sfc zHwbG2ZB;FCjVMV;EJ?LWE=mPb3`Pcq#<~WEx<*DJhGtfV=2oVbx(23J1_n=9x=fwe)vXlh*1v5Op&-VRGNgI&w>*?Yc!f`#BftitwBO$THNTxwR=Rm>%reH?F zqLPGyqJ#u*@6$}H6Sei%w;6aj+bZmdKI;Vst05@Jo4gdfE literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15(WW2 zA+A6=;qu#aAAbT#2vR=uOk(HVJ70hAdGme!%Wu(_-b{M|(eHvL>4nJa0`PlBg3pY5l7qL^=$uSCgK^l}D7K^}jSS4p3>8f>=Y^vAP6CZqEpd$~Nl7e8wMs5Z1yT$~ z28PDE28OyuMj?h~R)*$Qrk1(}rd9?9Pc2e^qG-s?PsvQH#I0dU>RnJ6F?hQAxvXR~Ji@(X5gcy=QV$O-jyaSY+Op3K0^ z$i|Vt(_-Y}%&Ne&aG`+W$4{S%HcVLXCC`zOEiE}Y+M$zg0mJ6*ZuypnOG)*c(J^`Aw9^b}8k(BT62}w{9AIFm{3JMmeVY045bDP46hOx7_4S6Fo+k-*%fF5l<*7i z32_C|78Vx4!NGxnf&Tvf0RaI%K0dy_zFuBl%7>mw?7Zvl?(XL1cIWHwJ#W6dxVWr; z`7Qd=n@JBpJ32ac-20e&{hghiowc>KrKRQn|Npo2e>Ve~$XF8O7tG-B>_!@hljQC0 zBKan7YX^|SS>O>_%)r1c48n{Iv*t(u1yem;977~7hn~7A)gU0ymRKK>u~GEy|EX@= z&#Y%0-_yKNN`jYJwBTHIqlCNStb|$1gG3pEPT72pw$0Re{psG-uv>{eKMzK|wsGQ+ zm$58YI(Fml202YtuIsE^46Sq0WT#wVU%Tm^=TbKHV<)@2fEKEjxJHzuB$lLFB^RXv zDF!10Lt|Y7LtP`I5JNL7Lvt%rOI-s~D+7b47O6i`H00)|WTsW()-WaYE+|YHJYD@< J);T3K0RW!Umcal3 diff --git a/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png b/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png index 028e2d8b9153d7ee8ec3965fec826059501ff760..57fb2366daa35e9c42a9f21ae9d85ceee3d4dca1 100644 GIT binary patch delta 212 zcmV;_04x9C1MmTmB!5CsOjJbx001P+*!|ftsfqym{W0mtErj>~n)v@K)ZpU6E2{bb zRP_Hv?fE_B@ipD)Z}tDFrl6dE0J-}AZ1w-==`GN+C`~35(*OVf0d!JMQvg8b*k%9# z09;8#K~xyiUCKuSfFKYAK^hE5GXMXpih_W3o8A=#qQyqLjZHDsdyFW1c<}|;=NV#9 zj}>d}dskg_;GD}rO1boS?^Bp=%Si~K`j9wlmP(1zP8a!6DPMVuFTd;;}ikFk9K O0000Slic literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|Drau&{Plm;&;K)j{GapVf6Mp(?ce|BeEpyQ_5aE)hB@^Npm7DsjJqJVC}oc2<;wrY>tw@v%C`+gms4F#Jm7NZ-+|&S|>J zL_9dB?b$W%Y%6a! z2x|guRV{IiC`m~yNwrEYN(E93Mh1q)x(0^2Mn)lqW>$vgR;HG^2Bua922U+gf1+r} b%}>cptHiBgO6pxu2s3!P`njxgN@xNArGu{V diff --git a/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png b/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png index 65cf6aee66a145641921297812d2a9320f0400ec..1f64db637d99133a97bd3c4e3ee1a1919ec45ab0 100644 GIT binary patch delta 216 zcmV;}04M*B1oQ!rB!5LvOjJbx0070J0MhOBdYhiw`2WJ%;qv7-`0YNi%hCPyMc>FD z*}oXmwh+y(3CX7fvahOekCN=%Fy+!H$>r;#yTR<+Fy+xGA#Amc00001bW%=J06^y0 zW&i*HT}ebiR2b7;%2gJ?APhuN25Pue_P^9Zv6J4vc?p}qC{alKwj>36fw{K|BLH`d zKnda#ke*cUVku52rF!6;`xRR27LLqcFvg6JY=yO!2Im|N83|cnJv5?)smvFFAOjTg SN?ykR000045bDP46hOx7_4S6Fo+k-*%fF5l&B8y z32_C|M;9^t|KaiHv&)~)&fnkI{djBl{jL4?H};>NSbThH@#%^A$0rtVZX3M0V^B4F zUP1q)rzv|Gfhd1_1+}tm5W1qyv(-#-- zK6rVXz@=@1XV-F_S<8859oLEFEGL(lsUe{DK)Ap4~_Tagw~< zT{QM?*t!YG;VkfoEM{Qf76xHPhFNnYfPy8SE{-7*mqX9K7HU!uXiK!??G3rmSJ8K6 z*MI9APv?qygAZ@c9hkwb!xN~{@wi$4foIi|-41h%CO$pH+2G`5^>SU^)D`EhT7`?> z7Tx~)F@MzSU5>ZEO7n!+KFaLbzEFD4GRu~ye>oXnFXvk^sWKs0`pwPf;^n_N^E(=+ z07H~PwZt`|BqgyV)hf9t6-Y4{85kPt8W`#t8HE^{Ss9vJnOf=^m|7VaJhe#uiJ~Dl aKP5A*61Rpasdqu~!QkoY=d#Wzp$PzYfzD|F diff --git a/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png b/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png index d3cad2e203a47884b9dbe28867f40bace8dc5e03..d22f6b843061e3c9196bd661137a92a1285cfc8e 100644 GIT binary patch delta 208 zcmV;>05AWJ1ndEjB!53pOjJbx0070J0I090lAMvZzPFp9n)2m0%c=(W?LL*8l>PNZ zh>(Zh$RF9i7>45bDP46hOx7_4S6Fo+k-*%fF5l&B8y z32_C|M;9^t|KaiHv&)~)&fnkI{djBl{jL4?H};>NSbThH@#%^A$0rtVZX3M0V=!sX z#P$hoPcLaay{NH$-}aU3SKdFNaPNfty%P#6)-UhtZkxSu){XrVH}^~2*e5Y{_LR>4 zj?3EwE^QM$yO!(BTFx`;xK1o*Ik}wW#4?uu|Nk%fIq5FYdd89R^j5e zMYsQc%pdi7m*efP(mWxyk1~6P6{Eo&c zzz}6nEpd$~Nl7e8wMs5Z1yT$~28PDE28OyuMj?h~R)*$Qrk1(}rd9?9Pc2e^qG-s? aPsvQH#I0dU>RnKLFnGH9xvXcFe* z%DF*1FO_UArEnvEULk5u74Xu;HZUflYa`^Yl;Nd_-I{vZkZsk0S$b0&=eVNSiDNS@ zBqAOd>cOq0rKRV$pplW0*N9?l1%Af>0004WQchC9=Pzh@7}{X_uU8o2`8V^+!szhr>n&YvKmsS9(~sXQN6o#)%P8(`GPAlR>_G~Odz%0}np-p~%7;5w zYHWb{S1)wUYkwlG3qdQp4wY)1?e{NH?FL#Ygp>eAz9EQ7$%lmprn%dw@h1qWxI+M_ zrgx`GE1Hd>;JPO4kufr_KN198L)ee&umOZ6**SV>k})Y+cv9x`Nt}1j1}m@u0;O1* zJvYg0Duw@RjknW20HNPRYmE@%c7m9cq=yp##N(0gvwv2TYNs8|z;8uspw#UII#h&y zmzeC*@+039)(~aci4+8#!4`xi86HcRM8S2*rczW+Ypj3YH^ra6TKp^&#SH?0k|!v6 zbpSHSaY`Pf$CG4|qrLk&BZ-?91i?Os-2;oq;e;EQyVia zBqAOd)z{ULk&%79fo=c*00DGTPE!Ct=GbNc004SPL_t&-(|=vf+Y-YN6op~SmZV73 zS=zq;dzLaW=|66K)(kcSyN3gR_v0pbw5DKvuPs~vSZjd>@_g1foOAtsA)-xac<%=Y zA;=Vj5C%vom(Ph9V+Yw5xxg4R7C94%9Vw*&TdSZpe-X6TUaW)CTB&w;2Y&Tid;vHM W1p&Wp@`(Td00{s|MNUMnLSTX+JZ~ic delta 526 zcmV+p0`dKz0-OYp8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-vn84xxSAToIe00050Nkl&MO}($K_NSdn`{Ir_!0&40NoTSu6+XGF7gn%aN#Da(0^522&HsYLqe&sG`C62 z&Ha-*E^a!-rj61A2Zl2+0aBHqPIXy9V5^-y;X|-E6uZzgPE>|iQ z6bgWZ1b}+IPIbE~a|PU*YsxRmhzQ2ak~j7nRJW_*%p+**HvlM=N{FPrn$0FN7AocE zrau^=)fJG4(0{uava|P|%_o}}V-OJz4i79ofCG@xn%%8?_Hz8Y&uNs<^A-RYjYqdq zDgcvA=y;w@XK9(@%MV0R3_#!qHm`>RAWHN3`>HKwv}SAljIT#o-o6Gu@NXq>0HVo+ zH_y&(aidTmXno|>9vg)My>_48r+4=7mv4$6ou4uz0MH!>-N6um zVt$400M=IW6!Z6|`$Lv;lNka5c>3s}xqQ=P`nwfoy1w%5k3){ze-r!xs!_Z0q*ojI Q00000Ne4wvM6N<$f*Bv_)&Kwi 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 a008864f07a65b0fdaf5daba198d02737bf4aa07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4073 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 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 7f18468999d6e2117c54cee4c7d1b8f686622ac3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4284 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 bUl5@0bA_lnJ1M?>DS(!mo@zDB_SOFZXP5iB 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 4f0657ab3f04f279530e53f0373385f00c837611..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2042 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 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 0000000000000000000000000000000000000000..c12166aa6a058a411a92abab2bb66c35166a9efd GIT binary patch literal 600 zcmV-e0;m0nP)e0UF&bj8xwa1EB$c$U##H-AcX3CIY+Om+vhEm_Vp5efy!+}iQx0u_s zl+vGf(VcVDq<+qqYuK%d+_jana68B37@+_F00DGTPE!Ct=GbNc00Fp3L_t(o!|j#f zj;kOLg?laqq#`KQ*1rFX-Wl2MT(aBEtatxx;ukbInE49SjHgrVV}E*rFF1V;mH%Tv z%Hc^ulU@n1fW~_=)>+0mlL0flF^>6_;L$&5d?Ik63j9_-hL?izK|=)2kiqc^Ho-Vl zMDP+3P&r>!Fp`2Uy}&wS$U>T21zb&Jy}+@ANc9Y;o=IwfwdXV6EN{UNzUv0M4caZZ z^Ba~|;JUu+=<V--vjd`>sne1+@E&>ng;iMfkD&Y_6V8=w{Hv5;C2Wyng+L1APsKk zAxeW&3T(52rorh1XA!Ju8r=6+FrjI1Nn=#vO8+hosQ!5;b~0-mE;!gtUo5s=RNZPt6}lL&mJ m;{kp8{}<`t;Nalk=lKhwIV*ffS|+~$0000na*S0K$W>!IVDU!L!O1%LW& z@#3fI{cq~mzi{k&%`oW>Wm77~*j}IUzqk zfq}_Up~3&hD)L> zkHQp~0v#Gfm5xMC^k`&KR83yGVT+TA=bwqH9qbCTd#5gnVN5g^_{PfAp(PCjnupFD zW0??fXfcD(v9=bGfIL@)qg*_iW{MM;SPvaLcPuNjHGtJw?<6lLYXx(bNKey34u**? V%9|@3la)Xo^mO%eS?83{1OP_NVKo2% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a4a2349d7bbbf7730b3835ef656996ae6002abec GIT binary patch literal 617 zcmV-v0+#)WP)=wCE)ieFi66&c2ppY39U`kaLkDIuO*7##Ic*2+DsQ=V&~20?B*Q9iGAQk*dD~e#vDSX-Yu)^_C+Ma7sYf08Ap_ z_5&P=fIIREBH;FSkVypGen24+a7TtH0!|6=q5~0dy8)3z!0iY0BmzzeSci^^c)k9Z zNV6$17qkqK-faME#6HG#TjwO;al74bP`#4gZGijz-a*5F-yrGT2Iv;8KT%RU2>`On zG^BSM061foU1Lb^Hh@{x)J1yt?;p~sQ>RXy`v3Y3N2M=LZafY700000NkvXXu0mjf D7Pk~w literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2cf0a901b62ff2f94aa2b4a568f4637db9255f97 GIT binary patch literal 1091 zcmV-J1ibr+P)AqP9W)&j%aSO z9$&2G^GQbGsJDqEni3&*Ythwl)$Dg>}LN^2!AHUKV*$G#uO(3Gw~ z=C5mA^K_U4@Kc_DyA6;1vJjxM1>iix&dh1fIiZu zol92+_(%PRqzDJPHb$?tVQN;>ya#U6R{JJy8UUlEmvLM-E4bI@ch9lezXQluU1#~s ziqX2}&5e4%@768>RNh?Gb=rOdJjH*3YP#)q~v@eOrCP2QKUHdNK|^6+_zH+fV4x!ulZ1#2Yd!N zfQ0O{#@Bqf9uNVLQ`RygmPQ(W0FXiRpTq;XI4jMA zGav~-=X_wUH9r>u>JJvMt~0`zy4Zp_1LgqEh+1pJ&8oT{U;)qwK{=W>vw0!FCvqv# z+O`iBKqTphxUu`{=NFE&U+vbxYQ!KA24IFLGYnRxWfR1z+odEPmcIYv^*8Ln2iRlg z_RSA}Fo(qRK5%m@Gv9IQ4|sf&VIm~RbY+U;f8|m zjmwT4Zj^uAT96OV1rPgKmy~Qx&m>Sn`W$eUwbU zJ>Q&hF-9*$y~ECVhAG$H`)0CZcq%Z)?8dZ1S`)z$hP@okHzHIOWBe|@H42*<_9DpV z0-T<`gcyQka_A}?WSGd{>AoFEG>{-;MmIbch-VEFB?Q$>!UDk>P=NJA1=gq};>TK` zpz}+Nsxhjl$`RVqX9N002ov JPDHLkV1fh4;&uQ4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..62447fa7b6cc5b83ed06a6f8c345d355a2109fe5 GIT binary patch literal 789 zcmV+w1M2*VP)sQ|;$3z(q*lbis_*%R68OPizs+UrEv=rPvj zD59+ZdY1rrk^tE1LBY=mt-1l;@M_)gW6azb-0oc0=s45i9I?Ftl9~W^j{wi$Agi|l z+3GxfodDqTde-JH&)pK8rvQJX0CIK!-tlU=#sj3J0E34B%*+O;vjB020KvfmkdOd? zzF;>10004WQchCyFwm5QUi%JAqut)j)0#NJw@QU`zY{ z&(?8P#cQdohIao{%CU)bZ24p2jLvNKc6qzZehWU)?9amE9|+KuW{ATKL$d?TJpx>R zTyfq3LC%>J_e2R0#7QibBvttc&|i9-cR3h0U0Qt?fa#3CzI(9fmi_O|ar|s$PBfv0nF51jR0T_c=M%U|p zhXl~~bVs^_uf0-o9|Q%CpeWi>k2E4ce7h?IE#RI91fT^R5#TF83tGSt0ksCu0`BPw z4xk0x-vG3Ldmd1L7H~uW*DBBgjs{=~V1X8J&jVc00*(m4HWt{)ri&@|-$a^hbaB9v zmsm92DL{q`u4UnCuGc_!3UJ-=k=;SiHQfY@j;@h;T7ltmgI# zm+4Lc5V=C6Jx2lEDS*AQ9bB>Jj^hB`DZt*@?;YH5_Q<8Xe{ZBolO|1?^!54$T24|Q T8Wn!d00000NkvXXu0mjfY{X_- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c9d341255100452cdd46aa9b9e8a49854d4061e8 GIT binary patch literal 771 zcmV+e1N{7nP)n-QLC2*22-#exIMZ$H%L;x}~M1fTE;{ii&}zrp?XGr?Rzmg@(ey!bw-hMF0Q* z0d!JMQvg8b*k%9#0vJg|K~z}7?UZ|u;vf{oy^9p6*oXG*yX|NltF!L+|8RSm&4?uH z_Ra;Ah3Tp*@26;w^r7)n)=0a!dY5PydN+<$`*)Q$=$SmAk$6%o@0 zP947LZ|QHl2@yId;>X1x&ZoIU<8G3h2%Pf_V^P zPcRO{5a`YV7U5zM;y}1SF5SI;kp>MKG-%Mj*KgdYNzziWk01a5002ovPDHLkV1iGs BcwYbj literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6ef6ec0dbdec79c0680945f48c885d3e4dcb1ecf GIT binary patch literal 741 zcmVKAg_Qy5aA--&exp!-W};bur=$7iMOS;5UGiI{-Y!@zDT!Q;EV7y<}_2HC-vg&UV22{D$OtjQxS)d1i%j0ryMR2TySs;;s;FyT&ZK*ZZQy6+w z6f>_91|$^Su8`}pLbwxv7^Kn?=q*K8K$KUvtO#;l0LPLDnIu+<#c|H`zDP2bfC-T(5HbPL zPsp2Y`9?SRF2HF9B7nI4>gosru0-gqL2=bulEU?>2~msPv#yQv=sz`%yW0TG z?fUKpqXS$=qE)c005}4sMOcg*xT5^#lXnT$e^j9&eP7Zxv|5@!~#s1`(i?^S=mkmIgi$ST<}Hq`M$* zH_{7Sk?e=a^`8l>9Y?v@D1s1-kz3Gi!Ht3_qyuLJQK&nx_i{(%0qnhehSh63C_6x+ zlmOhegE<4NNhzQh5o4s}{Q^x=3f|CBqSC==%g-SZNJ8?Sd*{@wwdto|d+m-3k_X^G z%XOH1l2q3oQY&y6DKWqa{g87I1GH;x>OO=1BUOI~xT73tEr4GK5t;#~6u2tDMi6@h z&4BCMLLG1&9S}4Fu1in{T=yZ?0jCt$rh{g{=>%gHBxnYlzJn@g2Aon*4jp4k|7fJi zt41O(fId}$Y%qCYSwNqvV3{hQPgO8Y*Xyuh4Cqr84Er-P7|^B%fhmAKRRQaQ5kd%{ rPgM{$GvPf$;rvd$=~x0w8kYL9>H|S00000NkvXXu0mjf(~|S- literal 0 HcmV?d00001 From 729968a509d15df0e20597bae683ceb465ff71eb Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 22:42:37 +0100 Subject: [PATCH 10/13] Proper model path --- .../mods/ironchest/client/TileEntityIronChestRenderer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java index 1c4aae5..bd5adf8 100644 --- a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java +++ b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java @@ -32,9 +32,8 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { private static Map locations; static { Builder builder = ImmutableMap.builder(); - for (IronChestType typ : IronChestType.values()) { - builder.put(typ, new ResourceLocation("ironchest","textures/model/"+typ.getModelTexture())); - } + for (IronChestType typ : IronChestType.values()) + builder.put(typ, new ResourceLocation("ironchest", "textures/models/" + typ.getModelTexture())); locations = builder.build(); } From a6e0afd0a01018c2b413ba6b3843c3c5f1fa8348 Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 22:48:02 +0100 Subject: [PATCH 11/13] Completely removed the configuration file since none of its values are even used --- .../cpw/mods/ironchest/ChestChangerType.java | 11 +---- .../java/cpw/mods/ironchest/IronChest.java | 40 +++++-------------- 2 files changed, 12 insertions(+), 39 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/ChestChangerType.java index 9c19c8c..304f3cc 100644 --- a/src/main/java/cpw/mods/ironchest/ChestChangerType.java +++ b/src/main/java/cpw/mods/ironchest/ChestChangerType.java @@ -10,7 +10,6 @@ import static cpw.mods.ironchest.IronChestType.SILVER; import static cpw.mods.ironchest.IronChestType.WOOD; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.common.registry.GameRegistry; public enum ChestChangerType { @@ -50,7 +49,7 @@ public enum ChestChangerType { return this.target.ordinal(); } - public ItemChestChanger buildItem(Configuration cfg) + public ItemChestChanger buildItem() { item = new ItemChestChanger(this); GameRegistry.registerItem(item, itemName); @@ -70,14 +69,6 @@ public enum ChestChangerType { } } - public static void buildItems(Configuration cfg) - { - for (ChestChangerType type : values()) - { - type.buildItem(cfg); - } - } - public static void generateRecipes() { for (ChestChangerType item : values()) diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index afbea12..0b15927 100644 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -1,11 +1,6 @@ package cpw.mods.ironchest; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; - -import org.apache.logging.log4j.Level; - -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -18,46 +13,33 @@ import cpw.mods.fml.common.registry.GameRegistry; @Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[10.10,);required-after:FML@[7.2,)") public class IronChest { public static BlockIronChest ironChestBlock; + @SidedProxy(clientSide = "cpw.mods.ironchest.client.ClientProxy", serverSide = "cpw.mods.ironchest.CommonProxy") public static CommonProxy proxy; + @Instance("IronChest") public static IronChest instance; - public static boolean CACHE_RENDER = true; - public static boolean OCELOTS_SITONCHESTS = true; @EventHandler - public void preInit(FMLPreInitializationEvent event) + public void preInit(FMLPreInitializationEvent e) { - Version.init(event.getVersionProperties()); - event.getModMetadata().version = Version.fullVersionString(); - Configuration cfg = new Configuration(event.getSuggestedConfigurationFile()); - try - { - cfg.load(); - ChestChangerType.buildItems(cfg); - CACHE_RENDER = cfg.get(Configuration.CATEGORY_GENERAL, "cacheRenderingInformation", true).getBoolean(true); - OCELOTS_SITONCHESTS = cfg.get(Configuration.CATEGORY_GENERAL, "ocelotsSitOnChests", true).getBoolean(true); - } - catch (Exception e) - { - FMLLog.log(Level.ERROR, e, "IronChest has a problem loading its configuration"); - } - finally - { - if (cfg.hasChanged()) - cfg.save(); - } + Version.init(e.getVersionProperties()); + e.getModMetadata().version = Version.fullVersionString(); + + for (ChestChangerType type : ChestChangerType.values()) + type.buildItem(); ironChestBlock = new BlockIronChest(); GameRegistry.registerBlock(ironChestBlock, ItemIronChest.class, "BlockIronChest"); + PacketHandler.INSTANCE.ordinal(); } @EventHandler - public void load(FMLInitializationEvent evt) + public void init(FMLInitializationEvent e) { for (IronChestType typ : IronChestType.values()) { - GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest."+typ.name(), typ.name()); + GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest." + typ.name(), typ.name()); proxy.registerTileEntitySpecialRenderer(typ); } IronChestType.registerBlocksAndRecipes(ironChestBlock); From 63a9fb558889c2a94a0a64bacabad3aef662aad9 Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 22:56:42 +0100 Subject: [PATCH 12/13] Properly established main mod identification --- src/main/java/cpw/mods/ironchest/IronChest.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index 0b15927..fe66704 100644 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -10,15 +10,17 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -@Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[10.10,);required-after:FML@[7.2,)") +@Mod(modid = IronChest.modid, name = IronChest.name) public class IronChest { - public static BlockIronChest ironChestBlock; + public static final String modid = "IronChest", name = "Iron Chests"; - @SidedProxy(clientSide = "cpw.mods.ironchest.client.ClientProxy", serverSide = "cpw.mods.ironchest.CommonProxy") - public static CommonProxy proxy; + @Instance(modid) + public static IronChest instance; - @Instance("IronChest") - public static IronChest instance; + @SidedProxy(clientSide = "cpw.mods.ironchest.client.ClientProxy", serverSide = "cpw.mods.ironchest.CommonProxy") + public static CommonProxy proxy; + + public static BlockIronChest ironChestBlock; @EventHandler public void preInit(FMLPreInitializationEvent e) @@ -39,7 +41,7 @@ public class IronChest { { for (IronChestType typ : IronChestType.values()) { - GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest." + typ.name(), typ.name()); + GameRegistry.registerTileEntityWithAlternatives(typ.clazz, modid + "." + typ.name(), typ.name()); proxy.registerTileEntitySpecialRenderer(typ); } IronChestType.registerBlocksAndRecipes(ironChestBlock); From 5df94b322e5e41c69c6619a98c175d0a020d8248 Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 23:02:27 +0100 Subject: [PATCH 13/13] Compacted the proxies into one universal proxy --- .../java/cpw/mods/ironchest/CommonProxy.java | 43 ------------------ .../java/cpw/mods/ironchest/IronChest.java | 7 +-- .../cpw/mods/ironchest/PacketHandler.java | 3 +- .../mods/ironchest/client/ClientProxy.java | 45 ------------------- .../mods/ironchest/net/UniversalProxy.java | 43 ++++++++++++++++++ 5 files changed, 49 insertions(+), 92 deletions(-) delete mode 100644 src/main/java/cpw/mods/ironchest/CommonProxy.java delete mode 100644 src/main/java/cpw/mods/ironchest/client/ClientProxy.java create mode 100644 src/main/java/cpw/mods/ironchest/net/UniversalProxy.java diff --git a/src/main/java/cpw/mods/ironchest/CommonProxy.java b/src/main/java/cpw/mods/ironchest/CommonProxy.java deleted file mode 100644 index af38477..0000000 --- a/src/main/java/cpw/mods/ironchest/CommonProxy.java +++ /dev/null @@ -1,43 +0,0 @@ -package cpw.mods.ironchest; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; - -public class CommonProxy implements IGuiHandler { - public void registerRenderInformation() - { - } - - public void registerTileEntitySpecialRenderer(IronChestType typ) - { - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - return null; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int X, int Y, int Z) - { - TileEntity te = world.getTileEntity(X, Y, Z); - if (te != null && te instanceof TileEntityIronChest) - { - TileEntityIronChest icte = (TileEntityIronChest) te; - return new ContainerIronChest(player.inventory, icte, icte.getType(), 0, 0); - } - else - { - return null; - } - } - - public World getClientWorld() - { - return null; - } - -} diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index fe66704..f371d70 100644 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -9,16 +9,17 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.ironchest.net.UniversalProxy; @Mod(modid = IronChest.modid, name = IronChest.name) public class IronChest { - public static final String modid = "IronChest", name = "Iron Chests"; + public static final String modid = "IronChest", name = "Iron Chests", proxyPath = "cpw.mods.ironchest.net.UniversalProxy"; @Instance(modid) public static IronChest instance; - @SidedProxy(clientSide = "cpw.mods.ironchest.client.ClientProxy", serverSide = "cpw.mods.ironchest.CommonProxy") - public static CommonProxy proxy; + @SidedProxy(clientSide = proxyPath, serverSide = proxyPath) + public static UniversalProxy proxy; public static BlockIronChest ironChestBlock; diff --git a/src/main/java/cpw/mods/ironchest/PacketHandler.java b/src/main/java/cpw/mods/ironchest/PacketHandler.java index d60e3a5..6cf4e71 100644 --- a/src/main/java/cpw/mods/ironchest/PacketHandler.java +++ b/src/main/java/cpw/mods/ironchest/PacketHandler.java @@ -9,6 +9,7 @@ import java.util.EnumMap; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; @@ -70,7 +71,7 @@ public enum PacketHandler { @Override protected void channelRead0(ChannelHandlerContext ctx, IronChestMessage msg) throws Exception { - World world = IronChest.proxy.getClientWorld(); + World world = FMLClientHandler.instance().getClient().theWorld; TileEntity te = world.getTileEntity(msg.x, msg.y, msg.z); if (te instanceof TileEntityIronChest) { diff --git a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java deleted file mode 100644 index c1737cc..0000000 --- a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java +++ /dev/null @@ -1,45 +0,0 @@ -package cpw.mods.ironchest.client; - -import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.ironchest.CommonProxy; -import cpw.mods.ironchest.IronChestType; -import cpw.mods.ironchest.TileEntityIronChest; - -public class ClientProxy extends CommonProxy { - @Override - public void registerRenderInformation() - { - TileEntityRendererChestHelper.instance = new IronChestRenderHelper(); - } - - @Override - public void registerTileEntitySpecialRenderer(IronChestType typ) - { - ClientRegistry.bindTileEntitySpecialRenderer(typ.clazz, new TileEntityIronChestRenderer()); - } - - @Override - public World getClientWorld() - { - return FMLClientHandler.instance().getClient().theWorld; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileEntityIronChest) - { - return GUIChest.GUI.buildGUI(IronChestType.values()[ID], player.inventory, (TileEntityIronChest) te); - } - else - { - return null; - } - } -} diff --git a/src/main/java/cpw/mods/ironchest/net/UniversalProxy.java b/src/main/java/cpw/mods/ironchest/net/UniversalProxy.java new file mode 100644 index 0000000..e66a559 --- /dev/null +++ b/src/main/java/cpw/mods/ironchest/net/UniversalProxy.java @@ -0,0 +1,43 @@ +package cpw.mods.ironchest.net; + +import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.ironchest.ContainerIronChest; +import cpw.mods.ironchest.IronChestType; +import cpw.mods.ironchest.TileEntityIronChest; +import cpw.mods.ironchest.client.GUIChest; +import cpw.mods.ironchest.client.IronChestRenderHelper; +import cpw.mods.ironchest.client.TileEntityIronChestRenderer; + +public class UniversalProxy implements IGuiHandler { + public void registerRenderInformation() { + TileEntityRendererChestHelper.instance = new IronChestRenderHelper(); + } + + public void registerTileEntitySpecialRenderer(IronChestType typ) { + ClientRegistry.bindTileEntitySpecialRenderer(typ.clazz, new TileEntityIronChestRenderer()); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te != null && te instanceof TileEntityIronChest) { + TileEntityIronChest chest = (TileEntityIronChest) te; + return new ContainerIronChest(player.inventory, chest, chest.getType(), 0, 0); + } else + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te != null && te instanceof TileEntityIronChest) + return GUIChest.GUI.buildGUI(IronChestType.values()[ID], player.inventory, (TileEntityIronChest) te); + else + return null; + } +} \ No newline at end of file