From 3444f528c31ed2dd0f6b18a529ad4a2c14897188 Mon Sep 17 00:00:00 2001 From: ghostflyby Date: Wed, 8 Nov 2023 22:17:00 +0800 Subject: Migrate to non-Object version Utility methods (#2359) A few calls restricted by other methods and interfaces are left untouched. --- .../loaders/oreprocessing/ProcessingArrows.java | 20 ++-- .../loaders/oreprocessing/ProcessingBeans.java | 2 +- .../loaders/oreprocessing/ProcessingBlock.java | 16 ++-- .../loaders/oreprocessing/ProcessingBolt.java | 2 +- .../loaders/oreprocessing/ProcessingCell.java | 8 +- .../loaders/oreprocessing/ProcessingCrafting.java | 102 ++++++++++---------- .../loaders/oreprocessing/ProcessingCrop.java | 2 +- .../oreprocessing/ProcessingCrushedOre.java | 10 +- .../oreprocessing/ProcessingCrystallized.java | 4 +- .../loaders/oreprocessing/ProcessingDirty.java | 14 +-- .../loaders/oreprocessing/ProcessingDust.java | 86 +++++++++-------- .../loaders/oreprocessing/ProcessingDye.java | 10 +- .../loaders/oreprocessing/ProcessingFineWire.java | 2 +- .../loaders/oreprocessing/ProcessingFoil.java | 2 +- .../loaders/oreprocessing/ProcessingFood.java | 8 +- .../loaders/oreprocessing/ProcessingGear.java | 2 +- .../loaders/oreprocessing/ProcessingGem.java | 80 ++++++++-------- .../loaders/oreprocessing/ProcessingIngot.java | 34 +++---- .../loaders/oreprocessing/ProcessingLog.java | 103 ++++++++++----------- .../loaders/oreprocessing/ProcessingNugget.java | 6 +- .../loaders/oreprocessing/ProcessingOre.java | 24 ++--- .../loaders/oreprocessing/ProcessingOrePoor.java | 6 +- .../oreprocessing/ProcessingOreSmelting.java | 2 +- .../loaders/oreprocessing/ProcessingPipe.java | 2 +- .../loaders/oreprocessing/ProcessingPlank.java | 24 ++--- .../loaders/oreprocessing/ProcessingPlate.java | 62 ++++++------- .../loaders/oreprocessing/ProcessingPure.java | 4 +- .../loaders/oreprocessing/ProcessingRound.java | 2 +- .../loaders/oreprocessing/ProcessingSand.java | 2 +- .../loaders/oreprocessing/ProcessingSaplings.java | 6 +- .../loaders/oreprocessing/ProcessingScrew.java | 2 +- .../loaders/oreprocessing/ProcessingShaping.java | 98 ++++++++++---------- .../loaders/oreprocessing/ProcessingSlab.java | 2 +- .../loaders/oreprocessing/ProcessingStick.java | 10 +- .../loaders/oreprocessing/ProcessingStickLong.java | 8 +- .../loaders/oreprocessing/ProcessingStone.java | 70 +++++++------- .../oreprocessing/ProcessingStoneCobble.java | 2 +- .../loaders/oreprocessing/ProcessingToolHead.java | 2 +- .../oreprocessing/ProcessingTransforming.java | 20 ++-- .../loaders/oreprocessing/ProcessingWax.java | 2 +- .../loaders/oreprocessing/ProcessingWire.java | 34 +++---- 41 files changed, 445 insertions(+), 452 deletions(-) (limited to 'src/main/java/gregtech/loaders/oreprocessing') diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index 3cd6015341..bb32333429 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -27,7 +27,7 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - ItemStack tOutput = GT_Utility.copyAmount(1L, aStack); + ItemStack tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( tOutput, @@ -35,14 +35,14 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.HolyWater.getFluid(25L)) .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); - tOutput = GT_Utility.copyAmount(1L, aStack); + tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( tOutput, @@ -50,14 +50,14 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.FierySteel.getFluid(25L)) .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); - tOutput = GT_Utility.copyAmount(1L, aStack); + tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( tOutput, @@ -65,14 +65,14 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.Blaze.getMolten(18L)) .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); - tOutput = GT_Utility.copyAmount(1L, aStack); + tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( tOutput, @@ -80,14 +80,14 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.Rubber.getMolten(18L)) .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); - tOutput = GT_Utility.copyAmount(1L, aStack); + tOutput = GT_Utility.copyAmount(1, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( tOutput, @@ -96,7 +96,7 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.Mercury.getFluid(25L)) .duration(5 * SECONDS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index 3ca039754e..9aed3d19af 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -26,7 +26,7 @@ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegist } GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) .duration(20 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 0b110aa381..e424f1c606 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -40,7 +40,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist || aMaterial == MaterialsBotania.Dreamwood) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(3)) + .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Water.getFluid( @@ -52,7 +52,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sCutterRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(3)) + .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( GT_ModHandler.getDistilledWater( @@ -64,7 +64,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sCutterRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(3)) + .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Lubricant.getFluid( @@ -80,7 +80,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Water.getFluid( @@ -92,7 +92,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sCutterRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( GT_ModHandler.getDistilledWater( @@ -104,7 +104,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sCutterRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Lubricant.getFluid( @@ -121,7 +121,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); ItemStack tStack3 = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L); - GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); + GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1, aStack)); if (tStack1 != null) GT_ModHandler .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); @@ -203,7 +203,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist case "Mercury" -> System.err.println( "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); case "Iron", "WroughtIron", "Steel" -> GT_Values.RA.stdBuilder() - .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8L), GT_Utility.copyAmount(1L, aStack)) + .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8L), GT_Utility.copyAmount(1, aStack)) .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L)) .duration(20 * SECONDS) .eut(4) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index ec9bc71a23..0d28c417a8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -36,7 +36,7 @@ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistr } GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(2L, aStack), + GT_Utility.copyAmount(2, 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 63b3aaf973..c99894caab 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -44,7 +44,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { } else { if (aMaterial.mFuelPower > 0) { GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); - recipeBuilder.itemInputs(GT_Utility.copyAmount(1L, aStack)); + recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack)); if (GT_Utility.getFluidForFilledItem(aStack, true) == null && GT_Utility.getContainerItem(aStack, true) != null) { recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true)); @@ -100,7 +100,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { : tList.size() < 6) && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L <= 64L)) { tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L; - tList.add(GT_Utility.copyAmount(64L, tStack)); + tList.add(GT_Utility.copyAmount(64, tStack)); tStack.stackSize -= 64; } int tThisCapsuleCount = GT_ModHandler @@ -183,7 +183,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { GT_ModHandler.removeRecipeByOutputDelayed(aStack); } else { GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); - recipeBuilder.itemInputs(GT_Utility.copyAmount(1L, aStack)); + recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack)); if (GT_Utility.getFluidForFilledItem(aStack, true) == null && GT_Utility.getContainerItem(aStack, true) != null) { recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true)); @@ -206,7 +206,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { } if (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) .duration(((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS) .eut(TierEU.RECIPE_MV) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index c061946082..5c2f74a9cd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -34,7 +34,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg switch (aOreDictName) { case "craftingQuartz" -> { GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.redstone_torch, 3, 32767), GT_Utility.copyAmount(1L, aStack)) + .itemInputs(new ItemStack(Blocks.redstone_torch, 3, 32767), GT_Utility.copyAmount(1, aStack)) .itemOutputs(new ItemStack(net.minecraft.init.Items.comparator, 1, 0)) .fluidInputs(Materials.Concrete.getMolten(144L)) .duration(2 * SECONDS) @@ -46,7 +46,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -55,14 +55,14 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L)) .requiresCleanRoom() .duration(45 * SECONDS) @@ -70,7 +70,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalSoC.get(1)) .requiresCleanRoom() .duration(30 * SECONDS) @@ -78,7 +78,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_PIC.get(1)) .requiresCleanRoom() .duration(60 * SECONDS) @@ -86,7 +86,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_PIC.get(4)) .requiresCleanRoom() .duration(40 * SECONDS) @@ -94,7 +94,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_QPIC.get(1)) .requiresCleanRoom() .duration(2 * MINUTES) @@ -107,7 +107,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -116,21 +116,21 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(4)) .requiresCleanRoom() .duration(30 * SECONDS) @@ -138,7 +138,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC.get(1)) .requiresCleanRoom() .duration(45 * SECONDS) @@ -146,7 +146,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC.get(4)) .requiresCleanRoom() .duration(30 * SECONDS) @@ -154,7 +154,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC.get(8)) .requiresCleanRoom() .duration(15 * SECONDS) @@ -164,28 +164,28 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg case "craftingLensOrange" -> { GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(1)) .duration(15 * SECONDS) .eut(64) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(4)) .duration(15 * SECONDS) .eut(256) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(16)) .duration(15 * SECONDS) .eut(1024) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(64)) .duration(15 * SECONDS) .eut(4096) @@ -197,7 +197,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -206,21 +206,21 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(1)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(4)) .requiresCleanRoom() .duration(45 * SECONDS) @@ -228,7 +228,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(8)) .requiresCleanRoom() .duration(30 * SECONDS) @@ -236,7 +236,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(16)) .requiresCleanRoom() .duration(15 * SECONDS) @@ -244,7 +244,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(32)) .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) @@ -257,7 +257,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) @@ -266,21 +266,21 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0)) .duration(10 * SECONDS) .eut(16) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(1)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(4)) .requiresCleanRoom() .duration(45 * SECONDS) @@ -288,7 +288,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(8)) .requiresCleanRoom() .duration(30 * SECONDS) @@ -296,7 +296,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(1)) .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) @@ -304,7 +304,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(4)) .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) @@ -315,7 +315,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg case "craftingLensGreen" -> { GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalCPU.get(1)) .requiresCleanRoom() .duration(30 * SECONDS) @@ -323,7 +323,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalSoC2.get(1)) .requiresCleanRoom() .duration(60 * SECONDS) @@ -331,21 +331,21 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(2)) .duration(30 * SECONDS) .eut(30) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(8)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(1)) .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) @@ -353,7 +353,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(2)) .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) @@ -361,7 +361,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(4)) .requiresCleanRoom() .duration(60 * SECONDS) @@ -373,7 +373,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -382,28 +382,28 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.sandstone, 1, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 3)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GT_Utility.copyAmount(0, aStack)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -412,14 +412,14 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), - GT_Utility.copyAmount(0L, aStack)) + GT_Utility.copyAmount(0, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(1)) .requiresCleanRoom() .duration(60 * SECONDS) @@ -427,7 +427,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(4)) .requiresCleanRoom() .duration(45 * SECONDS) @@ -435,7 +435,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(8)) .requiresCleanRoom() .duration(30 * SECONDS) @@ -443,7 +443,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(16)) .requiresCleanRoom() .duration(15 * SECONDS) @@ -451,7 +451,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) + .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(32)) .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index b73254c52f..a7e6b1529c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -30,7 +30,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr net.minecraft.item.ItemStack aStack) { // Compressor recipes GT_Values.RA.stdBuilder() - .itemInputs(gregtech.api.util.GT_Utility.copyAmount(8L, aStack)) + .itemInputs(gregtech.api.util.GT_Utility.copyAmount(8, aStack)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) .duration(15 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index e83900f979..2fd74622c4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -28,14 +28,14 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR switch (aPrefix) { case crushedCentrifuged -> { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(10 * TICKS) .eut(16) .addTo(sHammerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get( @@ -49,7 +49,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR } case crushedPurified -> { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs( GT_OreDictUnificator.get( OrePrefixes.crushedCentrifuged, @@ -73,7 +73,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR switch (aMaterial.mName) { case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GT_Values.RA .stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), @@ -86,7 +86,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR .eut(16) .addTo(sSifterRecipes); default -> GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index 3d72ee0082..cd9e3eb597 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -32,14 +32,14 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip } GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(10 * TICKS) .eut(16) .addTo(sHammerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) .duration(20 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index 09dbfad914..b407cb9c9b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -29,14 +29,14 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L)) .duration(10) .eut(16) .addTo(sHammerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs( GT_OreDictUnificator.get( OrePrefixes.dustImpure, @@ -53,7 +53,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .addTo(sMaceratorRecipes); GT_ModHandler.addOreWasherRecipe( - GT_Utility.copyAmount(1L, aStack), + GT_Utility.copyAmount(1, aStack), new int[] { 10000, 1111, 10000 }, 1000, GT_OreDictUnificator.get( @@ -69,7 +69,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist OrePrefixes prefix = aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust; GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs( GT_OreDictUnificator.get(prefix, aMaterial, 1L), GT_OreDictUnificator.get( @@ -95,7 +95,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist if (byproduct.contains(SubTag.WASHING_MERCURY)) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, stack)) + .itemInputs(GT_Utility.copyAmount(1, stack)) .itemOutputs( GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), @@ -108,7 +108,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist } if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT)) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, stack)) + .itemInputs(GT_Utility.copyAmount(1, stack)) .itemOutputs( GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), @@ -121,7 +121,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist } if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE)) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, stack)) + .itemInputs(GT_Utility.copyAmount(1, stack)) .itemOutputs( GT_OreDictUnificator.get(chemicalBathPrefix, material, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, byproduct.mMacerateInto, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 63679f4326..2aa2d42ac1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -55,7 +55,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case dust -> { if (aMaterial.mFuelPower > 0) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -75,7 +75,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1L, aStack), + GT_Utility.copyAmount(1, aStack), aMaterial, aPrefix.mMaterialAmount, null, @@ -91,13 +91,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); recipeBuilder - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)); + .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)); if (aMaterial.mBlastFurnaceTemp > 1750) { recipeBuilder.itemOutputs( GT_OreDictUnificator .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L)); } else { - recipeBuilder.itemOutputs(GT_Utility.copyAmount(1L, tDustStack)); + recipeBuilder.itemOutputs(GT_Utility.copyAmount(1, tDustStack)); } recipeBuilder .duration( @@ -115,7 +115,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, aStack)) + .itemInputs(GT_Utility.copyAmount(9, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .duration(15 * SECONDS) .eut(2) @@ -138,7 +138,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr { if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .duration(15 * SECONDS) .eut(2) @@ -170,7 +170,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64L <= 64L)) { tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64L; - tList.add(GT_Utility.copyAmount(64L, tDustStack)); + tList.add(GT_Utility.copyAmount(64, tDustStack)); tDustStack.stackSize -= 64; } if ((tDustStack.stackSize > 0) && (tList.size() < 6) @@ -249,7 +249,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.contains(SubTag.CRYSTALLISABLE) && GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(7000) .fluidInputs(Materials.Water.getFluid(200L)) @@ -257,7 +257,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .eut(24) .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(2)) + .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) @@ -265,7 +265,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .eut(24) .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(3)) + .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) @@ -278,7 +278,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr break; case "Glass": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), + GT_Utility.copyAmount(1, aStack), new ItemStack(net.minecraft.init.Blocks.glass)); break; case "NetherQuartz": @@ -291,13 +291,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr break; case "MeatRaw": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), + GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L)); break; case "Oilsands": sCentrifugeRecipes.addRecipe( true, - new ItemStack[] { GT_Utility.copyAmount(1L, aStack) }, + new ItemStack[] { GT_Utility.copyAmount(1, aStack) }, null, null, null, @@ -308,12 +308,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr break; case "HydratedCoal": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), + GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)); break; case "Diamond": { GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4L, aStack), ItemList.Block_Powderbarrel.get(64)) + .itemInputs(GT_Utility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(64)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) @@ -322,7 +322,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .addTo(sImplosionRecipes); GT_Values.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(4L, aStack), + GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("dynamite", 16, null)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), @@ -331,7 +331,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4L, aStack), new ItemStack(Blocks.tnt, 32)) + .itemInputs(GT_Utility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 32)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) @@ -339,7 +339,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_ModHandler.getIC2Item("industrialTnt", 8)) + .itemInputs(GT_Utility.copyAmount(4, aStack), GT_ModHandler.getIC2Item("industrialTnt", 8)) .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), GT_O