diff options
Diffstat (limited to 'src')
14 files changed, 0 insertions, 70 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index f6398bf99c..eb5aa271f9 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -616,8 +616,6 @@ public class GT_ModHandler { RA.stdBuilder() .itemInputs(aInput) .itemOutputs(aOutput) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sExtractorRecipes); @@ -734,8 +732,6 @@ public class GT_ModHandler { RA.stdBuilder() .itemInputs(aInput1, aInput2) .itemOutputs(aOutput1) - .noFluidInputs() - .noFluidOutputs() .duration(aDuration) .eut(aEUt) .addTo(sAlloySmelterRecipes); @@ -931,7 +927,6 @@ public class GT_ModHandler { .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2]) .outputChances(aChances) .fluidInputs(GT_ModHandler.getWater(aWaterAmount)) - .noFluidOutputs() .duration(25 * SECONDS) .eut(16) .addTo(sOreWasherRecipes); @@ -941,7 +936,6 @@ public class GT_ModHandler { .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2]) .outputChances(aChances) .fluidInputs(GT_ModHandler.getDistilledWater(aWaterAmount / 5)) - .noFluidOutputs() .duration(15 * SECONDS) .eut(16) .addTo(sOreWasherRecipes); @@ -955,7 +949,6 @@ public class GT_ModHandler { .itemInputs(aInput) .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2]) .fluidInputs(GT_ModHandler.getWater(aWaterAmount)) - .noFluidOutputs() .duration(25 * SECONDS) .eut(16) .addTo(sOreWasherRecipes); @@ -964,7 +957,6 @@ public class GT_ModHandler { .itemInputs(aInput) .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2]) .fluidInputs(GT_ModHandler.getDistilledWater(aWaterAmount / 5)) - .noFluidOutputs() .duration(15 * SECONDS) .eut(16) .addTo(sOreWasherRecipes); diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index feefa32909..c057cf0b2f 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -228,7 +228,6 @@ public class GT_RecipeRegistrator { RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) .itemOutputs(recipeOutput) - .noFluidInputs() .fluidOutputs(aMaterial.mSmeltInto.getMolten((L * aMaterialAmount) / (M * aStack.stackSize))) .duration((int) Math.max(1, (24 * aMaterialAmount) / M)) .eut(Math.max(8, (int) Math.sqrt(2 * aMaterial.mSmeltInto.mStandardMoltenFluid.getTemperature()))) @@ -236,8 +235,6 @@ public class GT_RecipeRegistrator { } else { RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack)) - .noItemOutputs() - .noFluidInputs() .fluidOutputs(aMaterial.mSmeltInto.getMolten((L * aMaterialAmount) / (M * aStack.stackSize))) .duration((int) Math.max(1, (24 * aMaterialAmount) / M)) .eut(Math.max(8, (int) Math.sqrt(2 * aMaterial.mSmeltInto.mStandardMoltenFluid.getTemperature()))) diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 087e450c69..e8f1298b49 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -2007,8 +2007,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(aEvent.Ore.getItem(), 1, 3)) .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 16, 4)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(8) .addTo(sCutterRecipes); @@ -2584,7 +2582,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG int hydrogenAmount = 2 * i + 2; GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) - .noItemOutputs() .fluidInputs(new FluidStack(uncrackedFluid, 1000), Materials.Hydrogen.getGas(hydrogenAmount * 800)) .fluidOutputs(new FluidStack(crackedFluids[i], 1000)) .duration((1 + i) * SECONDS) @@ -2637,7 +2634,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) - .noItemOutputs() .fluidInputs(new FluidStack(uncrackedFluid, 1000), GT_ModHandler.getSteam(1000)) .fluidOutputs(new FluidStack(crackedFluids[i], 1200)) .duration((1 + i) * SECONDS) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index ed9127bf62..61326312f9 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2639,8 +2639,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Cheese.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2648,8 +2646,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Dye_Cocoa.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2657,8 +2653,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Tine.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2667,8 +2661,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .itemInputs(new ItemStack(Blocks.melon_block, 1, 0)) .itemOutputs(new ItemStack(Items.melon, 8, 0), new ItemStack(Items.melon_seeds, 1)) .outputChances(10000, 8000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2676,8 +2668,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.pumpkin, 1, 0)) .itemOutputs(new ItemStack(Items.pumpkin_seeds, 4, 0)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2685,8 +2675,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.melon, 1, 0)) .itemOutputs(new ItemStack(Items.melon_seeds, 1, 0)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2694,8 +2682,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.wheat, 1, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2703,8 +2689,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("crop", 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2712,8 +2696,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.stick, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2722,8 +2704,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .itemInputs(new ItemStack(Blocks.wool, 1, WILDCARD)) .itemOutputs(new ItemStack(Items.string, 2), new ItemStack(Items.string, 1)) .outputChances(10000, 5000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2731,8 +2711,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Tesseract.get(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(32_000_000) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 828b1d330a..84f7610824 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -45,8 +45,6 @@ public class GT_ItemIterator implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(tStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -63,8 +61,6 @@ public class GT_ItemIterator implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(tStack) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -91,8 +87,6 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -117,8 +111,6 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -264,8 +256,6 @@ public class GT_ItemIterator implements Runnable { .itemInputs(new ItemStack(tItem, 1, 0)) .itemOutputs(new ItemStack(Items.stick, 2), new ItemStack(Items.stick, 1)) .outputChances(10000, 3000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index ce14d1b180..f5474aee23 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -24,8 +24,6 @@ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1L, aStack)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index 5f16a07830..663960e2bf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -43,8 +43,6 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_Utility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index 868b9c2451..49cee69ef4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -36,8 +36,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(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index 20eac3ec1c..09dbfad914 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -48,8 +48,6 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index b17ac6d071..7a8b4933fe 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -224,8 +224,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L), GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) .outputChances(10000, chanceOre2, 5000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java index a365c09f51..f88a073509 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java @@ -60,8 +60,6 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi 1L), GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) .outputChances(10000, 100 * 5 * aMultiplier, 10000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java index a8dae7f284..d5ae2409bc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java @@ -43,8 +43,6 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java index d90902d9c0..d5d1537a49 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java @@ -50,7 +50,6 @@ public class GT_BauxiteRefineChain { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs() .fluidInputs(MaterialsOreAlum.BauxiteSlurry.getFluid(32000), GT_ModHandler.getSteam(2000)) .fluidOutputs(MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(32000)) .duration(8 * SECONDS) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 9f35cf94d5..e3c3f30849 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -2076,8 +2076,6 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.cobblestone, 1, WILDCARD)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2086,8 +2084,6 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .itemInputs(new ItemStack(Blocks.gravel, 1, WILDCARD)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new ItemStack(Items.flint, 1)) .outputChances(10000, 1000) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2095,8 +2091,6 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.furnace, 1, WILDCARD)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); @@ -2104,8 +2098,6 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.lit_furnace, 1, WILDCARD)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sMaceratorRecipes); |