From f6a25d5d0d077852ed959d8f0a9e025234ba6eec Mon Sep 17 00:00:00 2001
From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com>
Date: Sat, 30 Sep 2023 17:46:13 +0200
Subject: [PATCH] Clean up reflection registry and utils

---
 .../inventoryaccess/util/ReflectionRegistry.java  |  6 ++----
 .../inventoryaccess/util/ReflectionUtils.java     | 15 +--------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java
index 2f6a347..bdf1898 100644
--- a/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java
+++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java
@@ -1,18 +1,16 @@
 package xyz.xenondevs.inventoryaccess.util;
 
 import com.mojang.authlib.GameProfile;
+import org.bukkit.Bukkit;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import static xyz.xenondevs.inventoryaccess.util.ReflectionUtils.*;
 
-
 public class ReflectionRegistry {
     
-    public static final int VERSION = getVersionNumber();
-    
-    public static final String CRAFT_BUKKIT_PACKAGE_PATH = getCB();
+    public static final String CRAFT_BUKKIT_PACKAGE_PATH = Bukkit.getServer().getClass().getPackage().getName();
     
     // Classes
     public static final Class<?> PLUGIN_CLASS_LOADER_CLASS = ReflectionUtils.getClass("org.bukkit.plugin.java.PluginClassLoader");
diff --git a/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java
index ad07b80..3a6e024 100644
--- a/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java
+++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java
@@ -1,6 +1,5 @@
 package xyz.xenondevs.inventoryaccess.util;
 
-import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.version.InventoryAccessRevision;
@@ -12,18 +11,6 @@ import java.lang.reflect.Method;
 @SuppressWarnings({"unchecked", "unused"})
 public class ReflectionUtils {
     
-    protected static @NotNull String getCB() {
-        String path = Bukkit.getServer().getClass().getPackage().getName();
-        String version = path.substring(path.lastIndexOf(".") + 1);
-        return "org.bukkit.craftbukkit." + version + ".";
-    }
-    
-    protected static int getVersionNumber() {
-        String version = Bukkit.getVersion();
-        version = version.substring(version.indexOf("MC: "), version.length() - 1).substring(4);
-        return Integer.parseInt(version.split("\\.")[1]);
-    }
-    
     public static <T> @NotNull Class<T> getImplClass(@NotNull String path) {
         try {
             return (Class<T>) Class.forName("xyz.xenondevs.inventoryaccess." + InventoryAccessRevision.REQUIRED_REVISION.getPackageName() + "." + path);
@@ -33,7 +20,7 @@ public class ReflectionUtils {
     }
     
     public static <T> @NotNull Class<T> getCBClass(@NotNull String path) {
-        return getClass(ReflectionRegistry.CRAFT_BUKKIT_PACKAGE_PATH + path);
+        return getClass(ReflectionRegistry.CRAFT_BUKKIT_PACKAGE_PATH + "." + path);
     }
     
     public static <T> @NotNull Class<T> getClass(@NotNull String path) {