From 67fcd20e21832f3811d089bbe1d7f4dd351d074c Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 27 May 2013 11:34:19 -0400 Subject: [PATCH] Finally fixed the transmutation stone crafting recipe bug, careof https://github.com/cpw. --- build_number.properties | 4 ++-- ee3_common/com/pahimar/ee3/EquivalentExchange3.java | 6 +++--- ee3_common/com/pahimar/ee3/emc/DynEMC.java | 1 - ee3_common/com/pahimar/ee3/emc/EmcValue.java | 4 ---- ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java | 6 ++++-- ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java | 6 ++++-- version.xml | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build_number.properties b/build_number.properties index 9ae6207b..4c77f071 100644 --- a/build_number.properties +++ b/build_number.properties @@ -1,3 +1,3 @@ -#Mon, 13 May 2013 21:28:00 -0400 +#Mon, 27 May 2013 09:17:55 -0400 -build_number=14 +build_number=17 diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index 2712e544..81950217 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -24,12 +24,12 @@ import com.pahimar.ee3.core.proxy.CommonProxy; import com.pahimar.ee3.core.util.LogHelper; import com.pahimar.ee3.core.util.VersionHelper; import com.pahimar.ee3.creativetab.CreativeTabEE3; -import com.pahimar.ee3.emc.DynEMC; import com.pahimar.ee3.item.ModItems; import com.pahimar.ee3.item.crafting.RecipesAlchemicalBagDyes; import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.network.PacketHandler; +import com.pahimar.ee3.recipe.RecipesTransmutationStone; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.FingerprintWarning; @@ -151,7 +151,7 @@ public class EquivalentExchange3 { proxy.initRenderingAndTextures(); // Load the Transmutation Stone recipes - //RecipesTransmutationStone.init(); + RecipesTransmutationStone.init(); // Add in the ability to dye Alchemical Bags CraftingManager.getInstance().getRecipeList().add(new RecipesAlchemicalBagDyes()); @@ -167,6 +167,6 @@ public class EquivalentExchange3 { // Initialize the Addon Handler AddonHandler.init(); - DynEMC.getInstance().toString(); + //DynEMC.getInstance().toString(); } } diff --git a/ee3_common/com/pahimar/ee3/emc/DynEMC.java b/ee3_common/com/pahimar/ee3/emc/DynEMC.java index cf307ea3..ce9a7a49 100644 --- a/ee3_common/com/pahimar/ee3/emc/DynEMC.java +++ b/ee3_common/com/pahimar/ee3/emc/DynEMC.java @@ -10,7 +10,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.pahimar.ee3.core.util.ItemUtil; import com.pahimar.ee3.item.CustomStackWrapper; public class DynEMC { diff --git a/ee3_common/com/pahimar/ee3/emc/EmcValue.java b/ee3_common/com/pahimar/ee3/emc/EmcValue.java index 3cc0e8bd..48b45153 100644 --- a/ee3_common/com/pahimar/ee3/emc/EmcValue.java +++ b/ee3_common/com/pahimar/ee3/emc/EmcValue.java @@ -1,11 +1,7 @@ package com.pahimar.ee3.emc; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; /** * Equivalent-Exchange-3 diff --git a/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java index 7ddfaf26..3f0e9274 100644 --- a/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java @@ -63,9 +63,11 @@ public class ItemMiniumStone extends ItemEE @Override public ItemStack getContainerItemStack(ItemStack itemStack) { - itemStack.setItemDamage(itemStack.getItemDamage() + 1); + ItemStack copiedStack = itemStack.copy(); + + copiedStack.setItemDamage(copiedStack.getItemDamage() + 1); - return itemStack; + return copiedStack; } @Override diff --git a/ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java b/ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java index bbb5945b..9438462e 100644 --- a/ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java @@ -70,9 +70,11 @@ public class ItemPhilosophersStone extends ItemEE @Override public ItemStack getContainerItemStack(ItemStack itemStack) { - itemStack.setItemDamage(itemStack.getItemDamage() + 1); + ItemStack copiedStack = itemStack.copy(); + + copiedStack.setItemDamage(copiedStack.getItemDamage() + 1); - return itemStack; + return copiedStack; } @Override diff --git a/version.xml b/version.xml index 84576acb..11759920 100644 --- a/version.xml +++ b/version.xml @@ -8,5 +8,5 @@ pre1e|http://goo.gl/Ria2V pre1f|http://goo.gl/Ria2V pre1g|http://goo.gl/Ria2V - pre1g|http://goo.gl/Ria2V + pre1h|http://goo.gl/Ria2V