From b7d6edb3f8ff9c8579618fc6c4a83a5665b565ca Mon Sep 17 00:00:00 2001 From: T145 Date: Mon, 22 Sep 2014 16:46:23 -0400 Subject: [PATCH 1/4] Updated main project files --- .gitignore | 26 +++++++++++++----------- README.md | 15 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 8eef75c..ff8994c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,16 @@ -build/ -.classpath -.project -.gradle/ -eclipse/ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore files that are not wanted in general. +.* +_MACOSX +Thumbs.db + +# Project-specific dependencies bin/ +build/ repo/ -/run/ -.settings/ -#IDEA files from Gradle -.idea/ -/*.iml -/*.ipr -/*.iws +run/ diff --git a/README.md b/README.md index 7c2d0e9..77fbe71 100644 --- a/README.md +++ b/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 - -See http://files.minecraftforge.net/IronChests2/ for downloads +## Downloads +Head over [here](http://files.minecraftforge.net/IronChests2/) for downloads! \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee09edf..678d9d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 From 82ca2dccfd6c55150167aa4e995b6bd1cdf6d6c5 Mon Sep 17 00:00:00 2001 From: T145 Date: Tue, 23 Sep 2014 09:14:13 -0400 Subject: [PATCH 2/4] Removed the extremely useless config file --- .../cpw/mods/ironchest/ChestChangerType.java | 7 +++--- .../java/cpw/mods/ironchest/IronChest.java | 23 +------------------ 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/ChestChangerType.java index 65dd56a..ff36850 100644 --- a/src/main/java/cpw/mods/ironchest/ChestChangerType.java +++ b/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(); } } diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index 2cce098..b9b137b 100644 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -12,12 +12,7 @@ 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; @@ -43,23 +38,7 @@ public class IronChest { { 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(); - } + ChestChangerType.buildItems(); ironChestBlock = new BlockIronChest(); GameRegistry.registerBlock(ironChestBlock, ItemIronChest.class, "BlockIronChest"); PacketHandler.INSTANCE.ordinal(); From ba427904c73aa12d79d114294aa22db6449b2dcc Mon Sep 17 00:00:00 2001 From: T145 Date: Tue, 23 Sep 2014 09:20:03 -0400 Subject: [PATCH 3/4] Removed most of the unused components --- .../cpw/mods/ironchest/BlockIronChest.java | 10 ++---- .../java/cpw/mods/ironchest/CommonProxy.java | 2 -- .../mods/ironchest/ContainerIronChest.java | 6 ++-- .../java/cpw/mods/ironchest/IronChest.java | 11 ------- .../mods/ironchest/IronChestAIOcelotSit.java | 22 ------------- .../cpw/mods/ironchest/IronChestType.java | 9 +---- .../ironchest/MappableItemStackWrapper.java | 33 ------------------- .../ironchest/OcelotsSitOnChestsHandler.java | 27 --------------- .../cpw/mods/ironchest/ValidatingSlot.java | 21 ------------ src/main/java/cpw/mods/ironchest/Version.java | 7 +--- .../client/TileEntityIronChestRenderer.java | 16 +++------ 11 files changed, 13 insertions(+), 151 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 delete mode 100644 src/main/java/cpw/mods/ironchest/ValidatingSlot.java diff --git a/src/main/java/cpw/mods/ironchest/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/BlockIronChest.java index da4c957..3cb6ad8 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,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) { 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..c44c9bc 100644 --- a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java +++ b/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)); } } } diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index b9b137b..931188d 100644 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -18,7 +18,6 @@ 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; @@ -57,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) - { - } - } 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/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index 3a9c9d3..d98ec24 100644 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/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; 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 1e42515..0000000 --- a/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java +++ /dev/null @@ -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 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); - } - } - } - } -} 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); - } -} 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 4c986d9db3b1b316ca4854621ffc68b67ffaf18c Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Wed, 24 Sep 2014 10:59:12 -0400 Subject: [PATCH 4/4] Updated .gitignore - Re-added ignorance for IDE preferences --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index ff8994c..df794b1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,11 @@ Thumbs.db # Project-specific dependencies bin/ build/ +eclipse/ repo/ run/ + +# IDEA files +*.iml +*.ipr +*.iws