diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-06-15 08:41:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 08:41:31 +0200 |
| commit | e93fefc3737a133153817e8536be0319d4e68ef8 (patch) | |
| tree | 96d4855950da10500405ba0f8b375c958548ac14 /src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | |
| parent | 6507be25e5e4af1dc07a18d7807b8cbf3ff437c2 (diff) | |
| parent | a1a47c928282fa729738c281f007536bc2be7fa9 (diff) | |
| download | GT5-Unofficial-e93fefc3737a133153817e8536be0319d4e68ef8.tar.gz GT5-Unofficial-e93fefc3737a133153817e8536be0319d4e68ef8.tar.bz2 GT5-Unofficial-e93fefc3737a133153817e8536be0319d4e68ef8.zip | |
Merge pull request #561 from Prometheus0000/format
Formatting change
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_RecipeRegistrator.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index cbaea6af3a..0868ff41c8 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -260,14 +260,15 @@ public class GT_RecipeRegistrator { long tAmount = 0; for (MaterialStack tMaterial : aData.getAllMaterialStacks()) tAmount += tMaterial.mAmount * tMaterial.mMaterial.getMass(); - boolean tHide = (aData.mMaterial.mMaterial != Materials.Iron)&&(GT_Mod.gregtechproxy.mHideRecyclingRecipes); + 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) 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; - } + 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) |