From 6cd9f33c3fcdc7ba58aa0e4a09b01db055cf9f1b Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 11 Feb 2016 17:35:21 -0800 Subject: [PATCH] Close #1060 Close #1065 Disable Growthcraft plugin for version 2.5.0+ --- .../farming/logic/FarmLogicOrchard.java | 17 ++++++++++------- .../plugins/compat/PluginGrowthCraft.java | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index f8044d829..51939f79c 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -51,22 +51,25 @@ public class FarmLogicOrchard extends FarmLogic { public FarmLogicOrchard(IFarmHousing housing) { super(housing); this.farmables = Farmables.farmables.get("farmOrchard"); + ImmutableList.Builder traversalBlocksBuilder = ImmutableList.builder(); if (PluginManager.Module.AGRICRAFT.isEnabled() || PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { traversalBlocksBuilder.add(Blocks.farmland); } - if (PluginManager.Module.GROWTHCRAFT.isEnabled()) { + if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { + traversalBlocksBuilder.add(Blocks.dirt); + } + if (PluginManager.Module.PLANTMEGAPACK.isEnabled()) { + traversalBlocksBuilder.add(Blocks.water); + } + + { Block grapeVine = GameRegistry.findBlock("Growthcraft|Grapes", "grc.grapeVine1"); if (grapeVine != null) { traversalBlocksBuilder.add(grapeVine); } } - if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) { - traversalBlocksBuilder.add(Blocks.dirt); - } - if (PluginManager.Module.PLANTMEGAPACK.isEnabled()) { - traversalBlocksBuilder.add(Blocks.water); - } + traversalBlocksBuilder.build(); this.traversalBlocks = traversalBlocksBuilder.build(); } diff --git a/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java b/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java index 867c02ffc..b52529c30 100644 --- a/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java @@ -40,7 +40,7 @@ public class PluginGrowthCraft extends ForestryPlugin { @Override public boolean isAvailable() { - return ModUtil.isModLoaded(GC); + return ModUtil.isModLoaded(GC, "[1.7.10-1.0.0,1.7.10-2.5.0)"); } @Override