feat: adapt allay-api 0.17.0 and bump plugin version to 0.3.0

Author: smartcmd

build.gradle.kts

@@ -2,27 +2,38 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("java-library")
+    id("org.allaymc.gradle.plugin") version "0.2.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 group = "me.daoge.daogelab"
 description = "A DgLab plugin for Minecraft: Bedrock Edition running in Allay platform"
-version = "0.2.0"
+version = "0.3.0"
 
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
+allay {
+    api = "0.17.0"
+
+    plugin {
+        entrance = ".DaogeLab"
+        name = "DaogeLab"
+        description = "A DgLab plugin for Minecraft: Bedrock Edition running in Allay platform"
+        authors += "daoge_cmd"
+        api = ">=0.17.0"
+    }
+}
+
 repositories {
     mavenCentral()
-    maven("https://central.sonatype.com/repository/maven-snapshots/")
     maven("https://storehouse.okaeri.eu/repository/maven-public/")
 }
 
 dependencies {
-    compileOnly(group = "org.allaymc.allay", name = "api", version = "0.14.0")
     compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.34")
 
     implementation(group = "io.netty", name = "netty-codec-http", version = "4.1.97.Final")

src/main/java/me/daoge/daogelab/DaogeLab.java

@@ -10,7 +10,7 @@
 import me.daoge.daogelab.mode.Mode;
 import me.daoge.daogelab.network.WebSocketServer;
 import org.allaymc.api.eventbus.EventHandler;
-import org.allaymc.api.eventbus.event.player.PlayerQuitEvent;
+import org.allaymc.api.eventbus.event.server.PlayerQuitEvent;
 import org.allaymc.api.plugin.Plugin;
 import org.allaymc.api.registry.Registries;
 import org.allaymc.api.server.Server;
@@ -77,7 +77,7 @@ public void onDisable() {
 
     @EventHandler
     protected void onPlayerQuit(PlayerQuitEvent event) {
-        var connection = ConnectionManager.getByPlayer(event.getPlayer());
+        var connection = ConnectionManager.getByPlayer(event.getPlayer().getControlledEntity());
         if (connection != null) {
             connection.disconnect();
         }

src/main/java/me/daoge/daogelab/DaogeLabCommand.java

@@ -5,14 +5,14 @@
 import org.allaymc.api.command.Command;
 import org.allaymc.api.command.SenderType;
 import org.allaymc.api.command.tree.CommandTree;
-import org.allaymc.api.permission.PermissionGroups;
+import org.allaymc.api.permission.OpPermissionCalculator;
 import org.allaymc.api.utils.TextFormat;
 
 public class DaogeLabCommand extends Command {
 
     public DaogeLabCommand() {
-        super("dglab", "DgLab main command");
-        this.permissions.forEach(PermissionGroups.MEMBER::addPermission);
+        super("dglab", "DgLab main command", "dglab.command");
+        OpPermissionCalculator.NON_OP_PERMISSIONS.addAll(this.permissions);
     }
 
     @Override
@@ -25,19 +25,19 @@ public void prepareCommandTree(CommandTree tree) {
                                     DaogeLab.INSTANCE.getConfig().useHttps() ? "wss" : "ws",
                                     DaogeLab.INSTANCE.getConfig().address(),
                                     DaogeLab.INSTANCE.getConfig().publicPort(),
-                                    player.getLoginData().getUuid().toString());
+                                    player.getController().getLoginData().getUuid().toString());
                     if (QRCodeUtils.showQRCode(player, qrText)) {
                         player.sendTranslatable(TextFormat.YELLOW + "%daogelab:scan_qr_code");
                         return context.success();
                     }
 
                     return context.fail();
-                }, SenderType.PLAYER)
+                }, SenderType.ACTUAL_PLAYER)
                 .root()
                 .key("disconnect")
                 .exec((context, player) -> {
                     QRCodeUtils.clearQRCode(player);
-                    var connection = ConnectionManager.getByUUID(player.getLoginData().getUuid());
+                    var connection = ConnectionManager.getByUUID(player.getController().getLoginData().getUuid());
                     if (connection != null) {
                         connection.disconnect();
                         player.sendTranslatable(TextFormat.YELLOW + "%daogelab:disconnecting");
@@ -46,7 +46,7 @@ public void prepareCommandTree(CommandTree tree) {
                         player.sendTranslatable(TextFormat.RED + "%daogelab:not_connected");
                         return context.fail();
                     }
-                }, SenderType.PLAYER)
+                }, SenderType.ACTUAL_PLAYER)
                 .root()
                 .key("switchmode")
                 .str("modename")

src/main/java/me/daoge/daogelab/api/Connection.java

@@ -60,9 +60,9 @@ public void handle(String text) {
         switch (message.type()) {
             case BIND -> {
                 sendMessage(DgLabMessage.bind(message.clientId(), message.targetId(), "200"));
-                this.player = Server.getInstance().getPlayerManager().getPlayers().get(UUID.fromString(clientId));
-                this.scoreboard = new Scoreboard("DgLab Strength of " + player.getOriginName());
-                this.scoreboard.addViewer(player, DisplaySlot.SIDEBAR);
+                this.player = Server.getInstance().getPlayerManager().getPlayers().get(UUID.fromString(clientId)).getControlledEntity();
+                this.scoreboard = new Scoreboard("DgLab Strength of " + player.getDisplayName());
+                this.scoreboard.addViewer(player.getController(), DisplaySlot.SIDEBAR);
             }
             case MSG -> {
                 Matcher matcher = STRENGTH_PATTERN.matcher(message.message());

src/main/java/me/daoge/daogelab/api/ConnectionManager.java

@@ -12,7 +12,7 @@ public class ConnectionManager {
     public static final Set<Connection> CONNECTIONS = new CopyOnWriteArraySet<>();
 
     public static Connection getByPlayer(EntityPlayer player) {
-        return getByUUID(player.getLoginData().getUuid());
+        return getByUUID(player.getUniqueId());
     }
 
     public static Connection getByUUID(UUID uuid) {

src/main/java/me/daoge/daogelab/network/DgLabHandler.java

@@ -45,7 +45,10 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                 return;
             }
 
-            QRCodeUtils.clearQRCode(player);
+            var entity = player.getControlledEntity();
+            if (entity != null) {
+                QRCodeUtils.clearQRCode(entity);
+            }
         }
     }
 }