Merge 4c986d9db3 into 62abf62ee5

.gitignore

@@ -1,14 +1,22 @@
-build/
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-.classpath
+#
-.project
+# If you find yourself ignoring temporary files generated by your text editor
-.gradle/
+# or operating system, you probably want to add a global ignore instead:
-eclipse/
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore files that are not wanted in general.
+.*
+_MACOSX
+Thumbs.db
+
+# Project-specific dependencies
 bin/
+build/
+eclipse/
 repo/
-/run/
+run/
-.settings/
+
-#IDEA files from Gradle
+# IDEA files
-.idea/
+*.iml
-/*.iml
+*.ipr
-/*.ipr
+*.iws
-/*.iws

README.md

@@ -1,10 +1,11 @@
-ironchest
+# IronChest
-=========
+A Minecraft mod that adds more chest variants to the game!
 
-Iron Chest minecraft mod
+## License
+[GPL v3](http://www.gnu.org/copyleft/gpl.html)
 
-a GPL v3 licensed mod by cpw
+## Maintainers
+Originally by cpw, currently maintained by ProgWML6
 
-Currently Maintained by ProgWML6
+## Downloads
-
+Head over [here](http://files.minecraftforge.net/IronChests2/) for downloads!
-See http://files.minecraftforge.net/IronChests2/ for downloads

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Sep 10 01:32:34 EDT 2014
+#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

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,16 +36,15 @@ 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;
 
 public class BlockIronChest extends BlockContainer {
-
     private Random random;
 
-    @SideOnly(Side.CLIENT)
-    private IIcon[][] icons;
-
     public BlockIronChest()
     {
         super(Material.iron);
@@ -228,7 +225,6 @@ public class BlockIronChest extends BlockContainer {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
     {

src/main/java/cpw/mods/ironchest/ChestChangerType.java

@@ -16,7 +16,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 {
@@ -56,7 +55,7 @@ public enum ChestChangerType {
         return this.target.ordinal();
     }
 
-    public ItemChestChanger buildItem(Configuration cfg)
+    public ItemChestChanger buildItem()
     {
         item = new ItemChestChanger(this);
         GameRegistry.registerItem(item, itemName);
@@ -76,11 +75,11 @@ public enum ChestChangerType {
         }
     }
 
-    public static void buildItems(Configuration cfg)
+    public static void buildItems()
     {
         for (ChestChangerType type : values())
         {
-            type.buildItem(cfg);
+            type.buildItem();
         }
     }
 

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

src/main/java/cpw/mods/ironchest/ContainerIronChest.java

@@ -10,13 +10,13 @@
  ******************************************************************************/
 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 {
@@ -85,13 +85,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));
                 }
             }
         }

src/main/java/cpw/mods/ironchest/IronChest.java

@@ -12,18 +12,12 @@ package cpw.mods.ironchest;
 
 import net.minecraft.init.Blocks;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.oredict.OreDictionary;
-
-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;
@@ -43,23 +37,7 @@ public class IronChest {
     {
         Version.init(event.getVersionProperties());
         event.getModMetadata().version = Version.fullVersionString();
-        Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
+        ChestChangerType.buildItems();
-        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();
-        }
         ironChestBlock = new BlockIronChest();
         GameRegistry.registerBlock(ironChestBlock, ItemIronChest.class, "BlockIronChest");
         PacketHandler.INSTANCE.ordinal();
@@ -78,16 +56,6 @@ 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)
-    {
-    }
-
 }

src/main/java/cpw/mods/ironchest/IronChestAIOcelotSit.java

@@ -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);
-    }
-*/}

src/main/java/cpw/mods/ironchest/IronChestType.java

@@ -13,11 +13,9 @@ 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;
@@ -226,11 +224,6 @@ public enum IronChestType {
     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;

src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java

@@ -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);
-    }
-}

src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java

@@ -1,27 +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<EntityAITasks.EntityAITaskEntry> tasks = ocelot.tasks.taskEntries;
-
-            for (EntityAITasks.EntityAITaskEntry task : tasks) {
-                if (task.priority == 6 && (task.action instanceof EntityAIOcelotSit) && !(task.action instanceof IronChestAIOcelotSit)) {
-                    task.action = new IronChestAIOcelotSit(ocelot, 0.4F);
-                }
-            }
-        }
-    }
-}

src/main/java/cpw/mods/ironchest/ValidatingSlot.java

@@ -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);
-    }
-}

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 major, minor, rev, build, mcversion;
-    private static String minor;
-    private static String rev;
-    private static String build;
-    @SuppressWarnings("unused")
-    private static String mcversion;
 
     static void init(Properties properties)
     {

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<MappableItemStackWrapper, Integer> renderList = new HashMap<MappableItemStackWrapper, Integer>();
-
     private static Map<IronChestType, ResourceLocation> locations;
     static {
         Builder<IronChestType, ResourceLocation> builder = ImmutableMap.<IronChestType,ResourceLocation>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) {