diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
42 files changed, 8 insertions, 861 deletions
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)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(sSlicerRecipes); @@ -112,7 +100,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.potatojuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) @@ -124,8 +111,6 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Lemon.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(sSlicerRecipes); @@ -133,7 +118,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.lemonjuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) @@ -143,7 +127,6 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(aStack) - .noItemOutputs() .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.leninade"), 750)) .duration(6 * SECONDS + 8 * TICKS) @@ -153,24 +136,18 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr case "cropTomato" -> GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Tomato.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(sSlicerRecipes); case "cropCucumber" -> GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Cucumber.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(sSlicerRecipes); case "cropOnion" -> GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Shape_Slicer_Flat.get(0)) .itemOutputs(ItemList.Food_Sliced_Onion.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(sSlicerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index 170f17e633..2b519a48a9 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -30,8 +30,6 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * TICKS) .eut(16) .addTo(sHammerRecipes); @@ -60,8 +58,6 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1111) - .noFluidInputs() - .noFluidOutputs() .duration(25 * SECONDS) .eut(48) .addTo(sThermalCentrifugeRecipes); @@ -80,8 +76,6 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)) .outputChances(300, 1200, 4500, 1400, 2800, 3500) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(16) .addTo(sSifterRecipes); @@ -95,8 +89,6 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)) .outputChances(100, 400, 1500, 2000, 4000, 5000) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(16) .addTo(sSifterRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index ff6f4022c8..7daf83504a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -28,8 +28,6 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * TICKS) .eut(16) .addTo(sHammerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index cd595a7e62..3ca8180f6e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -30,8 +30,6 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial.mMacerateInto, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10) .eut(16) .addTo(sHammerRecipes); @@ -75,8 +73,6 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 1111, 10000) - .noFluidInputs() - .noFluidOutputs() .duration(25 * SECONDS) .eut(48) .addTo(sThermalCentrifugeRecipes); @@ -101,7 +97,6 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 7000, 4000) .fluidInputs(Materials.Mercury.getFluid(1000L)) - .noFluidOutputs() .duration(40 * SECONDS) .eut(8) .addTo(sChemicalBathRecipes); @@ -115,7 +110,6 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 9900, 4000) .fluidInputs(Materials.Mercury.getFluid(1000L)) - .noFluidOutputs() .duration(40 * SECONDS) .eut(8) .addTo(sChemicalBathRecipes); @@ -129,7 +123,6 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .outputChances(10000, 7000, 4000) .fluidInputs(Materials.SodiumPersulfate.getFluid(100L)) - .noFluidOutputs() .duration(40 * SECONDS) .eut(8) .addTo(sChemicalBathRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 913572e6c0..63679f4326 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -56,9 +56,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mFuelPower > 0) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -70,8 +67,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(aStack, ItemList.Cell_Empty.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(1) .addTo(sCannerRecipes); @@ -104,8 +99,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } else { recipeBuilder.itemOutputs(GT_Utility.copyAmount(1L, tDustStack)); } - recipeBuilder.noFluidInputs() - .noFluidOutputs() + recipeBuilder .duration( (Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp) * TICKS) .eut(TierEU.RECIPE_MV) @@ -123,8 +117,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -148,8 +140,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -222,14 +212,9 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (tList.size() > 0) { ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]); recipeBuilder.itemOutputs(outputsArray); - } else { - recipeBuilder.noItemOutputs(); } - recipeBuilder.noFluidInputs(); if (tFluid != null) { recipeBuilder.fluidOutputs(tFluid); - } else { - recipeBuilder.noFluidOutputs(); } recipeBuilder .duration(Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount))) @@ -250,14 +235,9 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (tList.size() > 0) { ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]); recipeBuilder.itemOutputs(outputsArray); - } else { - recipeBuilder.noItemOutputs(); } - recipeBuilder.noFluidInputs(); if (tFluid != null) { recipeBuilder.fluidOutputs(tFluid); - } else { - recipeBuilder.noFluidOutputs(); } recipeBuilder.duration(Math.max(1L, Math.abs(aMaterial.getMass() * 4L * tItemAmount))) .eut(Math.min(4, tList.size()) * 5) @@ -273,7 +253,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(7000) .fluidInputs(Materials.Water.getFluid(200L)) - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(24) .addTo(sAutoclaveRecipes); @@ -282,7 +261,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) - .noFluidOutputs() .duration(1 * MINUTES + 15 * SECONDS) .eut(24) .addTo(sAutoclaveRecipes); @@ -291,7 +269,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) - .noFluidOutputs() .duration(1 * MINUTES) .eut(24) .addTo(sAutoclaveRecipes); @@ -340,8 +317,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -352,8 +327,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -362,8 +335,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -372,8 +343,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( ItemList.IC2_Industrial_Diamond.get(3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -394,8 +363,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -406,8 +373,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -416,8 +381,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -426,8 +389,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -447,8 +408,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -459,8 +418,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -469,8 +426,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -479,8 +434,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -501,8 +454,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L)) .outputChances(10000, 4000, 2000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(24) .addTo(sElectroMagneticSeparatorRecipes); @@ -515,8 +466,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L)) .outputChances(10000, 4000, 2000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(24) .addTo(sElectroMagneticSeparatorRecipes); @@ -529,8 +478,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L)) .outputChances(10000, 4000, 2000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(24) .addTo(sElectroMagneticSeparatorRecipes); @@ -543,7 +490,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(9000) .fluidInputs(Materials.Water.getFluid(200L)) - .noFluidOutputs() .duration(1 * MINUTES + 40 * SECONDS) .eut(24) .addTo(sAutoclaveRecipes); @@ -552,7 +498,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(9500) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) - .noFluidOutputs() .duration(1 * MINUTES + 15 * SECONDS) .eut(24) .addTo(sAutoclaveRecipes); @@ -561,7 +506,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) - .noFluidOutputs() .duration(1 * MINUTES) .eut(24) .addTo(sAutoclaveRecipes); @@ -585,8 +529,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(1L, aMaterial.getMass())) .eut(5) .addTo(sCentrifugeRecipes); @@ -598,8 +540,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(1L, aMaterial.getMass() * 72L)) .eut(5) .addTo(sCentrifugeRecipes); @@ -608,7 +548,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) - .noFluidInputs() .fluidOutputs(tFluid) .duration(Math.max(1L, aMaterial.getMass() * 8L)) .eut(5) @@ -619,8 +558,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 9L), tImpureStack) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(1L, aMaterial.getMass() * 72L)) .eut(5) .addTo(sCentrifugeRecipes); @@ -629,8 +566,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), tImpureStack) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(1L, aMaterial.getMass() * 16L)) .eut(5) .addTo(sCentrifugeRecipes); @@ -646,8 +581,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.nugget, tByProduct, 1L), 1L)) .outputChances(10000, 1111) - .noFluidInputs() - .fluidOutputs() .duration(Math.max(1L, aMaterial.getMass() * 8L)) .eut(5) .addTo(sCentrifugeRecipes); @@ -657,8 +590,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(4L, aStack), ItemList.Schematic_Dust.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(4) .addTo(sBoxinatorRecipes); @@ -679,8 +610,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack), ItemList.Schematic_Dust.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(4) .addTo(sBoxinatorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java index 40594357dc..be5d19b95b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java @@ -43,7 +43,6 @@ public class ProcessingDye implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs() .fluidInputs(Materials.Water.getFluid(216L)) .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 192)) .duration(16 * TICKS) @@ -52,7 +51,6 @@ public class ProcessingDye implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs() .fluidInputs(GT_ModHandler.getDistilledWater(288L)) .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 216)) .duration(16 * TICKS) @@ -84,7 +82,6 @@ public class ProcessingDye implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2)) - .noItemOutputs() .fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(FluidRegistry.getFluidStack(fluidName, 288)) .duration(30 * SECONDS) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index e92e2d0d7d..addfa2afc7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -33,8 +33,6 @@ public class ProcessingFoil implements IOreRecipeRegistrator { GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, material, 4L)), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, material, 4L)) - .noFluidInputs() - .noFluidOutputs() .duration((int) Math.max(material.getMass(), 1L)) .eut(calculateRecipeEU(material, 24)) .addTo(sBenderRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index 881b2ae4f1..013f42f75c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -44,8 +44,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(stack, ItemList.Shape_Slicer_Flat.get(0L)) .itemOutputs(ItemList.Food_Sliced_Cheese.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(4) .addTo(sSlicerRecipes); @@ -55,8 +53,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Food_Flat_Dough.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(4) .addTo(sBenderRecipes); @@ -66,8 +62,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) .itemOutputs(ItemList.Food_Dough_Sugar.get(2L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(sMixerRecipes); @@ -75,8 +69,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(sMixerRecipes); @@ -84,8 +76,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L)) .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(sMixerRecipes); @@ -96,8 +86,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, stack), ItemList.Shape_Mold_Bun.get(0L)) .itemOutputs(ItemList.Food_Raw_Bun.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) .eut(4) .addTo(sPressRecipes); @@ -105,8 +93,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, stack), ItemList.Shape_Mold_Bread.get(0L)) .itemOutputs(ItemList.Food_Raw_Bread.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(12 * SECONDS + 16 * TICKS) .eut(4) .addTo(sPressRecipes); @@ -114,8 +100,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, stack), ItemList.Shape_Mold_Baguette.get(0L)) .itemOutputs(ItemList.Food_Raw_Baguette.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(19 * SECONDS + 4 * TICKS) .eut(4) .addTo(sPressRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index 26fdecb741..889aecfe10 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -38,7 +38,6 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(ItemList.Shape_Mold_Gear.get(0L)) .itemOutputs(GT_OreDictUnificator.get(aPrefix, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(576L)) - .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sFluidSolidficationRecipes); @@ -76,7 +75,6 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(ItemList.Shape_Mold_Gear_Small.get(0L)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .fluidInputs(aMaterial.getMolten(144L)) - .noFluidOutputs() .duration(16 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sFluidSolidficationRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 548ee77610..a9c8b636f2 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -61,9 +61,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aFuelPower) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower * 2) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -79,8 +76,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -101,8 +96,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sHammerRecipes); @@ -117,8 +110,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sHammerRecipes); @@ -132,8 +123,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration((int) Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sBenderRecipes); @@ -144,8 +133,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -156,8 +143,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -168,8 +153,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 4L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -180,8 +163,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(5L, aStack), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 5L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -192,8 +173,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack), GT_Utility.getIntegratedCircuit(9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 9L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -210,8 +189,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sLatheRecipes); @@ -227,8 +204,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -239,8 +214,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -249,8 +222,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -261,8 +232,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -313,8 +282,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemInputs(aStack) .itemOutputs( GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(100 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sElectrolyzerRecipes); @@ -331,8 +298,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), is) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sLaserEngraverRecipes); @@ -346,9 +311,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aFuelPower) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower / 2) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -365,8 +327,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS) .eut(8) .addTo(sLatheRecipes); @@ -381,8 +341,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -393,8 +351,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -403,8 +359,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -415,8 +369,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -444,8 +396,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), is) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(30) .addTo(sLaserEngraverRecipes); @@ -457,9 +407,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aFuelPower) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower * 8) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -486,8 +433,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sHammerRecipes); @@ -498,9 +443,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aFuelPower) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -517,8 +459,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 2L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass, 1L)) * TICKS) .eut(12) .addTo(sLatheRecipes); @@ -533,8 +473,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -545,8 +483,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -555,8 +491,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -567,8 +501,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -593,8 +525,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sHammerRecipes); @@ -606,8 +536,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), is) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sLaserEngraverRecipes); @@ -620,9 +548,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aFuelPower) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower * 4) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -641,8 +566,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.getDust( aMaterial, aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 5L, 1L)) * TICKS) .eut(16) .addTo(sLatheRecipes); @@ -657,8 +580,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -669,8 +590,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -679,8 +598,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -691,8 +608,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -717,8 +632,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(aStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sHammerRecipes); @@ -729,8 +642,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), is) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(2000) .addTo(sLaserEngraverRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index 0fe857b077..80e6ad067d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -55,9 +55,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.mFuelPower > 0) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -72,7 +69,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144L)) - .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sFluidSolidficationRecipes); @@ -112,8 +108,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sHammerRecipes); @@ -125,8 +119,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sBenderRecipes); @@ -136,8 +128,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -147,8 +137,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -158,8 +146,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 4L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -169,8 +155,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(5L, aStack), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 5L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -180,8 +164,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack), GT_Utility.getIntegratedCircuit(9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 9L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -191,8 +173,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(10)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sBenderRecipes); @@ -207,8 +187,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -216,8 +194,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -241,8 +217,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -250,8 +224,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -275,8 +247,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -301,8 +271,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -327,8 +295,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 3L, 1L)) * TICKS) .eut(TierEU.RECIPE_MV) .addTo(sVacuumRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index 23a88ae071..6b8d1cd67d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -34,8 +34,6 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES) .eut(TierEU.RECIPE_LV) .addTo(sLatheRecipes); @@ -45,8 +43,6 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(16) .addTo(sLatheRecipes); @@ -55,8 +51,6 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * MINUTES) .eut(TierEU.RECIPE_UHV) .addTo(sCompressorRecipes); @@ -72,9 +66,7 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L)); } - recipeBuilder.noFluidInputs() - .noFluidOutputs() - .duration(1 * MINUTES) + recipeBuilder.duration(1 * MINUTES) .eut(TierEU.RECIPE_MV) .addTo(sLatheRecipes); } @@ -88,9 +80,7 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L)); } - recipeBuilder.noFluidInputs() - .noFluidOutputs() - .duration(2 * MINUTES) + recipeBuilder.duration(2 * MINUTES) .eut(TierEU.RECIPE_LV) .addTo(sLatheRecipes); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index dcc294836e..478193d7fa 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -45,7 +45,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .outputChances(5000, 3750, 2500, 2500) - .noFluidInputs() .fluidOutputs(Materials.Methane.getGas(60L)) .duration(10 * SECONDS) .eut(20) @@ -54,8 +53,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sExtractorRecipes); @@ -64,16 +61,12 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), ItemList.IC2_Resin.get(1L)) .outputChances(10000, 3300) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); } else { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs() - .noFluidInputs() .fluidOutputs(Materials.Methane.getGas(60L)) .duration(10 * SECONDS) .eut(20) @@ -85,8 +78,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .outputChances(10000, 8000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -103,8 +94,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(8 * SECONDS) .eut(7) .addTo(sLatheRecipes); @@ -113,7 +102,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.FR_Stick.get(1L)) .fluidInputs(Materials.SeedOil.getFluid(50L)) - .noFluidOutputs() .duration(16 * TICKS) .eut(7) .addTo(sAssemblerRecipes); @@ -122,7 +110,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .itemInputs(GT_Utility.copyAmount(8L, aStack), GT_Utility.getIntegratedCircuit(8)) .itemOutputs(ItemList.FR_Casing_Impregnated.get(1L)) .fluidInputs(Materials.SeedOil.getFluid(250L)) - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -131,7 +118,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 8)) .fluidInputs(Materials.Creosote.getFluid(750L)) - .noFluidOutputs() .duration(16 * TICKS) .eut(TierEU.ULV) .addTo(sChemicalBathRecipes); @@ -173,7 +159,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Utility.copyOrNull(tPlanks), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .fluidInputs(Materials.Lubricant.getFluid(1L)) - .noFluidOutputs() .duration(10 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -186,7 +171,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Water.getFluid(Math.min(1000, 200 * 8 / 320))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -199,7 +183,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(GT_ModHandler.getDistilledWater(3)) - .noFluidOutputs() .duration(20 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -212,7 +195,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Lubricant.getFluid(1)) - .noFluidOutputs() .duration(10 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -258,7 +240,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Utility.copyOrNull(tPlanks), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) .fluidInputs(Materials.Lubricant.getFluid(1L)) - .noFluidOutputs() .duration(10 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -270,7 +251,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Water.getFluid(Math.min(1000, 200 * 8 / 320))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -282,7 +262,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(GT_ModHandler.getDistilledWater(3)) - .noFluidOutputs() .duration(20 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -294,7 +273,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .fluidInputs(Materials.Lubricant.getFluid(1)) - .noFluidOutputs() .duration(10 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -329,7 +307,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(16L, logStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(Materials.Charcoal.getGems(20)) - .noFluidInputs() .fluidOutputs(Materials.Creosote.getFluid(4000)) .duration(32 * SECONDS) .eut(64) @@ -347,7 +324,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(16L, logStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(Materials.Charcoal.getGems(20)) - .noFluidInputs() .fluidOutputs(Materials.CharcoalByproducts.getGas(4000)) .duration(32 * SECONDS) .eut(64) @@ -365,7 +341,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(16L, logStack), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(Materials.Charcoal.getGems(20)) - .noFluidInputs() .fluidOutputs(Materials.WoodGas.getGas(1500)) .duration(32 * SECONDS) .eut(64) @@ -383,7 +358,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(16L, logStack), GT_Utility.getIntegratedCircuit(7)) .itemOutputs(Materials.Charcoal.getGems(20)) - .noFluidInputs() .fluidOutputs(Materials.WoodVinegar.getFluid(3000)) .duration(32 * SECONDS) .eut(64) @@ -401,7 +375,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(16L, logStack), GT_Utility.getIntegratedCircuit(9)) .itemOutputs(Materials.Charcoal.getGems(20)) - .noFluidInputs() .fluidOutputs(Materials.WoodTar.getFluid(1500)) .duration(32 * SECONDS) .eut(64) @@ -419,7 +392,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(16L, logStack), GT_Utility.getIntegratedCircuit(11)) .itemOutputs(Materials.Ash.getDust(4)) - .noFluidInputs() .fluidOutputs(Materials.OilHeavy.getFluid(200)) .duration(16 * SECONDS) .eut(192) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index 2406b5bb47..bdfa6cd58e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -34,8 +34,6 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack), ItemList.Shape_Mold_Ball.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2)) .addTo(sAlloySmelterRecipes); @@ -46,8 +44,6 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack), ItemList.Shape_Mold_Ingot.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2)) .addTo(sAlloySmelterRecipes); @@ -59,7 +55,6 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis .itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(16L)) - .noFluidOutputs() .duration(16 * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sFluidSolidficationRecipes); @@ -76,8 +71,6 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Mold_Nugget.get(0L)) .itemOutputs(GT_Utility.copyAmount(9L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 1)) .addTo(sAlloySmelterRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 8ac1bf9ae5..42bad3325d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -45,7 +45,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(new ItemStack(net.minecraft.init.Blocks.sand, 1, 0)) .outputChances(tIsRich ? 2000 : 4000) - .noFluidInputs() .fluidOutputs(Materials.OilHeavy.getFluid(tIsRich ? 4000L : 2000L)) .duration(tIsRich ? 30 * SECONDS : 15 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -146,8 +145,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_Utility.mul((long) aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -159,8 +156,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_Utility.mul((long) aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -175,8 +170,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_Utility.mul((long) aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -188,8 +181,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .itemOutputs( GT_Utility.mul((long) aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -211,8 +202,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.stdBuilder() .itemInputs(aOreStack) .itemOutputs(GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) - .noFluidInputs() - .noFluidOutputs() .duration(10) .eut(16) .addTo(sHammerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java index 3c0e4cb29a..6c43ceb135 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java @@ -44,8 +44,6 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, aMultiplier)) - .noFluidInputs() - .noFluidOutputs() .duration(10) .eut(16) .addTo(sHammerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index 0fb2a69059..d057a033be 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -53,8 +53,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe } else { recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)); } - recipeBuilder.noFluidInputs() - .noFluidOutputs() + recipeBuilder .duration(Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp * TICKS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, (int) aMaterial.mBlastFurnaceTemp) @@ -88,8 +87,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2, aStack)) .itemOutputs(aMaterial.mDirectSmelting.getIngots(outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -100,8 +97,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Ferrosilite.getDustSmall(2 * outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -111,8 +106,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Ferrosilite.getDustSmall(7 * outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -122,8 +115,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Ferrosilite.getDustSmall(outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -133,8 +124,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Ferrosilite.getDustSmall(outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -144,8 +133,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Ferrosilite.getDustSmall(outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -155,8 +142,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Ferrosilite.getDustSmall(outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -167,8 +152,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Antimony.getNuggets(3 * outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) @@ -179,8 +162,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Silver.getNuggets(3 * outputAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES) .eut(0) .metadata(ADDITIVE_AMOUNT, 2) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index dc8ecb19a1..dedbd43573 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -94,8 +94,6 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration( ((int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount)) * TICKS) .eut(4) @@ -115,8 +113,6 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4), GT_Utility.getIntegratedCircuit(9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sAssemblerRecipes); @@ -135,8 +131,6 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9), GT_Utility.getIntegratedCircuit(9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java index 78bfe32e3c..54f44208f1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java @@ -31,8 +31,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * TICKS) .eut(8) .addTo(sLatheRecipes); @@ -41,8 +39,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 1L)) .itemOutputs(ItemList.Crate_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(1) .addTo(sAssemblerRecipes); @@ -51,8 +47,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.WroughtIron, 1L)) .itemOutputs(ItemList.Crate_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(1) .addTo(sAssemblerRecipes); @@ -61,24 +55,18 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)) .itemOutputs(ItemList.Crate_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(1) .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(8L, aStack), GT_Utility.getIntegratedCircuit(8)) .itemOutputs(new ItemStack(Blocks.chest, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(6L, aStack), new ItemStack(Items.book, 3)) .itemOutputs(new ItemStack(Blocks.bookshelf, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); @@ -93,7 +81,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(GT_Utility.copyAmount(1L, tStack)) .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Water.getFluid(4)) - .noFluidOutputs() .duration(2 * 25 * TICKS) .eut(4) .addTo(sCutterRecipes); @@ -101,7 +88,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(GT_Utility.copyAmount(1L, tStack)) .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(GT_ModHandler.getDistilledWater(3)) - .noFluidOutputs() .duration(2 * 25 * TICKS) .eut(4) .addTo(sCutterRecipes); @@ -109,7 +95,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(GT_Utility.copyAmount(1L, tStack)) .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Lubricant.getFluid(1)) - .noFluidOutputs() .duration(25 * TICKS) .eut(4) .addTo(sCutterRecipes); @@ -130,7 +115,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Water.getFluid(4)) - .noFluidOutputs() .duration(2 * 25) .eut(4) .addTo(sCutterRecipes); @@ -138,7 +122,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(GT_ModHandler.getDistilledWater(3)) - .noFluidOutputs() .duration(2 * 25) .eut(4) .addTo(sCutterRecipes); @@ -146,7 +129,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput)) .fluidInputs(Materials.Lubricant.getFluid(1)) - .noFluidOutputs() .duration(25) .eut(4) .addTo(sCutterRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 64f38d9cc7..3508317b73 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -102,9 +102,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.mFuelPower > 0) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) .duration(0) @@ -118,7 +115,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) .itemOutputs(aMaterial.getPlates(1)) .fluidInputs(aMaterial.getMolten(L)) - .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sFluidSolidficationRecipes); @@ -197,8 +193,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -209,8 +203,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -221,7 +213,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .fluidInputs(Materials.Glue.getFluid(10L)) - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(8) .addTo(sAssemblerRecipes); @@ -260,8 +251,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -272,8 +261,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 3L), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -284,7 +271,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .fluidInputs(Materials.Glue.getFluid(20L)) - .noFluidOutputs() .duration(4 * SECONDS + 16 * TICKS) .eut(8) .addTo(sAssemblerRecipes); @@ -322,8 +308,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -332,8 +316,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -342,8 +324,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -352,8 +332,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sImplosionRecipes); @@ -374,8 +352,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 4L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -386,7 +362,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .fluidInputs(Materials.Glue.getFluid(30L)) - .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) .eut(8) .addTo(sAssemblerRecipes); @@ -431,8 +406,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 5L), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 5L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -443,7 +416,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .fluidInputs(Materials.Glue.getFluid(40L)) - .noFluidOutputs() .duration(8 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -488,8 +460,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), GT_Utility.getIntegratedCircuit(9)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterialMass * 9L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .addTo(sBenderRecipes); @@ -506,7 +476,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(L / 2)) - .noFluidOutputs() .duration(16 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sFluidSolidficationRecipes); @@ -537,8 +506,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_Utility.copyAmount(3L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) .eut(calculateRecipeEU(aMaterial, 15)) .addTo(sAlloySmelterRecipes); @@ -548,8 +515,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 45)) .addTo(sExtruderRecipes); @@ -566,7 +531,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Math.min( 1000, ((int) Math.max(aMaterial.getMass(), 1L)) * (calculateRecipeEU(aMaterial, 16)) / 320)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sCutterRecipes); @@ -581,7 +545,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Math.min( 750, ((int) Math.max(aMaterial.getMass(), 1L)) * (calculateRecipeEU(aMaterial, 16)) / 426)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sCutterRecipes); @@ -597,7 +560,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 250, ((int) Math.max(aMaterial.getMass(), 1L)) * (calculateRecipeEU(aMaterial, 16)) / 1280)))) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sCutterRecipes); @@ -612,8 +574,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("generator", 1L), GT_Utility.copyAmount(4L, aStack)) .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * MINUTES + 20 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -621,16 +581,12 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), new ItemStack(Blocks.glass, 3, W)) .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(4) .addTo(sAlloySmelterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), Materials.Glass.getDust(3)) .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(4) .addTo(sAlloySmelterRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java index c59e810e2a..e4875e15e7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java @@ -25,8 +25,6 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10) .eut(16) .addTo(sHammerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java index 10570c698b..153011c639 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java @@ -37,9 +37,7 @@ public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRe GT_Utility.getContainerItem(aStack, true), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aPrefix.mMaterialAmount / 3628800L)); } - recipeBuilder.noFluidInputs() - .noFluidOutputs() - .duration(((int) Math.max(aMaterial.getMass() / 2L, 1L)) * TICKS) + recipeBuilder.duration(((int) Math.max(aMaterial.getMass() / 2L, 1L)) * TICKS) .eut(2) .addTo(sCannerRecipes); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java index b8fade29fe..b004a68515 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java @@ -49,7 +49,6 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(Materials.Tin.getMolten(32)) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sAssemblerRecipes); @@ -58,7 +57,6 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(Materials.Lead.getMolten(48)) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sAssemblerRecipes); @@ -67,7 +65,6 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(16)) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sAssemblerRecipes); @@ -79,8 +76,6 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L), ItemList.Shape_Extruder_Rotor.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sExtruderRecipes); @@ -92,7 +87,6 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(ItemList.Shape_Mold_Rotor.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(612L)) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 24)) .addTo(sFluidSolidficationRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java index 0e8fe612f0..a3b0f02d89 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java @@ -30,8 +30,6 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass() / 4L, 1L)) * TICKS) .eut(8) .addTo(sLatheRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java index b6edaa995c..25473e4a9a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java @@ -28,8 +28,6 @@ public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistr .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), new ItemStack(Blocks.sand, 1, 0)) - .noFluidInputs() - .noFluidOutputs() .duration(50 * SECONDS) .eut(5) .addTo(sCentrifugeRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java index a17cfe0d27..bd0510d8d3 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java @@ -27,8 +27,6 @@ public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -36,8 +34,6 @@ public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(8L, aStack)) .itemOutputs(ItemList.IC2_Plantball.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -47,8 +43,6 @@ public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeReg .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(8) .addTo(sLatheRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java index 1260cc5a02..aca48f5335 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java @@ -30,8 +30,6 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass() / 8L, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sLatheRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index e8f448fb4d..dfde7e955d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -53,8 +53,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack), ItemList.Shape_Extruder_Block.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((10 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -64,8 +62,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, aStack), ItemList.Shape_Mold_Block.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((5 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .addTo(sAlloySmelterRecipes); @@ -76,8 +72,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Ingot.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * TICKS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -86,8 +80,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Pipe_Tiny.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial.mSmeltInto, tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((4 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -96,8 +88,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Pipe_Small.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((8 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -106,8 +96,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), ItemList.Shape_Extruder_Pipe_Medium.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((24 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -116,8 +104,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(6L, aStack), ItemList.Shape_Extruder_Pipe_Large.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((48 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -126,8 +112,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(12L, aStack), ItemList.Shape_Extruder_Pipe_Huge.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((96 * tAmount) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -136,8 +120,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Plate.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -146,8 +128,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Small_Gear.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -156,8 +136,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(6L, aStack), ItemList.Shape_Extruder_Turbine_Blade.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -170,7 +148,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Ring.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(36L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -180,7 +157,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Screw.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(18L)) - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -190,7 +166,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Rod.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(72L)) - .noFluidOutputs() .duration(7 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -200,7 +175,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Bolt.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(18L)) - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -210,7 +184,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Round.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(18L)) - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -220,7 +193,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144L)) - .noFluidOutputs() .duration(15 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -230,7 +202,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Turbine_Blade.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(864L)) - .noFluidOutputs() .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -240,7 +211,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(72L)) - .noFluidOutputs() .duration(1 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -250,7 +220,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144L)) - .noFluidOutputs() .duration(2 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -260,7 +229,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(432L)) - .noFluidOutputs() .duration(4 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -270,7 +238,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(864L)) - .noFluidOutputs() .duration(8 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -280,7 +247,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(1728L)) - .noFluidOutputs() .duration(16 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sFluidSolidficationRecipes); @@ -294,8 +260,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Rod.get(0L)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -306,8 +270,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Rod.get(0L)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -320,8 +282,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Wire.get(0L)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -332,8 +292,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Bolt.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -344,8 +302,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Ring.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -367,8 +323,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Sword.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -378,8 +332,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(GT_Utility.copyAmount(3L, aStack), ItemList.Shape_Extruder_Pickaxe.get(0L)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 3L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -389,8 +341,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Shovel.get(0L)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 1L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -399,8 +349,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(3L, aStack), ItemList.Shape_Extruder_Axe.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 3L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -409,8 +357,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Hoe.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -420,8 +366,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .itemInputs(GT_Utility.copyAmount(6L, aStack), ItemList.Shape_Extruder_Hammer.get(0L)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 6L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -430,8 +374,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_File.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -440,8 +382,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Saw.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -450,8 +390,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(4L, aStack), ItemList.Shape_Extruder_Gear.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 5L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(sExtruderRecipes); @@ -463,8 +401,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Plate.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(sAlloySmelterRecipes); @@ -477,8 +413,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Mold_Plate.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 2L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(sAlloySmelterRecipes); @@ -492,8 +426,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(8L, aStack), ItemList.Shape_Mold_Gear.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterialMass * 10L * tAmount, tAmount)) * TICKS) .eut(calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)) .addTo(sAlloySmelterRecipes); @@ -505,16 +437,12 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Bottle.get(0L)) .itemOutputs(new ItemStack(Items.glass_bottle, 1)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(16) .addTo(sExtruderRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Mold_Bottle.get(0L)) .itemOutputs(new ItemStack(Items.glass_bottle, 1)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 64) * TICKS) .eut(4) .addTo(sAlloySmelterRecipes); @@ -523,8 +451,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(ItemList.Cell_Empty.get(tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sExtruderRecipes); @@ -532,8 +458,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingadviron", tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(sExtruderRecipes); @@ -542,8 +466,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingadviron", tAmount * 3)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -553,8 +475,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sExtruderRecipes); @@ -562,8 +482,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingiron", tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(sExtruderRecipes); @@ -572,8 +490,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingiron", tAmount * 3)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -582,8 +498,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(31L, aStack), ItemList.Shape_Mold_Anvil.get(0L)) .itemOutputs(new ItemStack(Blocks.anvil, 1, 0)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 512) * TICKS) .eut(4 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -593,8 +507,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(ItemList.Cell_Empty.get(tAmount)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sExtruderRecipes); @@ -602,8 +514,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingtin", tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(sExtruderRecipes); @@ -612,8 +522,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingtin", tAmount * 3)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -624,8 +532,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casinglead", tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(sExtruderRecipes); @@ -634,8 +540,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casinglead", tAmount * 3)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -646,8 +550,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingcopper", tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(sExtruderRecipes); @@ -656,8 +558,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingcopper", tAmount * 3)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -668,8 +568,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingbronze", tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(sExtruderRecipes); @@ -678,8 +576,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casingbronze", tAmount * 3)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -690,8 +586,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casinggold", tAmount * 2)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 32) * TICKS) .eut(3 * tVoltageMultiplier) .addTo(sExtruderRecipes); @@ -700,8 +594,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Mold_Casing.get(0L)) .itemOutputs(GT_ModHandler.getIC2Item("casinggold", tAmount * 3)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(1 * tVoltageMultiplier) .addTo(sAlloySmelterRecipes); @@ -711,8 +603,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L)) .itemOutputs(ItemList.Cell_Empty.get(tAmount * 4)) - .noFluidInputs() - .noFluidOutputs() .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(sExtruderRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java index 6ceaea4612..932f990030 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java @@ -27,7 +27,6 @@ public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(GT_Utility.copyAmount(3L, aStack)) .itemOutputs(ItemList.RC_Tie_Wood.get(3L)) .fluidInputs(Materials.Creosote.getFluid(300L)) - .noFluidOutputs() .duration(10 * SECONDS) .eut(4) .addTo(sChemicalBathRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index 974e89d63d..fb130b5717 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -47,8 +47,6 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass() * 5L, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sLatheRecipes); @@ -68,7 +66,6 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist 2 * ((int) Math.max(aMaterial.getMass() * 2L, 1L)) * calculateRecipeEU(aMaterial, 4) / 320)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sCutterRecipes); @@ -85,7 +82,6 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist 2 * ((int) Math.max(aMaterial.getMass() * 2L, 1L)) * calculateRecipeEU(aMaterial, 4) / 426)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sCutterRecipes); @@ -101,7 +97,6 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist 250, ((int) Math.max(aMaterial.getMass() * 2L, 1L)) * calculateRecipeEU(aMaterial, 4) / 1280)))) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sCutterRecipes); @@ -127,8 +122,6 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sBenderRecipes); @@ -139,8 +132,6 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(Math.max(aMaterial.getMass(), 1L)) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sHammerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index 869f2b34bb..586d5ad8aa 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -47,7 +47,6 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe 1000, ((int) Math.max(aMaterial.getMass(), 1L)) * calculateRecipeEU(aMaterial, 4) / 320)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sCutterRecipes); @@ -63,7 +62,6 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe 750, ((int) Math.max(aMaterial.getMass(), 1L)) * calculateRecipeEU(aMaterial, 4) / 426)))) - .noFluidOutputs() .duration(2 * ((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sCutterRecipes); @@ -79,7 +77,6 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe 250, ((int) Math.max(aMaterial.getMass(), 1L)) * calculateRecipeEU(aMaterial, 4) / 1280)))) - .noFluidOutputs() .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 4)) .addTo(sCutterRecipes); @@ -105,8 +102,6 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 16)) .addTo(sBenderRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index 74029510c5..e0c549b9f2 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -37,7 +37,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(3L, aStack), new ItemStack(Blocks.redstone_torch, 2)) .itemOutputs(new ItemStack(Items.repeater, 1)) .fluidInputs(Materials.Redstone.getMolten(144L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(48) .addTo(sAssemblerRecipes); @@ -46,8 +45,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(new ItemStack(Blocks.sand, 1, 0)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -59,8 +56,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Endstone, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tungstate, 1L)) .outputChances(10000, 500) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -72,8 +67,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Netherrack, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L)) .outputChances(10000, 500) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -82,8 +75,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(new ItemStack(Blocks.nether_brick_fence, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); @@ -94,8 +85,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), ItemList.IC2_Compressed_Coal_Ball.get(8L)) .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); @@ -106,8 +95,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 4), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -117,7 +104,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 200 * 30 / 320)))) - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -126,7 +112,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 200 * 30 / 426)))) - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -135,7 +120,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 100 * 30 / 1280)))) - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -143,8 +127,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -156,8 +138,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartz, 1L)) .outputChances(10000, 2000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -169,8 +149,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Biotite, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1L)) .outputChances(10000, 500) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -183,8 +161,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) .outputChances(10000, 2000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -196,8 +172,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumFeldspar, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrite, 1L)) .outputChances(10000, 2000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -209,8 +183,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -222,8 +194,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.Talc, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chromite, 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -236,8 +206,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glauconite, 2L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -250,8 +218,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_OreDictUnificator.get(OrePrefixes.dustImpure, Materials.GraniteBlack, 1L)) .outputChances(10000, 5000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -262,7 +228,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -271,7 +236,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -280,7 +244,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -289,7 +252,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -298,7 +260,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -307,7 +268,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -318,8 +278,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -331,8 +289,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 2L), new ItemStack(Items.flint, 1)) .outputChances(10000, 5000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -342,7 +298,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -351,7 +306,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -360,7 +314,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -371,8 +324,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L)) .outputChances(10000, 100) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -382,7 +333,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, 400 * 30 / 320)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -391,7 +341,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, 400 * 30 / 426)))) - .noFluidOutputs() .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -400,7 +349,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, 200 * 30 / 1280)))) - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sCutterRecipes); @@ -411,8 +359,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1L)) .outputChances(10000, 100) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java index 9b4d4eab9f..e26778b157 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java @@ -23,8 +23,6 @@ public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipe GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(8L, aStack), GT_Utility.getIntegratedCircuit(8)) .itemOutputs(new ItemStack(Blocks.furnace, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 11e60aed3a..fb4897267f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -65,7 +65,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg .itemInputs(ItemList.Shape_Mold_Arrow.get(0L)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) .fluidInputs(aMaterial.getMolten(36L)) - .noFluidOutputs() .duration(16 * TICKS) .eut(8) .addTo(sFluidSolidficationRecipes); @@ -100,8 +99,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -533,7 +530,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg .itemInputs(ItemList.Shape_Mold_ToolHeadDrill.get(0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(144 * 4)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sFluidSolidficationRecipes); @@ -544,8 +540,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 4L), ItemList.Shape_Extruder_ToolHeadDrill.get(0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sExtruderRecipes); @@ -592,8 +586,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -623,8 +615,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -675,8 +665,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -717,8 +705,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -760,8 +746,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -803,8 +787,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -832,8 +814,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -884,8 +864,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -912,8 +890,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -1185,8 +1161,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg aMaterial, aMaterial.mHandleMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(sAssemblerRecipes); @@ -1241,8 +1215,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L)) .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(8 * SECONDS) .eut(calculateRecipeEU(aMaterial, 100)) .addTo(sAssemblerRecipes); @@ -1251,8 +1223,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L)) .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * SECONDS) .eut(calculateRecipeEU(aMaterial, 400)) .addTo(sAssemblerRecipes); @@ -1261,8 +1231,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L)) .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(32 * SECONDS) .eut(calculateRecipeEU(aMaterial, 1600)) .addTo(sAssemblerRecipes); @@ -1271,8 +1239,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L)) .itemOutputs(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 4 * SECONDS) .eut(calculateRecipeEU(aMaterial, 6400)) .addTo(sAssemblerRecipes); @@ -1295,8 +1261,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 2L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 60)) .addTo(sPressRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index 9664016c22..88ccba664c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -42,7 +42,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { .fluidInputs( Materials.SeedOil .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true))) - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(sChemicalBathRecipes); @@ -59,7 +58,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { .fluidInputs( Materials.FierySteel.getFluid( GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true))) - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(sChemicalBathRecipes); @@ -72,8 +70,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) .eut((int) TierEU.LV / 2) .addTo(sPolarizerRecipes); @@ -90,7 +86,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { .fluidInputs( Materials.FierySteel.getFluid( GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true))) - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(sChemicalBathRecipes); @@ -103,8 +98,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) .eut((int) TierEU.LV / 2) .addTo(sPolarizerRecipes); @@ -121,7 +114,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { .fluidInputs( Materials.FierySteel.getFluid( GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true))) - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.ULV) .addTo(sChemicalBathRecipes); @@ -134,8 +126,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) .eut((int) TierEU.LV / 2) .addTo(sPolarizerRecipes); @@ -149,8 +139,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) .eut((int) TierEU.HV / 2) .addTo(sPolarizerRecipes); @@ -163,8 +151,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) .eut((int) TierEU.IV / 2) .addTo(sPolarizerRecipes); @@ -178,8 +164,6 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M)) * TICKS) .eut((int) TierEU.RECIPE_UHV) .addTo(sPolarizerRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java index 029f03aea3..9874739eb0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java @@ -23,9 +23,6 @@ public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistra if (aOreDictName.equals("waxMagical")) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) - .noItemOutputs() - .noFluidInputs() - .noFluidOutputs() .metadata(FUEL_VALUE, 6) .metadata(FUEL_TYPE, 5) .duration(0) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 92c08dffdc..84440609e4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -71,8 +71,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sBenderRecipes); @@ -85,8 +83,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sWiremillRecipes); @@ -110,40 +106,30 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(2L, aStack), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(7 * SECONDS + 10 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(4L, aStack), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(8L, aStack), GT_Utility.getIntegratedCircuit(8)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(12L, aStack), GT_Utility.getIntegratedCircuit(12)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(16L, aStack), GT_Utility.getIntegratedCircuit(16)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(25 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); @@ -273,8 +259,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sBoxinatorRecipes); @@ -286,8 +270,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAlloySmelterRecipes); @@ -296,8 +278,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(16) .addTo(sAlloySmelterRecipes); @@ -306,8 +286,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAlloySmelterRecipes); @@ -319,7 +297,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Rubber.getMolten(144L * costMultiplier)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -328,7 +305,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.StyreneButadieneRubber.getMolten(108L * costMultiplier)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -337,7 +313,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(72L * costMultiplier)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -349,7 +324,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) - .noFluidOutputs() .duration(20 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -358,7 +332,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, dielectric.getDustSmall(costMultiplier)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -377,7 +350,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Rubber.getMolten(144 * costMultiplier)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -386,7 +358,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.StyreneButadieneRubber.getMolten(108 * costMultiplier)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -395,7 +366,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(72 * costMultiplier)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -407,7 +377,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) - .noFluidOutputs() .duration(20 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -416,7 +385,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs(aStack, dielectric.getDustSmall(costMultiplier)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(8) .addTo(sAssemblerRecipes); @@ -437,7 +405,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); @@ -449,7 +416,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.getIntegratedCircuit(24)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); @@ -464,7 +430,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4L)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) - .noFluidOutputs() .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); @@ -476,7 +441,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier * 4L)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) - .noFluidOutputs() .duration(20 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); @@ -487,7 +451,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); @@ -499,7 +462,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier)) .itemOutputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sAssemblerRecipes); @@ -512,8 +474,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L)) .itemOutputs(GT_Utility.copyAmount(1L, aStack)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(calculateRecipeEU(aMaterial, 8)) .addTo(sUnboxinatorRecipes); |