1.5.5 适配plg2.x

Author: handy

pom.xml

@@ -7,18 +7,18 @@
     <groupId>cn.handyplus.menu</groupId>
     <name>PlayerMenu</name>
     <artifactId>PlayerMenu</artifactId>
-    <version>1.5.4</version>
+    <version>1.5.5</version>
     <description>一个有点好用的玩家菜单插件</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spigot-api.vesion>1.21.4-R0.1-SNAPSHOT</spigot-api.vesion>
         <placeholderapi.version>2.11.6</placeholderapi.version>
         <lombok.version>1.18.36</lombok.version>
-        <HandyLib.version>3.15.7</HandyLib.version>
+        <HandyLib.version>3.16.1</HandyLib.version>
         <VaultAPI.vesion>1.7</VaultAPI.vesion>
         <PlayerPoints.version>3.2.7</PlayerPoints.version>
-        <PlayerGuild.version>1.15.0</PlayerGuild.version>
+        <PlayerGuild.version>2.0.0</PlayerGuild.version>
         <PlayerCurrency.version>1.0.6</PlayerCurrency.version>
         <annotations.version>26.0.1</annotations.version>
     </properties>
@@ -60,7 +60,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.handy.guild</groupId>
+            <groupId>cn.handyplus.guild</groupId>
             <artifactId>PlayerGuild</artifactId>
             <version>${PlayerGuild.version}</version>
             <scope>provided</scope>

src/main/java/cn/handyplus/menu/PlayerMenu.java

@@ -7,6 +7,7 @@
 import cn.handyplus.menu.hook.PlaceholderUtil;
 import cn.handyplus.menu.util.ConfigUtil;
 import net.milkbowl.vault.economy.Economy;
+import org.black_ixx.playerpoints.PlayerPoints;
 import org.bukkit.ChatColor;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -23,7 +24,7 @@ public class PlayerMenu extends JavaPlugin {
     public static PlayerMenu INSTANCE;
     public static boolean USE_PAPI;
     public static Economy ECON;
-    public static boolean PLAYER_POINTS;
+    public static PlayerPoints PLAYER_POINTS;
     public static boolean USE_GUILD;
     public static boolean USE_PLY;
 
@@ -36,7 +37,7 @@ public void onEnable() {
         // 加载vault
         this.loadEconomy();
         // 加载PlayerPoints
-        PLAYER_POINTS = BaseUtil.hook(HookPluginEnum.PLAYER_POINTS);
+        BaseUtil.hookToPlugin(HookPluginEnum.PLAYER_POINTS).ifPresent(value -> PLAYER_POINTS = (PlayerPoints) value);
         // 加载PlaceholderApi
         USE_PAPI = BaseUtil.hook(HookPluginEnum.PLACEHOLDER_API);
         if (USE_PAPI) {

src/main/java/cn/handyplus/menu/hook/PlayerPointsUtil.java

@@ -4,7 +4,6 @@
 import cn.handyplus.lib.util.BaseUtil;
 import cn.handyplus.lib.util.MessageUtil;
 import cn.handyplus.menu.PlayerMenu;
-import org.black_ixx.playerpoints.PlayerPoints;
 import org.bukkit.entity.Player;
 
 /**
@@ -22,12 +21,12 @@ public class PlayerPointsUtil {
      */
     public static boolean buy(Player player, int price) {
         // 点券是否加载
-        if (!PlayerMenu.PLAYER_POINTS) {
+        if (PlayerMenu.PLAYER_POINTS == null) {
             MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor(HookPluginEnum.PLAYER_POINTS.getFailMsg()));
             return false;
         }
         // 扣除点券
-        return PlayerPoints.getInstance().getAPI().take(player.getUniqueId(), price);
+        return PlayerMenu.PLAYER_POINTS.getAPI().take(player.getUniqueId(), price);
     }
 
     /**
@@ -41,12 +40,12 @@ public static void give(Player player, int price) {
             return;
         }
         // 点券是否加载
-        if (!PlayerMenu.PLAYER_POINTS) {
+        if (PlayerMenu.PLAYER_POINTS == null) {
             MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor(HookPluginEnum.PLAYER_POINTS.getFailMsg()));
             return;
         }
         // 给予点券
-        PlayerPoints.getInstance().getAPI().give(player.getUniqueId(), price);
+        PlayerMenu.PLAYER_POINTS.getAPI().give(player.getUniqueId(), price);
     }
 
     /**
@@ -56,10 +55,10 @@ public static void give(Player player, int price) {
      * @return 玩家点券
      */
     public static int getPlayerPoints(Player player) {
-        if (!PlayerMenu.PLAYER_POINTS || player == null) {
+        if (PlayerMenu.PLAYER_POINTS == null || player == null) {
             return 0;
         }
-        return PlayerPoints.getInstance().getAPI().look(player.getUniqueId());
+        return PlayerMenu.PLAYER_POINTS.getAPI().look(player.getUniqueId());
     }
 
 }

src/main/java/cn/handyplus/menu/util/MenuUtil.java

@@ -1,5 +1,6 @@
 package cn.handyplus.menu.util;
 
+import cn.handyplus.guild.api.PlayerGuildApi;
 import cn.handyplus.lib.constants.BaseConstants;
 import cn.handyplus.lib.core.CollUtil;
 import cn.handyplus.lib.core.DateUtil;
@@ -13,7 +14,6 @@
 import cn.handyplus.menu.PlayerMenu;
 import cn.handyplus.menu.inventory.MenuGui;
 import cn.handyplus.menu.service.MenuLimitService;
-import com.handy.guild.api.PlayerGuildApi;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -66,7 +66,7 @@ public static void openGui(Player player, String menu) {
     public static void openGui(Player player, String menu, String papiName) {
         HandySchedulerUtil.runTaskAsynchronously(() -> {
             // 判断是否在公会战
-            if (PlayerMenu.USE_GUILD && PlayerGuildApi.getInstance().isPvp(player)) {
+            if (PlayerMenu.USE_GUILD && PlayerGuildApi.isPvp(player)) {
                 MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor("noOpenPvpPermission"));
                 return;
             }

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: PlayerMenu
 main: cn.handyplus.menu.PlayerMenu
-version: 1.5.4
+version: 1.5.5
 author: handy
 api-version: 1.13
 website: https://ricedoc.handyplus.cn/wiki/PlayerMenu/log/