From 5a3a94ce95c6f7dab79f0e9a732f76bb054cd12d Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Mon, 9 Sep 2024 16:43:45 -0400 Subject: Removed implicit forestry dep (#3140) Co-authored-by: Martin Robertz --- .../core/item/chemistry/AgriculturalChem.java | 38 +++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/item') diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 4c7dc05804..fa017d4619 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -21,6 +21,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.Optional; import forestry.core.items.ItemForestryBonemeal; import forestry.core.items.ItemRegistryCore; import forestry.plugins.PluginCore; @@ -544,22 +545,7 @@ public class AgriculturalChem extends ItemPackage { ItemStack aManureByprod = ItemUtils.getSimpleStack(dustManureByproducts, 1); // Dehydrate Organise Fert to Normal Fert. - if (Mods.Forestry.isModLoaded()) { - ItemRegistryCore aItemRegInstance = PluginCore.items; - if (aItemRegInstance != null) { - ItemForestryBonemeal fertilizerCompound = aItemRegInstance.fertilizerCompound; - aFertForestry = ItemUtils.getSimpleStack(fertilizerCompound); - - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.getIntegratedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) - .itemOutputs(ItemUtils.getSimpleStack(fertilizerCompound, 3), aManureByprod, aManureByprod) - .outputChances(100_00, 20_00, 20_00) - .eut(240) - .duration(20 * SECONDS) - .addTo(chemicalDehydratorRecipes); - - } - } + addMiscForestryRecipes(); /* * IC2 Support @@ -640,6 +626,26 @@ public class AgriculturalChem extends ItemPackage { .addTo(centrifugeRecipes); } + @Optional.Method(modid = Mods.Names.FORESTRY) + private static void addMiscForestryRecipes() { + ItemStack aDustOrganicFert = ItemUtils.getSimpleStack(dustOrganicFertilizer, 1); + ItemStack aManureByprod = ItemUtils.getSimpleStack(dustManureByproducts, 1); + + ItemRegistryCore aItemRegInstance = PluginCore.items; + if (aItemRegInstance != null) { + ItemForestryBonemeal fertilizerCompound = aItemRegInstance.fertilizerCompound; + aFertForestry = ItemUtils.getSimpleStack(fertilizerCompound); + + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) + .itemOutputs(ItemUtils.getSimpleStack(fertilizerCompound, 3), aManureByprod, aManureByprod) + .outputChances(100_00, 20_00, 20_00) + .eut(240) + .duration(20 * SECONDS) + .addTo(chemicalDehydratorRecipes); + } + } + @Override public String errorMessage() { return "Failed to generate recipes for AgroChem."; -- cgit