Merge pull request #136 from Andre601/feature/improve-component-parser

Improve component parser
Andre601 · Mar 3, 2022 · 66898ff · 66898ff
2 parents 2910b13 + a5613db
commit 66898ff
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 26 deletions.
diff --git a/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/BungeeCore.java b/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/BungeeCore.java
@@ -30,7 +30,6 @@
 import com.andre601.oneversionremake.core.files.ConfigHandler;
 import com.andre601.oneversionremake.core.interfaces.PluginCore;
 import com.andre601.oneversionremake.core.interfaces.ProxyLogger;
-import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
@@ -48,7 +47,6 @@ public class BungeeCore extends Plugin implements PluginCore{
 
     @Override
     public void onEnable(){
-        BungeeAudiences.create(this);
         this.core = new OneVersionRemake(this);
     }
 
@@ -142,4 +140,8 @@ public ServerPing.PlayerInfo[] getPlayers(List<String> lines, List<Integer> serv
         return core.getPlayers(ServerPing.PlayerInfo.class, lines, serverProtocols, userProtocol, majorOnly)
                    .toArray(new ServerPing.PlayerInfo[0]);
     }
+
+    public OneVersionRemake getCore(){
+        return core;
+    }
 }
diff --git a/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/commands/BungeeSender.java b/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/commands/BungeeSender.java
@@ -19,18 +19,22 @@
 package com.andre601.oneversionremake.bungeecord.commands;
 
 import com.andre601.oneversionremake.core.CommandPermissions;
