diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
51 files changed, 4299 insertions, 4570 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java index 39b33b2d5f..2f390b25e8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java @@ -14,11 +14,11 @@ 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))) + ItemStack aStack) { + if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) + && (aPrefix.mDefaultStackSize < aStack.getItem() + .getItemStackLimit(aStack))) aStack.getItem() - .setMaxStackSize(aPrefix.mDefaultStackSize); + .setMaxStackSize(aPrefix.mDefaultStackSize); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index 9eb2fe13e0..0e5a2ae241 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -19,104 +19,103 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { ItemStack tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.smite, - EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); + tOutput, + Enchantment.smite, + EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.HolyWater.getFluid(25L), - tOutput, - null, - null, - null, - 100, - 2); + GT_Utility.copyAmount(1L, aStack), + Materials.HolyWater.getFluid(25L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.fireAspect, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); + tOutput, + Enchantment.fireAspect, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid(25L), - tOutput, - null, - null, - null, - 100, - 2); + GT_Utility.copyAmount(1L, aStack), + Materials.FierySteel.getFluid(25L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.fireAspect, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); + tOutput, + Enchantment.fireAspect, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Blaze.getMolten(18L), - tOutput, - null, - null, - null, - 100, - 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Blaze.getMolten(18L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.knockback, - EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); + tOutput, + Enchantment.knockback, + EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Rubber.getMolten(18L), - tOutput, - null, - null, - null, - 100, - 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Rubber.getMolten(18L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( - tOutput, - gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, - EnchantmentHelper.getEnchantmentLevel( - gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, - tOutput) + 1); + tOutput, + gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, + EnchantmentHelper + .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Mercury.getFluid(25L), - tOutput, - null, - null, - null, - 100, - 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(25L), + tOutput, + null, + null, + null, + 100, + 2); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aPrefix) { case arrowGtWood: GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', - OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', + OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); case arrowGtPlastic: GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.arrowGtPlastic, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Plastic), 'F', - OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.arrowGtPlastic, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Plastic), 'F', + OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); default: break; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index 9fdf755c8a..9e57768273 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -16,9 +16,9 @@ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aOreDictName.equals("beansCocoa")) GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 212459ab9c..5add59e42d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -18,17 +18,17 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - aMaterial == MaterialsBotania.Livingrock || aMaterial == MaterialsBotania.Livingwood - || aMaterial == MaterialsBotania.Dreamwood ? GT_Utility.getIntegratedCircuit(3) : null, - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), - null, - (int) Math.max(aMaterial.getMass() * 10L, 1L), - 30); + GT_Utility.copyAmount(1L, aStack), + aMaterial == MaterialsBotania.Livingrock || aMaterial == MaterialsBotania.Livingwood + || aMaterial == MaterialsBotania.Dreamwood ? GT_Utility.getIntegratedCircuit(3) : null, + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), + null, + (int) Math.max(aMaterial.getMass() * 10L, 1L), + 30); } } @@ -38,66 +38,42 @@ 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, - tStack3, - tStack3, - tStack3, - tStack3, - tStack3, - tStack3, - tStack3, - tStack3); + GT_ModHandler + .removeRecipeDelayed(tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3); } if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Block.get(0L), - aMaterial.getMolten(1296L), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - 288, - 8); + ItemList.Shape_Mold_Block.get(0L), + aMaterial.getMolten(1296L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + 288, + 8); } } } if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.storageblockcrafting, - OrePrefixes.block.get(aMaterial) - .toString(), - false)) { + ConfigCategories.Recipes.storageblockcrafting, + OrePrefixes.block.get(aMaterial) + .toString(), + false)) { if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial) }); if (tStack2 != null) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial) }); if (tStack1 != null) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial) }); } } if (tStack1 != null) tStack1.stackSize = 9; @@ -106,10 +82,10 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.addForgeHammerRecipe(aStack, tStack2, 100, 24); if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.storageblockdecrafting, - OrePrefixes.block.get(aMaterial) - .toString(), - tStack2 != null)) { + ConfigCategories.Recipes.storageblockdecrafting, + OrePrefixes.block.get(aMaterial) + .toString(), + tStack2 != null)) { if (tStack3 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); if (tStack2 != null) @@ -120,21 +96,21 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (!OrePrefixes.block.isIgnored(aMaterial)) { GT_ModHandler.addCompressionRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - 300, - calculateRecipeEU(aMaterial, 2)); + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + 300, + calculateRecipeEU(aMaterial, 2)); } switch (aMaterial.mName) { case "Mercury" -> System.err.println( - "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); + "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); case "Iron", "WroughtIron", "Steel" -> GT_Values.RA.addAssemblerRecipe( - ItemList.IC2_Compressed_Coal_Ball.get(8L), - GT_Utility.copyAmount(1L, aStack), - ItemList.IC2_Compressed_Coal_Chunk.get(1L), - 400, - 4); + ItemList.IC2_Compressed_Coal_Ball.get(8L), + GT_Utility.copyAmount(1L, aStack), + ItemList.IC2_Compressed_Coal_Chunk.get(1L), + 400, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index 96acfa1f17..278b7461ec 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -15,14 +15,14 @@ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(2L, aStack), - GT_Proxy.tBits, - new Object[] { "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) }); + GT_Utility.copyAmount(2L, aStack), + GT_Proxy.tBits, + new Object[] { "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index c7c92b8daf..9d3475bcc8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -23,7 +23,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { switch (aPrefix) { case cell -> { if (aMaterial == Materials.Empty) { @@ -34,12 +34,12 @@ public class ProcessingCell implements IOreRecipeRegistrator { } else { if (aMaterial.mFuelPower > 0) { GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getFluidForFilledItem(aStack, true) == null - ? GT_Utility.getContainerItem(aStack, true) - : null, - aMaterial.mFuelPower, - aMaterial.mFuelType); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getFluidForFilledItem(aStack, true) == null + ? GT_Utility.getContainerItem(aStack, true) + : null, + aMaterial.mFuelPower, + aMaterial.mFuelType); } if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { int tAllAmount = 0; @@ -48,9 +48,9 @@ public class ProcessingCell implements IOreRecipeRegistrator { } long tItemAmount = 0L; long tCapsuleCount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(aStack) - * -tAllAmount; + * -tAllAmount; long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L - : 1L; + : 1L; ArrayList<ItemStack> tList = new ArrayList<>(); for (MaterialStack tMat : aMaterial.mMaterialList) { if (tMat.mAmount > 0L) { @@ -60,34 +60,29 @@ 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 - <= aStack.getMaxStackSize() * aMaterial.getDensity()) { + <= aStack.getMaxStackSize() * aMaterial.getDensity()) { tItemAmount += tMat.mAmount * 3628800L; if (tStack != null) { tStack.stackSize = ((int) (tStack.stackSize * tDensityMultiplier)); while ((tStack.stackSize > 64) - && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L < 0L - ? tList.size() < 5 - : tList.size() < 6) - && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L - <= 64L)) { + && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L + < 0L ? tList.size() < 5 : tList.size() < 6) + && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L + <= 64L)) { tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L; 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) { + : tList.size() < 6) { tCapsuleCount += tThisCapsuleCount; tList.add(tStack); } @@ -102,45 +97,45 @@ public class ProcessingCell implements IOreRecipeRegistrator { if (GT_Utility.getFluidForFilledItem(aStack, true) == null) { // dust stuffed cell e.g. Phosphate, Phosphorous Pentoxide GT_Values.RA.addElectrolyzerRecipe( - GT_Utility.copyAmount(tItemAmount, aStack), - tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, - tList.get(0), - tList.size() >= 2 ? tList.get(1) : null, - tList.size() >= 3 ? tList.get(2) : null, - tList.size() >= 4 ? tList.get(3) : null, - tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null - : ItemList.Cell_Empty.get(-tCapsuleCount), - (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), - Math.min(4, tList.size()) * 30); + GT_Utility.copyAmount(tItemAmount, aStack), + tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, + tList.get(0), + tList.size() >= 2 ? tList.get(1) : null, + tList.size() >= 3 ? tList.get(2) : null, + tList.size() >= 4 ? tList.get(3) : null, + tList.size() >= 5 ? tList.get(4) : null, + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null + : ItemList.Cell_Empty.get(-tCapsuleCount), + (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), + Math.min(4, tList.size()) * 30); } else { long tCellBalance = tCapsuleCount + tItemAmount - 1; GT_Values.RA.addElectrolyzerRecipe( - aStack, - tCellBalance <= 0L ? 0 : (int) tCellBalance, - tList.get(0), - tList.size() >= 2 ? tList.get(1) : null, - tList.size() >= 3 ? tList.get(2) : null, - tList.size() >= 4 ? tList.get(3) : null, - tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null - : tCellBalance < 0 ? ItemList.Cell_Empty.get(-tCellBalance) : null, - (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount)), - Math.min(4, tList.size()) * 30); - } - } - if ((aMaterial.mExtraData & 0x2) != 0) { - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(tItemAmount, aStack), - tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, + aStack, + tCellBalance <= 0L ? 0 : (int) tCellBalance, tList.get(0), tList.size() >= 2 ? tList.get(1) : null, tList.size() >= 3 ? tList.get(2) : null, tList.size() >= 4 ? tList.get(3) : null, tList.size() >= 5 ? tList.get(4) : null, tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null - : ItemList.Cell_Empty.get(-tCapsuleCount), - (int) Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))); + : tCellBalance < 0 ? ItemList.Cell_Empty.get(-tCellBalance) : null, + (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount)), + Math.min(4, tList.size()) * 30); + } + } + if ((aMaterial.mExtraData & 0x2) != 0) { + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.copyAmount(tItemAmount, aStack), + tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, + tList.get(0), + tList.size() >= 2 ? tList.get(1) : null, + tList.size() >= 3 ? tList.get(2) : null, + tList.size() >= 4 ? tList.get(3) : null, + tList.size() >= 5 ? tList.get(4) : null, + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null + : ItemList.Cell_Empty.get(-tCapsuleCount), + (int) Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))); } } } @@ -151,16 +146,16 @@ public class ProcessingCell implements IOreRecipeRegistrator { GT_ModHandler.removeRecipeByOutputDelayed(aStack); } else { GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getFluidForFilledItem(aStack, true) == null - ? GT_Utility.getContainerItem(aStack, true) - : null, - (int) Math.max(1024L, 1024L * aMaterial.getMass()), - 4); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getFluidForFilledItem(aStack, true) == null + ? GT_Utility.getContainerItem(aStack, true) + : null, + (int) Math.max(1024L, 1024L * aMaterial.getMass()), + 4); GT_Values.RA.addVacuumFreezerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), - (int) Math.max(aMaterial.getMass() * 2L, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + (int) Math.max(aMaterial.getMass() * 2L, 1L)); } } default -> {} diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index 43a0656ae4..c5e0e9ce0d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -18,7 +18,7 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return; switch (aMaterial.mName) { case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> { @@ -29,16 +29,15 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi case "Basic" -> { GT_ModHandler.removeRecipeByOutputDelayed(aStack); GT_ModHandler.addCraftingRecipe( - aStack, - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "RIR", "VBV", "CCC", 'R', ItemList.Circuit_Parts_Resistor.get(1), 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), 'V', - ItemList.Circuit_Parts_Vacuum_Tube.get(1), 'B', - ItemList.Circuit_Board_Coated_Basic.get(1), 'I', - ItemList.IC2_Item_Casing_Steel.get(1) }); + aStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "RIR", "VBV", "CCC", 'R', ItemList.Circuit_Parts_Resistor.get(1), 'C', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), 'V', + ItemList.Circuit_Parts_Vacuum_Tube.get(1), 'B', ItemList.Circuit_Board_Coated_Basic.get(1), 'I', + ItemList.IC2_Item_Casing_Steel.get(1) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_ModHandler.getIC2Item("electronicCircuit", 1L), - new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.getIC2Item("electronicCircuit", 1L), + new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java index 86478eb3d7..725d382dc1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java @@ -17,12 +17,10 @@ public class ProcessingCompressed implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); - GregTech_API.registerCover( - aStack, - TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), - null); + GregTech_API + .registerCover(aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), null); // GT_RecipeRegistrator.registerUsagesForMaterials(null, false, GT_Utility.copyAmount(1L, aStack)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 2e9cb9a1d1..c81b97408a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -23,370 +23,370 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { switch (aOreDictName) { case "craftingQuartz" -> GT_Values.RA.addAssemblerRecipe( - new ItemStack(Blocks.redstone_torch, 3, 32767), - GT_Utility.copyAmount(1L, aStack), - Materials.Concrete.getMolten(144L), - new ItemStack(net.minecraft.init.Items.comparator, 1, 0), - 800, - 1); + new ItemStack(Blocks.redstone_torch, 3, 32767), + GT_Utility.copyAmount(1L, aStack), + Materials.Concrete.getMolten(144L), + new ItemStack(net.minecraft.init.Items.comparator, 1, 0), + 800, + 1); case "craftingWireCopper", "craftingWireTin" -> GT_Values.RA.addAssemblerRecipe( - ItemList.Circuit_Basic.get(1L), - GT_Utility.copyAmount(1L, aStack), - GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), - 800, - 1); + ItemList.Circuit_Basic.get(1L), + GT_Utility.copyAmount(1L, aStack), + GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), + 800, + 1); case "craftingLensBlue" -> { GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.IC2_LapotronCrystal.getWildcard(1L), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L), - 900, - 480, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Chip_CrystalCPU.get(1L), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Chip_CrystalSoC.get(1), - 600, - 40000, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer2.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_PIC.get(1), - 1200, - 480, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer3.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_PIC.get(4), - 800, - 1920, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer5.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_QPIC.get(1), - 2400, - 500000, - true); + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.IC2_LapotronCrystal.getWildcard(1L), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L), + 900, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Chip_CrystalCPU.get(1L), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Chip_CrystalSoC.get(1), + 600, + 40000, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_PIC.get(1), + 1200, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_PIC.get(4), + 800, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_QPIC.get(1), + 2400, + 500000, + true); } case "craftingLensYellow" -> { GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_LPIC.get(1), - 800, - 120, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer2.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_LPIC.get(4), - 600, - 480, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer3.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_SoC.get(1), - 900, - 1920, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer4.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_SoC.get(4), - 600, - 7680, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer5.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_SoC.get(8), - 300, - 30720, - true); + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_LPIC.get(1), + 800, + 120, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_LPIC.get(4), + 600, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC.get(1), + 900, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC.get(4), + 600, + 7680, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC.get(8), + 300, + 30720, + true); } case "craftingLensOrange" -> { GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Simple_SoC.get(1), - 300, - 64, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer2.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Simple_SoC.get(4), - 300, - 256, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer3.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Simple_SoC.get(16), - 300, - 1024, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer4.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Simple_SoC.get(64), - 300, - 4096, - false); + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(1), + 300, + 64, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(4), + 300, + 256, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(16), + 300, + 1024, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(64), + 300, + 4096, + false); } case "craftingLensCyan" -> { GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Ram.get(1), - 1200, - 120, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer2.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Ram.get(4), - 900, - 480, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer3.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Ram.get(8), - 600, - 1920, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer4.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Ram.get(16), - 300, - 7680, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer5.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_Ram.get(32), - 150, - 30720, - true); + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(1), + 1200, + 120, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(4), + 900, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(8), + 600, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(16), + 300, + 7680, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(32), + 150, + 30720, + true); } case "craftingLensRed" -> { GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0), - 50, - 120); - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0), - 200, - 16); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_ILC.get(1), - 1200, - 120, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer2.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_ILC.get(4), - 900, - 480, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer3.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_ILC.get(8), - 600, - 1920, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer4.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_NPIC.get(1), - 1800, - 30720, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer5.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_NPIC.get(4), - 1500, - 122880, - true); + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0), + 50, + 120); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0), + 200, + 16); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ILC.get(1), + 1200, + 120, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ILC.get(4), + 900, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ILC.get(8), + 600, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_NPIC.get(1), + 1800, + 30720, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_NPIC.get(4), + 1500, + 122880, + true); } case "craftingLensGreen" -> { GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Chip_CrystalCPU.get(1), - 600, - 10000, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Chip_CrystalSoC.get(1L), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Chip_CrystalSoC2.get(1), - 1200, - 80000, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_ULPIC.get(2), - 600, - 30, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer2.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_ULPIC.get(8), - 600, - 120, - false); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer3.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_SoC2.get(1), - 1800, - 1920, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer4.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_SoC2.get(2), - 1500, - 7680, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer5.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_SoC2.get(4), - 1200, - 30720, - true); + ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Chip_CrystalCPU.get(1), + 600, + 10000, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Chip_CrystalSoC.get(1L), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Chip_CrystalSoC2.get(1), + 1200, + 80000, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ULPIC.get(2), + 600, + 30, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ULPIC.get(8), + 600, + 120, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC2.get(1), + 1800, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC2.get(2), + 1500, + 7680, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC2.get(4), + 1200, + 30720, + true); } case "craftingLensWhite" -> { GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), - 2000, - 1920); - GT_Values.RA.addLaserEngraverRecipe( - new ItemStack(Blocks.sandstone, 1, 2), - GT_Utility.copyAmount(0L, aStack), - new ItemStack(Blocks.sandstone, 1, 1), - 50, - 16); - GT_Values.RA.addLaserEngraverRecipe( - new ItemStack(Blocks.stone, 1, 0), - GT_Utility.copyAmount(0L, aStack), - new ItemStack(Blocks.stonebrick, 1, 3), - 50, - 16); - GT_Values.RA.addLaserEngraverRecipe( - new ItemStack(Blocks.quartz_block, 1, 0), - GT_Utility.copyAmount(0L, aStack), - new ItemStack(Blocks.quartz_block, 1, 1), - 50, - 16); - GT_Values.RA.addLaserEngraverRecipe( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), - GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L), - 50, - 16); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_CPU.get(1), - 1200, - 120, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer2.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_CPU.get(4), - 900, - 480, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer3.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_CPU.get(8), - 600, - 1920, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer4.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_CPU.get(16), - 300, - 7680, - true); - GT_Values.RA.addLaserEngraverRecipe( - ItemList.Circuit_Silicon_Wafer5.get(1), - GT_Utility.copyAmount(0L, aStack), - ItemList.Circuit_Wafer_CPU.get(32), - 150, - 30720, - true); + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack(Blocks.sandstone, 1, 2), + GT_Utility.copyAmount(0L, aStack), + new ItemStack(Blocks.sandstone, 1, 1), + 50, + 16); + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack(Blocks.stone, 1, 0), + GT_Utility.copyAmount(0L, aStack), + new ItemStack(Blocks.stonebrick, 1, 3), + 50, + 16); + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack(Blocks.quartz_block, 1, 0), + GT_Utility.copyAmount(0L, aStack), + new ItemStack(Blocks.quartz_block, 1, 1), + 50, + 16); + GT_Values.RA.addLaserEngraverRecipe( + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L), + 50, + 16); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_CPU.get(1), + 1200, + 120, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_CPU.get(4), + 900, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_CPU.get(8), + 600, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_CPU.get(16), + 300, + 7680, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_CPU.get(32), + 150, + 30720, + true); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java index d280492e01..d61d2bfc7b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java @@ -19,81 +19,81 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING); + && !aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { case crateGtDust -> { GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)), - ItemList.Crate_Empty.get(1L), - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L), - 100, - 8); + GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)), + ItemList.Crate_Empty.get(1L), + GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L), + 100, + 8); GT_Values.RA.addUnboxingRecipe( - GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - ItemList.Crate_Empty.get(1L), - 800, - 1); + GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), + ItemList.Crate_Empty.get(1L), + 800, + 1); if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) }); } case crateGtIngot -> { GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L)), - ItemList.Crate_Empty.get(1L), - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L), - 100, - 8); + GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L)), + ItemList.Crate_Empty.get(1L), + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L), + 100, + 8); GT_Values.RA.addUnboxingRecipe( - GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), - ItemList.Crate_Empty.get(1L), - 800, - 1); + GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), + ItemList.Crate_Empty.get(1L), + 800, + 1); if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) }); } case crateGtGem -> { GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L)), - ItemList.Crate_Empty.get(1L), - GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L), - 100, - 8); + GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L)), + ItemList.Crate_Empty.get(1L), + GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L), + 100, + 8); GT_Values.RA.addUnboxingRecipe( - GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), - ItemList.Crate_Empty.get(1L), - 800, - 1); + GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), + ItemList.Crate_Empty.get(1L), + 800, + 1); if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) }); } case crateGtPlate -> { GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L)), - ItemList.Crate_Empty.get(1L), - GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L), - 100, - 8); + GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L)), + ItemList.Crate_Empty.get(1L), + GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L), + 100, + 8); GT_Values.RA.addUnboxingRecipe( - GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), - ItemList.Crate_Empty.get(1L), - 800, - 1); + GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), + ItemList.Crate_Empty.get(1L), + 800, + 1); if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) }); } default -> {} } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index 4d582564f4..9fdcb14055 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -17,106 +17,91 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - net.minecraft.item.ItemStack aStack) { + net.minecraft.item.ItemStack aStack) { GT_ModHandler.addCompressionRecipe( - gregtech.api.util.GT_Utility.copyAmount(8L, aStack), - ItemList.IC2_PlantballCompressed.get(1L)); + gregtech.api.util.GT_Utility.copyAmount(8L, aStack), + ItemList.IC2_PlantballCompressed.get(1L)); switch (aOreDictName) { case "cropTea" -> { GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false); GT_Values.RA.addBrewingRecipe( - aStack, - GT_ModHandler.getDistilledWater(1L) - .getFluid(), - FluidRegistry.getFluid("potion.tea"), - false); + aStack, + GT_ModHandler.getDistilledWater(1L) + .getFluid(), + FluidRegistry.getFluid("potion.tea"), + false); } case "cropGrape" -> { + GT_Values.RA + .addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.grapejuice"), false); GT_Values.RA.addBrewingRecipe( - aStack, - FluidRegistry.WATER, - FluidRegistry.getFluid("potion.grapejuice"), - false); - GT_Values.RA.addBrewingRecipe( - aStack, - GT_ModHandler.getDistilledWater(1L) - .getFluid(), - FluidRegistry.getFluid("potion.grapejuice"), - false); - } - case "cropChilipepper" -> GT_ModHandler.addPulverisationRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); - case "cropCoffee" -> GT_ModHandler.addPulverisationRecipe( aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); - case "cropPotato" -> { - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Raw_PotatoChips.get(1L), - 64, - 4); - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Stripes.get(0L), - ItemList.Food_Raw_Fries.get(1L), - 64, - 4); - GT_Values.RA.addBrewingRecipe( - aStack, - FluidRegistry.WATER, - FluidRegistry.getFluid("potion.potatojuice"), - true); - GT_Values.RA.addBrewingRecipe( - aStack, - GT_ModHandler.getDistilledWater(1L) - .getFluid(), - FluidRegistry.getFluid("potion.potatojuice"), - true); + GT_ModHandler.getDistilledWater(1L) + .getFluid(), + FluidRegistry.getFluid("potion.grapejuice"), + false); } - case "cropLemon" -> { + case "cropChilipepper" -> GT_ModHandler + .addPulverisationRecipe(aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); + case "cropCoffee" -> GT_ModHandler + .addPulverisationRecipe(aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); + case "cropPotato" -> { GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Lemon.get(4L), - 64, - 4); - GT_Values.RA.addBrewingRecipe( - aStack, - FluidRegistry.WATER, - FluidRegistry.getFluid("potion.lemonjuice"), - false); - GT_Values.RA.addBrewingRecipe( - aStack, - GT_ModHandler.getDistilledWater(1L) - .getFluid(), - FluidRegistry.getFluid("potion.lemonjuice"), - false); - GT_Values.RA.addBrewingRecipe( - aStack, - FluidRegistry.getFluid("potion.vodka"), - FluidRegistry.getFluid("potion.leninade"), - true); - } - case "cropTomato" -> GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Tomato.get(4L), + ItemList.Food_Raw_PotatoChips.get(1L), 64, 4); - case "cropCucumber" -> GT_Values.RA.addSlicerRecipe( + GT_Values.RA.addSlicerRecipe( aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Cucumber.get(4L), + ItemList.Shape_Slicer_Stripes.get(0L), + ItemList.Food_Raw_Fries.get(1L), 64, 4); - case "cropOnion" -> GT_Values.RA.addSlicerRecipe( + GT_Values.RA + .addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.potatojuice"), true); + GT_Values.RA.addBrewingRecipe( + aStack, + GT_ModHandler.getDistilledWater(1L) + .getFluid(), + FluidRegistry.getFluid("potion.potatojuice"), + true); + } + case "cropLemon" -> { + GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Onion.get(4L), + ItemList.Food_Sliced_Lemon.get(4L), 64, 4); + GT_Values.RA + .addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.lemonjuice"), false); + GT_Values.RA.addBrewingRecipe( + aStack, + GT_ModHandler.getDistilledWater(1L) + .getFluid(), + FluidRegistry.getFluid("potion.lemonjuice"), + false); + GT_Values.RA.addBrewingRecipe( + aStack, + FluidRegistry.getFluid("potion.vodka"), + FluidRegistry.getFluid("potion.leninade"), + true); + } + case "cropTomato" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Tomato.get(4L), + 64, + 4); + case "cropCucumber" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cucumber.get(4L), + 64, + 4); + case "cropOnion" -> GT_Values.RA + .addSlicerRecipe(aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Onion.get(4L), 64, 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index 627cdc10d8..a0c9b56b53 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -18,63 +18,63 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { switch (aPrefix) { case crushedCentrifuged -> { GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - 10, - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + 10, + 16); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - GT_Utility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts), - 1L), - 10, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L), + 10, + false); } case crushedPurified -> { GT_ModHandler.addThermalCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - new int[] { 10000, 1111 }, - (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), - GT_OreDictUnificator.get( - OrePrefixes.crushedCentrifuged, - aMaterial.mMacerateInto, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), - 1L)); + GT_Utility.copyAmount(1L, aStack), + new int[] { 10000, 1111 }, + (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), + GT_OreDictUnificator.get( + OrePrefixes.crushedCentrifuged, + aMaterial.mMacerateInto, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L)); ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); if (tGem != null) { switch (aMaterial.mName) { - case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GT_Values.RA.addSifterRecipe( + case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GT_Values.RA + .addSifterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, new int[] { 300, 1200, 4500, 1400, 2800, 3500 }, 800, 16); default -> GT_Values.RA.addSifterRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, - new int[] { 100, 400, 1500, 2000, 4000, 5000 }, - 800, - 16); + GT_Utility.copyAmount(1L, aStack), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 100, 400, 1500, 2000, 4000, 5000 }, + 800, + 16); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index df2284a95c..3e64f05773 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -18,17 +18,17 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - 10, - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + 10, + 16); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - null, - 10, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + null, + 10, + false); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index e9a1b0425c..571b3d1a7f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -20,125 +20,123 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - net.minecraft.item.ItemStack aStack) { + net.minecraft.item.ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), - 10, - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L), + 10, + 16); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get( - OrePrefixes.dustImpure, - aMaterial.mMacerateInto, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), - 1L), - 10, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get( + OrePrefixes.dustImpure, + aMaterial.mMacerateInto, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L), + 10, + false); GT_ModHandler.addOreWasherRecipe( - GT_Utility.copyAmount(1L, aStack), - new int[] { 10000, 1111, 10000 }, - 1000, - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); + GT_Utility.copyAmount(1L, aStack), + new int[] { 10000, 1111, 10000 }, + 1000, + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); GT_ModHandler.addThermalCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - new int[] { 10000, 1111, 10000 }, - (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust, - aMaterial, - 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); + GT_Utility.copyAmount(1L, aStack), + new int[] { 10000, 1111, 10000 }, + (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), + GT_OreDictUnificator + .get(aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust, aMaterial, 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); if (aMaterial.contains(SubTag.WASHING_MERCURY)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(1000L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 7000, 4000 }, + 800, + 8); + if (aMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(1000L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 9900, 4000 }, + 800, + 8); + if (aMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 7000, 4000 }, + 800, + 8); + for (Materials tMaterial : aMaterial.mOreByProducts) { + if (tMaterial.contains(SubTag.WASHING_MERCURY)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(1000L), GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new int[] { 10000, 7000, 4000 }, 800, 8); - if (aMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( + if (tMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(1000L), GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new int[] { 10000, 9900, 4000 }, 800, 8); - if (aMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( + if (tMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new int[] { 10000, 7000, 4000 }, 800, 8); - for (Materials tMaterial : aMaterial.mOreByProducts) { - if (tMaterial.contains(SubTag.WASHING_MERCURY)) GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Mercury.getFluid(1000L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] { 10000, 7000, 4000 }, - 800, - 8); - if (tMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Mercury.getFluid(1000L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] { 10000, 9900, 4000 }, - 800, - 8); - if (tMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] { 10000, 7000, 4000 }, - 800, - 8); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 9be8efb946..ab17077c16 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -30,91 +30,85 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + 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) + == null) GT_Values.RA.addCannerRecipe( - aStack, - ItemList.Cell_Empty.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), - null, - 100, - 1); + aStack, + ItemList.Cell_Empty.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + null, + 100, + 1); if (!aMaterial.mBlastFurnaceRequired) { GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1L, aStack), - aMaterial, - aPrefix.mMaterialAmount, - null, - null, - null); + GT_Utility.copyAmount(1L, aStack), + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null); } } ItemStack tDustStack; if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { + && (!aMaterial.contains(SubTag.NO_SMELTING))) { if (aMaterial.mBlastFurnaceRequired) { GT_ModHandler.removeFurnaceSmelting(aStack); if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { GT_Values.RA.addBlastRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 1L), - null, - null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial.mSmeltInto, - tDustStack, - 1L) - : GT_Utility.copyAmount(1L, tDustStack), - null, - (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, - 120, - aMaterial.mBlastFurnaceTemp); + GT_Utility.copyAmount(1L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 1L), + null, + null, + aMaterial.mBlastFurnaceTemp > 1750 + ? GT_OreDictUnificator + .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) + : GT_Utility.copyAmount(1L, tDustStack), + null, + (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, + 120, + aMaterial.mBlastFurnaceTemp); } } else { GT_ModHandler.addSmeltingRecipe(aStack, tDustStack); } } else if (!aMaterial.contains(SubTag.NO_WORKING)) { if ((!OrePrefixes.block.isIgnored(aMaterial)) - && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))) { + && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))) { GT_ModHandler.addCompressionRecipe( - GT_Utility.copyAmount(9L, aStack), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); + GT_Utility.copyAmount(9L, aStack), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); } // This is so disgustingly bad. if (((OrePrefixes.block.isIgnored(aMaterial)) - || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) - && (aMaterial != Materials.GraniteRed) - && (aMaterial != Materials.GraniteBlack) - && (aMaterial != Materials.Basalt) - && (aMaterial != Materials.Marble) - && (aMaterial != Materials.Glass) - && (aMaterial != Materials.Obsidian) - && (aMaterial != Materials.Glowstone) - && (aMaterial != Materials.Paper) - && (aMaterial != Materials.TranscendentMetal) - && (aMaterial != Materials.Clay)) { + || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) + && (aMaterial != Materials.GraniteRed) + && (aMaterial != Materials.GraniteBlack) + && (aMaterial != Materials.Basalt) + && (aMaterial != Materials.Marble) + && (aMaterial != Materials.Glass) + && (aMaterial != Materials.Obsidian) + && (aMaterial != Materials.Glowstone) + && (aMaterial != Materials.Paper) + && (aMaterial != Materials.TranscendentMetal) + && (aMaterial != Materials.Clay)) { GT_ModHandler.addCompressionRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); } } if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { long tItemAmount = 0L; long tCapsuleCount = 0L; long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L - : 1L; + : 1L; ArrayList<ItemStack> tList = new ArrayList<>(); for (MaterialStack tMat : aMaterial.mMaterialList) if (tMat.mAmount > 0L) { if (tMat.mMaterial == Materials.Air) { @@ -125,45 +119,59 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr tDustStack = GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); } if (tItemAmount + tMat.mAmount * 3628800L - <= aStack.getMaxStackSize() * aMaterial.getDensity()) { + <= aStack.getMaxStackSize() * aMaterial.getDensity()) { tItemAmount += tMat.mAmount * 3628800L; if (tDustStack != null) { tDustStack.stackSize = ((int) (tDustStack.stackSize * tDensityMultiplier)); while ((tDustStack.stackSize > 64) && (tList.size() < 6) - && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64 - <= 64L)) { + && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64 + <= 64L)) { tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64; tList.add(GT_Utility.copyAmount(64L, tDustStack)); tDustStack.stackSize -= 64; } if ((tDustStack.stackSize > 0) && (tList.size() < 6) - && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - tDustStack) - <= 64L)) { - tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - tDustStack); + && (tCapsuleCount + + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack) + <= 64L)) { + tCapsuleCount += GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack); tList.add(tDustStack); } } } } tItemAmount = (tItemAmount * tDensityMultiplier % aMaterial.getDensity() > 0L ? 1 : 0) - + tItemAmount * tDensityMultiplier / aMaterial.getDensity(); + + tItemAmount * tDensityMultiplier / aMaterial.getDensity(); if (tList.size() > 0) { FluidStack tFluid = null; int tList_sS = tList.size(); for (int i = 0; i < tList_sS; i++) { if ((!ItemList.Cell_Air.isStackEqual(tList.get(i))) - && ((tFluid = GT_Utility.getFluidForFilledItem(tList.get(i), true)) != null)) { + && ((tFluid = GT_Utility.getFluidForFilledItem(tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; - tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - tList.get(i)); + tCapsuleCount -= GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tList.get(i)); tList.remove(i); break; } } if ((aMaterial.mExtraData & 0x1) != 0) GT_Values.RA.addElectrolyzerRecipe( + GT_Utility.copyAmount(tItemAmount, aStack), + tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, + null, + tFluid, + tList.size() < 1 ? null : tList.get(0), + tList.size() < 2 ? null : tList.get(1), + tList.size() < 3 ? null : tList.get(2), + tList.size() < 4 ? null : tList.get(3), + tList.size() < 5 ? null : tList.get(4), + tList.size() < 6 ? null : tList.get(5), + null, + (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), + Math.min(4, tList.size()) * 30); + if ((aMaterial.mExtraData & 0x2) != 0) { + GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(tItemAmount, aStack), tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, null, @@ -175,104 +183,88 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr tList.size() < 5 ? null : tList.get(4), tList.size() < 6 ? null : tList.get(5), null, - (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), - Math.min(4, tList.size()) * 30); - if ((aMaterial.mExtraData & 0x2) != 0) { - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(tItemAmount, aStack), - tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, - null, - tFluid, - tList.size() < 1 ? null : tList.get(0), - tList.size() < 2 ? null : tList.get(1), - tList.size() < 3 ? null : tList.get(2), - tList.size() < 4 ? null : tList.get(3), - tList.size() < 5 ? null : tList.get(4), - tList.size() < 6 ? null : tList.get(5), - null, - (int) Math.max(1L, Math.abs(aMaterial.getMass() * 4L * tItemAmount)), - Math.min(4, tList.size()) * 5); + (int) Math.max(1L, Math.abs(aMaterial.getMass() * 4L * tItemAmount)), + Math.min(4, tList.size()) * 5); } } } if (aMaterial.contains(SubTag.CRYSTALLISABLE)) { GT_Values.RA.addAutoclaveRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(1), - Materials.Water.getFluid(200L), - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 7000, - 2000, - 24, - false); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), + Materials.Water.getFluid(200L), + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), + 7000, + 2000, + 24, + false); GT_Values.RA.addAutoclaveRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(2), - GT_ModHandler.getDistilledWater(100L), - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 9000, - 1500, - 24, - false); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(2), + GT_ModHandler.getDistilledWater(100L), + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), + 9000, + 1500, + 24, + false); GT_Values.RA.addAutoclaveRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(3), - Materials.Void.getMolten(36L), - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 10000, - 1200, - 24, - false); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(3), + Materials.Void.getMolten(36L), + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), + 10000, + 1200, + 24, + false); } switch (aMaterial.mName) { case "NULL": break; case "Glass": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack(net.minecraft.init.Blocks.glass)); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(net.minecraft.init.Blocks.glass)); break; case "NetherQuartz": case "Quartz": case "CertusQuartz": if (gregtech.api.GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Recipes.disabledrecipes, - "QuartzDustSmeltingIntoAESilicon", - true)) - GT_ModHandler.removeFurnaceSmelting(aStack); + gregtech.api.enums.ConfigCategories.Recipes.disabledrecipes, + "QuartzDustSmeltingIntoAESilicon", + true)) GT_ModHandler.removeFurnaceSmelting(aStack); break; case "MeatRaw": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L)); break; case "Mercury": break; case "Oilsands": GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( - true, - new ItemStack[] { GT_Utility.copyAmount(1L, aStack) }, - null, - null, - null, - new FluidStack[] { Materials.OilHeavy.getFluid(1000) }, - 660, - 8, - 0); + true, + new ItemStack[] { GT_Utility.copyAmount(1L, aStack) }, + null, + null, + null, + new FluidStack[] { Materials.OilHeavy.getFluid(1000) }, + 660, + 8, + 0); break; case "Coal": break; case "HydratedCoal": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)); break; case "Diamond": GT_Values.RA.addImplosionRecipe( - GT_Utility.copyAmount(4L, aStack), - 32, - ItemList.IC2_Industrial_Diamond.get(3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)); + GT_Utility.copyAmount(4L, aStack), + 32, + ItemList.IC2_Industrial_Diamond.get(3L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)); break; case "Opal": case "Olivine": @@ -285,10 +277,10 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "Tanzanite": case "Amethyst": GT_Values.RA.addImplosionRecipe( - GT_Utility.copyAmount(4L, aStack), - 24, - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)); + GT_Utility.copyAmount(4L, aStack), + 24, + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)); break; case "FoolsRuby": case "GarnetRed": @@ -300,215 +292,215 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "Forcillium": case "Force": GT_Values.RA.addImplosionRecipe( - GT_Utility.copyAmount(4L, aStack), - 16, - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)); + GT_Utility.copyAmount(4L, aStack), + 16, + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)); } } case dustPure, dustImpure, dustRefined -> { Materials tByProduct = GT_Utility.selectItemInList( - aPrefix == OrePrefixes.dustRefined ? 2 : aPrefix == OrePrefixes.dustPure ? 1 : 0, - aMaterial, - aMaterial.mOreByProducts); + aPrefix == OrePrefixes.dustRefined ? 2 : aPrefix == OrePrefixes.dustPure ? 1 : 0, + aMaterial, + aMaterial.mOreByProducts); if (aPrefix == OrePrefixes.dustPure) { if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_GOLD)) GT_Values.RA.addElectromagneticSeparatorRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L), - new int[] { 10000, 4000, 2000 }, - 400, - 24); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L), + new int[] { 10000, 4000, 2000 }, + 400, + 24); if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_IRON)) GT_Values.RA.addElectromagneticSeparatorRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L), - new int[] { 10000, 4000, 2000 }, - 400, - 24); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L), + new int[] { 10000, 4000, 2000 }, + 400, + 24); if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM)) { GT_Values.RA.addElectromagneticSeparatorRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L), - new int[] { 10000, 4000, 2000 }, - 400, - 24); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L), + new int[] { 10000, 4000, 2000 }, + 400, + 24); } } if (aMaterial.contains(SubTag.CRYSTALLISABLE)) { GT_Values.RA.addAutoclaveRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(1), - Materials.Water.getFluid(200L), - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 9000, - 2000, - 24, - false); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), + Materials.Water.getFluid(200L), + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), + 9000, + 2000, + 24, + false); GT_Values.RA.addAutoclaveRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(2), - GT_ModHandler.getDistilledWater(100L), - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 9500, - 1500, - 24, - false); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(2), + GT_ModHandler.getDistilledWater(100L), + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), + 9500, + 1500, + 24, + false); GT_Values.RA.addAutoclaveRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(3), - Materials.Void.getMolten(36L), - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 10000, - 1200, - 24, - false); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(3), + Materials.Void.getMolten(36L), + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), + 10000, + 1200, + 24, + false); } ItemStack tImpureStack = GT_OreDictUnificator.get( - OrePrefixes.dustTiny, - tByProduct, - GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), - 1L); + OrePrefixes.dustTiny, + tByProduct, + GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), + 1L); if (tImpureStack == null) { tImpureStack = GT_OreDictUnificator.get(OrePrefixes.dustSmall, tByProduct, 1L); if (tImpureStack == null) { tImpureStack = GT_OreDictUnificator.get( - OrePrefixes.dust, - tByProduct, - GT_OreDictUnificator.get(OrePrefixes.gem, tByProduct, 1L), - 1L); + OrePrefixes.dust, + tByProduct, + GT_OreDictUnificator.get(OrePrefixes.gem, tByProduct, 1L), + 1L); if (tImpureStack == null) { tImpureStack = GT_OreDictUnificator.get(OrePrefixes.cell, tByProduct, 1L); if (tImpureStack == null) { GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - 0, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - null, - null, - null, - null, - null, - (int) Math.max(1L, aMaterial.getMass())); + GT_Utility.copyAmount(1L, aStack), + 0, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + null, + null, + null, + null, + null, + (int) Math.max(1L, aMaterial.getMass())); } else { FluidStack tFluid = GT_Utility.getFluidForFilledItem(tImpureStack, true); if (tFluid == null) { GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(9L, aStack), - 1, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), - tImpureStack, - null, - null, - null, - null, - (int) Math.max(1L, aMaterial.getMass() * 72L)); + GT_Utility.copyAmount(9L, aStack), + 1, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), + tImpureStack, + null, + null, + null, + null, + (int) Math.max(1L, aMaterial.getMass() * 72L)); } else { tFluid.amount /= 10; GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - null, - null, - tFluid, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - null, - null, - null, - null, - null, - null, - (int) Math.max(1L, aMaterial.getMass() * 8L), - 5); + GT_Utility.copyAmount(1L, aStack), + null, + null, + tFluid, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + null, + null, + null, + null, + null, + null, + (int) Math.max(1L, aMaterial.getMass() * 8L), + 5); } } } else { GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(9L, aStack), - 0, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), - tImpureStack, - null, - null, - null, - null, - (int) Math.max(1L, aMaterial.getMass() * 72L)); - } - } else { - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(2L, aStack), + GT_Utility.copyAmount(9L, aStack), 0, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack, null, null, null, null, - (int) Math.max(1L, aMaterial.getMass() * 16L)); - } - } else { - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - null, - null, - null, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - tByProduct, - GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), - 1L), + (int) Math.max(1L, aMaterial.getMass() * 72L)); + } + } else { + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.copyAmount(2L, aStack), + 0, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), + tImpureStack, null, null, null, null, - new int[] { 10000, 1111 }, - (int) Math.max(1L, aMaterial.getMass() * 8L), - 5); + (int) Math.max(1L, aMaterial.getMass() * 16L)); + } + } else { + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.copyAmount(1L, aStack), + null, + null, + null, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + tByProduct, + GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), + 1L), + null, + null, + null, + null, + new int[] { 10000, 1111 }, + (int) Math.max(1L, aMaterial.getMass() * 8L), + 5); } } case dustSmall -> { GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(4L, aStack), - ItemList.Schematic_Dust.get(0L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - 20, - 4); + GT_Utility.copyAmount(4L, aStack), + ItemList.Schematic_Dust.get(0L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + 20, + 4); if (!aMaterial.mBlastFurnaceRequired) { GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1L, aStack), - aMaterial, - aPrefix.mMaterialAmount, - null, - null, - null); + GT_Utility.copyAmount(1L, aStack), + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null); } } } case dustTiny -> { GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(9L, aStack), - ItemList.Schematic_Dust.get(0L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - 20, - 4); + GT_Utility.copyAmount(9L, aStack), + ItemList.Schematic_Dust.get(0L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + 20, + 4); if (!aMaterial.mBlastFurnaceRequired) { GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1L, aStack), - aMaterial, - aPrefix.mMaterialAmount, - null, - null, - null); + GT_Utility.copyAmount(1L, aStack), + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null); } } if (!aMaterial.contains(SubTag.NO_SMELTING)) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java index f8b1519b8a..452a8e31fb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java @@ -23,60 +23,60 @@ public class ProcessingDye implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { Dyes aDye = Dyes.get(aOreDictName); if ((aDye.mIndex >= 0) && (aDye.mIndex < 16) && (GT_Utility.getContainerItem(aStack, true) == null)) { GT_ModHandler.addAlloySmelterRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L), - GT_Utility.copyAmount(1L, aStack), - new ItemStack(Blocks.stained_glass, 8, 15 - aDye.mIndex), - 200, - 8, - false); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L), + GT_Utility.copyAmount(1L, aStack), + new ItemStack(Blocks.stained_glass, 8, 15 - aDye.mIndex), + 200, + 8, + false); GT_ModHandler.addAlloySmelterRecipe( - new ItemStack(Blocks.glass, 8, 32767), - GT_Utility.copyAmount(1L, aStack), - new ItemStack(Blocks.stained_glass, 8, 15 - aDye.mIndex), - 200, - 8, - false); + new ItemStack(Blocks.glass, 8, 32767), + GT_Utility.copyAmount(1L, aStack), + new ItemStack(Blocks.stained_glass, 8, 15 - aDye.mIndex), + 200, + 8, + false); GT_Values.RA.addMixerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(1), - null, - null, - Materials.Water.getFluid(216L), - FluidRegistry.getFluidStack( - "dye.watermixed." + aDye.name() - .toLowerCase(Locale.ENGLISH), - 192), - null, - 16, - 4); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), + null, + null, + Materials.Water.getFluid(216L), + FluidRegistry.getFluidStack( + "dye.watermixed." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 192), + null, + 16, + 4); GT_Values.RA.addMixerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(1), - null, - null, - GT_ModHandler.getDistilledWater(288L), - FluidRegistry.getFluidStack( - "dye.watermixed." + aDye.name() - .toLowerCase(Locale.ENGLISH), - 216), - null, - 16, - 4); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), + null, + null, + GT_ModHandler.getDistilledWater(288L), + FluidRegistry.getFluidStack( + "dye.watermixed." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 216), + null, + 16, + 4); GT_Values.RA.addChemicalRecipe( - 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), - GT_Values.NI, - 600, - 48); + 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), + GT_Values.NI, + 600, + 48); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java index 941191132d..fdb78eae22 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java @@ -18,16 +18,16 @@ public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeReg @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { GT_RecipeRegistrator.registerWiremillRecipes(aMaterial, 100, 4); } if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Proxy.tBits, - new Object[] { "Xx", 'X', OrePrefixes.foil.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + GT_Proxy.tBits, + new Object[] { "Xx", 'X', OrePrefixes.foil.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index 31f7051c3d..22eb302aae 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -21,15 +21,13 @@ public class ProcessingFoil implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L)), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 24)); - GregTech_API.registerCover( - aStack, - TextureFactory.of(aMaterial.mIconSet.mTextures[70], aMaterial.mRGBa, false), - null); + GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L)), + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); + GregTech_API + .registerCover(aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[70], aMaterial.mRGBa, false), null); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index ae606caaab..097a637f0e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -18,72 +18,69 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { switch (aOreDictName) { case "foodCheese" -> { GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Cheese.get(4L), - 64, - 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cheese.get(4L), + 64, + 4); GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L)); } 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, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L), - null, - null, - null, - null, - ItemList.Food_Dough_Sugar.get(2L), - 32, - 8); + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L), + null, + null, + null, + null, + ItemList.Food_Dough_Sugar.get(2L), + 32, + 8); GT_Values.RA.addMixerRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L), - null, - null, - null, - null, - ItemList.Food_Dough_Chocolate.get(2L), - 32, - 8); + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L), + null, + null, + null, + null, + ItemList.Food_Dough_Chocolate.get(2L), + 32, + 8); GT_Values.RA.addMixerRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L), - null, - null, - null, - null, - ItemList.Food_Dough_Chocolate.get(2L), - 32, - 8); + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L), + null, + null, + null, + null, + ItemList.Food_Dough_Chocolate.get(2L), + 32, + 8); GT_Values.RA.addFormingPressRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Mold_Bun.get(0L), - ItemList.Food_Raw_Bun.get(1L), - 128, - 4); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Mold_Bun.get(0L), + ItemList.Food_Raw_Bun.get(1L), + 128, + 4); GT_Values.RA.addFormingPressRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Bread.get(0L), - ItemList.Food_Raw_Bread.get(1L), - 256, - 4); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Bread.get(0L), + ItemList.Food_Raw_Bread.get(1L), + 256, + 4); GT_Values.RA.addFormingPressRecipe( - GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Mold_Baguette.get(0L), - ItemList.Food_Raw_Baguette.get(1L), - 384, - 4); + GT_Utility.copyAmount(3L, aStack), + ItemList.Shape_Mold_Baguette.get(0L), + ItemList.Food_Raw_Baguette.get(1L), + 384, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index ed0fa7fe94..2f6a568bae 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -20,39 +20,39 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { switch (aPrefix) { case gearGt -> { GT_ModHandler.removeRecipeByOutputDelayed(aStack); if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Gear.get(0L), - aMaterial.getMolten(576L), - GT_OreDictUnificator.get(aPrefix, aMaterial, 1L), - 128, - calculateRecipeEU(aMaterial, 8)); + ItemList.Shape_Mold_Gear.get(0L), + aMaterial.getMolten(576L), + GT_OreDictUnificator.get(aPrefix, aMaterial, 1L), + 128, + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { case "Wood" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', - OrePrefixes.stick.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); case "Stone" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', - new ItemStack(Blocks.stone_button, 1, 32767) }); + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', + new ItemStack(Blocks.stone_button, 1, 32767) }); default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S', - OrePrefixes.stick.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); } } } @@ -62,30 +62,30 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Gear_Small.get(0L), - aMaterial.getMolten(144L), - GT_Utility.copyAmount(1L, aStack), - 16, - calculateRecipeEU(aMaterial, 8)); + ItemList.Shape_Mold_Gear_Small.get(0L), + aMaterial.getMolten(144L), + GT_Utility.copyAmount(1L, aStack), + 16, + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { case "Wood" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); case "Stone" -> GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', - OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 7a6a3ec004..75912ddf85 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -26,105 +26,105 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { long aMaterialMass = aMaterial.getMass(); boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); boolean aNoSmelting = aMaterial.contains(SubTag.NO_SMELTING); boolean aSpecialRecipeReq = (aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true)); + && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true)); boolean aFuelPower = aMaterial.mFuelPower > 0; switch (aPrefix) { case gem -> { if (aFuelPower) { GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), - null, - aMaterial.mFuelPower * 2, - aMaterial.mFuelType); + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower * 2, + aMaterial.mFuelType); } if (!OrePrefixes.block.isIgnored(aMaterial)) { GT_ModHandler.addCompressionRecipe( - GT_Utility.copyAmount(9L, aStack), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); + GT_Utility.copyAmount(9L, aStack), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); } if (!aNoSmelting) { GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)); } if (aNoSmashing) { GT_Values.RA.addForgeHammerRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), - 64, - 16); + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), + 64, + 16); } else { GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 16)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 16)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - calculateRecipeEU(aMaterial, 24)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(2L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(2L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(3L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 3L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(3L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 3L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(4L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 4L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(4L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 4L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(5L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 5L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(5L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 5L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(9L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), - (int) Math.max(aMaterialMass * 9L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(9L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), + (int) Math.max(aMaterialMass * 9L, 1L), + calculateRecipeEU(aMaterial, 96)); } if (aNoWorking) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addLatheRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 16)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 16)); } } else { if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); GT_Values.RA.addImplosionRecipe( - GT_Utility.copyAmount(3L, aStack), - 8, - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); + GT_Utility.copyAmount(3L, aStack), + 8, + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Proxy.tBits, - new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + GT_Proxy.tBits, + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial) }); if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "X", "m", 'X', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gem.get(aMaterial) }); } } // GT_RecipeRegistrator.registerUsagesForMaterials(OrePrefixes.plate.get(aMaterial).toString(), @@ -135,69 +135,64 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra break; case "Coal": case "Charcoal": - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, - "torchesFromCoal", - false)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { GT_ModHandler.removeRecipeDelayed( - GT_Utility.copyAmount(1L, aStack), - null, - null, - new ItemStack(net.minecraft.init.Items.stick, 1, 0)); + GT_Utility.copyAmount(1L, aStack), + null, + null, + new ItemStack(net.minecraft.init.Items.stick, 1, 0)); } break; case "CertusQuartz": GT_Values.RA.addElectrolyzerRecipe( - aStack, - 0, - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), - null, - null, - null, - null, - null, - 2000, - 30); + aStack, + 0, + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), + null, + null, + null, + null, + null, + 2000, + 30); } for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver // Recipe // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( - GT_Utility.copyAmount(3L, aStack), - is, - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L), - 1200, - 480); + GT_Utility.copyAmount(3L, aStack), + is, + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L), + 1200, + 480); } } case gemChipped -> { - if (aFuelPower) GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), - null, - aMaterial.mFuelPower / 2, - aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower / 2, aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - 8); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L), + (int) Math.max(aMaterialMass, 1L), + 8); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { GT_Values.RA.addImplosionRecipe( - GT_Utility.copyAmount(3L, aStack), - 8, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); + GT_Utility.copyAmount(3L, aStack), + 8, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial) }); } } for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver @@ -205,124 +200,111 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( - GT_Utility.copyAmount(3L, aStack), - is, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L), - 600, - 30); + GT_Utility.copyAmount(3L, aStack), + is, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L), + 600, + 30); } } case gemExquisite -> { - if (aFuelPower) GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), - null, - aMaterial.mFuelPower * 8, - aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 8, aMaterial.mFuelType); if (!aNoWorking) { if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), - GT_Proxy.tBits, - new Object[] { "X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); } GT_Values.RA.addForgeHammerRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), - 64, - 16); + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), + 64, + 16); } 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), - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - 12); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), + (int) Math.max(aMaterialMass, 1L), + 12); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { GT_Values.RA.addImplosionRecipe( - GT_Utility.copyAmount(3L, aStack), - 8, - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); + GT_Utility.copyAmount(3L, aStack), + 8, + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "h", "X", 'X', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "h", "X", 'X', OrePrefixes.gem.get(aMaterial) }); if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); } } GT_Values.RA.addForgeHammerRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), - 64, - 16); + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), + 64, + 16); for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver // Recipe // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( - GT_Utility.copyAmount(3L, aStack), - is, - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 600, - 120); + GT_Utility.copyAmount(3L, aStack), + is, + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), + 600, + 120); } } case gemFlawless -> { - if (aFuelPower) GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), - null, - aMaterial.mFuelPower * 4, - aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 4, aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_OreDictUnificator.getDust( - aMaterial, - aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount), - (int) Math.max(aMaterialMass * 5L, 1L), - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GT_OreDictUnificator + .getDust(aMaterial, aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount), + (int) Math.max(aMaterialMass * 5L, 1L), + 16); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { GT_Values.RA.addImplosionRecipe( - GT_Utility.copyAmount(3L, aStack), - 8, - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); + GT_Utility.copyAmount(3L, aStack), + 8, + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), + GT_Proxy.tBits, + 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 is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( - GT_Utility.copyAmount(3L, aStack), - is, - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L), - 2400, - 2000); + GT_Utility.copyAmount(3L, aStack), + is, + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L), + 2400, + 2000); } } default -> {} diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index fbc0766f81..0fd5d9e42e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -25,136 +25,125 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aNoSmelting = aMaterial.contains(SubTag.NO_SMELTING); long aMaterialMass = aMaterial.getMass(); boolean aSpecialRecipeReq = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_SMASHING); + && !aMaterial.contains(SubTag.NO_SMASHING); switch (aPrefix) { case ingot: if (aMaterial.mFuelPower > 0) { - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), - null, - aMaterial.mFuelPower, - aMaterial.mFuelType); + GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); } if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0L), - aMaterial.getMolten(144L), - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - 32, - calculateRecipeEU(aMaterial, 8)); + ItemList.Shape_Mold_Ingot.get(0L), + aMaterial.getMolten(144L), + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + 32, + calculateRecipeEU(aMaterial, 8)); } } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator.registerReverseMacerating( - aStack, + GT_RecipeRegistrator + .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { + GT_RecipeRegistrator.registerReverseArcSmelting( + GT_Utility.copyAmount(1L, aStack), aMaterial, aPrefix.mMaterialAmount, null, null, - null, - false); - if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { - GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1L, aStack), - aMaterial, - aPrefix.mMaterialAmount, - null, - null, - null); + null); } ItemStack tStack; if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))) - && ((aMaterial.mBlastFurnaceRequired) || aNoSmelting)) { + && ((aMaterial.mBlastFurnaceRequired) || aNoSmelting)) { GT_ModHandler.removeFurnaceSmelting(tStack); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { if (!aMaterial.contains(SubTag.SMELTING_TO_GEM)) if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) + && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial) }); } if (!aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(3L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 16)); + GT_Utility.copyAmount(3L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 16)); } GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 24)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(2L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(2L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(3L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 3L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(3L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 3L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(4L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 4L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(4L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 4L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(5L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 5L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(5L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 5L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(9L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), - (int) Math.max(aMaterialMass * 9L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(9L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), + (int) Math.max(aMaterialMass * 9L, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(10), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), - (int) Math.max(aMaterialMass * 2L, 1L), - calculateRecipeEU(aMaterial, 24)); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(10), + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), + (int) Math.max(aMaterialMass * 2L, 1L), + calculateRecipeEU(aMaterial, 24)); } break; case ingotDouble: if (!aNoSmashing) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(2L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(2L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + calculateRecipeEU(aMaterial, 96)); // 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, - new Object[] { "I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial) }); } } } @@ -162,25 +151,23 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist case ingotTriple: if (!aNoSmashing) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 96)); GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(3L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), - (int) Math.max(aMaterialMass * 3L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(3L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), + (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, - new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotDouble.get(aMaterial), 'B', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotDouble.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } @@ -188,22 +175,20 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist case ingotQuadruple: if (!aNoSmashing) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), + (int) Math.max(aMaterialMass, 1L), + calculateRecipeEU(aMaterial, 96)); // 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, - new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotTriple.get(aMaterial), 'B', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotTriple.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } @@ -211,21 +196,19 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist case ingotQuintuple: if (!aNoSmashing) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), - (int) Math.max(aMaterialMass, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), + (int) Math.max(aMaterialMass, 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.ingotQuintuple, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotQuadruple.get(aMaterial), 'B', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotQuadruple.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } @@ -233,9 +216,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist case ingotHot: if (aMaterial.mAutoGenerateVacuumFreezerRecipes) { GT_Values.RA.addVacuumFreezerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - (int) Math.max(aMaterialMass * 3L, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + (int) Math.max(aMaterialMass * 3L, 1L)); break; } default: diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java index 46bcc170f1..6a132e2dba 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java @@ -15,9 +15,9 @@ public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (GT_OreDictUnificator.getItemData(aStack) == null && !aOreDictName.equals("itemCertusQuartz") - && !aOreDictName.equals("itemNetherQuartz")) { + && !aOreDictName.equals("itemNetherQuartz")) { switch (aOreDictName) { case "itemSilicon": GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Silicon, 3628800L)); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index baa760dd3b..86b3caacbb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -19,48 +19,46 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { switch (aMaterial.mName) { case "Diamond", "Glass" -> { GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), - 1200, - 30); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), + 1200, + 30); GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - 2400, - 16); + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + 2400, + 16); } case "ChromaticGlass" -> GT_Values.RA.addCompressorRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - 600 * 20, - 1966080); + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), + GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + 600 * 20, + 1966080); default -> { GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), - 1200, - 120); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), + 1200, + 120); GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), - 2400, - 30); - final ITexture lensCoverTexture = TextureFactory.of( - Textures.BlockIcons.OVERLAY_LENS, - aMaterial.mRGBa, - false); + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), + 2400, + 30); + 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), - new gregtech.common.covers.GT_Cover_Lens(aMaterial.mColor.mIndex, lensCoverTexture)); + aStack, + TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), + new gregtech.common.covers.GT_Cover_Lens(aMaterial.mColor.mIndex, lensCoverTexture)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index c3b57a61b7..83fe77d82e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -20,116 +20,112 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aOreDictName.equals("logRubber")) { GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(2), - null, - Materials.Methane.getGas(60L), - ItemList.IC2_Resin.get(1L), - GT_ModHandler.getIC2Item("plantBall", 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), - GT_Values.NI, - GT_Values.NI, - new int[] { 5000, 3750, 2500, 2500 }, - 200, - 20); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(2), + null, + Materials.Methane.getGas(60L), + ItemList.IC2_Resin.get(1L), + GT_ModHandler.getIC2Item("plantBall", 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), + GT_Values.NI, + GT_Values.NI, + new int[] { 5000, 3750, 2500, 2500 }, + 200, + 20); GT_ModHandler.addSawmillRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.IC2_Resin.get(1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 16L)); + GT_Utility.copyAmount(1L, aStack), + ItemList.IC2_Resin.get(1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 16L)); GT_ModHandler.addExtractionRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L)); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), - ItemList.IC2_Resin.get(1L), - 33, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), + ItemList.IC2_Resin.get(1L), + 33, + false); } else { GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(1), - null, - Materials.Methane.getGas(60L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 200, - 20); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), + null, + Materials.Methane.getGas(60L), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 200, + 20); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), - 80, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), + 80, + false); } GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), + gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_Values.RA.addLatheRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), - 160, - 8); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), + 160, + 8); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 2L), - Materials.SeedOil.getFluid(50L), - ItemList.FR_Stick.get(1L), - 16, - 8); + GT_Utility.copyAmount(1L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 2L), + Materials.SeedOil.getFluid(50L), + ItemList.FR_Stick.get(1L), + 16, + 8); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(8L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 8L), - Materials.SeedOil.getFluid(250L), - ItemList.FR_Casing_Impregnated.get(1L), - 64, - 16); + GT_Utility.copyAmount(8L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 8L), + Materials.SeedOil.getFluid(250L), + ItemList.FR_Casing_Impregnated.get(1L), + 64, + 16); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Creosote.getFluid(1000L), - GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.cube", 1L, 8), - null, - null, - null, - 16, - 16); + GT_Utility.copyAmount(1L, aStack), + Materials.Creosote.getFluid(1000L), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.cube", 1L, 8), + null, + null, + null, + 16, + 16); short aMeta = (short) aStack.getItemDamage(); if (aMeta == Short.MAX_VALUE) { if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), - new ItemStack(Items.coal, 1, 1)))) { + 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)); } } for (int i = 0; i < 32767; i++) { if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), - new ItemStack(Items.coal, 1, 1)))) { + 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)); } } @@ -142,48 +138,45 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra ItemStack tPlanks = GT_Utility.copyOrNull(tStack); tPlanks.stackSize = (tPlanks.stackSize * 3 / 2); GT_Values.RA.addCutterRecipe( - new ItemStack(aStack.getItem(), 1, i), - Materials.Lubricant.getFluid(1L), - GT_Utility.copyOrNull(tPlanks), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), - 200, - 8); + new ItemStack(aStack.getItem(), 1, i), + Materials.Lubricant.getFluid(1L), + GT_Utility.copyOrNull(tPlanks), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), + 200, + 8); GT_Values.RA.addCutterRecipe( - new ItemStack(aStack.getItem(), 1, i), - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, - tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), - 200, - 8); + new ItemStack(aStack.getItem(), 1, i), + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + tStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), + 200, + 8); GT_ModHandler.addSawmillRecipe( - new ItemStack(aStack.getItem(), 1, i), - tPlanks, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); + new ItemStack(aStack.getItem(), 1, i), + 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_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), - tStack), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { new ItemStack(aStack.getItem(), 1, i) }); + GT_Utility + .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { new ItemStack(aStack.getItem(), 1, i) }); } } } else { if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), - new ItemStack(Items.coal, 1, 1)))) { + 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)); } } @@ -192,41 +185,39 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra ItemStack tPlanks = GT_Utility.copyOrNull(tStack); tPlanks.stackSize = (tPlanks.stackSize * 3 / 2); GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Lubricant.getFluid(1L), - GT_Utility.copyOrNull(tPlanks), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), - 200, - 8); + GT_Utility.copyAmount(1L, aStack), + Materials.Lubricant.getFluid(1L), + GT_Utility.copyOrNull(tPlanks), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), + 200, + 8); GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, - tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), - 200, - 8); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + tStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), + 200, + 8); GT_ModHandler.addSawmillRecipe( - GT_Utility.copyAmount(1L, aStack), - tPlanks, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); + GT_Utility.copyAmount(1L, aStack), + 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_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), - new Object[] { GT_Utility.copyAmount(1L, aStack) }); + GT_Utility.copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + new Object[] { GT_Utility.copyAmount(1L, aStack) }); } } if ((GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), - new ItemStack(Items.coal, 1, 1)))) { + 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)) GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); @@ -235,92 +226,92 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra public static void addPyrolyeOvenRecipes(ItemStack logStack) { GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - GT_Values.NF, - 1, - Materials.Charcoal.getGems(20), - Materials.Creosote.getFluid(4000), - 640, - 64); + GT_Utility.copyAmount(16L, logStack), + GT_Values.NF, + 1, + Materials.Charcoal.getGems(20), + Materials.Creosote.getFluid(4000), + 640, + 64); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - Materials.Nitrogen.getGas(1000), - 2, - Materials.Charcoal.getGems(20), - Materials.Creosote.getFluid(4000), - 320, - 96); + GT_Utility.copyAmount(16L, logStack), + Materials.Nitrogen.getGas(1000), + 2, + Materials.Charcoal.getGems(20), + Materials.Creosote.getFluid(4000), + 320, + 96); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - GT_Values.NF, - 3, - Materials.Ash.getDust(4), - Materials.OilHeavy.getFluid(200), - 320, - 192); + GT_Utility.copyAmount(16L, logStack), + GT_Values.NF, + 3, + Materials.Ash.getDust(4), + Materials.OilHeavy.getFluid(200), + 320, + 192); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - GT_Values.NF, - 3, - Materials.Charcoal.getGems(20), - Materials.CharcoalByproducts.getGas(4000), - 640, - 64); + GT_Utility.copyAmount(16L, logStack), + GT_Values.NF, + 3, + Materials.Charcoal.getGems(20), + Materials.CharcoalByproducts.getGas(4000), + 640, + 64); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - Materials.Nitrogen.getGas(1000), - 4, - Materials.Charcoal.getGems(20), - Materials.CharcoalByproducts.getGas(4000), - 320, - 96); + GT_Utility.copyAmount(16L, logStack), + Materials.Nitrogen.getGas(1000), + 4, + Materials.Charcoal.getGems(20), + Materials.CharcoalByproducts.getGas(4000), + 320, + 96); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - GT_Values.NF, - 5, - Materials.Charcoal.getGems(20), - Materials.WoodGas.getGas(1500), - 640, - 64); + GT_Utility.copyAmount(16L, logStack), + GT_Values.NF, + 5, + Materials.Charcoal.getGems(20), + Materials.WoodGas.getGas(1500), + 640, + 64); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - Materials.Nitrogen.getGas(1000), - 6, - Materials.Charcoal.getGems(20), - Materials.WoodGas.getGas(1500), - 320, - 96); + GT_Utility.copyAmount(16L, logStack), + Materials.Nitrogen.getGas(1000), + 6, + Materials.Charcoal.getGems(20), + Materials.WoodGas.getGas(1500), + 320, + 96); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - GT_Values.NF, - 7, - Materials.Charcoal.getGems(20), - Materials.WoodVinegar.getFluid(3000), - 640, - 64); + GT_Utility.copyAmount(16L, logStack), + GT_Values.NF, + 7, + Materials.Charcoal.getGems(20), + Materials.WoodVinegar.getFluid(3000), + 640, + 64); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - Materials.Nitrogen.getGas(1000), - 8, - Materials.Charcoal.getGems(20), - Materials.WoodVinegar.getFluid(3000), - 320, - 96); + GT_Utility.copyAmount(16L, logStack), + Materials.Nitrogen.getGas(1000), + 8, + Materials.Charcoal.getGems(20), + Materials.WoodVinegar.getFluid(3000), + 320, + 96); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - GT_Values.NF, - 9, - Materials.Charcoal.getGems(20), - Materials.WoodTar.getFluid(1500), - 640, - 64); + GT_Utility.copyAmount(16L, logStack), + GT_Values.NF, + 9, + Materials.Charcoal.getGems(20), + Materials.WoodTar.getFluid(1500), + 640, + 64); GT_Values.RA.addPyrolyseRecipe( - GT_Utility.copyAmount(16L, logStack), - Materials.Nitrogen.getGas(1000), - 10, - Materials.Charcoal.getGems(20), - Materials.WoodTar.getFluid(1500), - 320, - 96); + GT_Utility.copyAmount(16L, logStack), + Materials.Nitrogen.getGas(1000), + 10, + Materials.Charcoal.getGems(20), + Materials.WoodTar.getFluid(1500), + 320, + 96); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index af95ed62fd..bea8ab3bb7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -18,50 +18,44 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(9L, aStack), - aMaterial.contains(SubTag.SMELTING_TO_GEM) ? ItemList.Shape_Mold_Ball.get(0L) - : ItemList.Shape_Mold_Ingot.get(0L), - GT_OreDictUnificator.get( - aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, - aMaterial.mSmeltInto, - 1L), - 200, - calculateRecipeEU(aMaterial, 2)); + GT_Utility.copyAmount(9L, aStack), + aMaterial.contains(SubTag.SMELTING_TO_GEM) ? ItemList.Shape_Mold_Ball.get(0L) + : ItemList.Shape_Mold_Ingot.get(0L), + GT_OreDictUnificator.get( + aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, + aMaterial.mSmeltInto, + 1L), + 200, + calculateRecipeEU(aMaterial, 2)); if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Nugget.get(0L), - aMaterial.getMolten(16L), - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), - 16, - calculateRecipeEU(aMaterial, 4)); + ItemList.Shape_Mold_Nugget.get(0L), + aMaterial.getMolten(16L), + GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), + 16, + calculateRecipeEU(aMaterial, 4)); } 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), - ItemList.Shape_Mold_Nugget.get(0L), - GT_Utility.copyAmount(9L, aStack), - 100, - calculateRecipeEU(aMaterial, 1)); + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + ItemList.Shape_Mold_Nugget.get(0L), + GT_Utility.copyAmount(9L, aStack), + 100, + calculateRecipeEU(aMaterial, 1)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 9L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sI ", 'I', OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 9L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "sI ", 'I', OrePrefixes.ingot.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index cba50285a6..a74aa229a5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -19,60 +19,56 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra 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); + .startsWith("ore")) && (tPrefix != OrePrefixes.orePoor) + && (tPrefix != OrePrefixes.oreSmall) + && (tPrefix != OrePrefixes.oreRich) + && (tPrefix != OrePrefixes.oreNormal)) tPrefix.add(this); } @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { boolean tIsRich = (aPrefix == OrePrefixes.oreNetherrack) || (aPrefix == OrePrefixes.oreNether) - || (aPrefix == OrePrefixes.oreEndstone) - || (aPrefix == OrePrefixes.oreEnd) - || (aPrefix == OrePrefixes.oreRich) - || (aPrefix == OrePrefixes.oreDense); + || (aPrefix == OrePrefixes.oreEndstone) + || (aPrefix == OrePrefixes.oreEnd) + || (aPrefix == OrePrefixes.oreRich) + || (aPrefix == OrePrefixes.oreDense); if (aMaterial == Materials.Oilsands) { GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(1L, aStack), - null, - null, - Materials.OilHeavy.getFluid(tIsRich ? 4000L : 2000L), - new ItemStack(net.minecraft.init.Blocks.sand, 1, 0), - null, - null, - null, - null, - null, - new int[] { tIsRich ? 2000 : 4000 }, - tIsRich ? 600 : 300, - 30); + GT_Utility.copyAmount(1L, aStack), + null, + null, + Materials.OilHeavy.getFluid(tIsRich ? 4000L : 2000L), + new ItemStack(net.minecraft.init.Blocks.sand, 1, 0), + null, + null, + null, + null, + null, + new int[] { tIsRich ? 2000 : 4000 }, + tIsRich ? 600 : 300, + 30); } else { registerStandardOreRecipes( - aPrefix, - aMaterial, - GT_Utility.copyAmount(1L, aStack), - Math.max( - 1, - gregtech.api.GregTech_API.sOPStuff.get( - gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, - aMaterial.toString(), - 1)) - * (tIsRich ? 2 : 1)); + aPrefix, + aMaterial, + GT_Utility.copyAmount(1L, aStack), + Math.max( + 1, + gregtech.api.GregTech_API.sOPStuff.get( + gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, + aMaterial.toString(), + 1)) + * (tIsRich ? 2 : 1)); } } private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, - int aMultiplier) { + int aMultiplier) { if ((aOreStack == null) || (aMaterial == null)) return false; - GT_ModHandler.addValuableOre( - GT_Utility.getBlockFromStack(aOreStack), - aOreStack.getItemDamage(), - aMaterial.mOreValue); + GT_ModHandler + .addValuableOre(GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); Materials tMaterial = aMaterial.mOreReplacement; Materials tPrimaryByMaterial = null; aMultiplier = Math.max(1, aMultiplier); @@ -81,37 +77,37 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); - ItemStack tSmeltInto = tIngot == null ? null + ItemStack tSmeltInto = tIngot + == null + ? null : aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? GT_OreDictUnificator.get( + ? GT_OreDictUnificator.get( + OrePrefixes.gem, + tMaterial.mDirectSmelting, + GT_OreDictUnificator.get( + OrePrefixes.crystal, + tMaterial.mDirectSmelting, + GT_OreDictUnificator.get( OrePrefixes.gem, - tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( - OrePrefixes.crystal, - tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( - OrePrefixes.gem, - tMaterial, - GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), - 1L), - 1L), - 1L) - : tIngot; + tMaterial, + GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + 1L), + 1L), + 1L) + : tIngot; ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = GT_OreDictUnificator.get( - OrePrefixes.crushed, - tMaterial, - aMaterial.mOreMultiplier * aMultiplier); + ItemStack tCrushed = GT_OreDictUnificator + .get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { tCrushed = GT_OreDictUnificator.get( - OrePrefixes.dustImpure, - tMaterial, - GT_Utility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem), - aMaterial.mOreMultiplier * aMultiplier); + OrePrefixes.dustImpure, + tMaterial, + GT_Utility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem), + aMaterial.mOreMultiplier * aMultiplier); } ArrayList<ItemStack> tByProductStacks = new ArrayList<>(); @@ -122,32 +118,26 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator.get( - OrePrefixes.dustTiny, - tMat, - GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), - 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator.get( - OrePrefixes.dustTiny, - tMat, - GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), - 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) { this.mAlreadyListedOres.add(aMaterial); gregtech.api.util.GT_Recipe.GT_Recipe_Map.sByProductList.addFakeRecipe( - false, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L) }, - tByProductStacks.toArray(new ItemStack[0]), - null, - null, - null, - null, - 0, - 0, - 0); + false, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L) }, + tByProductStacks.toArray(new ItemStack[0]), + null, + null, + null, + null, + 0, + 0, + 0); } if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial; @@ -159,105 +149,95 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.removeFurnaceSmelting(aOreStack); } else { tHasSmelting = GT_ModHandler.addSmeltingRecipe( - aOreStack, - GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); + aOreStack, + GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); } if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { GT_Values.RA.addBlastRecipe( - aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier), - null, - null, - GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), - tSmeltInto.stackSize * 500, - 120, - 1500); + aOreStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier), + null, + null, + GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + tSmeltInto.stackSize * 500, + 120, + 1500); GT_Values.RA.addBlastRecipe( - aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier), - null, - null, - GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), - tSmeltInto.stackSize * 500, - 120, - 1500); + aOreStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier), + null, + null, + GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + tSmeltInto.stackSize * 500, + 120, + 1500); } } else if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_DOUBLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { GT_Values.RA.addBlastRecipe( - aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier), - null, - null, - GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), - tSmeltInto.stackSize * 500, - 120, - 1500); + aOreStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier), + null, + null, + GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + tSmeltInto.stackSize * 500, + 120, + 1500); GT_Values.RA.addBlastRecipe( - aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier), - null, - null, - GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), - tSmeltInto.stackSize * 500, - 120, - 1500); + aOreStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier), + null, + null, + GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + tSmeltInto.stackSize * 500, + 120, + 1500); } } } if (!tHasSmelting) { GT_ModHandler.addSmeltingRecipe( - aOreStack, - GT_OreDictUnificator.get( - OrePrefixes.gem, - tMaterial.mDirectSmelting, - Math.max(1, aMultiplier * aMaterial.mSmeltingMultiplier / 2))); + aOreStack, + GT_OreDictUnificator.get( + OrePrefixes.gem, + tMaterial.mDirectSmelting, + Math.max(1, aMultiplier * aMaterial.mSmeltingMultiplier / 2))); } if (tCrushed != null) { GT_Values.RA.addForgeHammerRecipe( - aOreStack, - GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed), - 16, - 10); + aOreStack, + GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed), + 16, + 10); GT_ModHandler.addPulverisationRecipe( - aOreStack, - GT_Utility.mul(2L, tCrushed), - tMaterial.contains(SubTag.PULVERIZING_CINNABAR) - ? GT_OreDictUnificator.get( - OrePrefixes.crystal, - Materials.Cinnabar, - GT_OreDictUnificator.get( - OrePrefixes.gem, - tPrimaryByMaterial, - GT_Utility.copyAmount(1L, tPrimaryByProduct), - 1L), - 1L) - : GT_OreDictUnificator.get( - OrePrefixes.gem, - tPrimaryByMaterial, - GT_Utility.copyAmount(1L, tPrimaryByProduct), - 1L), - tPrimaryByProduct == null ? 0 - : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier, - GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), - 50, - true); + aOreStack, + GT_Utility.mul(2L, tCrushed), + tMaterial.contains(SubTag.PULVERIZING_CINNABAR) + ? GT_OreDictUnificator.get( + OrePrefixes.crystal, + Materials.Cinnabar, + GT_OreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L), + 1L) + : GT_OreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L), + tPrimaryByProduct == null ? 0 + : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier, + GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), + 50, + true); } return true; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java index 11c7fb0a3c..e3b0a34016 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java @@ -20,7 +20,7 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { int aMultiplier = 1; switch (aPrefix) { case oreSmall: @@ -39,24 +39,22 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi } if (aMaterial != null) { GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, aMultiplier), - 16, - 10); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, aMultiplier), + 16, + 10); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier), - GT_OreDictUnificator.get( - OrePrefixes.dustTiny, - GT_Utility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts), - 1L), - 5 * aMultiplier, - GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), - 100, - true); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier), + GT_OreDictUnificator + .get(OrePrefixes.dustTiny, GT_Utility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts), 1L), + 5 * aMultiplier, + GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), + 100, + true); if (aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index 128a8d1368..04c359ae7a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -12,8 +12,8 @@ import gregtech.api.util.GT_Utility; public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipeRegistrator { private final OrePrefixes[] mSmeltingPrefixes = { OrePrefixes.crushed, OrePrefixes.crushedPurified, - OrePrefixes.crushedCentrifuged, OrePrefixes.dust, OrePrefixes.dustImpure, OrePrefixes.dustPure, - OrePrefixes.dustRefined }; + OrePrefixes.crushedCentrifuged, OrePrefixes.dust, OrePrefixes.dustImpure, OrePrefixes.dustPure, + OrePrefixes.dustRefined }; public ProcessingOreSmelting() { for (OrePrefixes tPrefix : this.mSmeltingPrefixes) tPrefix.add(this); @@ -21,28 +21,26 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_ModHandler.removeFurnaceSmelting(aStack); if (!aMaterial.contains(SubTag.NO_SMELTING)) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { if (aMaterial.mBlastFurnaceTemp < 1000 && aMaterial.mDirectSmelting.mBlastFurnaceTemp < 1000) if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { GT_Values.RA.addBlastRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 1L), - null, - null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - null, - (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, - 120, - aMaterial.mBlastFurnaceTemp); + GT_Utility.copyAmount(1L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 1L), + null, + null, + aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + aMaterial, + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + null, + (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, + 120, + aMaterial.mBlastFurnaceTemp); } } else { OrePrefixes outputPrefix; @@ -69,71 +67,71 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe if (aMaterial.mDirectSmelting != aMaterial) { if (!aMaterial.contains(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE)) { GT_Values.RA.addPrimitiveBlastRecipe( - GT_Utility.copyAmount(2, aStack), - GT_Values.NI, - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - GT_Values.NI, - 2400); + GT_Utility.copyAmount(2, aStack), + GT_Values.NI, + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + GT_Values.NI, + 2400); } else if (aMaterial == Materials.Chalcopyrite) { GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - new ItemStack(Blocks.sand, 2), - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDustSmall(2 * outputAmount), - 2400); + aMaterial.getDust(2), + new ItemStack(Blocks.sand, 2), + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Ferrosilite.getDustSmall(2 * outputAmount), + 2400); GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - Materials.Glass.getDust(2), - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDustTiny(7 * outputAmount), - 2400); + aMaterial.getDust(2), + Materials.Glass.getDust(2), + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Ferrosilite.getDustTiny(7 * outputAmount), + 2400); GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - Materials.SiliconDioxide.getDust(2), - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDust(outputAmount), - 2400); + aMaterial.getDust(2), + Materials.SiliconDioxide.getDust(2), + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Ferrosilite.getDust(outputAmount), + 2400); GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - Materials.Quartzite.getDust(4), - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDust(outputAmount), - 2400); + aMaterial.getDust(2), + Materials.Quartzite.getDust(4), + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Ferrosilite.getDust(outputAmount), + 2400); GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - Materials.NetherQuartz.getDust(2), - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDust(outputAmount), - 2400); + aMaterial.getDust(2), + Materials.NetherQuartz.getDust(2), + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Ferrosilite.getDust(outputAmount), + 2400); GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - Materials.CertusQuartz.getDust(2), - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDust(outputAmount), - 2400); + aMaterial.getDust(2), + Materials.CertusQuartz.getDust(2), + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Ferrosilite.getDust(outputAmount), + 2400); } else if (aMaterial == Materials.Tetrahedrite) { GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - GT_Values.NI, - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Antimony.getNuggets(3 * outputAmount), - 2400); + aMaterial.getDust(2), + GT_Values.NI, + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Antimony.getNuggets(3 * outputAmount), + 2400); } else if (aMaterial == Materials.Galena) { GT_Values.RA.addPrimitiveBlastRecipe( - aMaterial.getDust(2), - GT_Values.NI, - 2, - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Silver.getNuggets(3 * outputAmount), - 2400); + aMaterial.getDust(2), + GT_Values.NI, + 2, + aMaterial.mDirectSmelting.getIngots(outputAmount), + Materials.Silver.getNuggets(3 * outputAmount), + 2400); } } case dustImpure: @@ -159,9 +157,9 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe } ItemStack tStack = GT_OreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize); if (tStack == null) tStack = GT_OreDictUnificator.get( - aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, - aMaterial.mDirectSmelting, - 1L); + aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, + aMaterial.mDirectSmelting, + 1L); if ((tStack == null) && (!aMaterial.contains(SubTag.SMELTING_TO_GEM))) tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); GT_ModHandler.addSmeltingRecipe(aStack, tStack); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index 58f0c6e29b..053fae9488 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -29,60 +29,61 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { switch (aPrefix) { case pipeHuge, pipeLarge, pipeMedium, pipeSmall, pipeTiny -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PWP", "P P", "PHP", 'P', - aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench }); + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PWP", "P P", "PHP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PPP", "W H", "PPP", 'P', - aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench }); + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "W H", "PPP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PHP", "P P", "PWP", 'P', - aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench }); + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PHP", "P P", "PWP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) }); } } - case pipeRestrictiveHuge, pipeRestrictiveLarge, pipeRestrictiveMedium, pipeRestrictiveSmall, pipeRestrictiveTiny -> RA.addAssemblerRecipe( + case pipeRestrictiveHuge, pipeRestrictiveLarge, pipeRestrictiveMedium, pipeRestrictiveSmall, pipeRestrictiveTiny -> RA + .addAssemblerRecipe( GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true), GT_OreDictUnificator.get( - OrePrefixes.ring, - Materials.Steel, - aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), + OrePrefixes.ring, + Materials.Steel, + aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), GT_Utility.copyAmount(1L, aStack), (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount), 4); @@ -90,38 +91,33 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), - GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "MM ", "MM ", " ", 'M', - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); + GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), + GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "MM ", "MM ", " ", 'M', + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); } RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4), - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), - 60, - calculateRecipeEU(aMaterial, 4)); + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4), + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), + 60, + calculateRecipeEU(aMaterial, 4)); } case pipeNonuple -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PPP", "PPP", "PPP", 'P', - GT_OreDictUnificator.get( - aOreDictName.replaceFirst("Nonuple", "Small"), - null, - 1L, - false, - true) }); + GT_Utility.copyAmount(1, aStack), + GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPP", "PPP", "PPP", 'P', GT_OreDictUnificator + .get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) }); } RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9), - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1), - 60, - calculateRecipeEU(aMaterial, 8)); + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9), + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1), + 60, + calculateRecipeEU(aMaterial, 8)); } default -> {} } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java index 921491237a..e36eed66ab 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java @@ -20,91 +20,91 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aOreDictName.startsWith("plankWood")) { GT_Values.RA.addLatheRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2L), - null, - 10, - 8); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2L), + null, + 10, + 8); GT_Values.RA.addCNCRecipe( - GT_Utility.copyAmount(4L, aStack), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Wood, 1L), - 800, - 1); + GT_Utility.copyAmount(4L, aStack), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Wood, 1L), + 800, + 1); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(8L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - new ItemStack(Blocks.noteblock, 1), - 200, - 4); + GT_Utility.copyAmount(8L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + new ItemStack(Blocks.noteblock, 1), + 200, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(8L, aStack), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 1L), - new ItemStack(Blocks.jukebox, 1), - 400, - 4); + GT_Utility.copyAmount(8L, aStack), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 1L), + new ItemStack(Blocks.jukebox, 1), + 400, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 1L), - ItemList.Crate_Empty.get(1L), - 200, - 1); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 1L), + ItemList.Crate_Empty.get(1L), + 200, + 1); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.WroughtIron, 1L), - ItemList.Crate_Empty.get(1L), - 200, - 1); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.WroughtIron, 1L), + ItemList.Crate_Empty.get(1L), + 200, + 1); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), - ItemList.Crate_Empty.get(1L), - 200, - 1); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), + ItemList.Crate_Empty.get(1L), + 200, + 1); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 1L), - new ItemStack(Blocks.wooden_button, 1), - 100, - 4); + GT_Utility.copyAmount(1L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 1L), + new ItemStack(Blocks.wooden_button, 1), + 100, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 2L), - new ItemStack(Blocks.wooden_pressure_plate, 1), - 200, - 4); + GT_Utility.copyAmount(2L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 2L), + new ItemStack(Blocks.wooden_pressure_plate, 1), + 200, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(3L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 3L), - new ItemStack(Blocks.trapdoor, 1), - 300, - 4); + GT_Utility.copyAmount(3L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 3L), + new ItemStack(Blocks.trapdoor, 1), + 300, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(4L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 4L), - new ItemStack(Blocks.crafting_table, 1), - 400, - 4); + GT_Utility.copyAmount(4L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 4L), + new ItemStack(Blocks.crafting_table, 1), + 400, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(6L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 6L), - new ItemStack(Items.wooden_door, 1), - 600, - 4); + GT_Utility.copyAmount(6L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 6L), + new ItemStack(Items.wooden_door, 1), + 600, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(8L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 8L), - new ItemStack(Blocks.chest, 1), - 800, - 4); + GT_Utility.copyAmount(8L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 8L), + new ItemStack(Blocks.chest, 1), + 800, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(6L, aStack), - new ItemStack(Items.book, 3), - new ItemStack(Blocks.bookshelf, 1), - 400, - 4); + GT_Utility.copyAmount(6L, aStack), + new ItemStack(Items.book, 3), + new ItemStack(Blocks.bookshelf, 1), + 400, + 4); if (aStack.getItemDamage() == 32767) { for (byte i = 0; i < 64; i = (byte) (i + 1)) { @@ -113,35 +113,35 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist ItemStack tOutput = GT_ModHandler.getRecipeOutput(tStack, tStack, tStack); if ((tOutput != null) && (tOutput.stackSize >= 3)) { GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, tStack), - GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), - null, - 25, - 4); + GT_Utility.copyAmount(1L, tStack), + GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), + null, + 25, + 4); GT_ModHandler.removeRecipeDelayed(tStack, tStack, tStack); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sP", 'P', tStack }); + GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "sP", 'P', tStack }); } if ((tStack == null) && (i >= 16)) break; } } else { ItemStack tOutput = !aModName.equalsIgnoreCase("thaumcraft") - ? GT_ModHandler.getRecipeOutput(aStack, aStack, aStack) - : GT_ModHandler.getRecipeOutputNoOreDict(aStack, aStack, aStack); + ? GT_ModHandler.getRecipeOutput(aStack, aStack, aStack) + : GT_ModHandler.getRecipeOutputNoOreDict(aStack, aStack, aStack); if ((tOutput != null) && (tOutput.stackSize >= 3)) { GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), - null, - 25, - 4); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), + null, + 25, + 4); GT_ModHandler.removeRecipeDelayed(aStack, aStack, aStack); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sP", 'P', aStack }); + GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "sP", 'P', aStack }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index da12900bfd..f380b4ebdf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -48,7 +48,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist */ @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { final boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); final boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); @@ -75,89 +75,87 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeRecipeDelayed(aStack); GT_Utility.removeSimpleIC2MachineRecipe( - GT_Utility.copyAmount(9L, aStack), - GT_ModHandler.getCompressorRecipeList(), - GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); + GT_Utility.copyAmount(9L, aStack), + GT_ModHandler.getCompressorRecipeList(), + GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); if (aMaterial.mFuelPower > 0) { RA.addFuel(GT_Utility.copyAmount(1L, aStack), NI, aMaterial.mFuelPower, aMaterial.mFuelType); } if (aMaterial.mStandardMoltenFluid != null - && !(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { + && !(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(0L), - aMaterial.getMolten(L), - aMaterial.getPlates(1), - 32, - calculateRecipeEU(aMaterial, 8)); + ItemList.Shape_Mold_Plate.get(0L), + aMaterial.getMolten(L), + aMaterial.getPlates(1), + 32, + calculateRecipeEU(aMaterial, 8)); } GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { "hX", 'X', OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { "hX", 'X', OrePrefixes.plate.get(aMaterial) }); if (aMaterial == Materials.Paper) { GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(GregTech_API.sRecipeFile.get(harderrecipes, aStack, true) ? 2L : 3L, aStack), - BUFFERED, - new Object[] { "XXX", 'X', new ItemStack(Items.reeds, 1, W) }); + GT_Utility.copyAmount(GregTech_API.sRecipeFile.get(harderrecipes, aStack, true) ? 2L : 3L, aStack), + BUFFERED, + new Object[] { "XXX", 'X', new ItemStack(Items.reeds, 1, W) }); } if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial) { if (!aNoSmashing - && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { + && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { "h", // craftingToolHardHammer - "X", "X", 'X', OrePrefixes.ingot.get(aMaterial) }); + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { "h", // craftingToolHardHammer + "X", "X", 'X', OrePrefixes.ingot.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { "H", // craftingToolForgeHammer - "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', - OrePrefixes.ingot.get(aMaterial) }); + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { "H", // craftingToolForgeHammer + "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { "h", // craftingToolHardHammer - "X", 'X', OrePrefixes.gem.get(aMaterial) }); + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { "h", // craftingToolHardHammer + "X", 'X', OrePrefixes.gem.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( - aMaterial.getPlates(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { "H", // craftingToolForgeHammer - "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', - OrePrefixes.gem.get(aMaterial) }); + aMaterial.getPlates(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { "H", // craftingToolForgeHammer + "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.gem.get(aMaterial) }); } } if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) { + && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - aMaterial.getDust(1), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial) }); + aMaterial.getDust(1), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial) }); } } } } private void registerPlateDouble(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, - final long aMaterialMass) { + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -166,25 +164,25 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { RA.addBenderRecipe( - GT_Utility.copyAmount(2L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(2L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + calculateRecipeEU(aMaterial, 96)); if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammerdoubleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { + gregtech.api.enums.ConfigCategories.Tools.hammerdoubleplate, + OrePrefixes.plate.get(aMaterial) + .toString(), + true)) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', aPlateStack, 'B', aPlateStack }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', aPlateStack, 'B', aPlateStack }); } // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false @@ -197,25 +195,25 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } RA.addBenderRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), - GT_Utility.copyAmount(1L, aStack), - (int) Math.max(aMaterialMass * 2L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), + GT_Utility.copyAmount(1L, aStack), + (int) Math.max(aMaterialMass * 2L, 1L), + calculateRecipeEU(aMaterial, 96)); } else { RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), - GT_Utility.getIntegratedCircuit(2), - Materials.Glue.getFluid(10L), - GT_Utility.copyAmount(1L, aStack), - 64, - 8); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), + GT_Utility.getIntegratedCircuit(2), + Materials.Glue.getFluid(10L), + GT_Utility.copyAmount(1L, aStack), + 64, + 8); } } private void registerPlateTriple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, - final long aMaterialMass) { + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -224,117 +222,117 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { RA.addBenderRecipe( - GT_Utility.copyAmount(3L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), - (int) Math.max(aMaterialMass * 3L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_Utility.copyAmount(3L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L), + (int) Math.max(aMaterialMass * 3L, 1L), + calculateRecipeEU(aMaterial, 96)); if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammertripleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { + gregtech.api.enums.ConfigCategories.Tools.hammertripleplate, + OrePrefixes.plate.get(aMaterial) + .toString(), + true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, - aPlateStack, aPlateStack }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + aPlateStack, aPlateStack }); } } RA.addBenderRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), - GT_Utility.copyAmount(1L, aStack), - (int) Math.max(aMaterialMass * 3L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), + GT_Utility.copyAmount(1L, aStack), + (int) Math.max(aMaterialMass * 3L, 1L), + calculateRecipeEU(aMaterial, 96)); } else { RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), - GT_Utility.getIntegratedCircuit(3), - Materials.Glue.getFluid(20L), - GT_Utility.copyAmount(1L, aStack), - 96, - 8); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), + GT_Utility.getIntegratedCircuit(3), + Materials.Glue.getFluid(20L), + GT_Utility.copyAmount(1L, aStack), + 96, + 8); } RA.addImplosionRecipe( - GT_Utility.copyAmount(1L, aStack), - 2, - GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); + GT_Utility.copyAmount(1L, aStack), + 2, + GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); } private void registerPlateQuadruple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, - final long aMaterialMass, final boolean aNoWorking) { + final long aMaterialMass, final boolean aNoWorking) { registerCover(aMaterial, aStack); GT_ModHandler.removeRecipeByOutputDelayed(aStack); if (!aNoWorking) RA.addCNCRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - 30); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + 30); if (!aNoSmashing) { if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammerquadrupleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { + gregtech.api.enums.ConfigCategories.Tools.hammerquadrupleplate, + OrePrefixes.plate.get(aMaterial) + .toString(), + true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, - aPlateStack, aPlateStack, aPlateStack }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + aPlateStack, aPlateStack, aPlateStack }); } } RA.addBenderRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), - GT_Utility.copyAmount(1L, aStack), - (int) Math.max(aMaterialMass * 4L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), + GT_Utility.copyAmount(1L, aStack), + (int) Math.max(aMaterialMass * 4L, 1L), + calculateRecipeEU(aMaterial, 96)); } else { RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), - GT_Utility.getIntegratedCircuit(4), - Materials.Glue.getFluid(30L), - GT_Utility.copyAmount(1L, aStack), - 128, - 8); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), + GT_Utility.getIntegratedCircuit(4), + Materials.Glue.getFluid(30L), + GT_Utility.copyAmount(1L, aStack), + 128, + 8); } } private void registerPlateQuintuple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, - final long aMaterialMass) { + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -343,48 +341,48 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammerquintupleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { + gregtech.api.enums.ConfigCategories.Tools.hammerquintupleplate, + OrePrefixes.plate.get(aMaterial) + .toString(), + true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, - aPlateStack, aPlateStack }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, + aPlateStack, aPlateStack }); } } RA.addBenderRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), - GT_Utility.copyAmount(1L, aStack), - (int) Math.max(aMaterialMass * 5L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), + GT_Utility.copyAmount(1L, aStack), + (int) Math.max(aMaterialMass * 5L, 1L), + calculateRecipeEU(aMaterial, 96)); } else { RA.addAssemblerRecipe( - gregtech.api.util.GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), - ItemList.Circuit_Integrated.getWithDamage(0L, 5L), - Materials.Glue.getFluid(40L), - GT_Utility.copyAmount(1L, aStack), - 160, - 8); + gregtech.api.util.GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), + ItemList.Circuit_Integrated.getWithDamage(0L, 5L), + Materials.Glue.getFluid(40L), + GT_Utility.copyAmount(1L, aStack), + 160, + 8); } } private void registerPlateDense(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, - final long aMaterialMass) { + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -393,67 +391,67 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (!aNoSmashing) { RA.addBenderRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), - GT_Utility.copyAmount(1L, aStack), - (int) Math.max(aMaterialMass * 9L, 1L), - calculateRecipeEU(aMaterial, 96)); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), + GT_Utility.copyAmount(1L, aStack), + (int) Math.max(aMaterialMass * 9L, 1L), + calculateRecipeEU(aMaterial, 96)); } } private void registerItemCasing(final OrePrefixes aPrefix, final Materials aMaterial, final ItemStack aStack, - final boolean aNoSmashing) { + final boolean aNoSmashing) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); if (aMaterial.mStandardMoltenFluid != null) { RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Casing.get(0L), - aMaterial.getMolten(L / 2), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), - 16, - calculateRecipeEU(aMaterial, 8)); + ItemList.Shape_Mold_Casing.get(0L), + aMaterial.getMolten(L / 2), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), + 16, + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial - && !aNoSmashing - && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { + && !aNoSmashing + && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { "h X", 'X', OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { "h X", 'X', OrePrefixes.plate.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), - tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', - OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), + tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE + new Object[] { "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', + OrePrefixes.plate.get(aMaterial) }); } } RA.addAlloySmelterRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L), - ItemList.Shape_Mold_Casing.get(0L), - GT_Utility.copyAmount(3L, aStack), - 128, - calculateRecipeEU(aMaterial, 15)); + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L), + ItemList.Shape_Mold_Casing.get(0L), + GT_Utility.copyAmount(3L, aStack), + 128, + calculateRecipeEU(aMaterial, 15)); RA.addCutterRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L), - NI, - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 16)); + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L), + NI, + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 16)); RA.addExtruderRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - ItemList.Shape_Extruder_Casing.get(0L), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L), - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 45)); + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + ItemList.Shape_Extruder_Casing.get(0L), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L), + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 45)); GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); } @@ -463,41 +461,41 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist switch (aOreDictName) { case "plateAlloyCarbon" -> { RA.addAssemblerRecipe( - GT_ModHandler.getIC2Item("generator", 1L), - GT_Utility.copyAmount(4L, aStack), - GT_ModHandler.getIC2Item("windMill", 1L), - 6400, - 8); + GT_ModHandler.getIC2Item("generator", 1L), + GT_Utility.copyAmount(4L, aStack), + GT_ModHandler.getIC2Item("windMill", 1L), + 6400, + 8); GT_ModHandler.addAlloySmelterRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack(Blocks.glass, 3, W), - GT_ModHandler.getIC2Item("reinforcedGlass", 4L), - 400, - 4, - false); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(Blocks.glass, 3, W), + GT_ModHandler.getIC2Item("reinforcedGlass", 4L), + 400, + 4, + false); GT_ModHandler.addAlloySmelterRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Glass.getDust(3), - GT_ModHandler.getIC2Item("reinforcedGlass", 4L), - 400, - 4, - false); + GT_Utility.copyAmount(1L, aStack), + Materials.Glass.getDust(3), + GT_ModHandler.getIC2Item("reinforcedGlass", 4L), + 400, + 4, + false); } case "plateAlloyAdvanced" -> { GT_ModHandler.addAlloySmelterRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack(Blocks.glass, 3, W), - GT_ModHandler.getIC2Item("reinforcedGlass", 4L), - 400, - 4, - false); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(Blocks.glass, 3, W), + GT_ModHandler.getIC2Item("reinforcedGlass", 4L), + 400, + 4, + false); GT_ModHandler.addAlloySmelterRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Glass.getDust(3), - GT_ModHandler.getIC2Item("reinforcedGlass", 4L), - 400, - 4, - false); + GT_Utility.copyAmount(1L, aStack), + Materials.Glass.getDust(3), + GT_ModHandler.getIC2Item("reinforcedGlass", 4L), + 400, + 4, + false); } case "plateAlloyIridium" -> @@ -513,24 +511,24 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist ItemStack tStack = NI; // Try different prefixes to use same smooth stones as older GT5U for (OrePrefixes orePrefix : new OrePrefixes[] { OrePrefixes.block, OrePrefixes.block_, OrePrefixes.stoneSmooth, - OrePrefixes.stone }) { + OrePrefixes.stone }) { if ((tStack = GT_OreDictUnificator.get(orePrefix, aMaterial, 1)) != NI) break; } // Register the cover GregTech_API.registerCover( - aStack, - // If there is an ItemStack of Block for Materials - tStack == NI ? - // Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons - TextureFactory.builder() - .addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) - .setRGBA(aMaterial.mRGBa) - .stdOrient() - .build() - : - // or copy Block texture - TextureFactory.of(Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage()), - null); + aStack, + // If there is an ItemStack of Block for Materials + tStack == NI ? + // Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons + TextureFactory.builder() + .addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) + .setRGBA(aMaterial.mRGBa) + .stdOrient() + .build() + : + // or copy Block texture + TextureFactory.of(Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage()), + null); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java index 25c2810a94..01addd678c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java @@ -19,24 +19,24 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), - 10, - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), + 10, + 16); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get( - OrePrefixes.dustPure, - aMaterial.mMacerateInto, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), - 1L), - GT_OreDictUnificator.get( - OrePrefixes.dust, - GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), - 1L), - 10, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get( + OrePrefixes.dustPure, + aMaterial.mMacerateInto, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + 1L), + GT_OreDictUnificator.get( + OrePrefixes.dust, + GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), + 1L), + 10, + false); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java index 3f06f0676d..4f19d285ac 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java @@ -19,15 +19,15 @@ public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if ((aMaterial != Materials.Empty) && (GT_Utility.getFluidForFilledItem(aStack, true) == null) - && !aMaterial.contains(SubTag.SMELTING_TO_FLUID)) + && !aMaterial.contains(SubTag.SMELTING_TO_FLUID)) GT_Values.RA.addCannerRecipe( - aStack, - null, - GT_Utility.getContainerItem(aStack, true), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L), - (int) Math.max(aMaterial.getMass() / 2L, 1L), - 2); + aStack, + null, + GT_Utility.getContainerItem(aStack, true), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L), + (int) Math.max(aMaterial.getMass() / 2L, 1L), + 2); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java index 6f05d874e0..b17b48e358 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java @@ -18,9 +18,9 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { ItemStack tPlate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L); ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L); if (GT_Utility.isStackValid(tPlate) && GT_Utility.isStackValid(tRing)) { @@ -28,49 +28,49 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "PhP", "SRf", "PdP", 'P', - aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PhP", "SRf", "PdP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, - Materials.Tin.getMolten(32), - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 24)); + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, + Materials.Tin.getMolten(32), + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, - Materials.Lead.getMolten(48), - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 24)); + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, + Materials.Lead.getMolten(48), + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, - Materials.SolderingAlloy.getMolten(16), - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 24)); - } - GT_Values.RA.addExtruderRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L), - ItemList.Shape_Extruder_Rotor.get(0L), + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, + Materials.SolderingAlloy.getMolten(16), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), calculateRecipeEU(aMaterial, 24)); + } + GT_Values.RA.addExtruderRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L), + ItemList.Shape_Extruder_Rotor.get(0L), + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Rotor.get(0L), - aMaterial.getMolten(612L), - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 24)); + ItemList.Shape_Mold_Rotor.get(0L), + aMaterial.getMolten(612L), + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 24)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java index c470801b7e..0f28727558 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java @@ -21,29 +21,29 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), - GT_Utility.copyAmount(1L, aStack), - null, - (int) Math.max(aMaterial.getMass() / 4L, 1L), - 8); + GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), + GT_Utility.copyAmount(1L, aStack), + null, + (int) Math.max(aMaterial.getMass() / 4L, 1L), + 8); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 4L), - GT_Proxy.tBits, - new Object[] { "fXh", 'X', OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 4L), + GT_Proxy.tBits, + new Object[] { "fXh", 'X', OrePrefixes.ingot.get(aMaterial) }); } } if (GT_Mod.gregtechproxy.mAE2Integration) { Api.INSTANCE.registries() - .matterCannon() - .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); + .matterCannon() + .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java index 2e91eef9f5..b138ba6338 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java @@ -17,18 +17,18 @@ public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aOreDictName.equals("sandOil")) { GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(2L, aStack), - 1, - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), - new ItemStack(Blocks.sand, 1, 0), - null, - null, - null, - null, - 1000); + GT_Utility.copyAmount(2L, aStack), + 1, + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), + new ItemStack(Blocks.sand, 1, 0), + null, + null, + null, + null, + 1000); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java index 5ce42c6f45..dafde0e73d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java @@ -18,19 +18,19 @@ public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeReg @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_Values.RA.addPulveriserRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L) }, - new int[] { 10000 }, - 100, - 2); + GT_Utility.copyAmount(1L, aStack), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L) }, + new int[] { 10000 }, + 100, + 2); GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(8L, aStack), ItemList.IC2_Plantball.get(1L)); GT_Values.RA.addLatheRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L), - 16, - 8); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L), + 16, + 8); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java index 65564437e4..4da8591a2b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java @@ -18,20 +18,20 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), - GT_Utility.copyAmount(1L, aStack), - null, - (int) Math.max(aMaterial.getMass() / 8L, 1L), - calculateRecipeEU(aMaterial, 4)); + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), + GT_Utility.copyAmount(1L, aStack), + null, + (int) Math.max(aMaterial.getMass() / 8L, 1L), + calculateRecipeEU(aMaterial, 4)); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index aa12ca42ea..ae96f0eea9 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -21,9 +21,9 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (((aMaterial == Materials.Glass) || (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null)) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { + && (!aMaterial.contains(SubTag.NO_SMELTING))) { long aMaterialMass = aMaterial.getMass(); int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); if ((tAmount > 0) && (tAmount <= 64) && (aPrefix.mMaterialAmount % 3628800L == 0L)) { @@ -33,444 +33,444 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi if (aMaterial.contains(SubTag.NO_SMASHING)) { tVoltageMultiplier /= 4; } else if (aPrefix.name() - .startsWith(OrePrefixes.dust.name())) { - return; - } + .startsWith(OrePrefixes.dust.name())) { + return; + } if (!OrePrefixes.block.isIgnored(aMaterial.mSmeltInto)) { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(9L, aStack), - ItemList.Shape_Extruder_Block.get(0L), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount), - 10 * tAmount, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(9L, aStack), + ItemList.Shape_Extruder_Block.get(0L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount), + 10 * tAmount, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); // Allow creation of alloy smelter recipes for material recycling if < IV tier. if (tTrueVoltage < TierEU.IV) { GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(9L, aStack), - ItemList.Shape_Mold_Block.get(0L), - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount), - 5 * tAmount, - calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); + GT_Utility.copyAmount(9L, aStack), + ItemList.Shape_Mold_Block.get(0L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount), + 5 * tAmount, + calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); } } if (((aPrefix != OrePrefixes.ingot) || (aMaterial != aMaterial.mSmeltInto))) { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Ingot.get(0L), - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount), - 10, - calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Ingot.get(0L), + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount), + 10, + calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); } GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Pipe_Tiny.get(0L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2), - 4 * tAmount, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Pipe_Tiny.get(0L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2), + 4 * tAmount, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (!(aMaterial == Materials.Redstone || aMaterial == Materials.Glowstone)) { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Pipe_Small.get(0L), - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount), - 8 * tAmount, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Pipe_Small.get(0L), + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount), + 8 * tAmount, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Extruder_Pipe_Medium.get(0L), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount), - 24 * tAmount, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(3L, aStack), + ItemList.Shape_Extruder_Pipe_Medium.get(0L), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount), + 24 * tAmount, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(6L, aStack), - ItemList.Shape_Extruder_Pipe_Large.get(0L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount), - 48 * tAmount, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(6L, aStack), + ItemList.Shape_Extruder_Pipe_Large.get(0L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount), + 48 * tAmount, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); } GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(12L, aStack), - ItemList.Shape_Extruder_Pipe_Huge.get(0L), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount), - 96 * tAmount, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(12L, aStack), + ItemList.Shape_Extruder_Pipe_Huge.get(0L), + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount), + 96 * tAmount, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Plate.get(0L), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Plate.get(0L), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - ItemList.Shape_Extruder_Small_Gear.get(0L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + ItemList.Shape_Extruder_Small_Gear.get(0L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(6L, aStack), - ItemList.Shape_Extruder_Turbine_Blade.get(0L), - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(6L, aStack), + ItemList.Shape_Extruder_Turbine_Blade.get(0L), + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ring.get(0L), - aMaterial.getMolten(36L), - GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); + ItemList.Shape_Mold_Ring.get(0L), + aMaterial.getMolten(36L), + GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), + 100, + calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Screw.get(0L), - aMaterial.getMolten(18L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - 50, - calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + ItemList.Shape_Mold_Screw.get(0L), + aMaterial.getMolten(18L), + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), + 50, + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Rod.get(0L), - aMaterial.getMolten(72L), - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - 150, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Rod.get(0L), + aMaterial.getMolten(72L), + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + 150, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Bolt.get(0L), - aMaterial.getMolten(18L), - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), - 50, - calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + ItemList.Shape_Mold_Bolt.get(0L), + aMaterial.getMolten(18L), + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), + 50, + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Round.get(0L), - aMaterial.getMolten(18L), - GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), - 50, - calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + ItemList.Shape_Mold_Round.get(0L), + aMaterial.getMolten(18L), + GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), + 50, + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Rod_Long.get(0L), - aMaterial.getMolten(144L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - 300, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Rod_Long.get(0L), + aMaterial.getMolten(144L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + 300, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Turbine_Blade.get(0L), - aMaterial.getMolten(864L), - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), - 400, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Turbine_Blade.get(0L), + aMaterial.getMolten(864L), + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), + 400, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Tiny.get(0L), - aMaterial.getMolten(72L), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L), - 20, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Pipe_Tiny.get(0L), + aMaterial.getMolten(72L), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L), + 20, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Small.get(0L), - aMaterial.getMolten(144L), - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L), - 40, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Pipe_Small.get(0L), + aMaterial.getMolten(144L), + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L), + 40, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Medium.get(0L), - aMaterial.getMolten(432L), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L), - 80, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Pipe_Medium.get(0L), + aMaterial.getMolten(432L), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L), + 80, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Large.get(0L), - aMaterial.getMolten(864L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), - 160, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Pipe_Large.get(0L), + aMaterial.getMolten(864L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), + 160, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Huge.get(0L), - aMaterial.getMolten(1728L), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), - 320, - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + ItemList.Shape_Mold_Pipe_Huge.get(0L), + aMaterial.getMolten(1728L), + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), + 320, + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); } if (tAmount * 2 <= 64) { if (!(aMaterial == Materials.Aluminium)) { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Rod.get(0L), - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Rod.get(0L), + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); } else { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Rod.get(0L), - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), - 200, - calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Rod.get(0L), + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), + 200, + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } } if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Wire.get(0L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Wire.get(0L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); if (tAmount * 8 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Bolt.get(0L), - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Bolt.get(0L), + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (tAmount * 4 <= 64) { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Ring.get(0L), - GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Ring.get(0L), + GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_SMASHING)) + && !aMaterial.contains(SubTag.NO_SMASHING)) // If material tier < IV then add manual recipe. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "h ", "fX", 'X', OrePrefixes.stick.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "h ", "fX", 'X', OrePrefixes.stick.get(aMaterial) }); } } GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Sword.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Extruder_Sword.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Extruder_Pickaxe.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(3L, aStack), + ItemList.Shape_Extruder_Pickaxe.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Shovel.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Shovel.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Extruder_Axe.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(3L, aStack), + ItemList.Shape_Extruder_Axe.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Hoe.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Extruder_Hoe.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(6L, aStack), - ItemList.Shape_Extruder_Hammer.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 6L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(6L, aStack), + ItemList.Shape_Extruder_Hammer.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 6L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_File.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Extruder_File.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Saw.get(0L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Extruder_Saw.get(0L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(4L, aStack), - ItemList.Shape_Extruder_Gear.get(0L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 5L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + GT_Utility.copyAmount(4L, aStack), + ItemList.Shape_Extruder_Gear.get(0L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 5L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (!(aMaterial == Materials.StyreneButadieneRubber || aMaterial == Materials.Silicone)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Plate.get(0L), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Plate.get(0L), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } } else { // If tier < IV then add ability to turn ingots into plates via alloy smelter. if (tTrueVoltage < TierEU.IV) { GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Mold_Plate.get(0L), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Mold_Plate.get(0L), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } } // If tier < IV then add ability to turn ingots into gears via alloy smelter. if (tTrueVoltage < TierEU.IV) { GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(8L, aStack), - ItemList.Shape_Mold_Gear.get(0L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), - (int) Math.max(aMaterialMass * 10L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); + GT_Utility.copyAmount(8L, aStack), + ItemList.Shape_Mold_Gear.get(0L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), + (int) Math.max(aMaterialMass * 10L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } switch (aMaterial.mSmeltInto.mName) { case "Glass" -> { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Bottle.get(0L), - new ItemStack(Items.glass_bottle, 1), - tAmount * 32, - 16); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Bottle.get(0L), + new ItemStack(Items.glass_bottle, 1), + tAmount * 32, + 16); GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Mold_Bottle.get(0L), - new ItemStack(Items.glass_bottle, 1), - tAmount * 64, - 4); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Mold_Bottle.get(0L), + new ItemStack(Items.glass_bottle, 1), + tAmount * 64, + 4); } case "Steel" -> { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Cell.get(0L), - ItemList.Cell_Empty.get(tAmount), - tAmount * 128, - 30); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Cell.get(0L), + ItemList.Cell_Empty.get(tAmount), + tAmount * 128, + 30); if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingadviron", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingadviron", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); } case "Iron", "WroughtIron" -> { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Cell.get(0L), - GT_ModHandler.getIC2Item("fuelRod", tAmount), - tAmount * 128, - 30); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Cell.get(0L), + GT_ModHandler.getIC2Item("fuelRod", tAmount), + tAmount * 128, + 30); if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingiron", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingiron", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingiron", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingiron", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); if (tAmount * 31 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(31L, aStack), - ItemList.Shape_Mold_Anvil.get(0L), - new ItemStack(Blocks.anvil, 1, 0), - tAmount * 512, - 4 * tVoltageMultiplier); + GT_Utility.copyAmount(31L, aStack), + ItemList.Shape_Mold_Anvil.get(0L), + new ItemStack(Blocks.anvil, 1, 0), + tAmount * 512, + 4 * tVoltageMultiplier); } case "Tin" -> { GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Cell.get(0L), - ItemList.Cell_Empty.get(tAmount), - tAmount * 128, - 30); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Extruder_Cell.get(0L), + ItemList.Cell_Empty.get(tAmount), + tAmount * 128, + 30); if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingtin", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingtin", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingtin", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingtin", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); } case "Lead" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casinglead", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casinglead", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casinglead", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casinglead", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); } case "Copper", "AnnealedCopper" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingcopper", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingcopper", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); } case "Bronze" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingbronze", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingbronze", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); } case "Gold" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casinggold", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casinggold", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casinggold", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casinggold", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); } case "Polytetrafluoroethylene" -> // Recipe for cells from PTFE, why is it here? GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Cell.get(0L), - ItemList.Cell_Empty.get(tAmount * 4), - tAmount * 128, - 30); + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Cell.get(0L), + ItemList.Cell_Empty.get(tAmount * 4), + tAmount * 128, + 30); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java index 9d2bad9783..6d4ed4cfe8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java @@ -18,18 +18,18 @@ public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aOreDictName.startsWith("slabWood")) { if (Railcraft.isModLoaded()) { GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(3L, aStack), - Materials.Creosote.getFluid(300L), - ItemList.RC_Tie_Wood.get(3L), - null, - null, - null, - 200, - 4); + GT_Utility.copyAmount(3L, aStack), + Materials.Creosote.getFluid(300L), + ItemList.RC_Tie_Wood.get(3L), + null, + null, + null, + 200, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index 3e7470b5f7..a09e0ba0b2 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -18,58 +18,58 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { " s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { " s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial) }); } if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( - aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L), - (int) Math.max(aMaterial.getMass() * 5L, 1L), - calculateRecipeEU(aMaterial, 16)); + aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) + : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L), + (int) Math.max(aMaterial.getMass() * 5L, 1L), + calculateRecipeEU(aMaterial, 16)); GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L), - null, - (int) Math.max(aMaterial.getMass() * 2L, 1L), - calculateRecipeEU(aMaterial, 4)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L), + null, + (int) Math.max(aMaterial.getMass() * 2L, 1L), + calculateRecipeEU(aMaterial, 4)); if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "s", "X", 'X', OrePrefixes.stickLong.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "s", "X", 'X', OrePrefixes.stickLong.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "f ", " X", 'X', OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "f ", " X", 'X', OrePrefixes.ingot.get(aMaterial) }); } } } if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), - 100, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), + 100, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addForgeHammerRecipe( - GT_Utility.copyAmount(2L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 16)); + GT_Utility.copyAmount(2L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 16)); } GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - GT_Utility.getIntegratedCircuit(2), - Materials.SeedOil.getFluid(50L), - ItemList.FR_Stick.get(1L), - 16, - 8); + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + GT_Utility.getIntegratedCircuit(2), + Materials.SeedOil.getFluid(50L), + ItemList.FR_Stick.get(1L), + 16, + 8); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index e586922891..29a872cc04 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -18,45 +18,45 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { " s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { " s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial) }); } if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), - null, - (int) Math.max(aMaterial.getMass(), 1L), - calculateRecipeEU(aMaterial, 4)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), + null, + (int) Math.max(aMaterial.getMass(), 1L), + calculateRecipeEU(aMaterial, 4)); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] { "sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial) }); } } } if (!aMaterial.contains(SubTag.NO_SMASHING)) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), - 200, - calculateRecipeEU(aMaterial, 16)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), + 200, + calculateRecipeEU(aMaterial, 16)); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "ShS", 'S', OrePrefixes.stick.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "ShS", 'S', OrePrefixes.stick.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index 7588139cfc..4936487f68 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -24,206 +24,206 @@ public class ProcessingStone implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { Block aBlock = GT_Utility.getBlockFromStack(aStack); switch (aMaterial.mName) { case "NULL": GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(3L, aStack), - new ItemStack(Blocks.redstone_torch, 2), - Materials.Redstone.getMolten(144L), - new ItemStack(Items.repeater, 1), - 100, - 4); + GT_Utility.copyAmount(3L, aStack), + new ItemStack(Blocks.redstone_torch, 2), + Materials.Redstone.getMolten(144L), + new ItemStack(Items.repeater, 1), + 100, + 4); break; case "Sand": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack(Blocks.sand, 1, 0), - null, - 10, - false); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(Blocks.sand, 1, 0), + null, + 10, + false); break; case "Endstone": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Endstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungstate, 1L), - 5, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Endstone, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungstate, 1L), + 5, + false); break; case "Netherrack": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Netherrack, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L), - 5, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Netherrack, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L), + 5, + false); break; case "NetherBrick": GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 1L), - new ItemStack(Blocks.nether_brick_fence, 1), - 100, - 4); + GT_Utility.copyAmount(1L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 1L), + new ItemStack(Blocks.nether_brick_fence, 1), + 100, + 4); break; case "Obsidian": if (aBlock != Blocks.air) aBlock.setResistance(20.0F); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.IC2_Compressed_Coal_Ball.get(8L), - ItemList.IC2_Compressed_Coal_Chunk.get(1L), - 400, - 4); - GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_ModHandler.getModItem( - Railcraft.ID, - "cube.crushed.obsidian", - 1L, - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - 10, - true); + GT_Utility.copyAmount(1L, aStack), + ItemList.IC2_Compressed_Coal_Ball.get(8L), + ItemList.IC2_Compressed_Coal_Chunk.get(1L), + 400, + 4); + GT_ModHandler.addPulverisationRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_ModHandler.getModItem( + Railcraft.ID, + "cube.crushed.obsidian", + 1L, + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + 10, + true); break; case "Concrete": GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - null, - 100, - 30); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + null, + 100, + 30); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)); break; case "Rhyolite": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartz, 1L), - 20, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartz, 1L), + 20, + false); break; case "Komatiite": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L), - 5, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L), + 5, + false); break; case "Dacite": case "Andesite": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L), - 20, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L), + 20, + false); break; case "Gabbro": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L), - 20, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L), + 20, + false); break; case "Eclogite": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1L), - 10, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1L), + 10, + false); break; case "Soapstone": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Talc, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chromite, 1L), - 10, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Talc, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chromite, 1L), + 10, + false); break; case "Greenschist": case "Blueschist": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glauconite, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L), - 100, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glauconite, 2L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L), + 100, + false); break; case "Gneiss": case "Migmatite": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.GraniteBlack, 1L), - 50, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.GraniteBlack, 1L), + 50, + false); break; case "Redrock": case "Marble": GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - null, - 200, - 30); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + null, + 200, + 30); case "Basalt": GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - null, - 200, - 30); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + null, + 200, + 30); case "Quartzite": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - 10, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + 10, + false); break; case "Flint": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 2L), - new ItemStack(Items.flint, 1), - 50, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 2L), + new ItemStack(Items.flint, 1), + 50, + false); break; case "GraniteBlack": GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - null, - 200, - 30); - GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L), - 1, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + null, + 200, + 30); + GT_ModHandler.addPulverisationRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L), + 1, + false); break; case "GraniteRed": GT_Values.RA.addCutterRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), - null, - 200, - 30); - GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1L), - 1, - false); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), + null, + 200, + 30); + GT_ModHandler.addPulverisationRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1L), + 1, + false); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java index fad83fe171..6b545f2d02 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java @@ -19,31 +19,31 @@ public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), - new ItemStack(Blocks.lever, 1), - 400, - 1); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), + new ItemStack(Blocks.lever, 1), + 400, + 1); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(8L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 8L), - new ItemStack(Blocks.furnace, 1), - 400, - 4); + GT_Utility.copyAmount(8L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 8L), + new ItemStack(Blocks.furnace, 1), + 400, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(7L, aStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - new ItemStack(Blocks.dropper, 1), - 400, - 4); + GT_Utility.copyAmount(7L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + new ItemStack(Blocks.dropper, 1), + 400, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(7L, aStack), - new ItemStack(Items.bow, 1, 0), - Materials.Redstone.getMolten(144L), - new ItemStack(Blocks.dispenser, 1), - 400, - 4); + GT_Utility.copyAmount(7L, aStack), + new ItemStack(Items.bow, 1, 0), + Materials.Redstone.getMolten(144L), + new ItemStack(Blocks.dispenser, 1), + 400, + 4); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java index 1bab13c5b5..4dcc0ed73f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java @@ -23,20 +23,20 @@ public class ProcessingStoneVarious implements gregtech.api.interfaces.IOreRecip @Override public void registerOre(OrePrefixes aPrefix, gregtech.api.enums.Materials aMaterial, String aOreDictName, - String aModName, ItemStack aStack) { + String aModName, ItemStack aStack) { if (aPrefix == OrePrefixes.stoneSmooth) { GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 1L), - new ItemStack(Blocks.stone_button, 1), - 100, - 4); + GT_Utility.copyAmount(1L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 1L), + new ItemStack(Blocks.stone_button, 1), + 100, + 4); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Circuit_Integrated.getWithDamage(0L, 2L), - new ItemStack(Blocks.stone_pressure_plate, 1), - 200, - 4); + GT_Utility.copyAmount(2L, aStack), + ItemList.Circuit_Integrated.getWithDamage(0L, 2L), + new ItemStack(Blocks.stone_pressure_plate, 1), + 200, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 178a5f9e77..c65b496649 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -36,1217 +36,1141 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { boolean aSpecialRecipeReq1 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_SMASHING); + && !aMaterial.contains(SubTag.NO_SMASHING); boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING); + && !aMaterial.contains(SubTag.NO_WORKING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { case toolHeadArrow -> { if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Arrow.get(0L), - aMaterial.getMolten(36L), - GT_Utility.copyAmount(1L, aStack), - 16, - 4); + ItemList.Shape_Mold_Arrow.get(0L), + aMaterial.getMolten(36L), + GT_Utility.copyAmount(1L, aStack), + 16, + 4); } if (aSpecialRecipeReq2) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "Xf", 'X', OrePrefixes.gemChipped.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "Xf", 'X', OrePrefixes.gemChipped.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 3L), - GT_Proxy.tBits, - new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P', - OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 3L), + GT_Proxy.tBits, + new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P', + OrePrefixes.plate.get(aMaterial) }); } } case toolHeadAxe -> { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.AXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(2) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - 120); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "PIh", "P ", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_Utility.getIntegratedCircuit(2) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.AXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + 200, + 120); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PIh", "P ", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } case toolHeadBuzzSaw -> { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUZZSAW_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) }); } case toolHeadChainsaw -> { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CHAINSAW_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S', - OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) }); } case toolHeadDrill -> { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 100_000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 75_000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 50_000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 400_000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 300_000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 200_000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1_600_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_600_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1_200_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_200_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 800_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1_600_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Piston_HV.get(1L), 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.JACKHAMMER, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_600_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1_200_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Piston_HV.get(1L), 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.JACKHAMMER, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_200_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 800_000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Piston_HV.get(1L), 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.JACKHAMMER, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); if (aSpecialRecipeReq2) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "XSX", "XSX", "ShS", 'X', OrePrefixes.plate.get(aMaterial), 'S', - OrePrefixes.plate.get(Materials.Steel) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "XSX", "XSX", "ShS", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel) }); if (aMaterial.getMolten(1) != null) { GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_ToolHeadDrill.get(0), - aMaterial.getMolten(144 * 4), - GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), - 5 * 20, - calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); + ItemList.Shape_Mold_ToolHeadDrill.get(0), + aMaterial.getMolten(144 * 4), + GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), + 5 * 20, + calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); } if (aMaterial.getIngots(1) != null) { GT_Values.RA.addExtruderRecipe( - aMaterial.getIngots(4), - ItemList.Shape_Extruder_ToolHeadDrill.get(0), - GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), - 5 * 20, - calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); + aMaterial.getIngots(4), + ItemList.Shape_Extruder_ToolHeadDrill.get(0), + GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), + 5 * 20, + calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); } } } case toolHeadFile -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.FILE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + + if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { + GT_ModHandler.addCraftingRecipe( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - - if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - GT_ModHandler.RecipeBits.MIRRORED - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "P", "P", "S", 'P', OrePrefixes.plate.get(aMaterial), 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "P", "P", "S", 'P', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } } } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(15) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - calculateRecipeEU(aMaterial, 120)); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(15) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), + 200, + calculateRecipeEU(aMaterial, 120)); } case toolHeadHoe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.HOE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(16) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - calculateRecipeEU(aMaterial, 120)); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_Utility.getIntegratedCircuit(16) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), + 200, + calculateRecipeEU(aMaterial, 120)); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } case toolHeadPickaxe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.PICKAXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "PII", "f h", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PII", "f h", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(5) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - 120); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(5) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.PICKAXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + 200, + 120); } case toolHeadPlow -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.PLOW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(6) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - calculateRecipeEU(aMaterial, 120)); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(6) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), + 200, + calculateRecipeEU(aMaterial, 120)); } case toolHeadSaw -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SAW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "PP ", "fh ", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PP ", "fh ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(7) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - calculateRecipeEU(aMaterial, 120)); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(7) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), + 200, + calculateRecipeEU(aMaterial, 120)); } case toolHeadSense -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SENSE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "PPI", "hf ", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PPI", "hf ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(8) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - calculateRecipeEU(aMaterial, 120)); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(8) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SENSE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + 200, + calculateRecipeEU(aMaterial, 120)); } case toolHeadShovel -> { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SHOVEL, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(9) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - 120); - if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_Utility.getIntegratedCircuit(9) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SHOVEL, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + 200, + 120); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } case toolHeadSword -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SWORD, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { " P ", "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " P ", "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); if (!aNoWorking) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(10) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - calculateRecipeEU(aMaterial, 120)); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(10) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SWORD, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + 200, + calculateRecipeEU(aMaterial, 120)); } case toolHeadUniversalSpade -> { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, - 1, - aMaterial, - aMaterial, - null), - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial), - ToolDictNames.craftingToolScrewdriver }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, aMaterial, aMaterial, null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial), + ToolDictNames.craftingToolScrewdriver }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(11) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - 120); - if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) }); + GT_Utility.getIntegratedCircuit(11) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + 200, + 120); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) }); } case toolHeadWrench -> { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), - 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', - OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), 'S', + OrePrefixes.screw.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.Aluminium), + 'G', OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), - 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, - 1, - aMaterial, - Materials.Steel, - new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', - OrePrefixes.plate.get(Materials.Steel), 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), - 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), - 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, - 1, - aMaterial, - Materials.Aluminium, - new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), - 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, - 1, - aMaterial, - Materials.StainlessSteel, - new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S', - OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W', - OrePrefixes.screw.get(Materials.Steel) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W', + OrePrefixes.screw.get(Materials.Steel) }); } case toolHeadHammer, toolHeadMallet -> { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(14) }, - GT_Values.NF, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - 200, - 120); + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(14) }, + GT_Values.NF, + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) + ? GT_MetaGenerated_Tool_01.SOFTMALLET + : GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + 200, + 120); if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) + ? GT_MetaGenerated_Tool_01.SOFTMALLET + : GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "XX ", "XXS", "XX ", 'X', - aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) - : OrePrefixes.ingot.get(aMaterial), - 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) + ? GT_MetaGenerated_Tool_01.SOFTMALLET + : GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "XX ", "XXS", "XX ", 'X', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) + : OrePrefixes.ingot.get(aMaterial), + 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "XX ", "XXS", "XX ", 'X', - aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) - : OrePrefixes.gem.get(aMaterial), - 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) + ? GT_MetaGenerated_Tool_01.SOFTMALLET + : GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "XX ", "XXS", "XX ", 'X', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) + : OrePrefixes.gem.get(aMaterial), + 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } if (aPrefix == OrePrefixes.toolHeadHammer) if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I', - OrePrefixes.ingot.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); } case turbineBlade -> { GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L), - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null), - 160, - calculateRecipeEU(aMaterial, 100)); + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null), + 160, + calculateRecipeEU(aMaterial, 100)); GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L), - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null), - 320, - calculateRecipeEU(aMaterial, 400)); + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null), + 320, + calculateRecipeEU(aMaterial, 400)); GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L), - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null), - 640, - calculateRecipeEU(aMaterial, 1600)); + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null), + 640, + calculateRecipeEU(aMaterial, 1600)); GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L), - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null), - 1280, - calculateRecipeEU(aMaterial, 6400)); + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null), + 1280, + calculateRecipeEU(aMaterial, 6400)); if (aSpecialRecipeReq2) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "fPd", "SPS", " P ", 'P', - aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plateDouble.get(aMaterial), - 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fPd", "SPS", " P ", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plateDouble.get(aMaterial), + 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); } GT_Values.RA.addFormingPressRecipe( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L), - GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), - 200, - calculateRecipeEU(aMaterial, 60)); + GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L), + GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), + 200, + calculateRecipeEU(aMaterial, 60)); } } default -> {} diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java index 9925e013bf..ddb0bd46c7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java @@ -15,146 +15,109 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLUNGER, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R', - OrePrefixes.plate.get(Materials.AnyRubber) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R', + OrePrefixes.plate.get(Materials.AnyRubber) }); } if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING))) { + && (!aMaterial.contains(SubTag.NO_SMASHING))) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CROWBAR, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W', + OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WIRECUTTER, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', - OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCOOP, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W', - new ItemStack(Blocks.wool, 1, 32767) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W', + new ItemStack(Blocks.wool, 1, 32767) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BRANCHCUTTER, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', - OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.KNIFE, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', - OrePrefixes.plate.get(aMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, - 1, - aMaterial, - aMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PPf", "PP ", "Sh ", 'S', OrePrefixes.stick.get(aMaterial), 'P', - OrePrefixes.plate.get(aMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPf", "PP ", "Sh ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, - 1, - aMaterial, - Materials.Rubber, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', - OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Iron), - 'L', ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, + 1, + aMaterial, + Materials.Rubber, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Iron), 'L', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_MV, - 1, - aMaterial, - Materials.Rubber, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', - OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Steel), - 'L', ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SOLDERING_IRON_MV, + 1, + aMaterial, + Materials.Rubber, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Steel), 'L', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_HV, - 1, - aMaterial, - Materials.AnySyntheticRubber, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', - OrePrefixes.plate.get(Materials.AnySyntheticRubber), 'S', - OrePrefixes.stick.get(Materials.StainlessSteel), 'L', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SOLDERING_IRON_HV, + 1, + aMaterial, + Materials.AnySyntheticRubber, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnySyntheticRubber), 'S', + OrePrefixes.stick.get(Materials.StainlessSteel), 'L', ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - (GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.POCKET_MULTITOOL, - 1, - aMaterial, - aMaterial, - null)), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "ABC", "DEF", "CFG", 'A', OrePrefixes.stickLong.get(aMaterial), 'B', - OrePrefixes.toolHeadSaw.get(aMaterial), 'C', OrePrefixes.ring.get(aMaterial), 'D', - OrePrefixes.toolHeadFile.get(aMaterial), 'E', OrePrefixes.plate.get(aMaterial), 'F', - OrePrefixes.toolHeadSword.get(aMaterial), 'G', Dyes.dyeBlue }); + (GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.POCKET_MULTITOOL, 1, aMaterial, aMaterial, null)), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "ABC", "DEF", "CFG", 'A', OrePrefixes.stickLong.get(aMaterial), 'B', + OrePrefixes.toolHeadSaw.get(aMaterial), 'C', OrePrefixes.ring.get(aMaterial), 'D', + OrePrefixes.toolHeadFile.get(aMaterial), 'E', OrePrefixes.plate.get(aMaterial), 'F', + OrePrefixes.toolHeadSword.get(aMaterial), 'G', Dyes.dyeBlue }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index 4d37fc2eb1..4c7b10f7cb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -14,110 +14,109 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { public ProcessingTransforming() { for (OrePrefixes tPrefix : OrePrefixes.values()) if (((tPrefix.mMaterialAmount > 0L) && (!tPrefix.mIsContainer) && (!tPrefix.mIsEnchantable)) - || (tPrefix == OrePrefixes.plank)) - tPrefix.add(this); + || (tPrefix == OrePrefixes.plank)) tPrefix.add(this); } @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aPrefix == OrePrefixes.plank) aPrefix = OrePrefixes.plate; switch (aMaterial.mName) { case "Wood": GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.SeedOil.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), - GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), - GT_Values.NI, - GT_Values.NI, - null, - 100, - 8); + GT_Utility.copyAmount(1L, aStack), + Materials.SeedOil + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), + GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), + GT_Values.NI, + GT_Values.NI, + null, + 100, + 8); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilLin.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), - GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), - GT_Values.NI, - GT_Values.NI, - null, - 100, - 8); + GT_Utility.copyAmount(1L, aStack), + Materials.SeedOilLin + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), + GT_Values.NI, + GT_Values.NI, + null, + 100, + 8); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilHemp.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), - GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), - GT_Values.NI, - GT_Values.NI, - null, - 100, - 8); + GT_Utility.copyAmount(1L, aStack), + Materials.SeedOilHemp + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), + GT_Values.NI, + GT_Values.NI, + null, + 100, + 8); break; case "Iron": GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), - GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), - GT_Values.NI, - GT_Values.NI, - null, - 100, - 8); + GT_Utility.copyAmount(1L, aStack), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), + GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), + GT_Values.NI, + GT_Values.NI, + null, + 100, + 8); GT_Values.RA.addPolarizerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L), - (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L), + (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), + 16); break; case "WroughtIron": GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), - GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), - GT_Values.NI, - GT_Values.NI, - null, - 100, - 8); + GT_Utility.copyAmount(1L, aStack), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), + GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), + GT_Values.NI, + GT_Values.NI, + null, + 100, + 8); GT_Values.RA.addPolarizerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L), - (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L), + (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), + 16); break; case "Steel": GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), - GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), - GT_Values.NI, - GT_Values.NI, - null, - 100, - 8); + GT_Utility.copyAmount(1L, aStack), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), + GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), + GT_Values.NI, + GT_Values.NI, + null, + 100, + 8); GT_Values.RA.addPolarizerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L), - (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), - 16); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L), + (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), + 16); break; case "Neodymium": GT_Values.RA.addPolarizerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L), - (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), - 256); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L), + (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), + 256); case "Samarium": GT_Values.RA.addPolarizerRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L), - (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), - 4096); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L), + (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L), + 4096); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java index 6b6580885e..299e0a92fe 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java @@ -15,7 +15,7 @@ public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistra @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (aOreDictName.equals("waxMagical")) GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aStack), null, 6, 5); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 3ae77f5b91..8c4ce4953c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -35,7 +35,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (GT_Mod.gregtechproxy.mAE2Integration) { if (tt == TunnelType.ME) { try { @@ -54,67 +54,67 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt01; if (!aMaterial.contains(SubTag.NO_SMASHING)) { GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), - 100, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), + 100, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addWiremillRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L), - 200, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L), + 200, + calculateRecipeEU(aMaterial, 8)); } if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) - && !aMaterial.contains(SubTag.NO_WORKING)) { + && !aMaterial.contains(SubTag.NO_WORKING)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "Xx", 'X', OrePrefixes.plate.get(aMaterial) }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "Xx", 'X', OrePrefixes.plate.get(aMaterial) }); } } GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(2L, aStack), - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), - 150, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(2L, aStack), + GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), + 150, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(4L, aStack), - GT_Utility.getIntegratedCircuit(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), - 200, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(4L, aStack), + GT_Utility.getIntegratedCircuit(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), + 200, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(8L, aStack), - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L), - 300, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(8L, aStack), + GT_Utility.getIntegratedCircuit(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L), + 300, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(12L, aStack), - GT_Utility.getIntegratedCircuit(12), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L), - 400, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(12L, aStack), + GT_Utility.getIntegratedCircuit(12), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L), + 400, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - GT_Utility.copyAmount(16L, aStack), - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), - 500, - calculateRecipeEU(aMaterial, 8)); + GT_Utility.copyAmount(16L, aStack), + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), + 500, + calculateRecipeEU(aMaterial, 8)); } case wireGt02 -> { cableWidth = 2; correspondingCable = OrePrefixes.cableGt02; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), - new Object[] { aOreDictName }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); } } case wireGt04 -> { @@ -122,15 +122,15 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt04; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), - new Object[] { aOreDictName }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) }); } } case wireGt08 -> { @@ -138,17 +138,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt08; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), - new Object[] { aOreDictName }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } } case wireGt12 -> { @@ -156,11 +156,11 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt12; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), - new Object[] { aOreDictName }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } } case wireGt16 -> { @@ -169,14 +169,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), - new Object[] { aOreDictName }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - new Object[] { OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); if (GT_Mod.gregtechproxy.mAE2Integration) { AE2addNewAttunement(aStack); @@ -185,9 +185,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } default -> { GT_Log.err.println( - "OrePrefix " + aPrefix.name() - + " cannot be registered as a cable for Material " - + aMaterial.mName); + "OrePrefix " + aPrefix.name() + " cannot be registered as a cable for Material " + aMaterial.mName); return; } } @@ -207,32 +205,32 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr craftingListRubber.add(OrePrefixes.plate.get(Materials.Rubber)); } GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - craftingListRubber.toArray()); + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + craftingListRubber.toArray()); GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - 8); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); GT_Values.RA.addAlloySmelterRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L), - 100, - 8); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L), + 100, + 8); GT_Values.RA.addAlloySmelterRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L), - 200, - 16); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L), + 200, + 16); GT_Values.RA.addAlloySmelterRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L), - 300, - 30); + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L), + 300, + 30); case "Iron": case "Nickel": case "Cupronickel": @@ -250,139 +248,135 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr case "Aluminium": case "BlueAlloy": GT_Values.RA.addAssemblerRecipe( - aStack, - GT_Utility.getIntegratedCircuit(24), - Materials.Rubber.getMolten(144 * costMultiplier), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - 8); + aStack, + GT_Utility.getIntegratedCircuit(24), + Materials.Rubber.getMolten(144 * costMultiplier), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); GT_Values.RA.addAssemblerRecipe( - aStack, - GT_Utility.getIntegratedCircuit(24), - Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - 8); + aStack, + GT_Utility.getIntegratedCircuit(24), + Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); GT_Values.RA.addAssemblerRecipe( - aStack, - GT_Utility.getIntegratedCircuit(24), - Materials.Silicone.getMolten(72 * costMultiplier), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - 8); + aStack, + GT_Utility.getIntegratedCircuit(24), + Materials.Silicone.getMolten(72 * costMultiplier), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier) }, - syntheticRubber.getMolten(costMultiplier * 144), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), - 400, - 8); + new ItemStack[] { GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 144), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), + 400, + 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, - syntheticRubber.getMolten(costMultiplier * 36), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - 8); + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 36), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); } } case "RedstoneAlloy": GT_Values.RA.addAssemblerRecipe( + aStack, + GT_Utility.getIntegratedCircuit(24), + Materials.Rubber.getMolten(144 * costMultiplier), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); + GT_Values.RA.addAssemblerRecipe( + aStack, + GT_Utility.getIntegratedCircuit(24), + Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); + GT_Values.RA.addAssemblerRecipe( + aStack, + GT_Utility.getIntegratedCircuit(24), + Materials.Silicone.getMolten(72 * costMultiplier), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); + for (Materials dielectric : dielectrics) { + for (Materials syntheticRubber : syntheticRubbers) { + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 144), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), + 400, + 8); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 36), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + 8); + } + } + break; + default: + if (GT_Mod.gregtechproxy.mEasierIVPlusCables) { + GT_Values.RA.addAssemblerRecipe( aStack, GT_Utility.getIntegratedCircuit(24), Materials.Rubber.getMolten(144 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); - GT_Values.RA.addAssemblerRecipe( + calculateRecipeEU(aMaterial, 8)); + GT_Values.RA.addAssemblerRecipe( aStack, GT_Utility.getIntegratedCircuit(24), Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); - GT_Values.RA.addAssemblerRecipe( + calculateRecipeEU(aMaterial, 8)); + GT_Values.RA.addAssemblerRecipe( aStack, GT_Utility.getIntegratedCircuit(24), Materials.Silicone.getMolten(72 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); - for (Materials dielectric : dielectrics) { - for (Materials syntheticRubber : syntheticRubbers) { - GT_Values.RA.addAssemblerRecipe( + calculateRecipeEU(aMaterial, 8)); + for (Materials dielectric : dielectrics) { + for (Materials syntheticRubber : syntheticRubbers) { + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier) }, + dielectric.getDust(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, - 8); - GT_Values.RA.addAssemblerRecipe( + calculateRecipeEU(aMaterial, 8)); + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, - 8); - } - } - break; - default: - if (GT_Mod.gregtechproxy.mEasierIVPlusCables) { - GT_Values.RA.addAssemblerRecipe( - aStack, - GT_Utility.getIntegratedCircuit(24), - Materials.Rubber.getMolten(144 * costMultiplier), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - aStack, - GT_Utility.getIntegratedCircuit(24), - Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - aStack, - GT_Utility.getIntegratedCircuit(24), - Materials.Silicone.getMolten(72 * costMultiplier), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); - for (Materials dielectric : dielectrics) { - for (Materials syntheticRubber : syntheticRubbers) { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier) }, - syntheticRubber.getMolten(costMultiplier * 144), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), - 400, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, - syntheticRubber.getMolten(costMultiplier * 36), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); + calculateRecipeEU(aMaterial, 8)); } } } else { GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { aStack, GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), + GT_Utility.getIntegratedCircuit(24) }, + Materials.Silicone.getMolten(costMultiplier * 72), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + calculateRecipeEU(aMaterial, 8)); + GT_Values.RA + .addAssemblerRecipe( new ItemStack[] { aStack, - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), - GT_Utility.getIntegratedCircuit(24) }, - Materials.Silicone.getMolten(costMultiplier * 72), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { aStack, - GT_OreDictUnificator.get( - OrePrefixes.foil, - Materials.PolyphenyleneSulfide, - costMultiplier), - GT_Utility.getIntegratedCircuit(24) }, + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), + GT_Utility.getIntegratedCircuit(24) }, Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -390,41 +384,35 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4) }, - syntheticRubber.getMolten(costMultiplier * 144), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), - 400, - calculateRecipeEU(aMaterial, 8)); + new ItemStack[] { GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier), + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4) }, + syntheticRubber.getMolten(costMultiplier * 144), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), + 400, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GT_OreDictUnificator.get( - OrePrefixes.foil, - Materials.PolyphenyleneSulfide, - costMultiplier * 4) }, - syntheticRubber.getMolten(costMultiplier * 144), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), - 400, - calculateRecipeEU(aMaterial, 8)); + new ItemStack[] { GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier * 4) }, + syntheticRubber.getMolten(costMultiplier * 144), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), + 400, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier) }, - syntheticRubber.getMolten(costMultiplier * 36), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 36), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator.get( - OrePrefixes.foil, - Materials.PolyphenyleneSulfide, - costMultiplier) }, - syntheticRubber.getMolten(costMultiplier * 36), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 36), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + calculateRecipeEU(aMaterial, 8)); } } } @@ -432,11 +420,11 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } // Honestly when can this machine be removed? ); GT_Values.RA.addUnboxingRecipe( - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - GT_Utility.copyAmount(1L, aStack), - null, - 100, - calculateRecipeEU(aMaterial, 8)); + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + GT_Utility.copyAmount(1L, aStack), + null, + 100, + calculateRecipeEU(aMaterial, 8)); if (GT_Mod.gregtechproxy.mAE2Integration) { AE2AddNetAttunementCable(aStack, correspondingCable, aMaterial); } @@ -453,17 +441,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr private void AE2addNewAttunement(ItemStack aStack) { Api.INSTANCE.registries() - .p2pTunnel() - .addNewAttunement(aStack, (TunnelType) tt); + .p2pTunnel() + .addNewAttunement(aStack, (TunnelType) tt); } private void AE2AddNetAttunementCable(ItemStack aStack, OrePrefixes correspondingCable, Materials aMaterial) { Api.INSTANCE.registries() - .p2pTunnel() - .addNewAttunement(aStack, (TunnelType) tt); + .p2pTunnel() + .addNewAttunement(aStack, (TunnelType) tt); Api.INSTANCE.registries() - .p2pTunnel() - .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); + .p2pTunnel() + .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); } // end region } |