From b8830d93751f909d641bb4f94e1cf73adb8b86b1 Mon Sep 17 00:00:00 2001 From: makamys Date: Wed, 24 May 2023 04:04:34 +0200 Subject: [PATCH] Add ComparableVersion abstraction layer --- .../common/abstraction/ComparableVersion.java | 53 +++++++++++++++++++ .../gtnhmixins/GTNHMixinsModule.java | 2 +- .../java/makamys/mixingasm/Mixingasm.java | 2 +- 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/abstraction/ComparableVersion.java diff --git a/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/abstraction/ComparableVersion.java b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/abstraction/ComparableVersion.java new file mode 100644 index 0000000..1ef91f9 --- /dev/null +++ b/module-common/src/main/java/io/github/legacymoddingmc/unimixins/common/abstraction/ComparableVersion.java @@ -0,0 +1,53 @@ +package io.github.legacymoddingmc.unimixins.common.abstraction; + +public class ComparableVersion { + private final IComparableVersionImpl impl; + + public ComparableVersion(String version) { + if(ComparableVersion.class.getResource("/cpw/mods/fml/common/versioning/ComparableVersion.class") != null) { + impl = new ComparableVersionOld(version); + } else { + impl = new ComparableVersionNew(version); + } + } + + public int compareTo(ComparableVersion other) { + return impl.compareTo(other.impl); + } + + public interface IComparableVersionImpl { + int compareTo(IComparableVersionImpl other); + } + + public static class ComparableVersionOld implements IComparableVersionImpl { + private final cpw.mods.fml.common.versioning.ComparableVersion internal; + + public ComparableVersionOld(String version) { + this.internal = new cpw.mods.fml.common.versioning.ComparableVersion(version); + } + + public int compareTo(IComparableVersionImpl other) { + if(other instanceof ComparableVersionOld) { + return internal.compareTo(((ComparableVersionOld) other).internal); + } else { + throw new IllegalArgumentException(); + } + } + } + + public static class ComparableVersionNew implements IComparableVersionImpl { + private final net.minecraftforge.fml.common.versioning.ComparableVersion internal; + + public ComparableVersionNew(String version) { + this.internal = new net.minecraftforge.fml.common.versioning.ComparableVersion(version); + } + + public int compareTo(IComparableVersionImpl other) { + if(other instanceof ComparableVersionNew) { + return internal.compareTo(((ComparableVersionNew) other).internal); + } else { + throw new IllegalArgumentException(); + } + } + } +} diff --git a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java index ff1273c..aae9b80 100644 --- a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java +++ b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import cpw.mods.fml.common.versioning.ComparableVersion; +import io.github.legacymoddingmc.unimixins.common.abstraction.ComparableVersion; import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper; import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.LogManager; diff --git a/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java b/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java index 944fbea..58f2d62 100644 --- a/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java +++ b/module-mixingasm/src/main/java/makamys/mixingasm/Mixingasm.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import cpw.mods.fml.common.versioning.ComparableVersion; +import io.github.legacymoddingmc.unimixins.common.abstraction.ComparableVersion; import io.github.legacymoddingmc.unimixins.mixingasm.MixingasmModule; import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager;