v1.2 - Fix 1.20.6+ on Paper

MyPetORG · Aug 31, 2024 · a8f8cf6 · a8f8cf6
1 parent 3a47096
commit a8f8cf6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.mypet</groupId>
   <artifactId>MyPetDownloader</artifactId>
-  <version>1.1</version>
+  <version>1.2</version>
   <name>MyPetDownloader</name>
 
   <build>

diff --git a/src/main/java/org/mypet/MyPetDownloader/MyPetDownloader.java b/src/main/java/org/mypet/MyPetDownloader/MyPetDownloader.java
@@ -50,6 +50,9 @@ public String toString() {
     }
 
     private static final Pattern PACKAGE_VERSION_MATCHER = Pattern.compile(".*\\.(v\\d+_\\d+_R\\d+)(?:.+)?");
+    private static final Pattern MINECRAFT_VERSION_MATCHER = Pattern.compile("\\(MC: (\\d\\.\\d+(?:\\.\\d+)?)");
+    private static final Pattern VERSION_MATCHER = Pattern.compile("\\d\\.\\d+(?:\\.\\d+)?");
+
     private Map<String, Integer> compareCache = new HashMap<>();
     private String minecraftVersion = "0.0.0";
     protected static String internalVersion;
@@ -69,6 +72,15 @@ public void onLoad() {
         if (regexMatcher.find()) {
             internalVersion = regexMatcher.group(1);
         }
+        regexMatcher = MINECRAFT_VERSION_MATCHER.matcher(Bukkit.getVersion());
+        if (regexMatcher.find()) {
+            minecraftVersion = regexMatcher.group(1);
+        }
+
+        // Paper 1.20.6+ works differently - yay
+        if (internalVersion == null) {
+            internalVersion = GetBukkitVersionFromMinecraftVersion();
+        }
 
         Runnable generalDownloadRunner = () -> {
             Optional<Download> download = check();
@@ -93,6 +105,22 @@ public void onLoad() {
         }
     }
 
+    private String GetBukkitVersionFromMinecraftVersion() {
+        String bukkitVersion;
+        switch(minecraftVersion) {
+            case "1.20.6":
+                bukkitVersion = "v1_20_R4";
+                break;
+            case "1.21":
+            case "1.21.1":
+                bukkitVersion = "v1_21_R1";
+                break;
+            default:
+                bukkitVersion=null;
+        }
+        return bukkitVersion;
+    }
+
     private Optional<Download> check() {
         try {
             String url = "https://api.github.com/repos/MyPetORG/MyPet/releases";
@@ -168,11 +196,14 @@ private void download() {
     }
 
     private int compareWithMinecraftVersion(String version) {
-        if (compareCache.containsKey(minecraftVersion + "-::-" + version)) {
-            return compareCache.get(minecraftVersion + "-::-" + version);
+        if (VERSION_MATCHER.matcher(version).find()) {
+            if (compareCache.containsKey(minecraftVersion + "-::-" + version)) {
+                return compareCache.get(minecraftVersion + "-::-" + version);
+            }
+            int compare = Util.versionCompare(minecraftVersion, version);
+            compareCache.put(minecraftVersion + "-::-" + version, compare);
+            return compare;
         }
-        int compare = Util.versionCompare(minecraftVersion, version);
-        compareCache.put(minecraftVersion + "-::-" + version, compare);
-        return compare;
+        throw new IllegalArgumentException("\"version\" must be a valid Minecraft version. \"" + version + "\" given.");
     }
 }