diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
| commit | 148aa7636d15ccf0593b31f39529aea10eba3c19 (patch) | |
| tree | be6bd89b1566812d7843dc0cb292fc1f841d6079 /src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | |
| parent | 08217ad00eb35780f2162d5b136a18ef51fe34a1 (diff) | |
| parent | bf25038fc1f45d690c762fcf4e4d2c427aba19fe (diff) | |
| download | GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.gz GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.bz2 GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.zip | |
Merge branch 'Pollution-code' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_RecipeRegistrator.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index bbac9cd25f..2a7fae583b 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -149,10 +149,12 @@ public class GT_RecipeRegistrator { if (aStack == null || aMaterial == null || aMaterial.mSmeltInto.mStandardMoltenFluid == null || !aMaterial.contains(SubTag.SMELTING_TO_FLUID) || (L * aMaterialAmount) / (M * aStack.stackSize) <= 0) return; ItemData tData = GT_OreDictUnificator.getItemData(aStack); - boolean tHide = (aMaterial != Materials.Iron)&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes); - if(tHide && tData!=null&&tData.hasValidPrefixData()&&tData.mPrefix==OrePrefixes.ingot){ - tHide=false; - } + boolean tHide = aStack.getUnlocalizedName().startsWith("gt.blockmachines")&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes); + if(GT_Mod.gregtechproxy.mHideRecyclingRecipes&&tData!=null&&tData.hasValidPrefixData()&&!(tData.mPrefix==OrePrefixes.dust||tData.mPrefix==OrePrefixes.ingot||tData.mPrefix==OrePrefixes.block|tData.mPrefix==OrePrefixes.plate)){tHide=true;} +// boolean tHide = (aMaterial != Materials.Iron && aMaterial!= Materials.Redstone)&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes); +// if(tHide && tData!=null&&tData.hasValidPrefixData()&&tData.mPrefix==OrePrefixes.ingot){ +// tHide=false; +// } RA.addFluidSmelterRecipe(GT_Utility.copyAmount(1, aStack), aByproduct == null ? null : aByproduct.mMaterial.contains(SubTag.NO_SMELTING) || !aByproduct.mMaterial.contains(SubTag.METAL) ? aByproduct.mMaterial.contains(SubTag.FLAMMABLE) ? GT_OreDictUnificator.getDust(Materials.Ash, aByproduct.mAmount / 2) : aByproduct.mMaterial.contains(SubTag.UNBURNABLE) ? GT_OreDictUnificator.getDustOrIngot(aByproduct.mMaterial.mSmeltInto, aByproduct.mAmount) : null : GT_OreDictUnificator.getIngotOrDust(aByproduct.mMaterial.mSmeltInto, aByproduct.mAmount), aMaterial.mSmeltInto.getMolten((L * aMaterialAmount) / (M * aStack.stackSize)), 10000, (int) Math.max(1, (24 * aMaterialAmount) / M), Math.max(8, (int) Math.sqrt(2 * aMaterial.mSmeltInto.mStandardMoltenFluid.getTemperature())), tHide); } @@ -344,4 +346,4 @@ public class GT_RecipeRegistrator { } } } -} +}
\ No newline at end of file |