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 --- .../common/tileentities/machines/multi/production/MTETreeFarm.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') 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 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 implements ISur */ private static EnumMap 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()); -- cgit