Add support for Paper 1.20.5 (#53)

Co-authored-by: MrMicky <[email protected]>
MrMicky-FR · May 1, 2024 · 402661c · 402661c
1 parent 177e5ea
commit 402661c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ Lightweight packet-based scoreboard API for Bukkit plugins, with 1.7.10 to 1.20.
     <dependency>
         <groupId>fr.mrmicky</groupId>
         <artifactId>fastboard</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2</version>
     </dependency>
 </dependencies>
 ```
@@ -79,7 +79,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'fr.mrmicky:fastboard:2.1.1'
+    implementation 'fr.mrmicky:fastboard:2.1.2'
 }
 
 shadowJar {

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>fr.mrmicky</groupId>
     <artifactId>fastboard</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
 
     <name>FastBoard</name>
     <description>Lightweight packet-based scoreboard API for Bukkit plugins.</description>

diff --git a/src/main/java/fr/mrmicky/fastboard/FastBoardBase.java b/src/main/java/fr/mrmicky/fastboard/FastBoardBase.java
@@ -43,7 +43,7 @@
  * The project is on <a href="https://github.com/MrMicky-FR/FastBoard">GitHub</a>.
  *
  * @author MrMicky
- * @version 2.1.1
+ * @version 2.1.2
  */
 public abstract class FastBoardBase<T> {
 

diff --git a/src/main/java/fr/mrmicky/fastboard/FastReflection.java b/src/main/java/fr/mrmicky/fastboard/FastReflection.java
@@ -40,10 +40,8 @@
 public final class FastReflection {
 
     private static final String NM_PACKAGE = "net.minecraft";
-    public static final String OBC_PACKAGE = "org.bukkit.craftbukkit";
-    public static final String NMS_PACKAGE = NM_PACKAGE + ".server";
-
-    public static final String VERSION = Bukkit.getServer().getClass().getPackage().getName().substring(OBC_PACKAGE.length() + 1);
+    private static final String OBC_PACKAGE = Bukkit.getServer().getClass().getPackage().getName();
+    private static final String NMS_PACKAGE = OBC_PACKAGE.replace("org.bukkit.craftbukkit", NM_PACKAGE + ".server");
 
     private static final MethodType VOID_METHOD_TYPE = MethodType.methodType(void.class);
     private static final boolean NMS_REPACKAGED = optionalClass(NM_PACKAGE + ".network.protocol.Packet").isPresent();
@@ -61,9 +59,11 @@ public static boolean isRepackaged() {
     public static String nmsClassName(String post1_17package, String className) {
         if (NMS_REPACKAGED) {
             String classPackage = post1_17package == null ? NM_PACKAGE : NM_PACKAGE + '.' + post1_17package;
+
             return classPackage + '.' + className;
         }
-        return NMS_PACKAGE + '.' + VERSION + '.' + className;
+
+        return NMS_PACKAGE + '.' + className;
     }
 
     public static Class<?> nmsClass(String post1_17package, String className) throws ClassNotFoundException {
@@ -75,7 +75,7 @@ public static Optional<Class<?>> nmsOptionalClass(String post1_17package, String
     }
 
     public static String obcClassName(String className) {
-        return OBC_PACKAGE + '.' + VERSION + '.' + className;
+        return OBC_PACKAGE + '.' + className;
     }
 
     public static Class<?> obcClass(String className) throws ClassNotFoundException {