diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
22 files changed, 313 insertions, 179 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java index bdd1109a93..39b33b2d5f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java @@ -15,8 +15,10 @@ public class ProcessingAll implements gregtech.api.interfaces.IOreRecipeRegistra @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) - && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(aStack))) - aStack.getItem().setMaxStackSize(aPrefix.mDefaultStackSize); + if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) && (aPrefix.mDefaultStackSize + < aStack.getItem() + .getItemStackLimit(aStack))) + aStack.getItem() + .setMaxStackSize(aPrefix.mDefaultStackSize); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index 6c1d1896b1..9eb2fe13e0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -89,9 +89,9 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis GT_Utility.ItemNBT.addEnchantment( tOutput, gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, - EnchantmentHelper - .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) - + 1); + EnchantmentHelper.getEnchantmentLevel( + gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, + tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(25L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 4043ea02aa..c9345964f1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -38,10 +38,26 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - if (tStack1 != null) GT_ModHandler - .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); - if (tStack2 != null) GT_ModHandler - .removeRecipeDelayed(tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2); + if (tStack1 != null) GT_ModHandler.removeRecipeDelayed( + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1); + if (tStack2 != null) GT_ModHandler.removeRecipeDelayed( + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2); if (tStack3 != null) { GT_ModHandler.removeRecipeDelayed( tStack3, @@ -69,7 +85,8 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist } if (GregTech_API.sRecipeFile.get( ConfigCategories.Recipes.storageblockcrafting, - OrePrefixes.block.get(aMaterial).toString(), + OrePrefixes.block.get(aMaterial) + .toString(), false)) { if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), @@ -90,7 +107,8 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (GregTech_API.sRecipeFile.get( ConfigCategories.Recipes.storageblockdecrafting, - OrePrefixes.block.get(aMaterial).toString(), + OrePrefixes.block.get(aMaterial) + .toString(), tStack2 != null)) { if (tStack3 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index aa478a5560..e088330204 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -60,8 +60,10 @@ public class ProcessingCell implements IOreRecipeRegistrator { } else { tStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); if (tStack == null) { - tStack = GT_OreDictUnificator - .get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + tStack = GT_OreDictUnificator.get( + OrePrefixes.cell, + tMat.mMaterial, + tMat.mAmount); } } if (tItemAmount + tMat.mAmount * 3628800L @@ -81,8 +83,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.add(GT_Utility.copyAmount(64L, tStack)); tStack.stackSize -= 64; } - int tThisCapsuleCount = GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize(tStack); + int tThisCapsuleCount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + tStack); if (tStack.stackSize > 0 && tCapsuleCount + tThisCapsuleCount <= 64L) { if (tCapsuleCount + tThisCapsuleCount < 0L ? tList.size() < 5 : tList.size() < 6) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index 9062533d93..2a6678c485 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -26,7 +26,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.tea"), false); break; @@ -38,7 +39,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr false); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.grapejuice"), false); break; @@ -72,7 +74,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr true); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.potatojuice"), true); break; @@ -90,7 +93,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr false); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.lemonjuice"), false); GT_Values.RA.addBrewingRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 75ba5cc4af..8df5270399 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -33,8 +33,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr ItemStack aStack) { switch (aPrefix) { case dust: - if (aMaterial.mFuelPower > 0) GT_Values.RA - .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aMaterial.mFuelPower > 0) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower, + aMaterial.mFuelType); if (GT_Utility.getFluidForFilledItem(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true) == null) GT_Values.RA.addCannerRecipe( @@ -69,8 +72,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null, null, aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator - .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) + ? GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + aMaterial.mSmeltInto, + tDustStack, + 1L) : GT_Utility.copyAmount(1L, tDustStack), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, @@ -134,11 +140,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } if ((tDustStack.stackSize > 0) && (tList.size() < 6) && (tCapsuleCount - + GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack) + + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + tDustStack) <= 64L)) { - tCapsuleCount += GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack); + tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + tDustStack); tList.add(tDustStack); } } @@ -154,8 +160,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && ((tFluid = GT_Utility.getFluidForFilledItem((ItemStack) tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; - tCapsuleCount -= GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize((ItemStack) tList.get(i)); + tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + (ItemStack) tList.get(i)); tList.remove(i); break; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java index 42b5571b2b..f8b1519b8a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java @@ -46,7 +46,10 @@ public class ProcessingDye implements IOreRecipeRegistrator { null, null, Materials.Water.getFluid(216L), - FluidRegistry.getFluidStack("dye.watermixed." + aDye.name().toLowerCase(Locale.ENGLISH), 192), + FluidRegistry.getFluidStack( + "dye.watermixed." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 192), null, 16, 4); @@ -56,7 +59,10 @@ public class ProcessingDye implements IOreRecipeRegistrator { null, null, GT_ModHandler.getDistilledWater(288L), - FluidRegistry.getFluidStack("dye.watermixed." + aDye.name().toLowerCase(Locale.ENGLISH), 216), + FluidRegistry.getFluidStack( + "dye.watermixed." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 216), null, 16, 4); @@ -64,7 +70,10 @@ public class ProcessingDye implements IOreRecipeRegistrator { GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2), Materials.SulfuricAcid.getFluid(432), - FluidRegistry.getFluidStack("dye.chemical." + aDye.name().toLowerCase(Locale.ENGLISH), 288), + FluidRegistry.getFluidStack( + "dye.chemical." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 288), GT_Values.NI, 600, 48); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index bfd85af1a4..27a11896f6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -31,8 +31,11 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr break; case "foodDough": GT_ModHandler.removeFurnaceSmelting(aStack); - GT_Values.RA - .addBenderRecipe(GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); + GT_Values.RA.addBenderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Food_Flat_Dough.get(1L), + 16, + 4); GT_Values.RA.addMixerRecipe( aStack, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 0a3315a259..5bc183a1da 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -232,8 +232,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 16); break; case gemFlawed: - if (aFuelPower) GT_Values.RA - .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower, + aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -305,8 +308,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); } } - GT_Values.RA - .addForgeHammerRecipe(aStack, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), 64, 16); + GT_Values.RA.addForgeHammerRecipe( + aStack, + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), + 64, + 16); for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver // Recipe // adder diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index bc2534204a..fbc0766f81 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -52,8 +52,14 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator - .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator.registerReverseMacerating( + aStack, + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null, + false); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( GT_Utility.copyAmount(1L, aStack), @@ -141,8 +147,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Enable crafting with hammer if tier is < IV. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), GT_Proxy.tBits, @@ -164,8 +172,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist (int) Math.max(aMaterialMass * 3L, 1L), calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), GT_Proxy.tBits, @@ -185,8 +195,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // If tier < IV add manual crafting. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), GT_Proxy.tBits, @@ -205,8 +217,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), GT_Proxy.tBits, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index 6e3a8eac00..31c75fbcbb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -56,8 +56,10 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), 2400, 30); - final ITexture lensCoverTexture = TextureFactory - .of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false); + final ITexture lensCoverTexture = TextureFactory.of( + Textures.BlockIcons.OVERLAY_LENS, + aMaterial.mRGBa, + false); GregTech_API.registerCover( aStack, TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 43b4e8b98f..4bb3dd2072 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -112,8 +112,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "wood2charcoalsmelting", + true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -122,8 +124,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "wood2charcoalsmelting", + true)) { GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } } @@ -155,14 +159,12 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i)); - GT_ModHandler - .addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize - : tStack.stackSize * 5 / 4, - tStack), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + tStack), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount( tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), @@ -176,8 +178,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "wood2charcoalsmelting", + true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -205,16 +209,15 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - GT_ModHandler - .addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize - : tStack.stackSize * 5 / 4, - tStack), - new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + tStack), + new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility - .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + GT_Utility.copyAmount( + tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), + tStack), new Object[] { GT_Utility.copyAmount(1L, aStack) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index d62da2e857..af95ed62fd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -42,8 +42,14 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator - .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator.registerReverseMacerating( + aStack, + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null, + false); if (!aMaterial.contains(SubTag.NO_SMELTING)) { GT_Values.RA.addAlloySmelterRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 0bc88296da..ca585feab6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -18,12 +18,13 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra private ArrayList<Materials> mAlreadyListedOres = new ArrayList(1000); public ProcessingOre() { - for (OrePrefixes tPrefix : OrePrefixes.values()) - if ((tPrefix.name().startsWith("ore")) && (tPrefix != OrePrefixes.orePoor) - && (tPrefix != OrePrefixes.oreSmall) - && (tPrefix != OrePrefixes.oreRich) - && (tPrefix != OrePrefixes.oreNormal)) - tPrefix.add(this); + for (OrePrefixes tPrefix : OrePrefixes.values()) if ((tPrefix.name() + .startsWith("ore")) + && (tPrefix != OrePrefixes.orePoor) + && (tPrefix != OrePrefixes.oreSmall) |