diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-24 18:41:53 +0200 |
---|---|---|
committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-24 18:41:53 +0200 |
commit | a2ad9c9e8359f693f20bc0cc880fbf2bf2785868 (patch) | |
tree | 682ba8dea153e46bdab4bfedfff49d375bd6947a /src/main | |
parent | 8f851f0f685de48982578fda5d55774003c4af87 (diff) | |
download | GT5-Unofficial-a2ad9c9e8359f693f20bc0cc880fbf2bf2785868.tar.gz GT5-Unofficial-a2ad9c9e8359f693f20bc0cc880fbf2bf2785868.tar.bz2 GT5-Unofficial-a2ad9c9e8359f693f20bc0cc880fbf2bf2785868.zip |
fixed naquadah cell reverse processing
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GT_OreDictUnificator.java | 1 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 5d00a999e1..b0e3fc62db 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1701,4 +1701,6 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { public short[] getRGBA() { return mRGBa; } + + public static volatile int VERSION = 509; }
\ No newline at end of file diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java index 6e304a04a7..b404299fad 100644 --- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java @@ -317,6 +317,7 @@ public class GT_OreDictUnificator { public static ItemStack getIngotOrDust(MaterialStack aMaterial) { ItemStack rStack = getIngot(aMaterial); + if(aMaterial!=null&&aMaterial.mMaterial!=null&&(aMaterial.mMaterial==Materials.Naquadah||aMaterial.mMaterial==Materials.NaquadahEnriched))rStack = getDust(aMaterial); if (rStack == null) rStack = getDust(aMaterial); return rStack; } diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index 390d7f0d3c..5be4101e5f 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -160,6 +160,7 @@ public class GT_RecipeRegistrator { if (aStack == null || aMaterial == null || aMaterialAmount <= 0 || aMaterial.contains(SubTag.NO_SMELTING) || (aMaterialAmount > M && aMaterial.contains(SubTag.METAL))) return; aMaterialAmount /= aStack.stackSize; + if(aMaterial==Materials.Naquadah||aMaterial==Materials.NaquadahEnriched)return; if (aAllowAlloySmelter) GT_ModHandler.addSmeltingAndAlloySmeltingRecipe(GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.getIngot(aMaterial.mSmeltInto, aMaterialAmount)); else |