Skip to content

Commit

Permalink
Merge branch 'master' into add_recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Nov 7, 2024
2 parents 4751471 + f950fed commit d973e79
Show file tree
Hide file tree
Showing 16 changed files with 815 additions and 302 deletions.
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.51:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.56:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

implementation("com.github.GTNewHorizons:GTNHLib:0.5.17:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.5.18:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false }
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.28'
}


29 changes: 29 additions & 0 deletions src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,14 @@ private void bacterialVatRecipes() {
.eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8 * 9))
.duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV)
.metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
Expand All @@ -346,6 +354,13 @@ private void bacterialVatRecipes() {
.eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, false, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8 * 9)).duration(9 * 15 * SECONDS)
.eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, false, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.MarsStoneDust.get(16L))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
Expand All @@ -367,6 +382,13 @@ private void bacterialVatRecipes() {
.eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4 * 9)).duration(9 * 30 * SECONDS)
.eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(4))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(4L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1))
Expand All @@ -380,6 +402,13 @@ private void bacterialVatRecipes() {
.duration(1 * MINUTES).eut(TierEU.RECIPE_LuV)
.metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)).noOptimize().requiresCleanRoom()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(8L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2 * 9)).duration(9 * MINUTES)
.eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false))
.noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes);
}

private void bioLabRecipes() {
Expand Down
309 changes: 309 additions & 0 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2148,6 +2148,315 @@ public void run() {
GTModHandler.addShapelessCraftingRecipe(
tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1L),
new Object[] { tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1L) });

// Bus and Hatch Conversion
// Input bus to Output bus

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_ULV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_ULV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_LV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_LV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_MV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_MV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_HV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_HV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_EV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_EV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_IV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_IV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_LuV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_LuV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_ZPM.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_ZPM, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_UV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_UV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_Bus_MAX.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_Bus_MAX, 'S',
ToolDictNames.craftingToolScrewdriver, });

// Output bus to Input bus

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_ULV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_ULV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_LV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_LV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_MV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_MV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_HV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_HV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_EV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_EV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_IV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_IV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_LuV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_LuV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_ZPM.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_ZPM, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_UV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_UV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_Bus_MAX.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_Bus_MAX, 'S',
ToolDictNames.craftingToolScrewdriver, });

// Input hatch to Output Hatch

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_ULV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_ULV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_LV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_LV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_MV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_MV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_HV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_HV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_EV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_EV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_IV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_IV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_LuV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_LuV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_ZPM.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_ZPM, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_UV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_UHV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UHV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_UEV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UEV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_UIV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UIV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_UMV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UMV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_UXV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_UXV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Output_MAX.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Input_MAX, 'S',
ToolDictNames.craftingToolScrewdriver, });

// Output hatch to Input Hatch

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_ULV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_ULV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_LV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_LV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_MV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_MV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_HV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_HV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_EV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_EV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_IV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_IV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_LuV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_LuV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_ZPM.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_ZPM, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_UV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_UHV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UHV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_UEV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UEV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_UIV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UIV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_UMV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UMV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_UXV.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_UXV, 'S',
ToolDictNames.craftingToolScrewdriver, });

GTModHandler.addCraftingRecipe(
ItemList.Hatch_Input_MAX.get(1),
bits,
new Object[] { " S ", " B ", " ", 'B', ItemList.Hatch_Output_MAX, 'S',
ToolDictNames.craftingToolScrewdriver, });
}

private Consumer<Recipe> shapelessUnremovableGtRecipes() {
Expand Down
Loading

0 comments on commit d973e79

Please sign in to comment.