- add tab completor on spigot.

- always downsample colors on old version servers which don't support sending rgb colors.
jpenilla · Aug 15, 2020 · 7258551 · 7258551
1 parent 84f6f2b
commit 7258551
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>xyz.jpenilla</groupId>
     <artifactId>MiniMOTD</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7</version>
     <packaging>jar</packaging>
 
     <name>MiniMOTD</name>

diff --git a/src/main/java/xyz/jpenilla/minimotd/spigot/MiniMOTD.java b/src/main/java/xyz/jpenilla/minimotd/spigot/MiniMOTD.java
@@ -11,11 +11,18 @@ public final class MiniMOTD extends JavaPlugin {
     @Getter private SpigotConfig cfg;
     @Getter private PrismaHook prisma;
     @Getter private boolean isPaperServer;
+    @Getter private String serverPackageName;
+    @Getter private String serverApiVersion;
+    @Getter private int majorMinecraftVersion;
 
     @Override
     public void onEnable() {
+        serverPackageName = this.getServer().getClass().getPackage().getName();
+        serverApiVersion = serverPackageName.substring(serverPackageName.lastIndexOf('.') + 1);
+        majorMinecraftVersion = Integer.parseInt(serverApiVersion.split("_")[1]);
+
         try {
-            Class.forName("com.destroystokyo.paper.PaperConfig");
+            Class.forName("com.destroystokyo.paper.event.server.PaperServerListPingEvent");
             isPaperServer = true;
         } catch (ClassNotFoundException e) {
             isPaperServer = false;
@@ -29,10 +36,15 @@ public void onEnable() {
             getServer().getPluginManager().registerEvents(new PaperPingListener(this), this);
         } else {
             getServer().getPluginManager().registerEvents(new PingListener(this), this);
+            if (majorMinecraftVersion > 11) {
+                getLogger().info("This server is not using Paper, and therefore some features may be limited or disabled.");
+                getLogger().info("Get Paper from https://papermc.io/downloads");
+            }
         }
         final PluginCommand command = getCommand("minimotd");
         if (command != null) {
             command.setExecutor(new SpigotCommand(this));
+            command.setTabCompleter(new SpigotCommand(this));
         }
 
         Metrics metrics = new Metrics(this, 8132);

diff --git a/src/main/java/xyz/jpenilla/minimotd/spigot/PaperPingListener.java b/src/main/java/xyz/jpenilla/minimotd/spigot/PaperPingListener.java
@@ -11,12 +11,14 @@
 
 public class PaperPingListener implements Listener {
     private final SpigotConfig cfg;
+    private final MiniMOTD miniMOTD;
     private final LegacyComponentSerializer serializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
     private final MiniMessage miniMessage = MiniMessage.get();
     private final LegacyComponentSerializer legacySerializer = LegacyComponentSerializer.builder().build();
 
     public PaperPingListener(MiniMOTD miniMOTD) {
         this.cfg = miniMOTD.getCfg();
+        this.miniMOTD = miniMOTD;
     }
 
     @EventHandler
@@ -47,7 +49,7 @@ public void onPing(PaperServerListPingEvent e) {
 
         if (cfg.isMotdEnabled()) {
             final Component motd = miniMessage.parse(cfg.getMOTD(onlinePlayers, maxPlayers));
-            if (e.getClient().getProtocolVersion() < 735) {
+            if (e.getClient().getProtocolVersion() < 735 || miniMOTD.getMajorMinecraftVersion() < 16) {
                 e.setMotd(legacySerializer.serialize(motd));
             } else {
                 e.setMotd(serializer.serialize(motd));

diff --git a/src/main/java/xyz/jpenilla/minimotd/spigot/PingListener.java b/src/main/java/xyz/jpenilla/minimotd/spigot/PingListener.java
@@ -8,11 +8,14 @@
 
 public class PingListener implements Listener {
     private final SpigotConfig cfg;
+    private final MiniMOTD miniMOTD;
     private final LegacyComponentSerializer serializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
+    private final LegacyComponentSerializer legacySerializer = LegacyComponentSerializer.builder().build();
     private final MiniMessage miniMessage = MiniMessage.get();
 
     public PingListener(MiniMOTD miniMOTD) {
         this.cfg = miniMOTD.getCfg();
+        this.miniMOTD = miniMOTD;
     }
 
     @EventHandler
@@ -24,7 +27,11 @@ public void onPing(ServerListPingEvent e) {
         e.setMaxPlayers(maxPlayers);
 
         if (cfg.isMotdEnabled()) {
-            e.setMotd(serializer.serialize(miniMessage.parse(cfg.getMOTD(onlinePlayers, maxPlayers))));
+            if (miniMOTD.getMajorMinecraftVersion() > 15) {
+                e.setMotd(serializer.serialize(miniMessage.parse(cfg.getMOTD(onlinePlayers, maxPlayers))));
+            } else {
+                e.setMotd(legacySerializer.serialize(miniMessage.parse(cfg.getMOTD(onlinePlayers, maxPlayers))));
+            }
         }
     }
 }
diff --git a/src/main/java/xyz/jpenilla/minimotd/spigot/SpigotCommand.java b/src/main/java/xyz/jpenilla/minimotd/spigot/SpigotCommand.java
@@ -1,17 +1,21 @@
 package xyz.jpenilla.minimotd.spigot;
 
+import com.google.common.collect.ImmutableList;
 import lombok.NonNull;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-public class SpigotCommand implements CommandExecutor {
+public class SpigotCommand implements CommandExecutor, TabCompleter {
     private final MiniMOTD miniMOTD;
     private final BukkitAudiences audience;
     private final MiniMessage miniMessage;
@@ -95,4 +99,16 @@ private void send(@NonNull CommandSender sender, @NonNull List<String> messages)
             send(sender, message);
         }
     }
+
+    private static final List<String> COMMANDS = ImmutableList.of("about", "reload", "help");
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        final List<String> completions = new ArrayList<>();
+        if (args.length < 2 && sender.hasPermission("minimotd.admin")) {
+            StringUtil.copyPartialMatches(args[0], COMMANDS, completions);
+            Collections.sort(completions);
+        }
+        return completions;
+    }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -3,6 +3,7 @@ version: ${project.version}
 main: xyz.jpenilla.minimotd.spigot.MiniMOTD
 softdepend: [Prisma]
 authors: [jmp]
+api-version: 1.13
 description: Set the server list MOTD using MiniMessage!
 website: https://www.spigotmc.org/resources/minimotd.81254/
 commands: