chore(deps): bump com.github.TeamKUN:PeyangPaperUtils from 2.2.1 to 3…

….0.1 (#147) * chore(deps): bump com.github.TeamKUN:PeyangPaperUtils Bumps [com.github.TeamKUN:PeyangPaperUtils](https://github.com/TeamKun/PeyangPaperUtils) from 2.2.1 to 3.0.1. - [Release notes](https://github.com/TeamKun/PeyangPaperUtils/releases) - [Commits](TeamKun/PeyangPaperUtils@2.2.1...3.0.1) --- updated-dependencies: - dependency-name: com.github.TeamKUN:PeyangPaperUtils dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * refactor(plugin): Avoiding from using deprecated api --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PeyaPeyaPeyang <peyang@peya.tokyo>
TeamKun · Apr 28, 2024 · 577536e · 577536e
1 parent c12f540
commit 577536e
Show file tree

Hide file tree

Showing 23 changed files with 121 additions and 134 deletions.
diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandAutoRemove.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandAutoRemove.java
@@ -3,9 +3,9 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -40,9 +40,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.autoremove");
+        return of(LangProvider.get("command.autoremove"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandClean.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandClean.java
@@ -3,9 +3,9 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -40,9 +40,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.clean");
+        return of(LangProvider.get("command.clean"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandDebug.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandDebug.java
@@ -2,7 +2,7 @@
 
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
 import net.kunmc.lab.peyangpaperutils.lib.command.SubCommandWith;
-import net.kyori.adventure.text.TextComponent;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -47,7 +47,7 @@ protected Map<String, CommandBase> getSubCommands(@NotNull CommandSender sender)
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
         return of("KPMのデバッグに使用します。");
     }

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandInfo.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandInfo.java
@@ -2,8 +2,8 @@
 
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
@@ -59,9 +59,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.info");
+        return of(LangProvider.get("command.info"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandInstall.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandInstall.java
@@ -3,9 +3,9 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -45,9 +45,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.install");
+        return of(LangProvider.get("command.install"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandRegister.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandRegister.java
@@ -3,9 +3,9 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -49,9 +49,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.register");
+        return of(LangProvider.get("command.register"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandResolve.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandResolve.java
@@ -3,8 +3,8 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -46,9 +46,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.resolve");
+        return of(LangProvider.get("command.resolve"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUninstall.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUninstall.java
@@ -3,9 +3,9 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
@@ -56,9 +56,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.uninstall");
+        return of(LangProvider.get("command.uninstall"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUpdate.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUpdate.java
@@ -3,9 +3,9 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -44,9 +44,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.update");
+        return of(LangProvider.get("command.update"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUpgrade.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUpgrade.java
@@ -3,9 +3,9 @@
 import lombok.AllArgsConstructor;
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -50,9 +50,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.upgrade");
+        return of(LangProvider.get("command.upgrade"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUpgradeKPM.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandUpgradeKPM.java
@@ -2,9 +2,9 @@
 
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
 import net.kunmc.lab.peyangpaperutils.lib.utils.Runner;
-import net.kyori.adventure.text.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
@@ -77,9 +77,9 @@ public void onCommand(@NotNull CommandSender sender, @NotNull Terminal terminal,
     }
 
     @Override
-    public TextComponent getHelpOneLine()
+    public Text getHelpOneLine()
     {
-        return (TextComponent) LangProvider.getComponent("command.upgrade_kpm");
+        return of(LangProvider.get("command.upgrade_kpm"));
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandVersion.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/CommandVersion.java
@@ -4,8 +4,8 @@
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
 import net.kunmc.lab.peyangpaperutils.lang.MsgArgs;
 import net.kunmc.lab.peyangpaperutils.lib.command.CommandBase;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
-import net.kyori.adventure.text.TextComponent;
 import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -84,14 +84,10 @@ private static void printVersions(@NotNull Terminal terminal)
         terminal.writeLine("");
     }
 
-    private static void printLicenses(@NotNull Terminal terminal)
+    @Override
+    public Text getHelpOneLine()
     {
-        terminal.writeLine(LangProvider.get("command.version.license.1"));
-        terminal.write(LangProvider.getComponent("command.version.license.2"));
-        terminal.writeLine(LangProvider.get("command.version.license.3"));
-        terminal.writeLine(LangProvider.get("command.version.license.4"));
-        terminal.write(LangProvider.getComponent("command.version.license.bugs"));
-        terminal.writeLine("");
+        return of(LangProvider.get("command.version"));
     }
 
     private static void printStatus(@NotNull Terminal terminal, @NotNull KPMRegistry registry)
@@ -137,10 +133,14 @@ public String getPermission()
         return "kpm.version";
     }
 
-    @Override
-    public net.kyori.adventure.text.TextComponent getHelpOneLine()
+    private static void printLicenses(@NotNull Terminal terminal)
     {
-        return (TextComponent) LangProvider.getComponent("command.version");
+        terminal.writeLine(LangProvider.get("command.version.license.1"));
+        terminal.write(Text.ofTranslatable("command.version.license.2"));
+        terminal.writeLine(LangProvider.get("command.version.license.3"));
+        terminal.writeLine(LangProvider.get("command.version.license.4"));
+        terminal.write(Text.ofTranslatable("command.version.license.bugs"));
+        terminal.writeLine("");
     }
 
     @Override

diff --git a/KPMPlugin/src/main/java/org/kunlab/kpm/commands/PluginInfoWriter.java b/KPMPlugin/src/main/java/org/kunlab/kpm/commands/PluginInfoWriter.java
@@ -1,12 +1,9 @@
 package org.kunlab.kpm.commands;
 
 import net.kunmc.lab.peyangpaperutils.lang.LangProvider;
+import net.kunmc.lab.peyangpaperutils.lib.components.Text;
 import net.kunmc.lab.peyangpaperutils.lib.terminal.Terminal;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentBuilder;
-import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.event.ClickEvent;
-import net.kyori.adventure.text.event.HoverEvent;
+import net.md_5.bungee.api.chat.ClickEvent;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.plugin.Plugin;
@@ -206,36 +203,35 @@ public void writeDependencyInfo()
         if (meta == null)
             throw new IllegalStateException("Unable to find the plugin meta for " + this.plugin.getName());
 
-        this.terminal.write(
-                Component.text(ChatColor.GREEN + LangProvider.get("command.info.meta.dependency") +
-                                ChatColor.WHITE + "：")
-                        .append(this.getDependencyComponents(meta.getDependedBy(), true))
-        );
-
-        this.terminal.write(
-                Component.text(ChatColor.GREEN + LangProvider.get("command.info.meta.depended") +
-                                ChatColor.WHITE + "：")
-                        .append(this.getDependencyComponents(meta.getDependsOn(), false))
-        );
+
+        this.terminal.write(Text.of(LangProvider.get("command.info.meta.dependency"))
+                .color(ChatColor.GREEN)
+                .append("：")
+                .color(ChatColor.WHITE)
+                .append(this.getDependencyComponents(meta.getDependedBy(), false)));
+
+
+        this.terminal.write(Text.of(LangProvider.get("command.info.meta.depended"))
+                .color(ChatColor.GREEN)
+                .append("：")
+                .color(ChatColor.WHITE)
+                .append(this.getDependencyComponents(meta.getDependsOn(), false)));
     }
 
-    private TextComponent getDependencyComponents(List<? extends DependencyNode> dependencies, boolean direction)
+    private Text getDependencyComponents(List<? extends DependencyNode> dependencies, boolean direction)
     {
-        ComponentBuilder<TextComponent, ?> builder = Component.text();
-
+        Text text = Text.empty();
         if (dependencies.isEmpty())
-            builder.append(Component.text(LangProvider.get("general.none")));
-
+            text.append(Text.ofTranslatable("general.none"));
+        
         for (DependencyNode dependency : dependencies)
-            builder.append(this.getDependencyComponent(dependency, direction)).append(Component.text("  "));
+            text.append(this.getDependencyComponent(dependency, direction)).append("  ");
 
-        return builder.build();
+        return text;
     }
 
-    private TextComponent getDependencyComponent(DependencyNode dependency, boolean direction)
+    private Text getDependencyComponent(DependencyNode dependency, boolean direction)
     {
-        ComponentBuilder<TextComponent, ?> builder = Component.text();
-
         ChatColor color;
         switch (dependency.getDependType())
         {
@@ -252,14 +248,11 @@ private TextComponent getDependencyComponent(DependencyNode dependency, boolean
                 color = ChatColor.GRAY;
         }
 
-        builder.append(
-                Component.text(color + (direction ? dependency.getPlugin(): dependency.getDependsOn()))
-                        .hoverEvent(HoverEvent.showText(Component.text("クリックして詳細を表示")))
-                        .clickEvent(ClickEvent.runCommand("/kpm info " +
-                                (direction ? dependency.getPlugin(): dependency.getDependsOn()))
-                        )
-        );
-
-        return builder.build();
+        return Text.of(direction ? dependency.getPlugin(): dependency.getDependsOn())
+                .color(color)
+                .hoverText(Text.of("クリックして詳細を表示"))
+                .runCommandOnClick("/kpm info " +
+                        (direction ? dependency.getPlugin(): dependency.getDependsOn())
+                );
     }
 }