manually specify the few mc versions that don't have mappings

Author: fayer3

core/src/main/java/org/vivecraft/linker/Helpers.java

@@ -27,7 +27,7 @@ public static NMSHelper getNMS() {
     }
 
     public static Object getHelper(String classTemplate) {
-        MCVersion mc = MCVersion.getCurrent();
+        MCVersion mc = MCVersion.getCurrentCorrected();
         int major = mc.major;
         int minor = mc.minor;
         while (major > 7) {

core/src/main/java/org/vivecraft/util/MCVersion.java

@@ -15,6 +15,7 @@ public class MCVersion implements Comparable<MCVersion> {
     public final String version_;
 
     private static MCVersion CURRENT;
+    private static MCVersion CORRECTED;
 
     private MCVersion(int major, int minor) {
         this.major = major;
@@ -36,6 +37,31 @@ public static MCVersion getCurrent() {
         return CURRENT;
     }
 
+    public static MCVersion getCurrentCorrected() {
+        if (CORRECTED == null) {
+            MCVersion version = getCurrent();
+            // version resolving always tries to use version before the current version, if the actual one is not available
+            // some versions are not available, because they had critical bugfixes, so those need to use the one after
+            if (version.is(9, 1)) {
+                version = new MCVersion(9, 2);
+            } else if (version.is(9, 3)) {
+                version = new MCVersion(9, 4);
+            } else if (version.is(16, 0)) {
+                version = new MCVersion(16, 1);
+            } else if (version.is(20, 0)) {
+                version = new MCVersion(20, 1);
+            } else if (version.is(20, 3)) {
+                version = new MCVersion(20, 4);
+            } else if (version.is(20, 5)) {
+                version = new MCVersion(20, 6);
+            } else if (version.is(21, 2)) {
+                version = new MCVersion(21, 3);
+            }
+            CORRECTED = version;
+        }
+        return CORRECTED;
+    }
+
     public static MCVersion parse(String version, boolean fatal) {
         MCVersion mc;
         String[] segments = version.split("\\.");
@@ -54,6 +80,10 @@ public static MCVersion parse(String version, boolean fatal) {
         return mc;
     }
 
+    public boolean is(int major, int minor) {
+        return this.major == major && this.minor == minor;
+    }
+
     @Override
     public String toString() {
         return this.version;

core/src/main/java/org/vivecraft/util/reflection/ClassGetter.java

@@ -15,7 +15,7 @@ public class ClassGetter {
      */
     public static Class<?> getClass(boolean critical, ClassMapping... mappings) {
         // get the matching filed with the closest matching version, preferring older ones, unless there is none
-        MCVersion mc = MCVersion.getCurrent();
+        MCVersion mc = MCVersion.getCurrentCorrected();
         Class<?> c = null;
         for (String namespace : new String[]{"spigot", "mojang"}) {
             for (ClassMapping mapping : mappings) {
@@ -58,7 +58,7 @@ public static Class<?> getRaw(String cls) throws ClassNotFoundException {
     }
 
     public static Class<?> getWithApi(String pre, String post) throws ClassNotFoundException {
-        MCVersion mc = MCVersion.getCurrent();
+        MCVersion mc = MCVersion.getCurrentCorrected();
         for (int i = 0; i <= 10; i++) {
             String apiClass;
             if (i != 10) {
@@ -75,7 +75,7 @@ public static Class<?> getWithApi(String pre, String post) throws ClassNotFoundE
     }
 
     public static Class<?> getCompat(String pattern) throws ClassNotFoundException {
-        MCVersion mc = MCVersion.getCurrent();
+        MCVersion mc = MCVersion.getCurrentCorrected();
         for (int i = mc.minor; i >= 0; i--) {
             String apiClass;
             if (i != 0) {

core/src/main/java/org/vivecraft/util/reflection/ReflectionConstructor.java

@@ -69,7 +69,7 @@ public static ReflectionConstructor getConstructor(boolean critical, Constructor
 
     @Nullable
     private static Constructor<?> getConstructor(String namespace, ConstructorMapping... mappings) {
-        MCVersion mc = MCVersion.getCurrent();
+        MCVersion mc = MCVersion.getCurrentCorrected();
         Constructor<?> c = null;
         for (ConstructorMapping mapping : mappings) {
             int major = mc.major;

core/src/main/java/org/vivecraft/util/reflection/ReflectionField.java

@@ -88,7 +88,7 @@ public static ReflectionField getField(ClassMapping mapping, String fieldName) {
 
     @Nullable
     private static Field getField(String namespace, FieldMapping... mappings) {
-        MCVersion mc = MCVersion.getCurrent();
+        MCVersion mc = MCVersion.getCurrentCorrected();
         Field f = null;
         for (FieldMapping mapping : mappings) {
             int major = mc.major;

core/src/main/java/org/vivecraft/util/reflection/ReflectionMethod.java

@@ -72,7 +72,7 @@ public static ReflectionMethod getMethod(boolean critical, MethodMapping... mapp
     @Nullable
     private static Method getMethod(String namespace, MethodMapping... mappings) {
         // get the matching method with the closest matching version, preferring older ones, unless there is none
-        MCVersion mc = MCVersion.getCurrent();
+        MCVersion mc = MCVersion.getCurrentCorrected();
         Method m = null;
         for (MethodMapping mapping : mappings) {
             int major = mc.major;