diff options
4 files changed, 58 insertions, 52 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 1ce503294d..22c641df2b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -54,22 +54,15 @@ dependencies { // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} - runtimeOnlyNonPublishable('com.github.GTNewHorizons:ForestryMC:4.9.10:dev') - runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev') - runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.3-GTNH:dev') - runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.1:dev') - runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.17:dev') - devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.8.1-GTNH:dev") compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.52:dev") - // this is required because forestry is an hidden hard dep, revert this if you fixed the hidden hard dep - implementation("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false } compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta6:api') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.2:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false } @@ -111,8 +104,11 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false } annotationProcessor("com.google.auto.value:auto-value:1.10.1") - // For testing iApiary - //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") + // For testing forestry integration (iApiary, combs, tree growth simulator) + // runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") + // runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev') + // runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.3-GTNH:dev') + // runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.1:dev') testImplementation(platform('org.junit:junit-bom:5.9.2')) testImplementation('org.junit.jupiter:junit-jupiter') @@ -125,6 +121,7 @@ dependencies { functionalTestImplementation('org.junit.platform:junit-platform-reporting') runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") + runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.17:dev') // For testing //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.1:dev') diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index d4b3d3b668..cfcfec8042 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -538,29 +538,31 @@ public class FluidExtractorRecipes implements Runnable { .eut(TierEU.RECIPE_MV) .addTo(fluidExtractionRecipes); - // Beecombs fluid extractor recipes - // xenon - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(combs, 1, 134)) - .fluidOutputs(getFluidStack("xenon", 250)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_IV) - .addTo(fluidExtractionRecipes); - - // neon - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(combs, 1, 135)) - .fluidOutputs(getFluidStack("neon", 250)) - .duration(15 * TICKS) - .eut(TierEU.RECIPE_IV) - .addTo(fluidExtractionRecipes); - - // krpton - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(combs, 1, 136)) - .fluidOutputs(getFluidStack("krypton", 250)) - .duration(1 * SECONDS + 5 * TICKS) - .eut(TierEU.RECIPE_IV) - .addTo(fluidExtractionRecipes); + if (Forestry.isModLoaded()) { + // Beecombs fluid extractor recipes + // xenon + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(combs, 1, 134)) + .fluidOutputs(getFluidStack("xenon", 250)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(fluidExtractionRecipes); + + // neon + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(combs, 1, 135)) + .fluidOutputs(getFluidStack("neon", 250)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(fluidExtractionRecipes); + + // krpton + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(combs, 1, 136)) + .fluidOutputs(getFluidStack("krypton", 250)) + .duration(1 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(fluidExtractionRecipes); + } } } 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."; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java index 6f8dd28c03..389dd0392e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java @@ -10,6 +10,7 @@ import static gregtech.api.enums.HatchElement.Maintenance; import static gregtech.api.enums.HatchElement.Muffler; import static gregtech.api.enums.HatchElement.OutputBus; import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gregtech.api.util.GTUtility.filterValidMTEs; import static gregtech.common.items.IDMetaTool01.BRANCHCUTTER; @@ -458,7 +459,7 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur || damage == POCKET_MULTITOOL.ID)) { return 1; } - if (tool instanceof IToolGrafter && tool.isDamageable()) { + if (Forestry.isModLoaded() && tool instanceof IToolGrafter && tool.isDamageable()) { return 3; } break; @@ -578,7 +579,7 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur */ private static EnumMap<Mode, ItemStack> getOutputsForSapling(ItemStack sapling) { String registryName = Item.itemRegistry.getNameForObject(sapling.getItem()); - if ("Forestry:sapling".equals(registryName)) { + if (Forestry.isModLoaded() && "Forestry:sapling".equals(registryName)) { return getOutputsForForestrySapling(sapling); } else { return treeProductsMap.get(registryName + ":" + sapling.getItemDamage()); |