Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsInitializer.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java

1 files changed, 13 insertions, 0 deletions

diff --git a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
index 54ed0c55f..76952dd4b 100644
--- a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
@@ -28,6 +28,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.FMLLoader;
+import org.apache.maven.artifact.versioning.ComparableVersion;
 
 public class RoughlyEnoughItemsInitializerImpl {
     public static boolean isClient() {
@@ -47,4 +48,16 @@ public class RoughlyEnoughItemsInitializerImpl {
     public static String getMinecraftVersion() {
         return ModList.get().getModContainerById("minecraft").get().getModInfo().getVersion().toString();
     }
+    
+    public static int compareVersions(String version1, String version2) {
+        ComparableVersion v1 = new ComparableVersion(version1);
+        ComparableVersion v2 = new ComparableVersion(version2);
+        
+        try {
+            return v1.compareTo(v2);
+        } catch (IllegalStateException e) {
+            new IllegalStateException("Failed to compare versions: " + version1 + " and " + version2, e).printStackTrace();
+            return 0;
+        }
+    }
 }