Updated plugin messages to 1.13+

Author: Rigner

blccpsapibukkit/src/main/java/net/badlion/blccpsapibukkit/BlcCpsApiBukkit.java

@@ -21,12 +21,6 @@ public class BlcCpsApiBukkit extends JavaPlugin {
 
     @Override
     public void onEnable() {
-        // Only support <= 1.12.2 at the moment, we will add 1.13 support when BLC 1.13 is ready
-        if (this.getServer().getBukkitVersion().startsWith("1.13")) {
-            this.getLogger().log(Level.SEVERE, "BLC CPS API is not currently compatible with 1.13 Minecraft. Check back later for updates.");
-            this.getPluginLoader().disablePlugin(this);
-            return;
-        }
 
         if (!this.getDataFolder().exists()) {
             if (!this.getDataFolder().mkdir()) {
@@ -38,7 +32,7 @@ public void onEnable() {
             this.conf = loadConf(new File(this.getDataFolder(), "config.json"));
 
             // Register channel
-            this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BLC|C");
+            this.getServer().getMessenger().registerOutgoingPluginChannel(this, "badlion:cps");
 
             // Only register the listener if the config loads successfully
             this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);

blccpsapibukkit/src/main/java/net/badlion/blccpsapibukkit/listener/PlayerListener.java

@@ -128,7 +128,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
 
         // Create data we need for packet;
-        String channel = "BLC|C";
+        String channel = "badlion:cps";
         byte[] message = BlcCpsApiBukkit.GSON_NON_PRETTY.toJson(this.plugin.getConf()).getBytes();
 
         try {

blccpsapibungee/src/main/java/net/badlion/blccpsapibungee/listener/PlayerListener.java

@@ -5,7 +5,6 @@
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.PluginMessage;
 
 public class PlayerListener implements Listener {
@@ -16,13 +15,10 @@ public PlayerListener(BlcCpsApiBungee plugin) {
 		this.plugin = plugin;
 	}
 
-
 	@EventHandler
 	public void onLogin(PostLoginEvent event) {
 		// Send the click speed limitation to players when they login to the proxy. A notification will appear on the Badlion Client so they know their CPS has been limited
 		ProxiedPlayer player = event.getPlayer();
-		if (player.getPendingConnection().getVersion() <= ProtocolConstants.MINECRAFT_1_12_2) { // do not send to 1.13+ clients, this would break the connection
-			player.unsafe().sendPacket( new PluginMessage( "BLC|C", BlcCpsApiBungee.GSON_NON_PRETTY.toJson( this.plugin.getConf() ).getBytes(), false ) );
-		}
+		player.unsafe().sendPacket(new PluginMessage("badlion:cps", BlcCpsApiBungee.GSON_NON_PRETTY.toJson(this.plugin.getConf()).getBytes(), false));
 	}
 }