fixed bug which broke backwards compatibility, added exception wrappe…

…r for more useful debugging
divisionind · Jun 28, 2021 · 8bdd12b · 8bdd12b
1 parent 8708e41
commit 8bdd12b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 8 deletions.
diff --git a/src/main/java/com/divisionind/bprm/nms/reflect/NMS.java b/src/main/java/com/divisionind/bprm/nms/reflect/NMS.java
@@ -20,6 +20,7 @@
 
 import com.divisionind.bprm.FakeBackpackViewer;
 import com.divisionind.bprm.nms.KnownVersion;
+import com.divisionind.bprm.nms.reflect.ex.NMSLoadException;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.HumanEntity;
 
@@ -49,7 +50,7 @@ public static List<Exception> initialize() {
             try {
                 nmsClass.init();
             } catch (Exception e) {
-                exceptions.add(e);
+                exceptions.add(new NMSLoadException("NMSClass: " + nmsClass.name(), e));
             }
         }
 
@@ -62,7 +63,7 @@ public static List<Exception> initialize() {
             try {
                 type.init(NMSClass.NBTTagCompound.getClazz());
             } catch (Exception e) {
-                exceptions.add(e);
+                exceptions.add(new NMSLoadException("NMSType: " + type.name(), e));
             }
         }
 
@@ -71,7 +72,7 @@ public static List<Exception> initialize() {
             try {
                 nmsMethod.init();
             } catch (Exception e) {
-                exceptions.add(e);
+                exceptions.add(new NMSLoadException("NMSMethod: " + nmsMethod.name(), e));
             }
         }
 

diff --git a/src/main/java/com/divisionind/bprm/nms/reflect/NMSMethod.java b/src/main/java/com/divisionind/bprm/nms/reflect/NMSMethod.java
@@ -60,10 +60,11 @@ public enum NMSMethod {
     //load(TileEntityFurnace, "load", NBTTagCompound.getClazz()),
     getInventory(CraftInventory, "getInventory"),
     getBukkitEntity(EntityPlayer, "getBukkitEntity"),
-    getWorld(() ->    KnownVersion.v1_17_R1.isBefore() ? null : TileEntity.getClazz().getMethod("getWorld")),
-    getPosition(() -> KnownVersion.v1_17_R1.isBefore() ? null : TileEntity.getClazz().getMethod("getPosition")),
-    getBlock(() ->    KnownVersion.v1_17_R1.isBefore() ? null : TileEntity.getClazz().getMethod("getBlock")),
-    getTileEntity(CraftTileInventoryConverter_Furnace, "getTileEntity");
+    getWorld(() ->      KnownVersion.v1_17_R1.isBefore() ? null : TileEntity.getClazz().getMethod("getWorld")),
+    getPosition(() ->   KnownVersion.v1_17_R1.isBefore() ? null : TileEntity.getClazz().getMethod("getPosition")),
+    getBlock(() ->      KnownVersion.v1_17_R1.isBefore() ? null : TileEntity.getClazz().getMethod("getBlock")),
+    getTileEntity(() -> KnownVersion.v1_17_R1.isBefore() ? null : CraftTileInventoryConverter_Furnace
+            .getClazz().getMethod("getTileEntity"));
 
     private Method method;
     private MethodInitializer methodInitializer;
@@ -89,7 +90,10 @@ public enum NMSMethod {
 
     void init() throws NoSuchMethodException {
         this.method = methodInitializer.init();
-        if (methodPrivate) this.method.setAccessible(true);
+
+        if (methodPrivate)
+            this.method.setAccessible(true);
+
         this.methodInitializer = null; // so the initializer can be garbage collected, we will never need it again
     }
 

diff --git a/src/main/java/com/divisionind/bprm/nms/reflect/ex/NMSLoadException.java b/src/main/java/com/divisionind/bprm/nms/reflect/ex/NMSLoadException.java
@@ -0,0 +1,36 @@
+/*
+ * BackpacksRemastered - remastered version of the popular Backpacks plugin
+ * Copyright (C) 2019 - 2020, Andrew Howard, <divisionind.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.divisionind.bprm.nms.reflect.ex;
+
+public class NMSLoadException extends Exception {
+    public NMSLoadException() {
+    }
+
+    public NMSLoadException(String message) {
+        super(message);
+    }
+
+    public NMSLoadException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NMSLoadException(Throwable cause) {
+        super(cause);
+    }
+}