diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-24 18:41:53 +0200 |
|---|---|---|
| committer | Shawn Buckley <shawntbuckley@gmail.com> | 2015-10-24 13:41:56 -0400 |
| commit | 2d7a1087273a3dcb9e36fa68edffd7fc1bd62f50 (patch) | |
| tree | ab97bcf89fcd22f1eb178bb6ea2c36fa92d97699 /src/main | |
| parent | c402ce9404f4710261ea55f02a7f991965ebbccd (diff) | |
| download | GT5-Unofficial-2d7a1087273a3dcb9e36fa68edffd7fc1bd62f50.tar.gz GT5-Unofficial-2d7a1087273a3dcb9e36fa68edffd7fc1bd62f50.tar.bz2 GT5-Unofficial-2d7a1087273a3dcb9e36fa68edffd7fc1bd62f50.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 14dd8e0a5f..a5c382a227 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1676,4 +1676,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 63b6699200..39eabad202 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 3eea24785f..ab35b292f1 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 |