aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities
diff options
context:
space:
mode:
authorRecursivePineapple <recursive_pineapple@proton.me>2024-09-09 16:43:45 -0400
committerGitHub <noreply@github.com>2024-09-09 20:43:45 +0000
commit5a3a94ce95c6f7dab79f0e9a732f76bb054cd12d (patch)
tree714a91b5a3b370cbe57a198bd961cd8b8fe5d2e6 /src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities
parent21d2fdb35086f194ec929f90f0bd3f4a000afab8 (diff)
downloadGT5-Unofficial-5a3a94ce95c6f7dab79f0e9a732f76bb054cd12d.tar.gz
GT5-Unofficial-5a3a94ce95c6f7dab79f0e9a732f76bb054cd12d.tar.bz2
GT5-Unofficial-5a3a94ce95c6f7dab79f0e9a732f76bb054cd12d.zip
Removed implicit forestry dep (#3140)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java5
1 files changed, 3 insertions, 2 deletions
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());