diff options
| author | miozune <miozune@gmail.com> | 2022-04-08 04:09:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 21:09:43 +0200 |
| commit | 7f13ce4521693a587ac8ba29172e3a7f136f4dde (patch) | |
| tree | 1eaf07a59a4307b85295dd2488e64fba6769d0d7 /src/main/java/gregtech/api/util | |
| parent | dc1dfc9b03104b301ac5ee0ae2cb3b12b8d15810 (diff) | |
| download | GT5-Unofficial-7f13ce4521693a587ac8ba29172e3a7f136f4dde.tar.gz GT5-Unofficial-7f13ce4521693a587ac8ba29172e3a7f136f4dde.tar.bz2 GT5-Unofficial-7f13ce4521693a587ac8ba29172e3a7f136f4dde.zip | |
Remove ADVANCEDENTROPICPROCESSING (#1005)
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index 34cf7ca80e..9ce949f274 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -217,7 +217,7 @@ public class GT_RecipeRegistrator { if(GT_Mod.gregtechproxy.mArcSmeltIntoAnnealed){ tMaterial.mMaterial = tMaterial.mMaterial.mSmeltInto.mArcSmeltInto; }else{ - tMaterial.mMaterial = tMaterial.mMaterial.mSmeltInto.mSmeltInto; + tMaterial.mMaterial = tMaterial.mMaterial.mSmeltInto.mSmeltInto; } continue; } @@ -264,17 +264,12 @@ public class GT_RecipeRegistrator { boolean tHide = (aData.mMaterial.mMaterial != Materials.Iron) && (GT_Mod.gregtechproxy.mHideRecyclingRecipes); RA.addPulveriserRecipe(aStack, new ItemStack[]{GT_OreDictUnificator.getDust(aData.mMaterial), GT_OreDictUnificator.getDust(aData.getByProduct(0)), GT_OreDictUnificator.getDust(aData.getByProduct(1)), GT_OreDictUnificator.getDust(aData.getByProduct(2))}, null, aData.mMaterial.mMaterial==Materials.Marble ? 1 : (int) Math.max(16, tAmount / M), 4, tHide); - if (aAllowHammer) + if (aAllowHammer) for (MaterialStack tMaterial : aData.getAllMaterialStacks()) if (tMaterial.mMaterial.contains(SubTag.CRYSTAL) && !tMaterial.mMaterial.contains(SubTag.METAL) && tMaterial.mMaterial != Materials.Glass) { if (RA.addForgeHammerRecipe(GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.getDust(aData.mMaterial), 200, 30)) break; } - ItemStack tDust = GT_OreDictUnificator.getDust(aData.mMaterial); - if (tDust != null && GT_ModHandler.addPulverisationRecipe(GT_Utility.copyAmount(1, aStack), tDust, GT_OreDictUnificator.getDust(aData.getByProduct(0)), 100, GT_OreDictUnificator.getDust(aData.getByProduct(1)), 100, true)) { - if (GregTech_API.sThaumcraftCompat != null) - GregTech_API.sThaumcraftCompat.addCrucibleRecipe(IThaumcraftCompat.ADVANCEDENTROPICPROCESSING, aStack, tDust, Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, Math.max(1, (aData.mMaterial.mAmount * 2) / M)))); - } } /** |