Master

.github/actions/build/action.yml

@@ -35,7 +35,7 @@ runs:
         distribution: adopt-hotspot
 
     - name: Setup maven repo
-      uses: s4u/maven-settings-action@v2.6.0
+      uses: s4u/maven-settings-action@v3.1.0
       if: ${{ inputs.perform_deploy == 'true' }}
       with:
         servers: |
@@ -56,7 +56,7 @@ runs:
       shell: bash
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: waterdog
         path: target/Waterdog.jar

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim
+FROM eclipse-temurin:17-jdk-jammy
 
 EXPOSE 19132/tcp
 EXPOSE 19132/udp

README.md

@@ -24,9 +24,7 @@ If you haven't used WaterdogPE before, we recommend you to take a look at our [s
 *Please note that the config from the old Waterdog (Bungee) is not compatible with WaterdogPE*
 
 ### Supported Software
-Our focus lies on PowerNukkitX 2.0 since its the only server software that's worth using. (Besides Nukkit Mot maybe?)
-
-You can find list of currently supported/unsupported software [here](https://docs.waterdog.dev/books/waterdogpe-setup/page/software-compatibility).
+Our focus lies on PowerNukkitX since its the only server software that's worth using.
 
 ## Compiling
 

pom.xml

@@ -8,14 +8,14 @@
     </description>
     <groupId>xyz.syodo.software</groupId>
     <artifactId>syodogpe</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.4</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.release>17</maven.compiler.release>
         <raklib.version>1.0.0.CR3-SNAPSHOT</raklib.version>
-        <protocol.version>3.0.0.Beta5-SNAPSHOT</protocol.version>
+        <protocol.version>3.0.0.Beta11-SNAPSHOT</protocol.version>
         <log4j2.version>2.17.1</log4j2.version>
         <jline.version>3.23.0</jline.version>
         <netty.version>4.1.101.Final</netty.version>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.31</version>
+            <version>1.32</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.30</version>
+            <version>1.18.34</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -135,12 +135,6 @@
             <version>${jline.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.1.0-jre</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>net.minecrell</groupId>
             <artifactId>terminalconsoleappender</artifactId>

src/main/java/dev/waterdog/waterdogpe/VersionInfo.java

@@ -22,9 +22,9 @@ public class VersionInfo {
 
     public static final boolean DEFAULT_DEBUG = true;
 
-    private final String baseVersion = "2.0.2";
-    private final String buildVersion = "syo";
-    private final String author = "WaterdogTEAM, Syodo Development";
+    private final String baseVersion = "2.0.4";
+    private final String buildVersion = "#build";
+    private final String author = "WaterdogTEAM";
     private final int metricsId = 15678;
     private final int latestProtocolVersion;
 

src/main/java/dev/waterdog/waterdogpe/event/EventPriority.java

@@ -18,8 +18,8 @@
 /**
  * Represents the Priority of an event.
  * Default event priority, if not specific otherwise, is NORMAL.
- * HIGHEST is called first,
- * LOWEST is called last.
+ * LOWEST is called first,
+ * HIGHEST is called last.
  */
 public enum EventPriority {
     LOWEST,

src/main/java/dev/waterdog/waterdogpe/event/defaults/PlayerDisconnectedEvent.java

@@ -26,11 +26,20 @@
 @AsyncEvent
 public class PlayerDisconnectedEvent extends PlayerEvent {
 
-    private final String reason;
+    private final CharSequence reason;
 
-    public PlayerDisconnectedEvent(ProxiedPlayer player, String reason) {
+    public PlayerDisconnectedEvent(ProxiedPlayer player, CharSequence reason) {
         super(player);
-
         this.reason = reason;
     }
+
+
+    public String getReason() {
+        return this.getReason(String.class);
+    }
+
+    public <T extends CharSequence> T getReason(Class<T> type) {
+        return type.cast(this.reason);
+    }
+
 }

src/main/java/dev/waterdog/waterdogpe/event/defaults/PreClientDataSetEvent.java

@@ -22,6 +22,7 @@
 import lombok.Setter;
 
 import java.security.KeyPair;
+import java.util.UUID;
 
 /**
  * Called right when we decoded the player's LoginPacket data in the handshake(HandshakeUpstreamHandler).
@@ -32,13 +33,20 @@ public class PreClientDataSetEvent extends Event {
 
     private final ProxiedConnection connection;
     private final JsonObject clientData;
-    private final JsonObject extraData;
+    @Getter
+    private final String xuid;
+    @Getter
+    private final UUID uuid;
+    @Getter
+    private final String displayName;
     @Setter
     private KeyPair keyPair;
 
-    public PreClientDataSetEvent(JsonObject clientData, JsonObject extraData, KeyPair keyPair, ProxiedConnection playerSession) {
+    public PreClientDataSetEvent(JsonObject clientData, String xuid, UUID uuid, String displayName, KeyPair keyPair, ProxiedConnection playerSession) {
         this.clientData = clientData;
-        this.extraData = extraData;
+        this.xuid = xuid;
+        this.uuid = uuid;
+        this.displayName = displayName;
         this.connection = playerSession;
         this.keyPair = keyPair;
     }

src/main/java/dev/waterdog/waterdogpe/network/connection/peer/BedrockServerSession.java

@@ -77,7 +77,7 @@ public void sendPacketImmediately(BedrockPacket packet) {
     }
 
     @Override
-    public void disconnect(String reason, boolean hideReason) {
+    public void disconnect(CharSequence reason, boolean hideReason) {
         this.checkForClosed();
 
         DisconnectPacket packet = new DisconnectPacket();
@@ -128,8 +128,10 @@ public BedrockPacketHandler getPacketHandler() {
         return this.packetHandler;
     }
 
-    public void addDisconnectListener(Consumer<String> listener) {
-        this.getPeer().getChannel().closeFuture().addListener(future -> listener.accept(this.getDisconnectReason()));
+    public void addDisconnectListener(Consumer<CharSequence> listener) {
+        this.getPeer().getChannel().closeFuture().addListener(future -> {
+            listener.accept(this.getDisconnectReason());
+        });
     }
 
     public int getSubClientId() {

src/main/java/dev/waterdog/waterdogpe/network/connection/peer/ProxiedBedrockPeer.java

@@ -120,8 +120,8 @@ public void sendPacket(BedrockBatchWrapper wrapper) {
     private void sendPacket0(BedrockBatchWrapper wrapper) {
         if (!(wrapper.getAlgorithm() instanceof PacketCompressionAlgorithm)) {
             wrapper.setCompressed(null); // Do not allow using unsupported algorithms when sending to client
-        } else if (this.version.isBefore(ProtocolVersion.MINECRAFT_PE_1_20_60) &&
-                !Objects.equals(wrapper.getAlgorithm(), this.compressionStrategy.getDefaultCompression().getAlgorithm())) {
+        } else if (this.version.isBefore(ProtocolVersion.MINECRAFT_PE_1_20_60) && (this.compressionStrategy == null || 
+                !Objects.equals(wrapper.getAlgorithm(), this.compressionStrategy.getDefaultCompression().getAlgorithm()))) {
             wrapper.setCompressed(null); // Before 1.20.60 dynamic compression is not supported
         }
 

src/main/java/dev/waterdog/waterdogpe/network/protocol/ProtocolCodecs.java

@@ -112,12 +112,20 @@ public class ProtocolCodecs {
         HANDLED_PACKETS.add(LevelChunkPacket.class);
         HANDLED_PACKETS.add(ClientCheatAbilityPacket.class);
         HANDLED_PACKETS.add(ToastRequestPacket.class);
+        HANDLED_PACKETS.add(MovementEffectPacket.class);
         HANDLED_PACKETS.add(PlaySoundPacket.class);
         HANDLED_PACKETS.add(PlayerAuthInputPacket.class);
         HANDLED_PACKETS.add(ModalFormRequestPacket.class);
         HANDLED_PACKETS.add(ModalFormResponsePacket.class);
         HANDLED_PACKETS.add(BlockEntityDataPacket.class);
-
+        HANDLED_PACKETS.add(InventoryTransactionPacket.class);
+        HANDLED_PACKETS.add(ClientboundCloseFormPacket.class);
+        HANDLED_PACKETS.add(UpdateEquipPacket.class);
+        HANDLED_PACKETS.add(CameraInstructionPacket.class);
+        HANDLED_PACKETS.add(MovementPredictionSyncPacket.class);
+        HANDLED_PACKETS.add(PlayerUpdateEntityOverridesPacket.class);
+        HANDLED_PACKETS.add(PlayerLocationPacket.class);
+        HANDLED_PACKETS.add(CameraPresetsPacket.class);
     }
 
     private static final List<ProtocolCodecUpdater> UPDATERS = new ObjectArrayList<>();

src/main/java/dev/waterdog/waterdogpe/network/protocol/ProtocolVersion.java

@@ -64,6 +64,16 @@
 import org.cloudburstmc.protocol.bedrock.codec.v686.Bedrock_v686;
 import org.cloudburstmc.protocol.bedrock.codec.v712.Bedrock_v712;
 import org.cloudburstmc.protocol.bedrock.codec.v729.Bedrock_v729;
+import org.cloudburstmc.protocol.bedrock.codec.v748.Bedrock_v748;
+import org.cloudburstmc.protocol.bedrock.codec.v766.Bedrock_v766;
+import org.cloudburstmc.protocol.bedrock.codec.v776.Bedrock_v776;
+import org.cloudburstmc.protocol.bedrock.codec.v786.Bedrock_v786;
+import org.cloudburstmc.protocol.bedrock.codec.v800.Bedrock_v800;
+import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818;
+import org.cloudburstmc.protocol.bedrock.codec.v819.Bedrock_v819;
+import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
+import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844;
+import org.cloudburstmc.protocol.bedrock.codec.v859.Bedrock_v859;
 
 @ToString(exclude = {"defaultCodec", "bedrockCodec"})
 public enum ProtocolVersion {
@@ -112,7 +122,20 @@ public enum ProtocolVersion {
     MINECRAFT_PE_1_21_0(685, Bedrock_v685.CODEC),
     MINECRAFT_PE_1_21_2(686, Bedrock_v686.CODEC),
     MINECRAFT_PE_1_21_20(712, Bedrock_v712.CODEC),
-    MINECRAFT_PE_1_21_30(729, Bedrock_v729.CODEC);
+    MINECRAFT_PE_1_21_30(729, Bedrock_v729.CODEC),
+    MINECRAFT_PE_1_21_40(748, Bedrock_v748.CODEC),
+    MINECRAFT_PE_1_21_50_29(765, 766, Bedrock_v766.CODEC),
+    MINECRAFT_PE_1_21_50(766, Bedrock_v766.CODEC),
+    MINECRAFT_PE_1_21_60(776, Bedrock_v776.CODEC),
+    MINECRAFT_PE_1_21_70(786, Bedrock_v786.CODEC),
+    MINECRAFT_PE_1_21_80(800, Bedrock_v800.CODEC),
+    MINECRAFT_PE_1_21_90(818, Bedrock_v818.CODEC),
+    MINECRAFT_PE_1_21_93(819, Bedrock_v819.CODEC),
+    MINECRAFT_PE_1_21_100(827, Bedrock_v827.CODEC),
+    MINECRAFT_PE_1_21_110(843, 844, Bedrock_v844.CODEC),
+    MINECRAFT_PE_1_21_111(844, Bedrock_v844.CODEC),
+    MINECRAFT_PE_1_21_120(859, Bedrock_v859.CODEC),
+    ;
 
     private static final ProtocolVersion[] VALUES = values();
     private static final Int2ObjectMap<ProtocolVersion> VERSIONS = new Int2ObjectOpenHashMap<>();

src/main/java/dev/waterdog/waterdogpe/network/protocol/handler/ProxyBatchBridge.java

@@ -28,6 +28,7 @@
 import org.cloudburstmc.protocol.bedrock.netty.BedrockPacketWrapper;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacketHandler;
+import org.cloudburstmc.protocol.bedrock.packet.DisconnectPacket;
 import org.cloudburstmc.protocol.common.PacketSignal;
 import org.cloudburstmc.protocol.common.util.Preconditions;
 
@@ -53,7 +54,11 @@ public void onBedrockBatch(ProxiedConnection source, BedrockBatchWrapper batch)
         while (iterator.hasNext()) {
             BedrockPacketWrapper wrapper = iterator.next();
             if (wrapper.getPacket() == null) {
-                this.decodePacket(wrapper, source.getPacketDirection());
+                try {
+                    this.decodePacket(wrapper, source.getPacketDirection());
+                } catch (Exception e) {
+                    source.sendPacket(new DisconnectPacket());
+                }
             }
 
             PacketSignal signal = this.handlePacket(wrapper.getPacket());

src/main/java/dev/waterdog/waterdogpe/network/protocol/handler/downstream/AbstractDownstreamHandler.java

@@ -22,10 +22,21 @@
 import dev.waterdog.waterdogpe.network.protocol.rewrite.RewriteMaps;
 import dev.waterdog.waterdogpe.player.ProxiedPlayer;
 import dev.waterdog.waterdogpe.network.protocol.Signals;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
+import org.cloudburstmc.protocol.bedrock.data.camera.CameraPreset;
+import org.cloudburstmc.protocol.bedrock.data.command.CommandData;
+import org.cloudburstmc.protocol.bedrock.data.command.CommandEnumConstraint;
+import org.cloudburstmc.protocol.bedrock.data.command.CommandEnumData;
 import org.cloudburstmc.protocol.bedrock.data.command.*;
+import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
+import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleNamedDefinition;
 import org.cloudburstmc.protocol.bedrock.netty.BedrockBatchWrapper;
 import org.cloudburstmc.protocol.bedrock.packet.*;
+import org.cloudburstmc.protocol.common.NamedDefinition;
 import org.cloudburstmc.protocol.common.PacketSignal;
+import org.cloudburstmc.protocol.common.SimpleDefinitionRegistry;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -42,6 +53,18 @@ public AbstractDownstreamHandler(ProxiedPlayer player, ClientConnection connecti
         this.connection = connection;
     }
 
+    @Override
+    public PacketSignal handle(ItemComponentPacket packet) {
+        if (!this.player.acceptItemComponentPacket()) {
+            return Signals.CANCEL;
+        }
+        player.setAcceptItemComponentPacket(false);
+        if (this.player.getProtocol().isAfterOrEqual(ProtocolVersion.MINECRAFT_PE_1_21_60)) {
+            setItemDefinitions(packet.getItems());
+        }
+        return PacketSignal.UNHANDLED;
+    }
+
     @Override
     public void sendProxiedBatch(BedrockBatchWrapper batch) {
         if (this.player.getConnection().isConnected()) {
@@ -68,6 +91,7 @@ public PacketSignal handle(AvailableCommandsPacket packet) {
 
         for (Command command : this.player.getProxy().getCommandMap().getCommands().values()) {
             if (command.getPermission() == null || this.player.hasPermission(command.getPermission())) {
+                packet.getCommands().stream().filter(commandData -> commandData.getName().equalsIgnoreCase(command.getName())).findFirst().ifPresent(commandData -> packet.getCommands().remove(commandData));
                 packet.getCommands().add(command.getCommandData());
             }
         }
@@ -80,7 +104,6 @@ public PacketSignal handle(AvailableCommandsPacket packet) {
         ListIterator<CommandData> iterator = packet.getCommands().listIterator();
         while (iterator.hasNext()) {
             CommandData command = iterator.next();
-
             if (command.getAliases() != null) {
                 continue;
             }
@@ -96,6 +119,16 @@ public PacketSignal handle(AvailableCommandsPacket packet) {
                     Collections.emptyList(),
                     command.getOverloads()));
         }
+
+        for(CommandData command : packet.getCommands()) {
+            for(CommandOverloadData overload : command.getOverloads()) {
+                for(CommandParamData param : overload.getOverloads()) {
+                    if(param.getType() == null) {
+                        param.setType(CommandParam.UNKNOWN);
+                    }
+                }
+            }
+        }
         return PacketSignal.HANDLED;
     }
 
@@ -119,6 +152,12 @@ public PacketSignal handle(ClientCacheMissResponsePacket packet) {
         return PacketSignal.UNHANDLED;
     }
 
+    @Override
+    public PacketSignal handle(CameraPresetsPacket packet) {
+        setCameraPresetDefinitions(packet.getPresets());
+        return PacketSignal.UNHANDLED;
+    }
+
     protected PacketSignal onPlayStatus(PlayStatusPacket packet, Consumer<String> failedTask, ClientConnection connection) {
         String message;
         switch (packet.getStatus()) {
@@ -148,4 +187,32 @@ public RewriteMaps getRewriteMaps() {
     public ClientConnection getConnection() {
         return connection;
     }
+
+    protected void setItemDefinitions(Collection<ItemDefinition> definitions) {
+        BedrockCodecHelper codecHelper = this.player.getConnection()
+                .getPeer()
+                .getCodecHelper();
+        SimpleDefinitionRegistry.Builder<ItemDefinition> itemRegistry = SimpleDefinitionRegistry.builder();
+        IntSet runtimeIds = new IntOpenHashSet();
+        for (ItemDefinition definition : definitions) {
+            if (runtimeIds.add(definition.getRuntimeId())) {
+                itemRegistry.add(definition);
+            } else {
+                player.getLogger().warning("[{}|{}] has duplicate item definition: {}", this.player.getName(), this.connection.getServerInfo().getServerName(), definition);
+            }
+        }
+        codecHelper.setItemDefinitions(itemRegistry.build());
+    }
+
+    protected void setCameraPresetDefinitions(Collection<CameraPreset> presets) {
+        BedrockCodecHelper codecHelper = this.player.getConnection()
+                .getPeer()
+                .getCodecHelper();
+        SimpleDefinitionRegistry.Builder<NamedDefinition> registry = SimpleDefinitionRegistry.builder();
+        int id = 0;
+        for (CameraPreset preset : presets) {
+            registry.add(new SimpleNamedDefinition(preset.getIdentifier(), id++));
+        }
+        codecHelper.setCameraPresetDefinitions(registry.build());
+    }
 }