Merge branch 'master' into CosmicNeutroniumBlockSolidifierRecipe

GTNewHorizons · Nov 14, 2024 · 4186441 · 4186441
2 parents 32a425d + e527755
commit 4186441
Show file tree

Hide file tree

Showing 28 changed files with 1,026 additions and 610 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,27 +1,27 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.44:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.65: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.15:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.5.20:dev")
 
-    compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.7:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:twilightforest:2.6.34:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.22:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Mantle:0.4.1:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.2:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.24:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.13-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
-    compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.6:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.7:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:amunra:0.7.0:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:amunra:0.7.1:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
 }
 
 
diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
@@ -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))
@@ -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))
@@ -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))
@@ -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() {

diff --git a/src/main/java/com/dreammaster/command/ItemInHandInfoCommand.java b/src/main/java/com/dreammaster/command/ItemInHandInfoCommand.java
diff --git a/src/main/java/com/dreammaster/config/CoreModConfig.java b/src/main/java/com/dreammaster/config/CoreModConfig.java
@@ -21,7 +21,6 @@ public CoreModConfig(File pConfigBaseDirectory, String pModCollectionDirectory,
     public boolean ModHazardousItems_Enabled;
     public boolean ModDebugVersionDisplay_Enabled;
     public boolean ModCustomToolTips_Enabled;
-    public boolean ModItemInHandInfo_Enabled;
     public boolean ModCustomFuels_Enabled;
     public boolean ModCustomDrops_Enabled;
     public boolean ModAdminErrorLogs_Enabled;
@@ -62,7 +61,6 @@ protected void PreInit() {
         ModDebugVersionDisplay_Enabled = true;
         ModHazardousItems_Enabled = false;
         ModCustomToolTips_Enabled = false;
-        ModItemInHandInfo_Enabled = false;
         ModCustomFuels_Enabled = false;
         ModCustomDrops_Enabled = false;
         ModAdminErrorLogs_Enabled = true;
@@ -122,11 +120,6 @@ protected void Init() {
                 "Modules",
                 ModCustomToolTips_Enabled,
                 "Set to true to enable CustomToolTips module. This needs a separate config file which is created once you start with this setting enabled");
-        ModItemInHandInfo_Enabled = _mainConfig.getBoolean(
-                "ItemInHandInfo",
-                "Modules",
-                ModItemInHandInfo_Enabled,
-                "Set to true to enable ItemInHandInfo module. If enabled, type /iih to display the item's name-info");
         ModCustomDrops_Enabled = _mainConfig.getBoolean(
                 "CustomDrops",
                 "Modules",