fix: old versions

cerus · Apr 26, 2024 · 1df4556 · 1df4556
1 parent 9a9d4b4
commit 1df4556
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 25 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-16R3/pom.xml b/bukkit-16R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-17R1/pom.xml b/bukkit-17R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-18R1/pom.xml b/bukkit-18R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-18R2/pom.xml b/bukkit-18R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-19R1/pom.xml b/bukkit-19R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-19R2/pom.xml b/bukkit-19R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-19R3/pom.xml b/bukkit-19R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.visualcrafting</groupId>
         <artifactId>parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>bukkit-19R3</artifactId>

diff --git a/bukkit-20R1/pom.xml b/bukkit-20R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.visualcrafting</groupId>
         <artifactId>parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>bukkit-20R1</artifactId>

diff --git a/bukkit-20R2/pom.xml b/bukkit-20R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.visualcrafting</groupId>
         <artifactId>parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>bukkit-20R2</artifactId>

diff --git a/bukkit-20R3/pom.xml b/bukkit-20R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.visualcrafting</groupId>
         <artifactId>parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>bukkit-20R3</artifactId>

diff --git a/bukkit-20R4/pom.xml b/bukkit-20R4/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.visualcrafting</groupId>
         <artifactId>parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>bukkit-20R4</artifactId>

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugin/src/main/java/dev/cerus/visualcrafting/plugin/VisualCraftingPlugin.java b/plugin/src/main/java/dev/cerus/visualcrafting/plugin/VisualCraftingPlugin.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.security.CodeSource;
 import java.util.logging.Level;
@@ -50,17 +51,17 @@ public void onEnable() {
 
         // Initialize version adapter
         final VersionAdapter versionAdapter = switch (version) {
-            case "1.16.5" -> new VersionAdapter16R3();
-            case "1.17", "1.17.1" -> new VersionAdapter17R1();
-            case "1.18.1" -> new VersionAdapter18R1();
-            case "1.18.2" -> new VersionAdapter18R2();
-            case "1.19", "1.19.1", "1.19.2" -> new VersionAdapter19R1();
-            case "1.19.3" -> new VersionAdapter19R2();
-            case "1.19.4" -> new VersionAdapter19R3();
-            case "1.20", "1.20.1" -> new VersionAdapter20R1();
-            case "1.20.2" -> new VersionAdapter20R2();
-            case "1.20.3", "1.20.4" -> new VersionAdapter20R3();
-            case "1.20.5" -> new VersionAdapter20R4();
+            case "1.16.5" -> createVersionAdapter("16R3");
+            case "1.17", "1.17.1" -> createVersionAdapter("17R1");
+            case "1.18.1" -> createVersionAdapter("18R1");
+            case "1.18.2" -> createVersionAdapter("18R2");
+            case "1.19", "1.19.1", "1.19.2" -> createVersionAdapter("19R1");
+            case "1.19.3" -> createVersionAdapter("19R2");
+            case "1.19.4" -> createVersionAdapter("19R3");
+            case "1.20", "1.20.1" -> createVersionAdapter("20R1");
+            case "1.20.2" -> createVersionAdapter("20R2");
+            case "1.20.3", "1.20.4" -> createVersionAdapter("20R3");
+            case "1.20.5" -> createVersionAdapter("20R4");
             default -> null;
         };
         if (versionAdapter == null) {
@@ -185,6 +186,18 @@ private String normalize(final String s) {
         return Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase();
     }
 
+    // Required to prevent the JVM from complaining about java versions
+    private VersionAdapter createVersionAdapter(String versionSlug) {
+        try {
+            String classPath = "dev.cerus.visualcrafting.v%s.VersionAdapter%s".formatted(versionSlug.toLowerCase(), versionSlug.toUpperCase());
+            Class<?> cls = Class.forName(classPath);
+            return (VersionAdapter) cls.getDeclaredConstructor().newInstance();
+        } catch (ClassNotFoundException | InvocationTargetException | InstantiationException | IllegalAccessException | NoSuchMethodException e) {
+            getLogger().log(Level.SEVERE, "Could not create version adapter", e);
+            return null;
+        }
+    }
+
     private String getDownloadSource() {
         StringBuilder sourceBuilder = new StringBuilder();
         try (InputStream in = VisualCraftingPlugin.class.getClassLoader().getResourceAsStream("metadata")) {

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.cerus.visualcrafting</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <modules>
         <module>plugin</module>
         <module>api</module>