diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2024-08-16 12:32:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-16 12:32:00 +0100 |
| commit | 07610983b13813893b482e2c1a050355fd007c60 (patch) | |
| tree | 00149d17c86d4cfc52c4c231aeeeb63a7e0794f4 /src/main/java | |
| parent | 54f98cd732f1ce1dc5a8a6ed69490a25d676c8b1 (diff) | |
| download | GT5-Unofficial-07610983b13813893b482e2c1a050355fd007c60.tar.gz GT5-Unofficial-07610983b13813893b482e2c1a050355fd007c60.tar.bz2 GT5-Unofficial-07610983b13813893b482e2c1a050355fd007c60.zip | |
Move gt machine recipes to postload (#2902)
* move assembler and compresser recipes
* move canner+extractor+packager
* register MTEs in preload
* move to init instead
Diffstat (limited to 'src/main/java')
7 files changed, 875 insertions, 893 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 cde7a66229..69f5a5a3ee 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 @@ -1,6 +1,5 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.enums.Textures.BlockIcons.COVER_WOOD_PLATE; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR; @@ -32,14 +31,6 @@ import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_LuV; import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_MV; import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UV; import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_ZPM; -import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.recipe.RecipeMaps.cannerRecipes; -import static gregtech.api.recipe.RecipeMaps.compressorRecipes; -import static gregtech.api.recipe.RecipeMaps.extractorRecipes; -import static gregtech.api.recipe.RecipeMaps.packagerRecipes; -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.ERV; import static gregtech.client.GT_TooltipHandler.Tier.EV; import static gregtech.client.GT_TooltipHandler.Tier.HV; @@ -467,7 +458,6 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -484,7 +474,6 @@ 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; @@ -3345,13 +3334,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { setAllElectricStats(); registerTieredTooltips(); - compressorRecipes(); craftingShapedRecipes(); craftingShapelessRecipes(); - assemblerRecipes(); - cannerRecipes(); - packagerRecipes(); - extractorRecipes(); } private static final Map<Materials, Materials> cauldronRemap = new HashMap<>(); @@ -3498,15 +3482,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.addToBlacklist(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID)); } - private void compressorRecipes() { - RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L)) - .itemOutputs(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - } - private void registerCovers() { final ITexture doesWorkCoverTexture = TextureFactory.of( TextureFactory.of(OVERLAY_ACTIVITYDETECTOR), @@ -3853,872 +3828,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new ItemStack(Blocks.glass)); } - private void assemblerRecipes() { - 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)) - .duration(40 * SECONDS) - .eut(1) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Aluminium, 2L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.ThermosCan_Empty.get(1L)) - .duration(40 * SECONDS) - .eut(1) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnyBronze, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_Steel.get(1L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Platinum, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_TungstenSteel.get(1L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); - - 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)) - .duration(10 * SECONDS) - .eut(64) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Electrum, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_StainlessSteel.get(1L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.RoseGold, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_Titanium.get(1L)) - .duration(10 * SECONDS) - .eut(256) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Chrome, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Palladium, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_Chrome.get(1L)) - .duration(10 * SECONDS) - .eut(1024) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Naquadah, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_Iridium.get(1L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.ElectrumFlux, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_Osmium.get(1L)) - .duration(10 * SECONDS) - .eut(4096) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Draconium, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Large_Fluid_Cell_Neutronium.get(1L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - ItemList.Large_Fluid_Cell_Aluminium.get(1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Spray_Color_Remover_Empty.get(1L)) - .duration(40 * SECONDS) - .eut(1) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Tool_Matches.get(1L)) - .duration(16 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Tool_Matches.get(1L)) - .duration(16 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Tool_Matches.get(4L)) - .duration(3 * SECONDS + 4 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Tool_Matches.get(4L)) - .duration(3 * SECONDS + 4 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - 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)) - .duration(12 * SECONDS + 16 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - 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)) - .duration(12 * SECONDS + 16 * TICKS) - .eut(256) - .addTo(assemblerRecipes); - - 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)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(assemblerRecipes); - 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)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(assemblerRecipes); - 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)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(assemblerRecipes); - 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)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(assemblerRecipes); - 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)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(assemblerRecipes); - 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)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .duration(5 * MINUTES + 20 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .duration(5 * MINUTES + 20 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Upgrade_Lock.get(1L)) - .duration(5 * MINUTES + 20 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - ItemList.Sensor_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_PlayerDetector.get(1L)) - .duration(2 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - 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)) - .duration(40 * SECONDS) - .eut(16) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - ItemList.Cover_Screen.get(1L), - ItemList.Cover_FluidDetector.get(1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_FluidStorageMonitor.get(1L)) - .duration(40 * SECONDS) - .eut(4) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs(ItemList.Sensor_LV.get(1L), ItemList.Emitter_LV.get(1L), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.NC_SensorKit.get(1L)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - ItemList.Emitter_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_RedstoneTransmitterExternal.get(1L)) - .duration(2 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - ItemList.Sensor_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_RedstoneReceiverExternal.get(1L)) - .duration(2 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - ItemList.Emitter_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_NeedsMaintainance.get(1L)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L), - ItemList.Component_Filter.get(1L), - ItemList.Conveyor_Module_LV.get(1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.ItemFilter_Export.get(1L)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L), - ItemList.Component_Filter.get(1L), - ItemList.Conveyor_Module_LV.get(1L), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.ItemFilter_Import.get(1L)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 2L)) - .itemOutputs(ItemList.BatteryHull_EV.get(1L)) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144L)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RoseGold, 6L)) - .itemOutputs(ItemList.BatteryHull_IV.get(1L)) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18L)) - .itemOutputs(ItemList.BatteryHull_LuV.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(144L)) - .duration(15 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6L)) - .itemOutputs(ItemList.BatteryHull_ZPM.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(288L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18L)) - .itemOutputs(ItemList.BatteryHull_UV.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(576L)) - .duration(15 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24L)) - .itemOutputs(ItemList.BatteryHull_UHV.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(1152L)) - .duration(5 * SECONDS) - .eut(500000) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36L)) - .itemOutputs(ItemList.BatteryHull_UEV.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L)) - .duration(10 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48L)) - .itemOutputs(ItemList.BatteryHull_UIV.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(4608L)) - .duration(15 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56L)) - .itemOutputs(ItemList.BatteryHull_UMV.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(9216L)) - .duration(30 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64L)) - .itemOutputs(ItemList.BatteryHull_UxV.get(1L)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(18432L)) - .duration(60 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); - } - - private void cannerRecipes() { - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 2L), - ItemList.Battery_Hull_LV.get(1L)) - .itemOutputs(ItemList.Battery_RE_LV_Cadmium.get(1L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2L), - ItemList.Battery_Hull_LV.get(1L)) - .itemOutputs(ItemList.Battery_RE_LV_Lithium.get(1L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2L), - ItemList.Battery_Hull_LV.get(1L)) - .itemOutputs(ItemList.Battery_RE_LV_Sodium.get(1L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 8L), - ItemList.Battery_Hull_MV.get(1L)) - .itemOutputs(ItemList.Battery_RE_MV_Cadmium.get(1L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 8L), - ItemList.Battery_Hull_MV.get(1L)) - .itemOutputs(ItemList.Battery_RE_MV_Lithium.get(1L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 8L), - ItemList.Battery_Hull_MV.get(1L)) - .itemOutputs(ItemList.Battery_RE_MV_Sodium.get(1L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 32L), - ItemList.Battery_Hull_HV.get(1L)) - .itemOutputs(ItemList.Battery_RE_HV_Cadmium.get(1L)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), - ItemList.Battery_Hull_HV.get(1L)) - .itemOutputs(ItemList.Battery_RE_HV_Lithium.get(1L)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), - ItemList.Battery_Hull_HV.get(1L)) - .itemOutputs(ItemList.Battery_RE_HV_Sodium.get(1L)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(2) - .addTo(cannerRecipes); - // Recipes to actually fill the empty hulls with content - // IV 2048 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 4L), - ItemList.BatteryHull_EV.get(1L)) - .itemOutputs(ItemList.BatteryHull_EV_Full.get(1L)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(cannerRecipes); - // EV 8192 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 16L), - ItemList.BatteryHull_IV.get(1L)) - .itemOutputs(ItemList.BatteryHull_IV_Full.get(1L)) - .duration(7 * SECONDS + 10 * TICKS) - .eut(1024) - .addTo(cannerRecipes); - // LuV 32768 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32L), - ItemList.BatteryHull_LuV.get(1L)) - .itemOutputs(ItemList.BatteryHull_LuV_Full.get(1L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(cannerRecipes); - // ZPM 131072 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 16L), - ItemList.BatteryHull_ZPM.get(1L)) - .itemOutputs(ItemList.BatteryHull_ZPM_Full.get(1L)) - .duration(12 * SECONDS + 10 * TICKS) - .eut(4096) - .addTo(cannerRecipes); - // UV 524288 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32L), - ItemList.BatteryHull_UV.get(1L)) - .itemOutputs(ItemList.BatteryHull_UV_Full.get(1L)) - .duration(15 * SECONDS) - .eut(7860) - .addTo(cannerRecipes); - // UHV 2097152 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 16L), - ItemList.BatteryHull_UHV.get(1L)) - .itemOutputs(ItemList.BatteryHull_UHV_Full.get(1L)) - .duration(17 * SECONDS + 10 * TICKS) - .eut(15720) - .addTo(cannerRecipes); - // UEV 8388608 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 32L), - ItemList.BatteryHull_UEV.get(1L)) - .itemOutputs(ItemList.BatteryHull_UEV_Full.get(1L)) - .duration(20 * SECONDS) - .eut(31440) - .addTo(cannerRecipes); - // UIV 33554432 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 64L), - ItemList.BatteryHull_UIV.get(1L)) - .itemOutputs(ItemList.BatteryHull_UIV_Full.get(1L)) - .duration(22 * SECONDS + 10 * TICKS) - .eut(62880) - .addTo(cannerRecipes); - // UMV 134217728 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 4L), - ItemList.BatteryHull_UMV.get(1L)) - .itemOutputs(ItemList.BatteryHull_UMV_Full.get(1L)) - .duration(25 * SECONDS) - .eut(125760) - .addTo(cannerRecipes); - // UxV 536870912 - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8L), - ItemList.BatteryHull_UxV.get(1L)) - .itemOutputs(ItemList.BatteryHull_UxV_Full.get(1L)) - .duration(30 * SECONDS) - .eut(251520) - .addTo(cannerRecipes); - } - - private void packagerRecipes() { - RA.stdBuilder() - .itemInputs( - ItemList.Tool_Matches.get(16L), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L)) - .itemOutputs(ItemList.Tool_MatchBox_Full.get(1L)) - .duration(3 * SECONDS + 4 * TICKS) - .eut(16) - .addTo(packagerRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Tool_MatchBox_Full.get(1L)) - .itemOutputs(ItemList.Tool_Matches.get(16L)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(16) - .addTo(packagerRecipes); - } - - private void extractorRecipes() { - RA.stdBuilder() - .itemInputs(ItemList.Battery_SU_LV_SulfuricAcid.get(1L)) - .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_SU_LV_Mercury.get(1L)) - .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_SU_MV_SulfuricAcid.get(1L)) - .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_SU_MV_Mercury.get(1L)) - .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_SU_HV_SulfuricAcid.get(1L)) - .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_SU_HV_Mercury.get(1L)) - .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_LV_Cadmium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_LV_Lithium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_LV_Sodium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_MV_Cadmium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_MV_Lithium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_MV_Sodium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_HV_Cadmium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_HV_Lithium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - RA.stdBuilder() - .itemInputs(ItemList.Battery_RE_HV_Sodium.get(1L)) - .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_EV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_EV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_IV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_IV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_LuV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_LuV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_ZPM_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_ZPM.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_UV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_UV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_UHV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_UHV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_UEV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_UEV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_UIV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_UIV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_UMV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_UMV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.BatteryHull_UxV_Full.get(1L)) - .itemOutputs(ItemList.BatteryHull_UxV.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - } - private void craftingShapedRecipes() { ItemStack tStack = new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID); tStack.setStackDisplayName("The holy Planks of Sengir"); diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 1881f19b9e..50f87606fa 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -65,6 +65,525 @@ public class AssemblerRecipes implements Runnable { this.loadOutputHatchesRecipes(); this.withIC2NuclearControl(); + { + 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)) + .duration(40 * SECONDS) + .eut(1) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.ThermosCan_Empty.get(1L)) + .duration(40 * SECONDS) + .eut(1) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_Steel.get(1L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_TungstenSteel.get(1L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + 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)) + .duration(10 * SECONDS) + .eut(64) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_StainlessSteel.get(1L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_Titanium.get(1L)) + .duration(10 * SECONDS) + .eut(256) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_Chrome.get(1L)) + .duration(10 * SECONDS) + .eut(1024) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_Iridium.get(1L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_Osmium.get(1L)) + .duration(10 * SECONDS) + .eut(4096) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Large_Fluid_Cell_Neutronium.get(1L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + ItemList.Large_Fluid_Cell_Aluminium.get(1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Spray_Color_Remover_Empty.get(1L)) + .duration(40 * SECONDS) + .eut(1) + .addTo(assemblerRecipes); + + 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)) + .itemOutputs(ItemList.Tool_Matches.get(1L)) + .duration(16 * TICKS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .itemOutputs(ItemList.Tool_Matches.get(1L)) + .duration(16 * TICKS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .itemOutputs(ItemList.Tool_Matches.get(4L)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .itemOutputs(ItemList.Tool_Matches.get(4L)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(assemblerRecipes); + + 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)) + .duration(12 * SECONDS + 16 * TICKS) + .eut(16) + .addTo(assemblerRecipes); + + 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)) + .duration(12 * SECONDS + 16 * TICKS) + .eut(256) + .addTo(assemblerRecipes); + + 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)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(assemblerRecipes); + 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)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(assemblerRecipes); + 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)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(assemblerRecipes); + 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)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(assemblerRecipes); + 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)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(assemblerRecipes); + 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)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(assemblerRecipes); + 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)) + .itemOutputs(ItemList.Upgrade_Lock.get(1L)) + .duration(5 * MINUTES + 20 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .itemOutputs(ItemList.Upgrade_Lock.get(1L)) + .duration(5 * MINUTES + 20 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .itemOutputs(ItemList.Upgrade_Lock.get(1L)) + .duration(5 * MINUTES + 20 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Sensor_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_PlayerDetector.get(1L)) + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + 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)) + .duration(40 * SECONDS) + .eut(16) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Cover_Screen.get(1L), + ItemList.Cover_FluidDetector.get(1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_FluidStorageMonitor.get(1L)) + .duration(40 * SECONDS) + .eut(4) + .addTo(assemblerRecipes); + + 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)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Emitter_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_RedstoneTransmitterExternal.get(1L)) + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Sensor_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_RedstoneReceiverExternal.get(1L)) + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Emitter_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_NeedsMaintainance.get(1L)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L), + ItemList.Component_Filter.get(1L), + ItemList.Conveyor_Module_LV.get(1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.ItemFilter_Export.get(1L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 2L), + ItemList.Component_Filter.get(1L), + ItemList.Conveyor_Module_LV.get(1L), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.ItemFilter_Import.get(1L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 2L)) + .itemOutputs(ItemList.BatteryHull_EV.get(1L)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RoseGold, 6L)) + .itemOutputs(ItemList.BatteryHull_IV.get(1L)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18L)) + .itemOutputs(ItemList.BatteryHull_LuV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(144L)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6L)) + .itemOutputs(ItemList.BatteryHull_ZPM.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18L)) + .itemOutputs(ItemList.BatteryHull_UV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(576L)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24L)) + .itemOutputs(ItemList.BatteryHull_UHV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(1152L)) + .duration(5 * SECONDS) + .eut(500000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36L)) + .itemOutputs(ItemList.BatteryHull_UEV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L)) + .duration(10 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48L)) + .itemOutputs(ItemList.BatteryHull_UIV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(4608L)) + .duration(15 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56L)) + .itemOutputs(ItemList.BatteryHull_UMV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(9216L)) + .duration(30 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64L)) + .itemOutputs(ItemList.BatteryHull_UxV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(18432L)) + .duration(60 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); + } + // If Cleanroom is enabled, add an assembler recipe if (GT_Mod.gregtechproxy.mEnableCleanroom) { GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java index aef837a6b3..534a5e5c63 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java @@ -2,6 +2,7 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.recipe.RecipeMaps.cannerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -9,6 +10,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -16,6 +18,181 @@ public class CannerRecipes implements Runnable { @Override public void run() { + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 2L), + ItemList.Battery_Hull_LV.get(1L)) + .itemOutputs(ItemList.Battery_RE_LV_Cadmium.get(1L)) + .duration(5 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2L), + ItemList.Battery_Hull_LV.get(1L)) + .itemOutputs(ItemList.Battery_RE_LV_Lithium.get(1L)) + .duration(5 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2L), + ItemList.Battery_Hull_LV.get(1L)) + .itemOutputs(ItemList.Battery_RE_LV_Sodium.get(1L)) + .duration(5 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 8L), + ItemList.Battery_Hull_MV.get(1L)) + .itemOutputs(ItemList.Battery_RE_MV_Cadmium.get(1L)) + .duration(20 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 8L), + ItemList.Battery_Hull_MV.get(1L)) + .itemOutputs(ItemList.Battery_RE_MV_Lithium.get(1L)) + .duration(20 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 8L), + ItemList.Battery_Hull_MV.get(1L)) + .itemOutputs(ItemList.Battery_RE_MV_Sodium.get(1L)) + .duration(20 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 32L), + ItemList.Battery_Hull_HV.get(1L)) + .itemOutputs(ItemList.Battery_RE_HV_Cadmium.get(1L)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), + ItemList.Battery_Hull_HV.get(1L)) + .itemOutputs(ItemList.Battery_RE_HV_Lithium.get(1L)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), + ItemList.Battery_Hull_HV.get(1L)) + .itemOutputs(ItemList.Battery_RE_HV_Sodium.get(1L)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(cannerRecipes); + // Recipes to actually fill the empty hulls with content + // IV 2048 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 4L), + ItemList.BatteryHull_EV.get(1L)) + .itemOutputs(ItemList.BatteryHull_EV_Full.get(1L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(cannerRecipes); + // EV 8192 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 16L), + ItemList.BatteryHull_IV.get(1L)) + .itemOutputs(ItemList.BatteryHull_IV_Full.get(1L)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(1024) + .addTo(cannerRecipes); + // LuV 32768 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32L), + ItemList.BatteryHull_LuV.get(1L)) + .itemOutputs(ItemList.BatteryHull_LuV_Full.get(1L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(cannerRecipes); + // ZPM 131072 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 16L), + ItemList.BatteryHull_ZPM.get(1L)) + .itemOutputs(ItemList.BatteryHull_ZPM_Full.get(1L)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(4096) + .addTo(cannerRecipes); + // UV 524288 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32L), + ItemList.BatteryHull_UV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UV_Full.get(1L)) + .duration(15 * SECONDS) + .eut(7860) + .addTo(cannerRecipes); + // UHV 2097152 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 16L), + ItemList.BatteryHull_UHV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UHV_Full.get(1L)) + .duration(17 * SECONDS + 10 * TICKS) + .eut(15720) + .addTo(cannerRecipes); + // UEV 8388608 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 32L), + ItemList.BatteryHull_UEV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UEV_Full.get(1L)) + .duration(20 * SECONDS) + .eut(31440) + .addTo(cannerRecipes); + // UIV 33554432 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 64L), + ItemList.BatteryHull_UIV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UIV_Full.get(1L)) + .duration(22 * SECONDS + 10 * TICKS) + .eut(62880) + .addTo(cannerRecipes); + // UMV 134217728 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 4L), + ItemList.BatteryHull_UMV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UMV_Full.get(1L)) + .duration(25 * SECONDS) + .eut(125760) + .addTo(cannerRecipes); + // UxV 536870912 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8L), + ItemList.BatteryHull_UxV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UxV_Full.get(1L)) + .duration(30 * SECONDS) + .eut(251520) + .addTo(cannerRecipes); + // fuel rod canner recipes if (IndustrialCraft2.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index 675143d43a..ac462e4d50 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -25,6 +25,13 @@ public class CompressorRecipes implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(sapling_Rainforest, 8)) .itemOutputs(ItemList.IC2_Plantball.get(1)) .duration(15 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java index e26c4fef97..b47efc2e08 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java @@ -34,6 +34,158 @@ public class ExtractorRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L)); addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L)); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_SU_LV_SulfuricAcid.get(1L)) + .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_SU_LV_Mercury.get(1L)) + .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_SU_MV_SulfuricAcid.get(1L)) + .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_SU_MV_Mercury.get(1L)) + .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_SU_HV_SulfuricAcid.get(1L)) + .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_SU_HV_Mercury.get(1L)) + .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_LV_Cadmium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_LV_Lithium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_LV_Sodium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_LV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_MV_Cadmium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_MV_Lithium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_MV_Sodium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_MV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_HV_Cadmium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_HV_Lithium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_RE_HV_Sodium.get(1L)) + .itemOutputs(ItemList.Battery_Hull_HV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_EV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_EV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_IV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_IV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_LuV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_LuV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_ZPM_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_ZPM.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UHV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UHV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UEV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UEV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UIV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UIV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UMV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UMV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UxV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UxV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); } public void addExtractionRecipe(ItemStack input, ItemStack output) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java index bb434cbf7d..4ff99582c2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java @@ -15,6 +15,22 @@ public class PackagerRecipes implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Tool_Matches.get(16L), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L)) + .itemOutputs(ItemList.Tool_MatchBox_Full.get(1L)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(packagerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Tool_MatchBox_Full.get(1L)) + .itemOutputs(ItemList.Tool_Matches.get(16L)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(16) + .addTo(packagerRecipes); + + GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Scrap.get(9), ItemList.Schematic_3by3.get(0)) .itemOutputs(ItemList.IC2_Scrapbox.get(1)) .duration(16 * TICKS) diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java index ad66ad30af..51277e14d1 100644 --- a/src/main/java/kubatech/CommonProxy.java +++ b/src/main/java/kubatech/CommonProxy.java @@ -66,11 +66,13 @@ public class CommonProxy { } public void init(FMLInitializationEvent event) { - if (MineTweaker.isModLoaded()) MTLoader.init(); + RecipeLoader.registerMTEs(); // crashes in preinit because EIG references some blocks from other mods. + if (MineTweaker.isModLoaded()) { + MTLoader.init(); + } } public void postInit(FMLPostInitializationEvent event) { - RecipeLoader.registerMTEs(); RecipeLoader.addRecipes(); EIGBucketLoader.LoadEIGBuckets(); if (Thaumcraft.isModLoaded()) TCLoader.init(); |