From 5c19a04b1a1d42a4544656b3d2d71e145a1e0aab Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Tue, 12 Jul 2022 15:13:25 +0800 Subject: [PATCH] BUG FIX --- .../momirealms/customnameplates/CustomNameplates.java | 5 +++-- .../momirealms/customnameplates/commands/Execute.java | 10 ++-------- .../momirealms/customnameplates/data/DataManager.java | 6 +++--- .../momirealms/customnameplates/data/PlayerData.java | 7 ------- .../momirealms/customnameplates/data/SqlHandler.java | 2 +- .../momirealms/customnameplates/hook/HookManager.java | 4 ++-- .../customnameplates/resource/ResourceManager.java | 4 ++-- src/main/resources/database.yml | 1 - src/main/resources/messages/messages_cn.yml | 4 ++-- src/main/resources/messages/messages_en.yml | 2 +- 10 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java index 7d84f25..080ce78 100644 --- a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java +++ b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java @@ -38,6 +38,7 @@ public final class CustomNameplates extends JavaPlugin { public void onEnable() { instance = this; adventure = BukkitAudiences.create(this); + AdventureManager.consoleMessage("[CustomNameplates] Running on " + Bukkit.getVersion()); //重载插件 ConfigManager.MainConfig.ReloadConfig(); ConfigManager.Message.ReloadConfig(); @@ -61,7 +62,7 @@ public final class CustomNameplates extends JavaPlugin { return; } //启动完成 - AdventureManager.consoleMessage("[CustomNameplates] Plugin has been enabled! Author: XiaoMoMi"); + AdventureManager.consoleMessage("[CustomNameplates] 插件已启用! 作者: 小默米 QQ:3266959688"); } @Override @@ -71,7 +72,7 @@ public final class CustomNameplates extends JavaPlugin { //清除缓存实体 Execute.pCache.forEach(Entity::remove); //卸载完成 - AdventureManager.consoleMessage("[CustomNameplates] Plugin has been disabled! Author: XiaoMoMi"); + AdventureManager.consoleMessage("[CustomNameplates] 插件已卸载! 作者: 小默米 QQ:3266959688"); //关闭adventure if(adventure != null) { adventure.close(); diff --git a/src/main/java/net/momirealms/customnameplates/commands/Execute.java b/src/main/java/net/momirealms/customnameplates/commands/Execute.java index 32f0f55..af84373 100644 --- a/src/main/java/net/momirealms/customnameplates/commands/Execute.java +++ b/src/main/java/net/momirealms/customnameplates/commands/Execute.java @@ -38,14 +38,8 @@ import java.util.Optional; public class Execute implements CommandExecutor { private final CustomNameplates plugin; - private final HashMap coolDown; - { - coolDown = new HashMap<>(); - } - public static List pCache; - { - pCache = new ArrayList<>(); - } + private final HashMap coolDown = new HashMap<>(); + public static List pCache = new ArrayList<>(); public Execute(CustomNameplates plugin) { this.plugin = plugin; diff --git a/src/main/java/net/momirealms/customnameplates/data/DataManager.java b/src/main/java/net/momirealms/customnameplates/data/DataManager.java index 61f255e..48ba34f 100644 --- a/src/main/java/net/momirealms/customnameplates/data/DataManager.java +++ b/src/main/java/net/momirealms/customnameplates/data/DataManager.java @@ -20,7 +20,7 @@ public class DataManager { } PlayerData playerData = SqlHandler.getPlayerData(uuid); if (playerData == null) { - playerData = PlayerData.EMPTY; + playerData = new PlayerData(ConfigManager.MainConfig.default_nameplate, 0); } cache.put(uuid, playerData); return playerData; @@ -40,9 +40,9 @@ public class DataManager { public static boolean create() { if(ConfigManager.DatabaseConfig.use_mysql){ - AdventureManager.consoleMessage("[CustomNameplates] Storage Mode - MYSQL"); + AdventureManager.consoleMessage("[CustomNameplates] 存储模式 - MYSQL"); }else { - AdventureManager.consoleMessage("[CustomNameplates] Storage Mode - SQLite"); + AdventureManager.consoleMessage("[CustomNameplates] 存储模式 - SQLite"); } if (SqlHandler.connect()) { if (ConfigManager.DatabaseConfig.use_mysql) { diff --git a/src/main/java/net/momirealms/customnameplates/data/PlayerData.java b/src/main/java/net/momirealms/customnameplates/data/PlayerData.java index 5e7adc4..d7fd941 100644 --- a/src/main/java/net/momirealms/customnameplates/data/PlayerData.java +++ b/src/main/java/net/momirealms/customnameplates/data/PlayerData.java @@ -1,14 +1,7 @@ package net.momirealms.customnameplates.data; -import net.momirealms.customnameplates.ConfigManager; - public class PlayerData { - public static PlayerData EMPTY; - static { - EMPTY = new PlayerData(ConfigManager.MainConfig.default_nameplate, 0); - } - private String equipped; private int accepted; diff --git a/src/main/java/net/momirealms/customnameplates/data/SqlHandler.java b/src/main/java/net/momirealms/customnameplates/data/SqlHandler.java index 4b96f21..f6fbdcd 100644 --- a/src/main/java/net/momirealms/customnameplates/data/SqlHandler.java +++ b/src/main/java/net/momirealms/customnameplates/data/SqlHandler.java @@ -79,7 +79,7 @@ public class SqlHandler { if (rs.next()) { playerData = new PlayerData(rs.getString(2), rs.getInt(3)); }else { - sql = "INSERT INTO nameplates(player,equipped,accepted) values(?,?,?)"; + sql = "INSERT INTO " + tableName + "(player,equipped,accepted) values(?,?,?)"; statement = connection.prepareStatement(sql); statement.setString(1, uuid.toString()); statement.setString(2, "none"); diff --git a/src/main/java/net/momirealms/customnameplates/hook/HookManager.java b/src/main/java/net/momirealms/customnameplates/hook/HookManager.java index be6ee90..8623fd9 100644 --- a/src/main/java/net/momirealms/customnameplates/hook/HookManager.java +++ b/src/main/java/net/momirealms/customnameplates/hook/HookManager.java @@ -26,14 +26,15 @@ public class HookManager { } //Papi Hook检测 + //其实是一段问题代码，但基本人人都装了PAPI，更改意义不大 private void initializePlaceholderAPI() { if(!ConfigManager.MainConfig.placeholderAPI){ this.placeholderAPI = false; return; } if(CustomNameplates.instance.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null){ + AdventureManager.consoleMessage("[CustomNameplates] 已启用 PlaceholderAPI 变量解析!"); this.placeholderAPI = true; - AdventureManager.consoleMessage("[CustomNameplates] " + "PlaceholderAPI Hooked!"); } } //ItemsAdder Hook检测 @@ -43,7 +44,6 @@ public class HookManager { } if(CustomNameplates.instance.getServer().getPluginManager().getPlugin("ItemsAdder") != null){ this.itemsAdder = true; - AdventureManager.consoleMessage("[CustomNameplates] " + "ItemsAdder Hooked!"); } } /* diff --git a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java index a9763eb..ebf0724 100644 --- a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java +++ b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java @@ -111,10 +111,11 @@ public class ResourceManager { return; } //资源包生成成功提示 - AdventureManager.consoleMessage("[CustomNameplates] Resource pack has been successfully generated! " + (this.caches.size() -1) + " nameplates Loaded."); + AdventureManager.consoleMessage("[CustomNameplates] 资源包已成功生成! 已载入 " + (this.caches.size() -1) + " 个铭牌!"); if (this.plugin.getHookManager().hasItemsAdder()){ try{ FileUtils.copyDirectory(g_file, new File(Bukkit.getPluginManager().getPlugin("ItemsAdder").getDataFolder() + File.separator + "data"+ File.separator + "resource_pack" + File.separator + "assets") ); + AdventureManager.consoleMessage("[CustomNameplates] 检测到 ItemsAdder 已自动转移生成的资源包!"); }catch (IOException e){ e.printStackTrace(); AdventureManager.consoleMessage("[CustomNameplates] Error! Failed to copy files to ItemsAdder..."); @@ -137,7 +138,6 @@ public class ResourceManager { if(file.exists()){ try{ FileUtils.deleteDirectory(file); - AdventureManager.consoleMessage("[CustomNameplates] Successfully copy files to ItemsAdder..."); }catch (IOException e){ e.printStackTrace(); AdventureManager.consoleMessage("[CustomNameplates] Error! Failed to delete generated folder..." ); diff --git a/src/main/resources/database.yml b/src/main/resources/database.yml index 1197e54..2102040 100644 --- a/src/main/resources/database.yml +++ b/src/main/resources/database.yml @@ -4,7 +4,6 @@ settings: # Restart is a must when you change database configuration. storage-mode: SQLite use-pool: false - disable-async: false # MySQL settings MySQL: diff --git a/src/main/resources/messages/messages_cn.yml b/src/main/resources/messages/messages_cn.yml index 950bcee..0bcb81a 100644 --- a/src/main/resources/messages/messages_cn.yml +++ b/src/main/resources/messages/messages_cn.yml @@ -1,9 +1,9 @@ messages: - prefix: '[CustomNameplates] ' + prefix: '[CustomNameplates] ' no-perm: '你没有权限!' lack-args: '参数不足!' reload: '插件已重载!' - equip: '你已佩戴铭牌 {Nameplate} [点击预览]' + equip: '你已佩戴铭牌 {Nameplate} [点击预览]' force-equip: '你已为玩家 {Player} 强制佩戴了铭牌 {Nameplate}' unequip: '你已卸下铭牌!' force-unequip: '你已强制卸下玩家 {Player} 的铭牌!' diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index 7ed62bc..98c37af 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -1,5 +1,5 @@ messages: - prefix: '[CustomNameplates] ' + prefix: '[CustomNameplates] ' no-perm: 'No Permission!' lack-args: 'Insufficient parameters!' reload: 'Reloaded!'