diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-05-19 18:52:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 19:52:57 +0200 |
| commit | 1798aa29d3126252c163f919b0eb2518b2e5b68c (patch) | |
| tree | 9b887bf7c8dfdad005c13564741b2b2923d7a018 /src/main/java/gregtech/common | |
| parent | 1722f9738b57db2958efd339a6bc490a643ac5c9 (diff) | |
| download | GT5-Unofficial-1798aa29d3126252c163f919b0eb2518b2e5b68c.tar.gz GT5-Unofficial-1798aa29d3126252c163f919b0eb2518b2e5b68c.tar.bz2 GT5-Unofficial-1798aa29d3126252c163f919b0eb2518b2e5b68c.zip | |
Yet another round of ra2 conversions (#2006)
* lathe and saplings
* toolhead oreproc recipes
* fluid solidification
* reverse macerating
* autoclave combs
* implosion compressor
* assembler recipes
* assembling line
* slicer recipes
* minor fixes
* attempted cell to fluid fix
* minor fix 2
Diffstat (limited to 'src/main/java/gregtech/common')
4 files changed, 573 insertions, 371 deletions
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 cb96330058..b5b00fba5a 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 @@ -2,10 +2,12 @@ package gregtech.common.items; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.client.GT_TooltipHandler.Tier.*; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; @@ -35,6 +37,7 @@ import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects; +import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.ITexture; import gregtech.api.items.GT_MetaBase_Item; @@ -839,13 +842,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L))); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Spray_Empty.get(1L), - 800, - 1); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + 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); ItemList.Crate_Empty.set( addItem( @@ -879,14 +886,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L))); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Aluminium, 2L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.ThermosCan_Empty.get(1L), - 800, - 1); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.ThermosCan_Empty.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_Steel.set( addItem( @@ -901,14 +911,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L))); setFluidContainerStats(32000 + tLastID, 8000L, 64L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnyBronze, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_Steel.get(1L), - 200, - 30); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_Steel.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_TungstenSteel.set( addItem( @@ -923,14 +936,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 7L))); setFluidContainerStats(32000 + tLastID, 512000L, 32L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Platinum, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_TungstenSteel.get(1L), - 200, - 480); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_TungstenSteel.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_Aluminium.set( addItem( @@ -945,13 +961,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 3L))); setFluidContainerStats(32000 + tLastID, 32000L, 64L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Silver, 4L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_Aluminium.get(1L), - 200, - 64); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 4L), + 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); ItemList.Large_Fluid_Cell_StainlessSteel.set( addItem( @@ -966,14 +986,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L))); setFluidContainerStats(32000 + tLastID, 64000L, 64L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Electrum, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_StainlessSteel.get(1L), - 200, - 120); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_StainlessSteel.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_Titanium.set( addItem( @@ -988,14 +1011,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 5L))); setFluidContainerStats(32000 + tLastID, 128000L, 64L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.RoseGold, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_Titanium.get(1L), - 200, - 256); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_Titanium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_Chrome.set( addItem( @@ -1010,14 +1036,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 6L))); setFluidContainerStats(32000 + tLastID, 2048000L, 8L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Chrome, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Chrome, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Palladium, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_Chrome.get(1L), - 200, - 1024); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_Chrome.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(1024) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_Iridium.set( addItem( @@ -1032,14 +1061,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 8L))); setFluidContainerStats(32000 + tLastID, 8192000L, 2L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Naquadah, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_Iridium.get(1L), - 200, - 1920); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_Iridium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_Osmium.set( addItem( @@ -1054,14 +1086,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 9L))); setFluidContainerStats(32000 + tLastID, 32768000L, 1L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.ElectrumFlux, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_Osmium.get(1L), - 200, - 4096); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_Osmium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4096) + .addTo(sAssemblerRecipes); ItemList.Large_Fluid_Cell_Neutronium.set( addItem( @@ -1076,14 +1111,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 10L))); setFluidContainerStats(32000 + tLastID, 131072000L, 1L); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 4L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Draconium, 4L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Large_Fluid_Cell_Neutronium.get(1L), - 200, - 7680); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Large_Fluid_Cell_Neutronium.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); for (byte i = 0; i < 16; i = (byte) (i + 1)) { ItemList.SPRAY_CAN_DYES[i].set( addItem( @@ -1144,38 +1182,50 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { addItemBehavior(32472, tBehaviour); addItemBehavior(32473, tBehaviour); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Tool_Matches.get(1L), - 16, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Tool_Matches.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Tool_Matches.get(1L), - 16, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Tool_Matches.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Tool_Matches.get(4L), - 64, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Tool_Matches.get(4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Tool_Matches.get(4L), - 64, - 16); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Tool_Matches.get(4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.addBoxingRecipe( ItemList.Tool_Matches.get(16L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L), @@ -1219,13 +1269,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { addItemBehavior(32475, tBehaviour); addItemBehavior(32476, tBehaviour); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 2L), - new ItemStack(Items.flint, 1), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Tool_Lighter_Invar_Empty.get(1L), - 256, - 16); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 2L), + 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); ItemList.Tool_Lighter_Platinum_Empty.set( addItem( @@ -1264,13 +1318,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { addItemBehavior(32478, tBehaviour); addItemBehavior(32479, tBehaviour); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Platinum, 2L), - new ItemStack(Items.flint, 1), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Tool_Lighter_Platinum_Empty.get(1L), - 256, - 256); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Platinum, 2L), + 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); if (GalacticraftMars.isModLoaded()) { ItemList.Ingot_Heavy1 @@ -3644,72 +3702,105 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "Protects your Machines", new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 4L))); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Muffler.get(1L), - 1600, - 2); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Muffler.get(1L), - 1600, - 2); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Muffler.get(1L), - 1600, - 2); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Muffler.get(1L), - 1600, - 2); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 2L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Muffler.get(1L), - 1600, - 2); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Muffler.get(1L), - 1600, - 2); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Lock.get(1L), - 6400, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Upgrade_Lock.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * MINUTES + 20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Lock.get(1L), - 6400, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Upgrade_Lock.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * MINUTES + 20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Upgrade_Lock.get(1L), - 6400, - 16); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Upgrade_Lock.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * MINUTES + 20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); ItemList.Component_Filter.set( addItem( @@ -3771,14 +3862,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "Displays the fluid stored in the Tank", new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L))); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Sensor_EV.get(1L), + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Sensor_EV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_PlayerDetector.get(1L), - 3200, - 128); + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_PlayerDetector.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GregTech_API.registerCover( ItemList.Cover_Controller.get(1L), @@ -3861,83 +3955,127 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { OrePrefixes.dust.get(Materials.Glowstone), 'R', Dyes.dyeRed, 'G', Dyes.dyeLime, 'B', Dyes.dyeBlue, 'P', OrePrefixes.plate.get(Materials.Glass) }); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Shutter.get(1L), - 200, - 64); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Shutter.get(1L), - 800, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - ItemList.Cover_Drain.get(1L), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Shutter.get(1L), - 400, - 30); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), - new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Drain.get(1L), - 200, - 64); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2L), - new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Drain.get(1L), - 800, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 2L), - new ItemStack(Blocks.iron_bars, 2), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Drain.get(1L), - 400, - 30); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Crafting.get(1L), - 200, - 64); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Crafting.get(1L), - 800, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - new ItemStack(Blocks.crafting_table, 1), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_Crafting.get(1L), - 800, - 16); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Cover_Shutter.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.FluidFilter.get(1L), - 800, - 4); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Cover_Screen.get(1L), ItemList.Cover_FluidDetector.get(1L), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF, - ItemList.Cover_FluidStorageMonitor.get(1L), - 1200, - 128); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), + ItemList.Cover_Drain.get(1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_Shutter.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + ItemList.Cover_Drain.get(1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_Shutter.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + ItemList.Cover_Drain.get(1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_Shutter.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 2L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + 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); + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Cover_Shutter.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.FluidFilter.get(1L)) + .noFluidInputs() + .noFluidOutputs() + |
