From 706d51a21b9300e9f8eb4573773e58df0752336d Mon Sep 17 00:00:00 2001 From: The_Fireplace Date: Thu, 30 Jul 2015 17:02:00 -0500 Subject: [PATCH 1/3] Fixed #48 --- src/main/java/cpw/mods/ironchest/ItemChestChanger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java index 84ab992..b98aacd 100755 --- a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java +++ b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java @@ -59,7 +59,7 @@ public class ItemChestChanger extends Item chestContents = new ItemStack[((TileEntityChest) te).getSizeInventory()]; for (int i = 0; i < chestContents.length; i++) chestContents[i] = ((TileEntityChest) te).getStackInSlot(i); - newchest = IronChestType.makeEntity(IronChestType.IRON.ordinal()); + newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal())); } } From a3899f4034cb0530a64bec069812700e3e85e9f5 Mon Sep 17 00:00:00 2001 From: The_Fireplace Date: Thu, 30 Jul 2015 17:02:25 -0500 Subject: [PATCH 2/3] Fixed #29 --- src/main/java/cpw/mods/ironchest/ChestChangerType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cpw/mods/ironchest/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/ChestChangerType.java index e6c6dc7..ba3ce49 100755 --- a/src/main/java/cpw/mods/ironchest/ChestChangerType.java +++ b/src/main/java/cpw/mods/ironchest/ChestChangerType.java @@ -75,7 +75,7 @@ public enum ChestChangerType { { Object targetMaterial = IronChestType.translateOreName(targetMat); Object sourceMaterial = IronChestType.translateOreName(sourceMat); - IronChestType.addRecipe(new ItemStack(item), recipe, 'm', targetMaterial, 's', sourceMaterial, 'G', Blocks.glass, 'O', Blocks.obsidian); + IronChestType.addRecipe(new ItemStack(item), recipe, 'm', targetMaterial, 's', sourceMaterial, 'G', "blockGlass", 'O', Blocks.obsidian); } } } From 34036bdff1353f7316090eec54b8a6fea2a42898 Mon Sep 17 00:00:00 2001 From: The_Fireplace Date: Thu, 30 Jul 2015 17:03:00 -0500 Subject: [PATCH 3/3] Fixed #47 and #45 --- src/main/java/cpw/mods/ironchest/ChestChangerType.java | 4 ++++ src/main/java/cpw/mods/ironchest/ItemChestChanger.java | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/cpw/mods/ironchest/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/ChestChangerType.java index ba3ce49..c4a1f0c 100755 --- a/src/main/java/cpw/mods/ironchest/ChestChangerType.java +++ b/src/main/java/cpw/mods/ironchest/ChestChangerType.java @@ -47,6 +47,10 @@ public enum ChestChangerType { this.descriptiveName = descriptiveName; this.recipe = recipe; } + + public IronChestType getSource(){ + return source; + } public boolean canUpgrade(IronChestType from) { diff --git a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java index b98aacd..96d048a 100755 --- a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java +++ b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java @@ -10,6 +10,7 @@ ******************************************************************************/ package cpw.mods.ironchest; +import net.minecraft.block.BlockChest; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -38,6 +39,15 @@ public class ItemChestChanger extends Item { if (world.isRemote) return false; + if(this.type.canUpgrade(IronChestType.WOOD)){ + if(!(world.getBlockState(pos).getBlock() instanceof BlockChest)){ + return false; + } + }else{ + if(world.getBlockState(pos) != IronChest.ironChestBlock.getStateFromMeta(IronChestType.valueOf(type.getSource().getName().toUpperCase()).ordinal())){ + return false; + } + } TileEntity te = world.getTileEntity(pos); TileEntityIronChest newchest = new TileEntityIronChest(); ItemStack[] chestContents = new ItemStack[27];