Merge remote-tracking branch 'origin/master' into floodgate-2.0

# Conflicts: # connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java # connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
bundabrg · Mar 10, 2021 · 643098e · 643098e
2 parents cea1627 + f0e6e55
commit 643098e
Show file tree

Hide file tree

Showing 56 changed files with 1,159 additions and 507 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -35,8 +35,8 @@ pipeline {
                 rtMavenResolver(
                         id: "maven-resolver",
                         serverId: "opencollab-artifactory",
-                        releaseRepo: "release",
-                        snapshotRepo: "snapshot"
+                        releaseRepo: "maven-deploy-release",
+                        snapshotRepo: "maven-deploy-snapshot"
                 )
                 rtMavenRun(
                         pom: 'pom.xml',

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have now joined us here!
 
-### Currently supporting Minecraft Bedrock v1.16.100 - v1.16.201 and Minecraft Java v1.16.4 - v1.16.5.
+### Currently supporting Minecraft Bedrock v1.16.100 - v1.16.210 and Minecraft Java v1.16.4 - v1.16.5.
 
 ## Setting Up
 Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set up Geyser.

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -16,10 +16,6 @@
             <id>spigot-public</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/public/</url>
         </repository>
-        <repository>
-            <id>bukkit-public</id>
-            <url>https://repo.md-5.net/content/repositories/public/</url>
-        </repository>
         <repository>
             <id>sponge-repo</id>
             <url>https://repo.spongepowered.org/repository/maven-public/</url>

diff --git a/...igot/src/main/java/org/geysermc/platform/spigot/world/GeyserSpigotBlockPlaceListener.java b/...igot/src/main/java/org/geysermc/platform/spigot/world/GeyserSpigotBlockPlaceListener.java
@@ -53,11 +53,11 @@ public void place(final BlockPlaceEvent event) {
                 placeBlockSoundPacket.setPosition(Vector3f.from(event.getBlockPlaced().getX(), event.getBlockPlaced().getY(), event.getBlockPlaced().getZ()));
                 placeBlockSoundPacket.setBabySound(false);
                 if (worldManager.isLegacy()) {
-                    placeBlockSoundPacket.setExtraData(BlockTranslator.getBedrockBlockId(worldManager.getBlockAt(session,
+                    placeBlockSoundPacket.setExtraData(session.getBlockTranslator().getBedrockBlockId(worldManager.getBlockAt(session,
                             event.getBlockPlaced().getX(), event.getBlockPlaced().getY(), event.getBlockPlaced().getZ())));
                 } else {
                     String javaBlockId = event.getBlockPlaced().getBlockData().getAsString();
-                    placeBlockSoundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaIdBlockMap().getOrDefault(javaBlockId, BlockTranslator.JAVA_AIR_ID)));
+                    placeBlockSoundPacket.setExtraData(session.getBlockTranslator().getBedrockBlockId(BlockTranslator.getJavaIdBlockMap().getOrDefault(javaBlockId, BlockTranslator.JAVA_AIR_ID)));
                 }
                 placeBlockSoundPacket.setIdentifier(":");
                 session.sendUpstreamPacket(placeBlockSoundPacket);

diff --git a/connector/pom.xml b/connector/pom.xml
@@ -12,6 +12,8 @@
 
     <properties>
         <netty.version>4.1.59.Final</netty.version>
+        <fastutil.version>8.5.2</fastutil.version>
+        <adventure.version>4.5.0</adventure.version>
     </properties>
 
     <dependencies>
@@ -40,24 +42,20 @@
         </dependency>
         <dependency>
             <groupId>com.github.CloudburstMC.Protocol</groupId>
-            <artifactId>bedrock-v422</artifactId>
-            <version>294e7e5</version>
+            <artifactId>bedrock-v428</artifactId>
+            <version>42da92f</version>
             <scope>compile</scope>
             <exclusions>
-                <exclusion>
-                    <groupId>net.sf.trove4j</groupId>
-                    <artifactId>trove</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.nukkitx.network</groupId>
                     <artifactId>raknet</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.github.CloudburstMC.Network</groupId>
+            <groupId>com.nukkitx.network</groupId>
             <artifactId>raknet</artifactId>
-            <version>a94d2dd</version>
+            <version>1.6.26-20210217.205834-2</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -69,61 +67,61 @@
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-int-int-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-int-float-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-long-long-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-object-long-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-int-byte-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-int-double-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-int-boolean-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-object-int-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-object-byte-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.nukkitx.fastutil</groupId>
             <artifactId>fastutil-object-object-maps</artifactId>
-            <version>8.3.1</version>
+            <version>${fastutil.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -225,25 +223,25 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.5.0</version>
+            <version>${adventure.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-gson</artifactId>
-            <version>4.5.0</version>
+            <version>${adventure.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.5.0</version>
+            <version>${adventure.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-gson-legacy-impl</artifactId>
-            <version>4.5.0</version>
+            <version>${adventure.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/connector/src/main/java/org/geysermc/connector/entity/BoatEntity.java b/connector/src/main/java/org/geysermc/connector/entity/BoatEntity.java
@@ -28,6 +28,7 @@
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.entity.EntityData;
+import com.nukkitx.protocol.bedrock.packet.AnimatePacket;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 
@@ -105,27 +106,38 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
             metadata.put(EntityData.VARIANT, entityMetadata.getValue());
         } else if (entityMetadata.getId() == 11) {
             isPaddlingLeft = (boolean) entityMetadata.getValue();
-            if (!isPaddlingLeft) {
-                metadata.put(EntityData.ROW_TIME_LEFT, 0f);
-            }
-            else {
+            if (isPaddlingLeft) {
                 // Java sends simply "true" and "false" (is_paddling_left), Bedrock keeps sending packets as you're rowing
                 // This is an asynchronous method that emulates Bedrock rowing until "false" is sent.
                 paddleTimeLeft = 0f;
-                session.getConnector().getGeneralThreadPool().execute(() ->
-                        updateLeftPaddle(session, entityMetadata)
-                );
+                if (!this.passengers.isEmpty()) {
+                    // Get the entity by the first stored passenger and convey motion in this manner
+                    Entity entity = session.getEntityCache().getEntityByJavaId(this.passengers.iterator().nextLong());
+                    if (entity != null) {
+                        session.getConnector().getGeneralThreadPool().execute(() ->
+                                updateLeftPaddle(session, entity)
+                        );
+                    }
+                }
+            } else {
+                // Indicate that the row position should be reset
+                metadata.put(EntityData.ROW_TIME_LEFT, 0.0f);
             }
         }
         else if (entityMetadata.getId() == 12) {
             isPaddlingRight = (boolean) entityMetadata.getValue();
-            if (!isPaddlingRight) {
-                metadata.put(EntityData.ROW_TIME_RIGHT, 0f);
-            } else {
+            if (isPaddlingRight) {
                 paddleTimeRight = 0f;
-                session.getConnector().getGeneralThreadPool().execute(() ->
-                        updateRightPaddle(session, entityMetadata)
-                );
+                if (!this.passengers.isEmpty()) {
+                    Entity entity = session.getEntityCache().getEntityByJavaId(this.passengers.iterator().nextLong());
+                    if (entity != null) {
+                        session.getConnector().getGeneralThreadPool().execute(() ->
+                                updateRightPaddle(session, entity)
+                        );
+                    }
+                }
+            } else {
+                metadata.put(EntityData.ROW_TIME_RIGHT, 0.0f);
             }
         } else if (entityMetadata.getId() == 13) {
             // Possibly - I don't think this does anything?
@@ -135,27 +147,46 @@ else if (entityMetadata.getId() == 12) {
         super.updateBedrockMetadata(entityMetadata, session);
     }
 
-    public void updateLeftPaddle(GeyserSession session, EntityMetadata entityMetadata) {
+    @Override
+    public void updateBedrockMetadata(GeyserSession session) {
+        super.updateBedrockMetadata(session);
+
+        // As these indicate to reset rowing, remove them until it is time to send them out again.
+        metadata.remove(EntityData.ROW_TIME_LEFT);
+        metadata.remove(EntityData.ROW_TIME_RIGHT);
+    }
+
+    private void updateLeftPaddle(GeyserSession session, Entity rower) {
         if (isPaddlingLeft) {
             paddleTimeLeft += ROWING_SPEED;
-            metadata.put(EntityData.ROW_TIME_LEFT, paddleTimeLeft);
-            super.updateBedrockMetadata(entityMetadata, session);
+            sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_LEFT, paddleTimeLeft);
+
             session.getConnector().getGeneralThreadPool().schedule(() ->
-                    updateLeftPaddle(session, entityMetadata),
+                    updateLeftPaddle(session, rower),
                     100,
                     TimeUnit.MILLISECONDS
             );
-        }}
+        }
+    }
 
-    public void updateRightPaddle(GeyserSession session, EntityMetadata entityMetadata) {
+    private void updateRightPaddle(GeyserSession session, Entity rower) {
         if (isPaddlingRight) {
             paddleTimeRight += ROWING_SPEED;
-            metadata.put(EntityData.ROW_TIME_RIGHT, paddleTimeRight);
-            super.updateBedrockMetadata(entityMetadata, session);
+            sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_RIGHT, paddleTimeRight);
+
             session.getConnector().getGeneralThreadPool().schedule(() ->
-                            updateRightPaddle(session, entityMetadata),
+                            updateRightPaddle(session, rower),
                     100,
                     TimeUnit.MILLISECONDS
             );
-        }}
+        }
+    }
+
+    private void sendAnimationPacket(GeyserSession session, Entity rower, AnimatePacket.Action action, float rowTime) {
+        AnimatePacket packet = new AnimatePacket();
+        packet.setRuntimeEntityId(rower.getGeyserId());
+        packet.setAction(action);
+        packet.setRowingTime(rowTime);
+        session.sendUpstreamPacket(packet);
+    }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java b/connector/src/main/java/org/geysermc/connector/entity/CommandBlockMinecartEntity.java
@@ -31,7 +31,6 @@
 import net.kyori.adventure.text.Component;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 import org.geysermc.connector.network.translators.chat.MessageTranslator;
 
 public class CommandBlockMinecartEntity extends DefaultBlockMinecartEntity {
@@ -60,8 +59,8 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
      * By default, the command block shown is purple on Bedrock, which does not match Java Edition's orange.
      */
     @Override
-    public void updateDefaultBlockMetadata() {
-        metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.BEDROCK_RUNTIME_COMMAND_BLOCK_ID);
+    public void updateDefaultBlockMetadata(GeyserSession session) {
+        metadata.put(EntityData.DISPLAY_ITEM, session.getBlockTranslator().getBedrockRuntimeCommandBlockId());
         metadata.put(EntityData.DISPLAY_OFFSET, 6);
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java b/connector/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.java
@@ -30,7 +30,6 @@
 import com.nukkitx.protocol.bedrock.data.entity.EntityData;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 
 /**
  * This class is used as a base for minecarts with a default block to display like furnaces and spawners
@@ -44,10 +43,15 @@ public class DefaultBlockMinecartEntity extends MinecartEntity {
     public DefaultBlockMinecartEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
         super(entityId, geyserId, entityType, position, motion, rotation);
 
-        updateDefaultBlockMetadata();
         metadata.put(EntityData.CUSTOM_DISPLAY, (byte) 1);
     }
 
+    @Override
+    public void spawnEntity(GeyserSession session) {
+        updateDefaultBlockMetadata(session);
+        super.spawnEntity(session);
+    }
+
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
 
@@ -56,7 +60,7 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
             customBlock = (int) entityMetadata.getValue();
 
             if (showCustomBlock) {
-                metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId(customBlock));
+                metadata.put(EntityData.DISPLAY_ITEM, session.getBlockTranslator().getBedrockBlockId(customBlock));
             }
         }
 
@@ -73,16 +77,16 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
         if (entityMetadata.getId() == 12) {
             if ((boolean) entityMetadata.getValue()) {
                 showCustomBlock = true;
-                metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId(customBlock));
+                metadata.put(EntityData.DISPLAY_ITEM, session.getBlockTranslator().getBedrockBlockId(customBlock));
                 metadata.put(EntityData.DISPLAY_OFFSET, customBlockOffset);
             } else {
                 showCustomBlock = false;
-                updateDefaultBlockMetadata();
+                updateDefaultBlockMetadata(session);
             }
         }
 
         super.updateBedrockMetadata(entityMetadata, session);
     }
 
-    public void updateDefaultBlockMetadata() { }
+    public void updateDefaultBlockMetadata(GeyserSession session) { }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/entity/Entity.java b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
@@ -273,13 +273,9 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
                     metadata.getFlags().setFlag(EntityFlag.SWIMMING, ((xd & 0x10) == 0x10) && metadata.getFlags().getFlag(EntityFlag.SPRINTING)); // Otherwise swimming is enabled on older servers
                     metadata.getFlags().setFlag(EntityFlag.GLIDING, (xd & 0x80) == 0x80);
 
-                    if ((xd & 0x20) == 0x20) {
-                        // Armour stands are handled in their own class
-                        if (!this.is(ArmorStandEntity.class)) {
-                            metadata.getFlags().setFlag(EntityFlag.INVISIBLE, true);
-                        }
-                    } else {
-                        metadata.getFlags().setFlag(EntityFlag.INVISIBLE, false);
+                    // Armour stands are handled in their own class
+                    if (!this.is(ArmorStandEntity.class)) {
+                        metadata.getFlags().setFlag(EntityFlag.INVISIBLE, (xd & 0x20) == 0x20);
                     }
 
                     // Shield code