diff options
Diffstat (limited to 'src/main/java/gregtech/common')
8 files changed, 3 insertions, 186 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 4c8c4bd922..e92d9ffae9 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1990,16 +1990,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 1, 8)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(1) .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 1, 9)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sWiremillRecipes); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java index 0852e67ecf..0aedc4ea73 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java @@ -72,16 +72,12 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 0), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(new ItemStack(this, 1, 3)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 8), GT_Utility.getIntegratedCircuit(4)) .itemOutputs(new ItemStack(this, 1, 11)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(sAssemblerRecipes); @@ -134,8 +130,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 3)) .itemOutputs(new ItemStack(this, 1, 4)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -143,8 +137,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 11)) .itemOutputs(new ItemStack(this, 1, 12)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -152,8 +144,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 0)) .itemOutputs(new ItemStack(this, 1, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -161,8 +151,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 8)) .itemOutputs(new ItemStack(this, 1, 9)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(10) .addTo(sHammerRecipes); @@ -176,8 +164,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 7), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(new ItemStack(this, 1, 6)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); @@ -185,8 +171,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(this, 1, 15), GT_Utility.copyAmount(0L, aStack)) .itemOutputs(new ItemStack(this, 1, 14)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(sLaserEngraverRecipes); diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java index efec34bc01..3625acb1e8 100644 --- a/src/main/java/gregtech/common/fluid/GT_Fluid.java +++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java @@ -126,7 +126,6 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R GT_Values.RA.stdBuilder() .itemInputs(fullContainer) .itemOutputs(GT_Utility.getContainerItem(fullContainer, false)) - .noFluidInputs() .fluidOutputs(fluidStack) .duration(fluidStack.amount / 62) .eut(1) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 34b922b43d..ff8d1c3e94 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -196,8 +196,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L)) .itemOutputs(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -921,8 +919,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Spray_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sAssemblerRecipes); @@ -965,8 +961,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Aluminium, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.ThermosCan_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(1) .addTo(sAssemblerRecipes); @@ -990,8 +984,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnyBronze, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Steel.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); @@ -1015,8 +1007,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Platinum, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_TungstenSteel.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sAssemblerRecipes); @@ -1040,8 +1030,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Silver, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Aluminium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -1065,8 +1053,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Electrum, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_StainlessSteel.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -1090,8 +1076,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.RoseGold, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Titanium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(256) .addTo(sAssemblerRecipes); @@ -1115,8 +1099,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Palladium, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Chrome.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(1024) .addTo(sAssemblerRecipes); @@ -1140,8 +1122,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Naquadah, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Iridium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(sAssemblerRecipes); @@ -1165,8 +1145,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.ElectrumFlux, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Osmium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(4096) .addTo(sAssemblerRecipes); @@ -1190,8 +1168,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Draconium, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Large_Fluid_Cell_Neutronium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(sAssemblerRecipes); @@ -1261,8 +1237,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1272,8 +1246,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(16 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1283,8 +1255,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1294,8 +1264,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Matches.get(4L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1304,16 +1272,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_Matches.get(16L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L)) .itemOutputs(ItemList.Tool_MatchBox_Full.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) .eut(16) .addTo(sBoxinatorRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Tool_MatchBox_Full.get(1L)) .itemOutputs(ItemList.Tool_Matches.get(16L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) .eut(16) .addTo(sBoxinatorRecipes); @@ -1358,8 +1322,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Items.flint, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Lighter_Invar_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(12 * SECONDS + 16 * TICKS) .eut(16) .addTo(sAssemblerRecipes); @@ -1407,8 +1369,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Items.flint, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Tool_Lighter_Platinum_Empty.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(12 * SECONDS + 16 * TICKS) .eut(256) .addTo(sAssemblerRecipes); @@ -1860,8 +1820,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 2L), ItemList.Battery_Hull_LV.get(1L)) .itemOutputs(ItemList.Battery_RE_LV_Cadmium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1870,8 +1828,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2L), ItemList.Battery_Hull_LV.get(1L)) .itemOutputs(ItemList.Battery_RE_LV_Lithium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1880,8 +1836,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2L), ItemList.Battery_Hull_LV.get(1L)) .itemOutputs(ItemList.Battery_RE_LV_Sodium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1890,8 +1844,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 8L), ItemList.Battery_Hull_MV.get(1L)) .itemOutputs(ItemList.Battery_RE_MV_Cadmium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1900,8 +1852,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 8L), ItemList.Battery_Hull_MV.get(1L)) .itemOutputs(ItemList.Battery_RE_MV_Lithium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1910,8 +1860,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 8L), ItemList.Battery_Hull_MV.get(1L)) .itemOutputs(ItemList.Battery_RE_MV_Sodium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(20 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1920,8 +1868,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 32L), ItemList.Battery_Hull_HV.get(1L)) .itemOutputs(ItemList.Battery_RE_HV_Cadmium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1930,8 +1876,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), ItemList.Battery_Hull_HV.get(1L)) .itemOutputs(ItemList.Battery_RE_HV_Lithium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -1940,8 +1884,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), ItemList.Battery_Hull_HV.get(1L)) .itemOutputs(ItemList.Battery_RE_HV_Sodium.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sCannerRecipes); @@ -3777,8 +3719,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3788,8 +3728,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3799,8 +3737,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3810,8 +3746,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3821,8 +3755,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3832,8 +3764,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Muffler.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -3843,8 +3773,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * MINUTES + 20 * SECONDS) .eut(16) .addTo(sAssemblerRecipes); @@ -3854,8 +3782,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * MINUTES + 20 * SECONDS) .eut(16) .addTo(sAssemblerRecipes); @@ -3865,8 +3791,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * MINUTES + 20 * SECONDS) .eut(16) .addTo(sAssemblerRecipes); @@ -3937,8 +3861,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_PlayerDetector.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -4030,8 +3952,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Shutter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4041,8 +3961,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Shutter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4052,8 +3970,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Shutter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4063,8 +3979,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Drain.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4074,8 +3988,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Drain.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4085,8 +3997,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Drain.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4096,8 +4006,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Crafting.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4107,8 +4015,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Crafting.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4118,8 +4024,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_Crafting.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(10 * SECONDS) .eut(64) .addTo(sAssemblerRecipes); @@ -4129,8 +4033,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.FluidFilter.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); @@ -4140,8 +4042,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_FluidDetector.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_FluidStorageMonitor.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(40 * SECONDS) .eut(4) .addTo(sAssemblerRecipes); @@ -4350,8 +4250,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Sensor_LV.get(1L), ItemList.Emitter_LV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.NC_SensorKit.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(sAssemblerRecipes); @@ -4408,8 +4306,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_RedstoneTransmitterExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -4419,8 +4315,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_RedstoneReceiverExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -4456,8 +4350,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_NeedsMaintainance.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); @@ -4486,8 +4378,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Conveyor_Module_LV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.ItemFilter_Export.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); @@ -4498,8 +4388,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Conveyor_Module_LV.get(1L), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.ItemFilter_Import.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); 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 d652b68714..b3046616b5 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 @@ -2463,8 +2463,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2474,8 +2472,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2485,8 +2481,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Emitter_EV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_WirelessFluidDetector.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2496,8 +2490,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Emitter_EV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_WirelessItemDetector.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2507,8 +2499,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Emitter_EV.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_WirelessNeedsMaintainance.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(sAssemblerRecipes); @@ -2562,8 +2552,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Coppon.get(4L)) .itemOutputs(new ItemStack(Blocks.wool, 1, 1)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2571,8 +2559,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Plumbilia.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2580,8 +2566,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Argentia.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2589,8 +2573,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Indigo.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2598,8 +2580,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Ferru.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2607,8 +2587,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Aurelia.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2616,8 +2594,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_OilBerry.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2625,8 +2601,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2634,8 +2608,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Tine.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2643,8 +2615,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Crop_Drop_Rape.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2652,8 +2622,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.red_flower, 8, 32767)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); @@ -2661,8 +2629,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.yellow_flower, 8, 32767)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .noFluidInputs() - .noFluidOutputs() .duration(15 * SECONDS) .eut(2) .addTo(sCompressorRecipes); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index a44f720f14..18e163592a 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -1594,7 +1594,6 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { .itemInputs(GT_Utility.copyAmount(9, getStackForType(comb)), GT_Utility.getIntegratedCircuit(circuitNumber)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4)) .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + volt.getUUAmplifier()) / 10)))) - .noFluidOutputs() .duration(((int) (aMaterial.getMass() * 128)) * TICKS) .eut(volt.getAutoClaveEnergy()); if (volt.compareTo(Voltage.HV) > 0) { @@ -1617,8 +1616,6 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, getStackForType(comb))) - .noItemOutputs() - .noFluidInputs() .fluidOutputs(fluid) .duration(duration) .eut(eut) @@ -1696,9 +1693,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { recipeBuilder.itemInputs(combInput) .itemOutputs(combOutput) .fluidInputs(fluidInput); - if (fluidOutput == null) { - recipeBuilder.noFluidOutputs(); - } else { + if (fluidOutput != null) { recipeBuilder.fluidOutputs(fluidOutput); } recipeBuilder.duration(durationTicks) @@ -1785,8 +1780,6 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { .itemInputs(tComb) .itemOutputs(aItem) .outputChances(chance) - .noFluidInputs() - .noFluidOutputs() .duration(duration) .eut(volt.getSimpleEnergy()) .addTo(sCentrifugeRecipes); diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index c7e9789cd8..a3d786714a 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -197,7 +197,6 @@ public class ItemDrop extends Item { .itemInputs(tDrop) .itemOutputs(aOutput2) .outputChances(aChance) - .noFluidInputs() .fluidOutputs(aOutput) .duration(1 * SECONDS + 12 * TICKS) .eut(aEUt) @@ -210,7 +209,6 @@ public class ItemDrop extends Item { .itemInputs(tDrop) .itemOutputs(aOutput2) .outputChances(aChance) - .noFluidInputs() .fluidOutputs(aOutput) .duration(aDuration) .eut(aEUt) @@ -222,7 +220,6 @@ public class ItemDrop extends Item { .itemInputs(tDrop) .itemOutputs(aOutput2) .outputChances(aChance) - .noFluidInputs() .fluidOutputs(aOutput) .duration(6 * SECONDS + 8 * TICKS) .eut(aEUt) @@ -232,14 +229,11 @@ public class ItemDrop extends Item { public void addProcessHV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance) { GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); recipeBuilder.itemInputs(tDrop); - if (aOutput2 == GT_Values.NI) { - recipeBuilder.noItemOutputs(); - } else { + if (aOutput2 != GT_Values.NI) { recipeBuilder.itemOutputs(aOutput2) .outputChances(aChance); } - recipeBuilder.noFluidInputs() - .fluidOutputs(aOutput) + recipeBuilder.fluidOutputs(aOutput) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sFluidExtractionRecipes); diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 5559de9013..222635845a 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -111,7 +111,6 @@ public class ItemPropolis extends Item { .itemInputs(tPropolis) .itemOutputs(aOutput2) .outputChances(5000) - .noFluidInputs() .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 100)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV) @@ -123,7 +122,6 @@ public class ItemPropolis extends Item { .itemInputs(tPropolis) .itemOutputs(aOutput2) .outputChances(2500) - .noFluidInputs() .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 200)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -135,7 +133,6 @@ public class ItemPropolis extends Item { .itemInputs(tPropolis) .itemOutputs(aOutput2) .outputChances(1500) - .noFluidInputs() .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 300)) .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_IV) |