chore: 迁移用法

mcchampions · Feb 7, 2025 · 60373fd · 60373fd
1 parent 02b1acd
commit 60373fd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 41 deletions.
diff --git a/src/main/java/me/qscbm/slimefun4/utils/NBTUtils.java b/src/main/java/me/qscbm/slimefun4/utils/NBTUtils.java
@@ -2,6 +2,7 @@
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
+import io.github.bakedlibs.dough.reflection.ReflectionGetterMethodFunction;
 import io.github.bakedlibs.dough.reflection.ReflectionUtils;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import org.bukkit.Bukkit;
@@ -57,7 +58,7 @@ public class NBTUtils {
             RESOLVABLE_PROFILE_GAME_PROFILE_GETTER = ReflectionUtils.getMethod(resolvableProfile, "f");
             if (RESOLVABLE_PROFILE_GAME_PROFILE_GETTER != null) {
                 RESOLVABLE_PROFILE_GAME_PROFILE_GETTER.setAccessible(true);
-                RESOLVABLE_PROFILE_GAME_PROFILE_GETTER_FUNCTION = QsReflectionUtils.createGetterFunction(RESOLVABLE_PROFILE_GAME_PROFILE_GETTER);
+                RESOLVABLE_PROFILE_GAME_PROFILE_GETTER_FUNCTION = ReflectionUtils.createGetterFunction(RESOLVABLE_PROFILE_GAME_PROFILE_GETTER);
             }
         } catch (ClassNotFoundException e) {
             resolvableProfile = null;
@@ -66,12 +67,12 @@ public class NBTUtils {
         PROPERTY_NAME_GETTER = ReflectionUtils.getMethod(Property.class, "getName");
         if (PROPERTY_NAME_GETTER != null) {
             PROPERTY_NAME_GETTER.setAccessible(true);
-            PROPERTY_NAME_GETTER_FUNCTION = QsReflectionUtils.createGetterFunction(PROPERTY_NAME_GETTER);
+            PROPERTY_NAME_GETTER_FUNCTION = ReflectionUtils.createGetterFunction(PROPERTY_NAME_GETTER);
         }
         PROPERTY_VALUE_GETTER = ReflectionUtils.getMethod(Property.class, "getValue");
         if (PROPERTY_VALUE_GETTER != null) {
             PROPERTY_VALUE_GETTER.setAccessible(true);
-            PROPERTY_VALUE_GETTER_FUNCTION = QsReflectionUtils.createGetterFunction(PROPERTY_VALUE_GETTER);
+            PROPERTY_VALUE_GETTER_FUNCTION = ReflectionUtils.createGetterFunction(PROPERTY_VALUE_GETTER);
         }
     }
 

diff --git a/src/main/java/me/qscbm/slimefun4/utils/QsReflectionUtils.java b/src/main/java/me/qscbm/slimefun4/utils/QsReflectionUtils.java
diff --git a/src/main/java/me/qscbm/slimefun4/utils/ReflectionGetterMethodFunction.java b/src/main/java/me/qscbm/slimefun4/utils/ReflectionGetterMethodFunction.java
diff --git a/src/main/java/me/qscbm/slimefun4/utils/VersionEventsUtils.java b/src/main/java/me/qscbm/slimefun4/utils/VersionEventsUtils.java
@@ -1,5 +1,7 @@
 package me.qscbm.slimefun4.utils;
 
+import io.github.bakedlibs.dough.reflection.ReflectionGetterMethodFunction;
+import io.github.bakedlibs.dough.reflection.ReflectionUtils;
 import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import me.qscbm.slimefun4.utils.compatibillty.HighVersionEventsConstructor;
@@ -49,23 +51,23 @@ public class VersionEventsUtils {
                     Class.forName("org.bukkit.inventory.InventoryView")
                             .getMethod("getTopInventory");
             TOP_INVENTORY_GETTER.setAccessible(true);
-            TOP_INVENTORY_GETTER_FUNCTION = QsReflectionUtils.createGetterFunction(TOP_INVENTORY_GETTER);
+            TOP_INVENTORY_GETTER_FUNCTION = ReflectionUtils.createGetterFunction(TOP_INVENTORY_GETTER);
         } catch (NoSuchMethodException | ClassNotFoundException ignored) {
         }
         try {
             CLICKED_INVENTORY_GETTER =
                     Class.forName("org.bukkit.event.inventory.InventoryClickEvent")
                             .getMethod("getClickedInventory");
             CLICKED_INVENTORY_GETTER.setAccessible(true);
-            CLICKED_INVENTORY_GETTER_FUNCTION = QsReflectionUtils.createGetterFunction(CLICKED_INVENTORY_GETTER);
+            CLICKED_INVENTORY_GETTER_FUNCTION = ReflectionUtils.createGetterFunction(CLICKED_INVENTORY_GETTER);
         } catch (NoSuchMethodException | ClassNotFoundException ignored) {
         }
         try {
             EXPLOSION_RESULT_GETTER =
                     Class.forName("org.bukkit.event.block.BlockExplodeEvent")
                             .getMethod("getExplosionResult");
             EXPLOSION_RESULT_GETTER.setAccessible(true);
-            EXPLOSION_RESULT_GETTER_FUNCTION = QsReflectionUtils.createGetterFunction(EXPLOSION_RESULT_GETTER);
+            EXPLOSION_RESULT_GETTER_FUNCTION = ReflectionUtils.createGetterFunction(EXPLOSION_RESULT_GETTER);
         } catch (NoSuchMethodException | ClassNotFoundException ignored) {
         }
         try {

diff --git a/src/main/java/me/qscbm/slimefun4/utils/compatibillty/HighVersionEventsConstructor.java b/src/main/java/me/qscbm/slimefun4/utils/compatibillty/HighVersionEventsConstructor.java
@@ -1,7 +1,6 @@
 package me.qscbm.slimefun4.utils.compatibillty;
 
 import io.github.bakedlibs.dough.reflection.ReflectionUtils;
-import me.qscbm.slimefun4.utils.QsReflectionUtils;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.damage.DamageSource;
@@ -31,7 +30,7 @@ public HighVersionEventsConstructor() {
         }
         Constructor<BlockExplodeEvent> blockExplodeEventConstructor = ReflectionUtils.getConstructor(BlockExplodeEvent.class, Block.class, BlockState.class, List.class, float.class, explosionResultClass);
         try {
-            blockExplodeEventConstructorHandle = QsReflectionUtils.LOOKUP.unreflectConstructor(blockExplodeEventConstructor);
+            blockExplodeEventConstructorHandle = ReflectionUtils.LOOKUP.unreflectConstructor(blockExplodeEventConstructor);
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
         }