diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java index e9e173a..00859d0 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java @@ -1,11 +1,47 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.versioning.ArtifactVersion; +import cpw.mods.fml.common.versioning.DefaultArtifactVersion; +import cpw.mods.fml.common.versioning.InvalidVersionSpecificationException; +import cpw.mods.fml.common.versioning.VersionRange; + +import java.util.List; + public abstract class IntegrationModule { public String getModID () { return null; } + public boolean versionCheck () { + String pattern = versionPattern(); + if (pattern == null) + return true; + + List modList = Loader.instance().getModList(); + for (int i = 0, n = modList.size(); i < n; i++) { + ModContainer mod = modList.get(i); + if (mod.getModId().equals(getModID())) { + try { + VersionRange validVersions = VersionRange.createFromVersionSpec(pattern); + ArtifactVersion version = new DefaultArtifactVersion(mod.getVersion()); + return validVersions.containsVersion(version); + } + catch (InvalidVersionSpecificationException e) { + return false; + } + } + } + + return false; + } + + protected String versionPattern () { + return null; + } + public abstract void init () throws Throwable; public abstract void postInit (); diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java index cf65ee0..731c840 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java @@ -40,7 +40,8 @@ public class IntegrationRegistry } public void add (IntegrationModule module) { - registry.add(module); + if (module.versionCheck()) + registry.add(module); } public void init () { diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java b/src/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java index e9939f5..c7a5682 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java @@ -40,6 +40,11 @@ public class RefinedRelocation extends IntegrationModule return "RefinedRelocation"; } + @Override + protected String versionPattern () { + return "[1.0.8b,)"; + } + @Override public void init () throws Throwable { fullDrawers1 = new BlockSortingDrawers("fullDrawers1", 1, false);