From c485c29d5dfc2556536316fc75ea1fd8259c50db Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Tue, 30 May 2023 04:46:01 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=87=8D=E5=86=99=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/bukkit/command/core/sub/YamlCommand.java | 6 +++--- .../bukkit/command/lore/sub/LoreAddCommand.java | 4 ++-- .../bukkit/command/lore/sub/LoreClearCommand.java | 4 ++-- .../lore/sub/LoreCustomModelDataCommand.java | 4 ++-- .../bukkit/command/lore/sub/LoreFlagCommand.java | 4 ++-- .../bukkit/command/lore/sub/LoreNameCommand.java | 4 ++-- .../bukkit/command/lore/sub/LoreRemoveCommand.java | 4 ++-- .../bukkit/command/lore/sub/LoreSetCommand.java | 4 ++-- .../plugin/core/bukkit/constant/CoreMessage.java | 4 ++-- .../{BukkitUtils.java => CoreBukkitUtils.java} | 4 ++-- .../bukkit/util/serializer/ItemStackAdapter.java | 6 +++--- .../util/serializer/PotionEffectAdapter.java | 6 +++--- .../mc/plugin/core/bungee/api/CoreBungeeAPI.java | 5 ++--- ...ngeeCordUtils.java => CoreBungeeCordUtils.java} | 14 +++++++------- 14 files changed, 36 insertions(+), 37 deletions(-) rename hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/{BukkitUtils.java => CoreBukkitUtils.java} (99%) rename hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/{BungeeCordUtils.java => CoreBungeeCordUtils.java} (89%) diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java index f61c835..3e642e8 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.core.sub; import cn.hamster3.mc.plugin.core.bukkit.HamsterCorePlugin; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.Command; @@ -51,8 +51,8 @@ public class YamlCommand extends ChildCommand { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { YamlConfiguration config = new YamlConfiguration(); - config.set("mc-version", BukkitUtils.getMCVersion()); - config.set("nms-version", BukkitUtils.getNMSVersion()); + config.set("mc-version", CoreBukkitUtils.getMCVersion()); + config.set("nms-version", CoreBukkitUtils.getNMSVersion()); config.set("server-version", Bukkit.getBukkitVersion()); config.set("bukkit-version", Bukkit.getVersion()); diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java index 437650d..623fe5b 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -52,7 +52,7 @@ public class LoreAddCommand extends ChildCommand { } Player player = (Player) sender; ItemStack stack = player.getItemInHand(); - if (BukkitUtils.isEmptyItemStack(stack)) { + if (CoreBukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java index a7db632..186f4e2 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -48,7 +48,7 @@ public class LoreClearCommand extends ChildCommand { } Player player = (Player) sender; ItemStack stack = player.getItemInHand(); - if (BukkitUtils.isEmptyItemStack(stack)) { + if (CoreBukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java index 6a73898..04dce4b 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -48,7 +48,7 @@ public class LoreCustomModelDataCommand extends ChildCommand { } Player player = (Player) sender; ItemStack stack = player.getItemInHand(); - if (BukkitUtils.isEmptyItemStack(stack)) { + if (CoreBukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java index c8858e9..b0cf208 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -54,7 +54,7 @@ public class LoreFlagCommand extends ChildCommand { } Player player = (Player) sender; ItemStack stack = player.getItemInHand(); - if (BukkitUtils.isEmptyItemStack(stack)) { + if (CoreBukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java index 51079ef..ab428da 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -51,7 +51,7 @@ public class LoreNameCommand extends ChildCommand { } Player player = (Player) sender; ItemStack stack = player.getItemInHand(); - if (BukkitUtils.isEmptyItemStack(stack)) { + if (CoreBukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java index 651f7d2..acc14a8 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -57,7 +57,7 @@ public class LoreRemoveCommand extends ChildCommand { } Player player = (Player) sender; ItemStack stack = player.getItemInHand(); - if (BukkitUtils.isEmptyItemStack(stack)) { + if (CoreBukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java index 8b6ae14..4cc9c27 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -62,7 +62,7 @@ public class LoreSetCommand extends ChildCommand { } Player player = (Player) sender; ItemStack stack = player.getItemInHand(); - if (BukkitUtils.isEmptyItemStack(stack)) { + if (CoreBukkitUtils.isEmptyItemStack(stack)) { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java index 1675c53..e0819cd 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java @@ -1,7 +1,7 @@ package cn.hamster3.mc.plugin.core.bukkit.constant; import cn.hamster3.mc.plugin.core.bukkit.api.CoreBukkitAPI; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.TextReplacementConfig; @@ -52,7 +52,7 @@ public enum CoreMessage { continue; } try { - value.message = BukkitUtils.getDisplayMessage(section); + value.message = CoreBukkitUtils.getDisplayMessage(section); } catch (Exception e) { plugin.getLogger().warning("加载消息设置 " + value.name() + " 时遇到了一个异常: "); e.printStackTrace(); diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java similarity index 99% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java rename to hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java index 38ef206..f5121ed 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java @@ -33,8 +33,8 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; @SuppressWarnings("unused") -public final class BukkitUtils { - private BukkitUtils() { +public final class CoreBukkitUtils { + private CoreBukkitUtils() { } @NotNull diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java index 25fc059..140fef5 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java @@ -1,6 +1,6 @@ package cn.hamster3.mc.plugin.core.bukkit.util.serializer; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import com.google.gson.*; import org.bukkit.inventory.ItemStack; @@ -17,7 +17,7 @@ public final class ItemStackAdapter implements JsonSerializer, JsonDe if (json.isJsonNull()) { return null; } - return BukkitUtils.deserializeItemStack(json.getAsString()); + return CoreBukkitUtils.deserializeItemStack(json.getAsString()); } @Override @@ -25,7 +25,7 @@ public final class ItemStackAdapter implements JsonSerializer, JsonDe if (src == null) { return JsonNull.INSTANCE; } - String s = BukkitUtils.serializeItemStack(src); + String s = CoreBukkitUtils.serializeItemStack(src); return new JsonPrimitive(s); } } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java index 3ae9449..66a031a 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java @@ -1,6 +1,6 @@ package cn.hamster3.mc.plugin.core.bukkit.util.serializer; -import cn.hamster3.mc.plugin.core.bukkit.util.BukkitUtils; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import com.google.gson.*; import org.bukkit.potion.PotionEffect; @@ -17,7 +17,7 @@ public final class PotionEffectAdapter implements JsonSerializer, if (json.isJsonNull()) { return null; } - return BukkitUtils.deserializePotionEffect(json); + return CoreBukkitUtils.deserializePotionEffect(json); } @Override @@ -25,6 +25,6 @@ public final class PotionEffectAdapter implements JsonSerializer, if (src == null) { return JsonNull.INSTANCE; } - return BukkitUtils.serializePotionEffect(src); + return CoreBukkitUtils.serializePotionEffect(src); } } diff --git a/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java b/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java index 49adedb..e93147c 100644 --- a/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java +++ b/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java @@ -1,7 +1,7 @@ package cn.hamster3.mc.plugin.core.bungee.api; import cn.hamster3.mc.plugin.core.bungee.HamsterCorePlugin; -import cn.hamster3.mc.plugin.core.bungee.util.BungeeCordUtils; +import cn.hamster3.mc.plugin.core.bungee.util.CoreBungeeCordUtils; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; @@ -16,8 +16,7 @@ public final class CoreBungeeAPI extends CoreAPI { private CoreBungeeAPI() { HamsterCorePlugin plugin = HamsterCorePlugin.getInstance(); - Configuration config = BungeeCordUtils.getPluginConfig(plugin); - + Configuration config = CoreBungeeCordUtils.getPluginConfig(plugin); Configuration datasourceConfig = config.getSection("datasource"); if (datasourceConfig == null) { throw new IllegalArgumentException("配置文件中未找到 datasource 节点！"); diff --git a/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BungeeCordUtils.java b/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java similarity index 89% rename from hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BungeeCordUtils.java rename to hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java index 254302d..5493575 100644 --- a/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BungeeCordUtils.java +++ b/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java @@ -12,10 +12,11 @@ import java.io.InputStream; import java.nio.file.Files; @SuppressWarnings("unused") -public final class BungeeCordUtils { - private BungeeCordUtils() { +public final class CoreBungeeCordUtils { + private CoreBungeeCordUtils() { } + @NotNull public static Configuration getConfig(@NotNull File file) { if (!file.exists()) { throw new IllegalArgumentException("文件不存在！"); @@ -27,20 +28,20 @@ public final class BungeeCordUtils { } } + @NotNull public static Configuration getPluginConfig(@NotNull Plugin plugin) { File configFile = new File(plugin.getDataFolder(), "config.yml"); if (!configFile.exists()) { return saveDefaultConfig(plugin); } - try { return ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile); } catch (IOException e) { - e.printStackTrace(); - return null; + throw new RuntimeException(e); } } + @NotNull public static Configuration saveDefaultConfig(@NotNull Plugin plugin) { if (plugin.getDataFolder().mkdir()) { plugin.getLogger().info("创建插件文件夹..."); @@ -51,8 +52,7 @@ public final class BungeeCordUtils { Files.copy(in, configFile.toPath()); return ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile); } catch (Exception e) { - e.printStackTrace(); + throw new RuntimeException(e); } - return null; } }