add missing ismodloaded checks for forestry (#992)

GTNewHorizons · Sep 10, 2024 · baff68a · baff68a
1 parent a11b0c1
commit baff68a
Show file tree

Hide file tree

Showing 7 changed files with 218 additions and 212 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.84:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.87:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
@@ -21,7 +21,7 @@ dependencies {
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
     compileOnly("com.github.GTNewHorizons:amunra:0.6.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.12:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
 
     runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CentrifugeRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CentrifugeRecipes.java
@@ -90,12 +90,6 @@ public void run() {
                 .fluidOutputs(Materials.Water.getFluid(500L)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV)
                 .addTo(centrifugeRecipes);
 
-        GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1L, 9))
-                .itemOutputs(
-                        GTModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1L))
-                .outputChances(10000, 11).duration(15 * SECONDS).eut(TierEU.RECIPE_IV).addTo(centrifugeRecipes);
-
         GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.fire_charge, 1, 0))
                 .itemOutputs(
                         new ItemStack(Items.blaze_powder, 1, 0),
@@ -594,19 +588,6 @@ public void run() {
                         GTOreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 1L))
                 .duration(40 * SECONDS).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes);
 
-        GTValues.RA.stdBuilder()
-                .itemInputs(GTUtility.getIntegratedCircuit(2), GTBees.combs.getStackForType(CombType.INDIUM, 8))
-                .fluidInputs(GGMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000))
-                .itemOutputs(
-                        WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64),
-                        WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 16),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 64),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 32),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 12))
-                .outputChances(10000, 8000, 10000, 8000, 3000, 5000).duration(1 * MINUTES + 15 * SECONDS)
-                .eut(TierEU.RECIPE_EV / 2).addTo(centrifugeRecipes);
-
         GTValues.RA.stdBuilder().itemInputs(ItemList.Cell_Air.get(5L))
                 .itemOutputs(Materials.Oxygen.getCells(1), ItemList.Cell_Empty.get(4L))
                 .fluidOutputs(Materials.Nitrogen.getGas(3900L)).duration(1 * MINUTES + 20 * SECONDS).eut(8)
@@ -672,6 +653,24 @@ public void run() {
                     .fluidOutputs(Materials.FierySteel.getFluid(10L)).duration(12 * TICKS).eut(TierEU.RECIPE_HV)
                     .addTo(centrifugeRecipes);
         }
-
+        if (Forestry.isModLoaded()) {
+            GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1L, 9))
+                    .itemOutputs(
+                            GTModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1L))
+                    .outputChances(10000, 11).duration(15 * SECONDS).eut(TierEU.RECIPE_IV).addTo(centrifugeRecipes);
+            GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.getIntegratedCircuit(2), GTBees.combs.getStackForType(CombType.INDIUM, 8))
+                    .fluidInputs(GGMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000))
+                    .itemOutputs(
+                            WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64),
+                            WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 16),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 64),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 32),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 12))
+                    .outputChances(10000, 8000, 10000, 8000, 3000, 5000).duration(1 * MINUTES + 15 * SECONDS)
+                    .eut(TierEU.RECIPE_EV / 2).addTo(centrifugeRecipes);
+        }
     }
 }
diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java
@@ -2,6 +2,7 @@
 
 import static goodgenerator.items.GGMaterial.indiumPhosphate;
 import static gregtech.api.enums.Mods.DraconicEvolution;
+import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.Gendustry;
 import static gregtech.api.enums.Mods.Genetics;
 import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
@@ -577,34 +578,36 @@ public static void multiBlockOnly() {
                 .fluidInputs(Materials.Water.getFluid(16000L)).fluidOutputs(Materials.Hydrogen.getGas(48000L))
                 .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes);
 
-        GTValues.RA.stdBuilder()
-                .itemInputs(
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 36L),
-                        GTBees.combs.getStackForType(CombType.INDIUM, 4),
-                        GTUtility.getIntegratedCircuit(3))
-                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 3L))
-                .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 72000))
-                .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 72000)).duration(22 * SECONDS + 10 * TICKS)
-                .eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes);
+        if (Forestry.isModLoaded()) {
+            GTValues.RA.stdBuilder()
+                    .itemInputs(
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 36L),
+                            GTBees.combs.getStackForType(CombType.INDIUM, 4),
+                            GTUtility.getIntegratedCircuit(3))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 3L))
+                    .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 72000))
+                    .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 72000)).duration(22 * SECONDS + 10 * TICKS)
+                    .eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes);
 
-        GTValues.RA.stdBuilder()
-                .itemInputs(
-                        indiumPhosphate.get(OrePrefixes.dust, 12),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3),
-                        GTBees.combs.getStackForType(CombType.INDIUM, 8),
-                        GTUtility.getIntegratedCircuit(2))
-                .itemOutputs(
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 6),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5))
-                .duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(multiblockChemicalReactorRecipes);
+            GTValues.RA.stdBuilder()
+                    .itemInputs(
+                            indiumPhosphate.get(OrePrefixes.dust, 12),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3),
+                            GTBees.combs.getStackForType(CombType.INDIUM, 8),
+                            GTUtility.getIntegratedCircuit(2))
+                    .itemOutputs(
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 6),
+                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5))
+                    .duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(multiblockChemicalReactorRecipes);
 
-        GTValues.RA.stdBuilder()
-                .itemInputs(
-                        GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Indium, 4),
-                        GTBees.combs.getStackForType(CombType.INDIUM, 16))
-                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Indium, 12))
-                .fluidInputs(Materials.PhthalicAcid.getFluid(2688)).duration(14 * SECONDS + 8 * TICKS)
-                .eut(TierEU.RECIPE_IV).addTo(UniversalChemical);
+            GTValues.RA.stdBuilder()
+                    .itemInputs(
+                            GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Indium, 4),
+                            GTBees.combs.getStackForType(CombType.INDIUM, 16))
+                    .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Indium, 12))
+                    .fluidInputs(Materials.PhthalicAcid.getFluid(2688)).duration(14 * SECONDS + 8 * TICKS)
+                    .eut(TierEU.RECIPE_IV).addTo(UniversalChemical);
+        }
     }
 
 }