From da4db141a608dfa1682d40b7721531c622a0f324 Mon Sep 17 00:00:00 2001 From: Pelotrio <45769595+Pelotrio@users.noreply.github.com> Date: Sat, 28 Oct 2023 16:03:06 +0200 Subject: [PATCH] Add recipes for stocking buses/hatches --- dependencies.gradle | 2 +- .../gthandler/recipes/AssemblerRecipes.java | 13 ++++++++++++- .../recipes/AssemblingLineRecipes.java | 11 +++++++++++ .../recipes/SpaceAssemblerRecipes.java | 18 ++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f2c873ee9a..eace2a7db5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.68:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.70-pre:dev") api("com.github.GTNewHorizons:Yamcl:0.5.86:dev") api("com.github.GTNewHorizons:Baubles:1.0.1.16:dev") diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 869d952e86..26e7098af0 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -3773,12 +3773,23 @@ private void makeAE2Recipes() { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hatch_Input_Bus_HV.get(1L), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1L, 440), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1L), GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4L, 30), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ME.get(1)).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Hatch_Input_Multi_2x2_UV.get(4L), + GT_ModHandler.getModItem(AE2FluidCraft.ID, "fluid_interface", 1L), + ItemList.Circuit_Chip_NeuroCPU.get(1L), + ItemList.Electric_Pump_UV.get(1L), + GT_ModHandler.getModItem(AE2FluidCraft.ID, "fluid_part", 4L, 6), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 56)) + .itemOutputs(ItemList.Hatch_Input_ME.get(1)).duration(15 * SECONDS).eut(TierEU.RECIPE_UV) + .addTo(sAssemblerRecipes); + // Cell Workbench GT_Values.RA.stdBuilder() .itemInputs( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 2d48631fa8..385729aaf3 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -137,6 +137,17 @@ public void run() { .fluidInputs(new FluidStack(solderIndalloy, 720)).itemOutputs(ItemList.Energy_LapotronicOrb2.get(1L)) .eut(TierEU.RECIPE_ZPM).duration(50 * SECONDS).addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Input_Bus_ME.get(1L)) + .metadata(RESEARCH_TIME, 1 * HOURS) + .itemInputs( + ItemList.Hatch_Input_Bus_LuV.get(1L), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1L), + ItemList.Conveyor_Module_IV.get(1L), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4L, 30)) + .fluidInputs(new FluidStack(solderIndalloy, 288), FluidRegistry.getFluidStack("lubricant", 500)) + .itemOutputs(ItemList.Hatch_Input_Bus_ME_Advanced.get(1L)).eut(TierEU.RECIPE_LuV).duration(15 * SECONDS) + .addTo(AssemblyLine); + if (TecTech.isModLoaded()) { TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.get(1L), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index 749dad93e0..6dd21358f0 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -1,5 +1,7 @@ package com.dreammaster.gthandler.recipes; +import static gregtech.api.enums.Mods.AE2FluidCraft; +import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.GTNHIntergalactic; import static gregtech.api.enums.Mods.GTPlusPlus; @@ -230,6 +232,22 @@ public void run() { (int) TierEU.RECIPE_UIV, null, null); + + IG_RecipeAdder + .addSpaceAssemblerRecipe( + new ItemStack[] { ItemList.Hatch_Input_Multi_2x2_UEV.get(4L), + GT_ModHandler.getModItem(AE2FluidCraft.ID, "fluid_interface", 1L), + ItemList.Optically_Compatible_Memory.get(2), ItemList.Electric_Pump_UEV.get(1L), + GT_ModHandler.getModItem(AE2FluidCraft.ID, "fluid_part", 4, 7), + GT_ModHandler + .getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4L, 56) }, + new FluidStack[] { new FluidStack(solderUEV, 2304) }, + ItemList.Hatch_Input_ME_Advanced.get(1), + 1, + 15 * 20, + (int) TierEU.RECIPE_UHV, + null, + null); } if (OpenComputers.isModLoaded()) { // Memory Tier 3.5