From 17ec7edcf599e020d4a266dae54ca27766f10382 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 02:25:02 -0700 Subject: [PATCH] Fix #128 Make plugins for Buildcraft only available for 6.0.x, not 6.1.x --- src/main/java/forestry/plugins/PluginBuildCraft.java | 3 ++- src/main/java/forestry/plugins/PluginPropolisPipe.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginBuildCraft.java b/src/main/java/forestry/plugins/PluginBuildCraft.java index 8b638e8a0..763d679e9 100755 --- a/src/main/java/forestry/plugins/PluginBuildCraft.java +++ b/src/main/java/forestry/plugins/PluginBuildCraft.java @@ -53,6 +53,7 @@ public class PluginBuildCraft implements IPlugin, ITriggerProvider { public static Item wrench; public static Item stoneGear; public static Item pipeWaterproof; + public static final String validVersionRange = "[6.0.0,6.1.0)"; public PluginBuildCraft() { if (PluginBuildCraft.instance == null) @@ -64,7 +65,7 @@ public class PluginBuildCraft implements IPlugin, ITriggerProvider { */ @Override public boolean isAvailable() { - return (Proxies.common.isModLoaded("BuildCraft|Core") && Proxies.common.isModLoaded("BuildCraft|Transport")); + return (Proxies.common.isModLoaded("BuildCraft|Core", validVersionRange) && Proxies.common.isModLoaded("BuildCraft|Transport", validVersionRange)); } @Override diff --git a/src/main/java/forestry/plugins/PluginPropolisPipe.java b/src/main/java/forestry/plugins/PluginPropolisPipe.java index f90d87cba..a068bb5f7 100755 --- a/src/main/java/forestry/plugins/PluginPropolisPipe.java +++ b/src/main/java/forestry/plugins/PluginPropolisPipe.java @@ -38,7 +38,7 @@ public class PluginPropolisPipe extends NativePlugin { @Override public boolean isAvailable() { - return Proxies.common.isModLoaded("BuildCraft|Transport"); + return Proxies.common.isModLoaded("BuildCraft|Transport", PluginBuildCraft.validVersionRange); } @Override @@ -62,7 +62,7 @@ public class PluginPropolisPipe extends NativePlugin { if (FMLCommonHandler.instance().getSide().isClient()) proxyClass = "forestry.pipes.proxy.ClientProxyPipes"; - proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", proxyClass); + proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", PluginBuildCraft.validVersionRange, proxyClass); if (proxy == null) return;