Updated plugin messages to 1.13+

Author: Rigner

blcmodapibukkit/src/main/java/net/badlion/blcmodapibukkit/BlcModApiBukkit.java

@@ -23,12 +23,6 @@ public class BlcModApiBukkit 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 Mod 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()) {
@@ -40,7 +34,7 @@ public void onEnable() {
             this.conf = loadConf(new File(this.getDataFolder(), "config.json"));
 
             // Register channel
-            this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BLC|M");
+            this.getServer().getMessenger().registerOutgoingPluginChannel(this, "badlion:mods");
 
             // Only register the listener if the config loads successfully
             this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);

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

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

blcmodapibungee/src/main/java/net/badlion/blcmodapibungee/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 {
@@ -21,8 +20,6 @@ public PlayerListener(BlcModApiBungee plugin) {
 	public void onLogin(PostLoginEvent event) {
 		// Send the disallowed mods to players when they login to the proxy. A notification will appear on the Badlion Client so they know the mod was disabled
 		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|M", BlcModApiBungee.GSON_NON_PRETTY.toJson( this.plugin.getConf().getModsDisallowed() ).getBytes(), false ) );
-		}
+		player.unsafe().sendPacket(new PluginMessage("badlion:mods", BlcModApiBungee.GSON_NON_PRETTY.toJson(this.plugin.getConf().getModsDisallowed()).getBytes(), false));
 	}
 }