diff --git a/pandalib-chat/pom.xml b/pandalib-chat/pom.xml index c63cae5..4eedead 100644 --- a/pandalib-chat/pom.xml +++ b/pandalib-chat/pom.xml @@ -56,7 +56,7 @@ com.google.code.gson gson - 2.10 + 2.10.1 diff --git a/pandalib-paper/pom.xml b/pandalib-paper/pom.xml index 75c754b..d166f49 100644 --- a/pandalib-paper/pom.xml +++ b/pandalib-paper/pom.xml @@ -94,7 +94,7 @@ net.fabricmc mapping-io - 0.3.0 + 0.5.0 provided diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java index 92c7bb9..7bae2df 100644 --- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java @@ -169,7 +169,7 @@ public class NMSReflect { } MemoryMappingTree tree = new MemoryMappingTree(); - MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2, tree); + MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2_FILE, tree); List classes = new ArrayList<>(); for (MappingTree.ClassMapping cls : tree.getClasses()) { diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java index 67ee72b..3afa13f 100644 --- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java @@ -10,18 +10,7 @@ import fr.pandacube.lib.reflect.ReflectClass; */ public class OBCReflect { - private static final String OBC_PACKAGE_PREFIX = "org.bukkit.craftbukkit."; - - private static final String OBC_PACKAGE_VERSION; - - static { - String name = Bukkit.getServer().getClass().getName() - .substring(OBC_PACKAGE_PREFIX.length()); - name = name.substring(0, name.indexOf(".")); - - OBC_PACKAGE_VERSION = name; - } - + private static final String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackage().getName(); /** * Returns the OBC class that has the provided name, wrapped into a {@link ReflectClass}. @@ -31,10 +20,7 @@ public class OBCReflect { * @throws ClassNotFoundException if the provided class was not found in {@code OBC} package. */ public static ReflectClass ofClass(String obcClass) throws ClassNotFoundException { - return Reflect.ofClass(OBC_PACKAGE_PREFIX + OBC_PACKAGE_VERSION + "." + obcClass); + return Reflect.ofClass(CRAFTBUKKIT_PACKAGE + "." + obcClass); } - - - } diff --git a/pandalib-reflect/pom.xml b/pandalib-reflect/pom.xml index 5a4e7e1..8aafbc9 100644 --- a/pandalib-reflect/pom.xml +++ b/pandalib-reflect/pom.xml @@ -27,7 +27,7 @@ com.google.guava guava - 31.1-jre + 32.1.2-jre diff --git a/pom.xml b/pom.xml index c2bca38..f3c365d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,8 +56,8 @@ UTF-8 1.20-R0.3-SNAPSHOT - 1.20.1-R0.1 - 1.20.1 + 1.20.2-R0.1 + 1.20.2