+import com.andre601.oneversionremake.core.OneVersionRemake;
 import com.andre601.oneversionremake.core.interfaces.CmdSender;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.CommandSender;
 
 public class BungeeSender implements CmdSender{
 
+    private final OneVersionRemake core;
     private final CommandSender sender;
+    private final BungeeAudiences bungeeAudiences;
 
-    public BungeeSender(CommandSender sender){
+    public BungeeSender(OneVersionRemake core, CommandSender sender, BungeeAudiences bungeeAudiences){
+        this.core = core;
         this.sender = sender;
+        this.bungeeAudiences = bungeeAudiences;
     }
 
     @Override
@@ -50,8 +54,8 @@ public void sendMsg(String msg, Object... args){
 
     @Override
     public void sendMsg(NamedTextColor color, String msg, Object... args){
-        sender.sendMessage(BungeeComponentSerializer.get().serialize(
-                Component.text(String.format(msg, args)).color(color)
-        ));
+        bungeeAudiences.sender(sender).sendMessage(
+                core.getComponentParser().toComponent(String.format(msg, args)).color(color)
+        );
     }
 }
diff --git a/.../src/main/java/com/andre601/oneversionremake/bungeecord/commands/CmdOneVersionRemake.java b/.../src/main/java/com/andre601/oneversionremake/bungeecord/commands/CmdOneVersionRemake.java
@@ -20,21 +20,24 @@
 
 import com.andre601.oneversionremake.bungeecord.BungeeCore;
 import com.andre601.oneversionremake.core.CommandPermissions;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Command;
 
 public class CmdOneVersionRemake extends Command{
 
     private final BungeeCore plugin;
+    private final BungeeAudiences bungeeAudiences;
 
     public CmdOneVersionRemake(BungeeCore plugin){
         super("oneversionremake", CommandPermissions.ADMIN, "ovr");
         this.plugin = plugin;
+        this.bungeeAudiences = BungeeAudiences.create(plugin);
     }
 
     @Override
     public void execute(CommandSender commandSender, String[] args){
-        BungeeSender sender = new BungeeSender(commandSender);
+        BungeeSender sender = new BungeeSender(plugin.getCore(), commandSender, bungeeAudiences);
 
         plugin.getCommandHandler().handle(sender, args);
     }

diff --git a/.../src/main/java/com/andre601/oneversionremake/bungeecord/listener/BungeeLoginListener.java b/.../src/main/java/com/andre601/oneversionremake/bungeecord/listener/BungeeLoginListener.java
@@ -52,7 +52,7 @@ public void onLogin(PreLoginEvent event){
                 kickMessage = Collections.singletonList("<red>This Server is running MC {version}! Please change your client version.");
 
             event.setCancelReason(BungeeComponentSerializer.get().serialize(
-                    plugin.getComponentParser().toTextComponent(kickMessage, serverProtocols, userProtocol, majorOnly)
+                    plugin.getComponentParser().toComponent(kickMessage, serverProtocols, userProtocol, majorOnly)
             ));
             event.setCancelled(true);
 

diff --git a/...d/src/main/java/com/andre601/oneversionremake/bungeecord/listener/BungeePingListener.java b/...d/src/main/java/com/andre601/oneversionremake/bungeecord/listener/BungeePingListener.java
@@ -76,7 +76,7 @@ public void onProxyPing(ProxyPingEvent event){
                     motd = motd.subList(0, 1);
 
                 TextComponent component = new TextComponent(BungeeComponentSerializer.get().serialize(
-                        plugin.getComponentParser().toTextComponent(motd, serverProtocols, userProtocol, majorOnly)
+                        plugin.getComponentParser().toComponent(motd, serverProtocols, userProtocol, majorOnly)
                 ));
 
                 ping.setDescriptionComponent(component);

diff --git a/core/src/main/java/com/andre601/oneversionremake/core/Parser.java b/core/src/main/java/com/andre601/oneversionremake/core/Parser.java
@@ -32,12 +32,17 @@ public Parser(OneVersionRemake core){
         this.core = core;
     }
 
-    public Component toTextComponent(List<String> lines, List<Integer> serverProtocols, int userProtocol, boolean majorOnly){
-        return MiniMessage.get().parse(parse(String.join("\n", lines), serverProtocols, userProtocol, majorOnly));
+    public Component toComponent(List<String> lines, List<Integer> serverProtocols, int userProtocol, boolean majorOnly){
+        return toComponent(parse(String.join("\n", lines), serverProtocols, userProtocol, majorOnly));
+    }
+
+    public Component toComponent(String text){
+        return MiniMessage.miniMessage().deserialize(text);
     }
 
     public String toString(String text, List<Integer> serverProtocols, int userProtocol, boolean majorOnly){
-        Component component = MiniMessage.get().parse(parse(text, serverProtocols, userProtocol, majorOnly));
+        Component component = MiniMessage.miniMessage()
+                .deserialize(parse(text, serverProtocols, userProtocol, majorOnly));
         return LegacyComponentSerializer.legacySection().serialize(component);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <plugin.version>3.9.0</plugin.version>
+        <plugin.version>3.10.0</plugin.version>
         <plugin.description>Only allow specific client versions on your Network.</plugin.description>
 
         <maven.compiler.target>11</maven.compiler.target>

diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -36,11 +36,11 @@
     <repositories>
         <repository>
             <id>velocity</id>
-            <url>https://nexus.velocitypowered.com/repository/maven-public</url>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
         <repository>
             <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
     </repositories>
 
@@ -54,15 +54,9 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.10.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-velocity</artifactId>

diff --git a/.../src/main/java/com/andre601/oneversionremake/velocity/listener/VelocityLoginListener.java b/.../src/main/java/com/andre601/oneversionremake/velocity/listener/VelocityLoginListener.java
@@ -50,7 +50,7 @@ public void onPreLogin(PreLoginEvent event){
                 kickMessage = Collections.singletonList("&cThis Server is running MC {version}! Please change your client version.");
 
             PreLoginEvent.PreLoginComponentResult result = PreLoginEvent.PreLoginComponentResult
-                    .denied(plugin.getComponentParser().toTextComponent(kickMessage, serverProtocols, userProtocol, majorOnly));
+                    .denied(plugin.getComponentParser().toComponent(kickMessage, serverProtocols, userProtocol, majorOnly));
 
             event.setResult(result);
 

diff --git a/...y/src/main/java/com/andre601/oneversionremake/velocity/listener/VelocityPingListener.java b/...y/src/main/java/com/andre601/oneversionremake/velocity/listener/VelocityPingListener.java
@@ -77,7 +77,7 @@ public void onProxyPing(ProxyPingEvent event){
                 if(motd.size() > 2)
                     motd = motd.subList(0, 1);
 
-                builder.description(plugin.getComponentParser().toTextComponent(motd, serverProtocols, userProtocol, majorOnly));
+                builder.description(plugin.getComponentParser().toComponent(motd, serverProtocols, userProtocol, majorOnly));
             }
 
             event.setPing(builder.build());