From 6fffceea470bcede71582da257270ecfbbed27c6 Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 9 Sep 2023 23:26:57 +0900 Subject: Deprecate GT_RecipeBuilder#noXXXYYY methods (#2284) * Deprecate GT_RecipeBuilder#noXXXYYY methods * Remove existing references --- .../java/gregtech/loaders/load/GT_FuelLoader.java | 15 - .../gregtech/loaders/load/GT_ItemIterator.java | 22 +- .../load/GT_Loader_MetaTileEntities_Recipes.java | 7 - .../loaders/oreprocessing/ProcessingArrows.java | 5 - .../loaders/oreprocessing/ProcessingBlock.java | 13 - .../loaders/oreprocessing/ProcessingCell.java | 24 +- .../loaders/oreprocessing/ProcessingCrafting.java | 101 -- .../loaders/oreprocessing/ProcessingCrate.java | 16 - .../loaders/oreprocessing/ProcessingCrop.java | 23 - .../oreprocessing/ProcessingCrushedOre.java | 8 - .../oreprocessing/ProcessingCrystallized.java | 2 - .../loaders/oreprocessing/ProcessingDirty.java | 7 - .../loaders/oreprocessing/ProcessingDust.java | 73 +- .../loaders/oreprocessing/ProcessingDye.java | 3 - .../loaders/oreprocessing/ProcessingFoil.java | 2 - .../loaders/oreprocessing/ProcessingFood.java | 16 - .../loaders/oreprocessing/ProcessingGear.java | 2 - .../loaders/oreprocessing/ProcessingGem.java | 89 -- .../loaders/oreprocessing/ProcessingIngot.java | 34 - .../loaders/oreprocessing/ProcessingLens.java | 14 +- .../loaders/oreprocessing/ProcessingLog.java | 28 - .../loaders/oreprocessing/ProcessingNugget.java | 7 - .../loaders/oreprocessing/ProcessingOre.java | 11 - .../loaders/oreprocessing/ProcessingOrePoor.java | 2 - .../oreprocessing/ProcessingOreSmelting.java | 21 +- .../loaders/oreprocessing/ProcessingPipe.java | 6 - .../loaders/oreprocessing/ProcessingPlank.java | 18 - .../loaders/oreprocessing/ProcessingPlate.java | 44 - .../loaders/oreprocessing/ProcessingPure.java | 2 - .../loaders/oreprocessing/ProcessingRecycling.java | 4 +- .../loaders/oreprocessing/ProcessingRotor.java | 6 - .../loaders/oreprocessing/ProcessingRound.java | 2 - .../loaders/oreprocessing/ProcessingSand.java | 2 - .../loaders/oreprocessing/ProcessingSaplings.java | 6 - .../loaders/oreprocessing/ProcessingScrew.java | 2 - .../loaders/oreprocessing/ProcessingShaping.java | 110 -- .../loaders/oreprocessing/ProcessingSlab.java | 1 - .../loaders/oreprocessing/ProcessingStick.java | 9 - .../loaders/oreprocessing/ProcessingStickLong.java | 5 - .../loaders/oreprocessing/ProcessingStone.java | 54 - .../oreprocessing/ProcessingStoneCobble.java | 2 - .../loaders/oreprocessing/ProcessingToolHead.java | 36 - .../oreprocessing/ProcessingTransforming.java | 16 - .../loaders/oreprocessing/ProcessingWax.java | 3 - .../loaders/oreprocessing/ProcessingWire.java | 40 - .../postload/chains/GT_BauxiteRefineChain.java | 9 - .../loaders/postload/chains/GT_NaniteChain.java | 3 - .../postload/chains/GT_PCBFactoryRecipes.java | 8 - .../postload/recipes/AlloySmelterRecipes.java | 10 - .../postload/recipes/ArcFurnaceRecipes.java | 93 -- .../loaders/postload/recipes/AssemblerRecipes.java | 1050 -------------------- .../postload/recipes/AssemblyLineRecipes.java | 36 - .../loaders/postload/recipes/AutoclaveRecipes.java | 23 - .../loaders/postload/recipes/BenderRecipes.java | 68 -- .../postload/recipes/BlastFurnaceRecipes.java | 61 -- .../loaders/postload/recipes/BreweryRecipes.java | 58 -- .../loaders/postload/recipes/CannerRecipes.java | 12 - .../postload/recipes/CentrifugeRecipes.java | 148 --- .../postload/recipes/ChemicalBathRecipes.java | 39 - .../loaders/postload/recipes/ChemicalRecipes.java | 330 ------ .../postload/recipes/CircuitAssemblerRecipes.java | 20 - .../postload/recipes/CompressorRecipes.java | 36 +- .../postload/recipes/CropProcessingRecipes.java | 7 +- .../loaders/postload/recipes/CuttingRecipes.java | 6 - .../postload/recipes/DistilleryRecipes.java | 70 +- .../postload/recipes/ElectrolyzerRecipes.java | 24 - .../recipes/ElectromagneticSeparatorRecipes.java | 4 - .../loaders/postload/recipes/ExtractorRecipes.java | 2 - .../loaders/postload/recipes/ExtruderRecipes.java | 4 - .../loaders/postload/recipes/FermenterRecipes.java | 80 -- .../postload/recipes/FluidCannerRecipes.java | 8 - .../postload/recipes/FluidExtractorRecipes.java | 121 --- .../postload/recipes/FluidHeaterRecipes.java | 9 - .../postload/recipes/FluidSolidifierRecipes.java | 64 -- .../postload/recipes/ForgeHammerRecipes.java | 35 - .../postload/recipes/FormingPressRecipes.java | 38 - .../loaders/postload/recipes/FuelRecipes.java | 50 - .../postload/recipes/FusionReactorRecipes.java | 68 -- .../recipes/ImplosionCompressorRecipes.java | 12 - .../postload/recipes/LaserEngraverRecipes.java | 10 - .../loaders/postload/recipes/LatheRecipes.java | 4 - .../postload/recipes/MatterAmplifierRecipes.java | 4 - .../loaders/postload/recipes/MixerRecipes.java | 174 ---- .../loaders/postload/recipes/PackagerRecipes.java | 8 - .../postload/recipes/PlasmaForgeRecipes.java | 2 - .../loaders/postload/recipes/PrinterRecipes.java | 5 - .../loaders/postload/recipes/Pulverizer.java | 126 --- .../loaders/postload/recipes/PyrolyseRecipes.java | 9 - .../loaders/postload/recipes/SifterRecipes.java | 4 - .../loaders/postload/recipes/SlicerRecipes.java | 8 - .../postload/recipes/ThermalCentrifugeRecipes.java | 2 - .../recipes/TranscendentPlasmaMixerRecipes.java | 6 - .../postload/recipes/VacuumFreezerRecipes.java | 97 -- .../loaders/postload/recipes/WiremillRecipes.java | 16 - .../preload/GT_Loader_Item_Block_And_Fluid.java | 19 - 95 files changed, 16 insertions(+), 3997 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 3863b5c952..ad9b890cc1 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -152,9 +152,6 @@ public class GT_FuelLoader implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 4) .metadata(FUEL_TYPE, 5) .duration(0) @@ -162,9 +159,6 @@ public class GT_FuelLoader implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.experience_bottle, 1)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 10) .metadata(FUEL_TYPE, 5) .duration(0) @@ -172,9 +166,6 @@ public class GT_FuelLoader implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.ghast_tear, 1)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 50) .metadata(FUEL_TYPE, 5) .duration(0) @@ -182,9 +173,6 @@ public class GT_FuelLoader implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.beacon, 1)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2) .metadata(FUEL_TYPE, Materials.NetherStar.mFuelType) .duration(0) @@ -192,9 +180,6 @@ public class GT_FuelLoader implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 250) .metadata(FUEL_TYPE, 1) .duration(0) diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 22dab43083..0e10d2a7de 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -123,40 +123,30 @@ public class GT_ItemIterator implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.rotten_flesh, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L)) .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(1) .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.spider_eye, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L)) .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(1) .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L)) .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(1) .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.cake, 1, 32767), ItemList.IC2_Food_Can_Empty.get(12L)) .itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(1) .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.mushroom_stew, 1, 32767), ItemList.IC2_Food_Can_Empty.get(6L)) .itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(1) .addTo(sCannerRecipes); @@ -227,9 +217,7 @@ public class GT_ItemIterator implements Runnable { ItemList.IC2_Food_Can_Filled.get(tFoodValue), GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true)); } - recipeBuilder.noFluidInputs() - .noFluidOutputs() - .duration(tFoodValue * 5 * SECONDS) + recipeBuilder.duration(tFoodValue * 5 * SECONDS) .eut(1) .addTo(sCannerRecipes); } @@ -243,9 +231,6 @@ public class GT_ItemIterator implements Runnable { if (tName.equals("item.ArsMagica:purified_vinteum")) { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(tItem, 1, 0)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 256) .metadata(FUEL_TYPE, 5) .duration(0) @@ -255,9 +240,6 @@ public class GT_ItemIterator implements Runnable { if ((tName.equals("item.fieryBlood")) || (tName.equals("item.fieryTears"))) { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(tItem, 1, 0)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 2048) .metadata(FUEL_TYPE, 5) .duration(0) @@ -277,8 +259,6 @@ public class GT_ItemIterator implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(tItem, 1, 1)) .itemOutputs(new ItemStack(Items.stick, 4)) - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 32) .metadata(FUEL_TYPE, 5) .duration(0) diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index 0416cf22c6..4164ab289a 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -7302,7 +7302,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Machine_Multi_Cleanroom.get(1L)) .fluidInputs(Materials.StainlessSteel.getMolten(864L)) - .noFluidOutputs() .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -7489,8 +7488,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Electric_Pump_EV.get(1L), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sAssemblerRecipes); @@ -7500,8 +7497,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Electric_Pump_IV.get(1L), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(4096) .addTo(sAssemblerRecipes); @@ -7511,8 +7506,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Electric_Pump_IV.get(2L), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(sAssemblerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index fddb464724..0b53a771a4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -38,7 +38,6 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.HolyWater.getFluid(25L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); @@ -54,7 +53,6 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.FierySteel.getFluid(25L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); @@ -70,7 +68,6 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.Blaze.getMolten(18L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); @@ -86,7 +83,6 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.Rubber.getMolten(18L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); @@ -103,7 +99,6 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(tOutput) .fluidInputs(Materials.Mercury.getFluid(25L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sChemicalBathRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index aff06f9c5d..440fb4b88e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -47,7 +47,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.max( 4, Math.min(1000, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 320)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -60,7 +59,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.max( 3, Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -73,7 +71,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.max( 1, Math.min(250, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 1280)))) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -93,7 +90,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.max( 4, Math.min(1000, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 320)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -106,7 +102,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.max( 3, Math.min(750, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 426)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -119,7 +114,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist Math.max( 1, Math.min(250, ((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS * 30 / 1280)))) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass() * 10L, 1L)) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -149,7 +143,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(ItemList.Shape_Mold_Block.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(1296L)) - .noFluidOutputs() .duration(14 * SECONDS + 8 * TICKS) .eut(8) .addTo(sFluidSolidficationRecipes); @@ -181,8 +174,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(tStack2) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(24) .addTo(sHammerRecipes); @@ -206,8 +197,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2)) .addTo(sCompressorRecipes); @@ -219,8 +208,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist case "Iron", "WroughtIron", "Steel" -> GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8L), GT_Utility.copyAmount(1L, aStack)) .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index 55887eaf6f..71d5dd818c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -48,12 +48,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { if (GT_Utility.getFluidForFilledItem(aStack, true) == null && GT_Utility.getContainerItem(aStack, true) != null) { recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true)); - } else { - recipeBuilder.noItemOutputs(); } - recipeBuilder.noFluidInputs() - .noFluidOutputs() - .metadata(FUEL_VALUE, aMaterial.mFuelPower) + recipeBuilder.metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) .eut(0) @@ -130,8 +126,6 @@ public class ProcessingCell implements IOreRecipeRegistrator { ItemStack[] outputsArray = tList .toArray(new ItemStack[Math.min(tList.size(), 6)]); recipeBuilder.itemOutputs(outputsArray) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount))) .eut(Math.min(4, tList.size()) * 30) .addTo(sElectrolyzerRecipes); @@ -149,8 +143,6 @@ public class ProcessingCell implements IOreRecipeRegistrator { ItemStack[] outputsArray = tList .toArray(new ItemStack[Math.min(tList.size(), 6)]); recipeBuilder.itemOutputs(outputsArray) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount))) .eut(Math.min(4, tList.size()) * 30) .addTo(sElectrolyzerRecipes); @@ -171,8 +163,6 @@ public class ProcessingCell implements IOreRecipeRegistrator { } ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]); recipeBuilder.itemOutputs(outputsArray) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))) .eut(5) .addTo(sCentrifugeRecipes); @@ -190,24 +180,18 @@ public class ProcessingCell implements IOreRecipeRegistrator { if (GT_Utility.getFluidForFilledItem(aStack, true) == null && GT_Utility.getContainerItem(aStack, true) != null) { recipeBuilder.itemOutputs(GT_Utility.getContainerItem(aStack, true)); - } else { - recipeBuilder.noItemOutputs(); } // Switch case to set manual values for specific plasmas and escape the formula based on mass // when it doesn't make sense for powergen balance. switch (aMaterial.mName) { case "Tin": - recipeBuilder.noFluidInputs() - .noFluidOutputs() - .metadata(FUEL_VALUE, 150_000) + recipeBuilder.metadata(FUEL_VALUE, 150_000) .metadata(FUEL_TYPE, 4) .duration(0) .eut(0) .addTo(GT_RecipeConstants.Fuel); default: - recipeBuilder.noFluidInputs() - .noFluidOutputs() - .metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * aMaterial.getMass())) + recipeBuilder.metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * aMaterial.getMass())) .metadata(FUEL_TYPE, 4) .duration(0) .eut(0) @@ -217,8 +201,6 @@ public class ProcessingCell implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS) .eut(TierEU.RECIPE_MV) .addTo(sVacuumRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index a0ca336da9..c061946082 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -37,7 +37,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg .itemInputs(new ItemStack(Blocks.redstone_torch, 3, 32767), GT_Utility.copyAmount(1L, aStack)) .itemOutputs(new ItemStack(net.minecraft.init.Items.comparator, 1, 0)) .fluidInputs(Materials.Concrete.getMolten(144L)) - .noFluidOutputs() .duration(2 * SECONDS) .eut(20) .addTo(sAssemblerRecipes); @@ -49,8 +48,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -60,8 +57,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -69,8 +64,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_LapotronCrystal.getWildcard(1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -79,8 +72,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Chip_CrystalCPU.get(1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalSoC.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(30 * SECONDS) .eut(40000) @@ -89,8 +80,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_PIC.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -99,8 +88,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_PIC.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -109,8 +96,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_QPIC.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(2 * MINUTES) .eut(TierEU.RECIPE_UV) @@ -124,8 +109,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -135,8 +118,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -144,8 +125,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(1)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); @@ -153,8 +132,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_LPIC.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -163,8 +140,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -173,8 +148,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) @@ -183,8 +156,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC.get(8)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_LuV) @@ -195,8 +166,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(1)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(64) .addTo(sLaserEngraverRecipes); @@ -204,8 +173,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(4)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(256) .addTo(sLaserEngraverRecipes); @@ -213,8 +180,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(16)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(1024) .addTo(sLaserEngraverRecipes); @@ -222,8 +187,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Simple_SoC.get(64)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(4096) .addTo(sLaserEngraverRecipes); @@ -236,8 +199,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -247,8 +208,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -256,8 +215,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(1)) - .noFluidInputs() - .noFluidOutputs() .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); @@ -265,8 +222,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -275,8 +230,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(8)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -285,8 +238,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(16)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) @@ -295,8 +246,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_Ram.get(32)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LuV) @@ -310,8 +259,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); @@ -321,8 +268,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(16) .addTo(sLaserEngraverRecipes); @@ -330,8 +275,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(1)) - .noFluidInputs() - .noFluidOutputs() .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); @@ -339,8 +282,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -349,8 +290,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ILC.get(8)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -359,8 +298,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_LuV) @@ -369,8 +306,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_ZPM) @@ -382,8 +317,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalCPU.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(30 * SECONDS) .eut(10000) @@ -392,8 +325,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Chip_CrystalSoC.get(1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Chip_CrystalSoC2.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(60 * SECONDS) .eut(80000) @@ -402,8 +333,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(2)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(30) .addTo(sLaserEngraverRecipes); @@ -411,8 +340,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_ULPIC.get(8)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); @@ -420,8 +347,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -430,8 +355,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(2)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_IV) @@ -440,8 +363,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_SoC2.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(60 * SECONDS) .eut(TierEU.RECIPE_LuV) @@ -454,8 +375,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -465,8 +384,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sLaserEngraverRecipes); @@ -474,8 +391,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(new ItemStack(Blocks.sandstone, 1, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); @@ -483,8 +398,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 3)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); @@ -492,8 +405,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.quartz_block, 1, 0), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); @@ -503,8 +414,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); @@ -512,8 +421,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(1)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) @@ -522,8 +429,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(4)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -532,8 +437,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(8)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -542,8 +445,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(16)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) @@ -552,8 +453,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(ItemList.Circuit_Wafer_CPU.get(32)) - .noFluidInputs() - .noFluidOutputs() .requiresCleanRoom() .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LuV) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java index 42b60bcd88..6c20061f19 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java @@ -37,8 +37,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sBoxinatorRecipes); @@ -47,8 +45,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sUnboxinatorRecipes); @@ -65,8 +61,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sBoxinatorRecipes); @@ -75,8 +69,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sUnboxinatorRecipes); @@ -93,8 +85,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sBoxinatorRecipes); @@ -103,8 +93,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sUnboxinatorRecipes); @@ -121,8 +109,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sBoxinatorRecipes); @@ -131,8 +117,6 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), ItemList.Crate_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sUnboxinatorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index 1229e55211..a7eeb338a3 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -33,8 +33,6 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(gregtech.api.util.GT_Utility.copyAmount(8L, aStack)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -54,7 +52,6 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr for (Fluid tFluid : waterArray) { GT_Values.RA.stdBuilder() .itemInputs(aStack) - .noItemOutputs() .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.tea"), 750)) .duration(6 * SECONDS + 8 * TICKS) @@ -66,7 +63,6 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr for (Fluid tFluid : waterArray) { GT_Values.RA.stdBuilder() .itemInputs(aStack) - .noItemOutputs() .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.grapejuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) @@ -77,16 +73,12 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr case "cropChilipepper" -> GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); case "cropCoffee" -> GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -94,8 +86,6 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Raw_PotatoChips.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(sSlicerRecipes); @@ -103,8 +93,6 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Stripes.get(0L)) .itemOutputs(ItemList.Food_Raw_Fries.get(1L)) - .noFluid