Marge from Upstream

* 172a5a6 (upstream/master, master) Add Fabric as a platform type (GeyserMC#1376) [Camotoy] * 90656a9 Jenkins improvements (GeyserMC#1368) [Camotoy] * ba6f174 Add support for fishing rods pulling Bedrock players (GeyserMC#1355) [Camotoy] * 772cb24 Forward keep alive packets to the client (GeyserMC#1344) [Camotoy] * 3c4cde9 Tipped arrow translation (GeyserMC#1331) [Camotoy] * aee9ccc DoorSoundInteractionHandler: ignore iron [trap]doors (GeyserMC#1343) [Camotoy] * 9bb52af BedrockRespawnTranslator: prevent some respawn bugs (GeyserMC#1346) [Camotoy] * a5b00e0 Villager trade fixes (GeyserMC#1350) [Camotoy]
bundabrg · Oct 8, 2020 · 74c6be6 · 74c6be6
2 parents be7e61f + 0be2440
commit 74c6be6
Show file tree

Hide file tree

Showing 30 changed files with 466 additions and 63 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         jdk 'Java 8'
     }
     options {
-        buildDiscarder(logRotator(artifactNumToKeepStr: '5'))
+        buildDiscarder(logRotator(artifactNumToKeepStr: '20'))
     }
     stages {
         stage ('Build') {
@@ -32,9 +32,40 @@ pipeline {
 
     post {
         always {
+            script {
+                def changeLogSets = currentBuild.changeSets
+                def message = "**Changes:**"
+
+                if (changeLogSets.size() == 0) {
+                    message += "\n*No changes.*"
+                } else {
+                    def repositoryUrl = scm.userRemoteConfigs[0].url.replace(".git", "")
+                    def count = 0;
+                    def extra = 0;
+                    for (int i = 0; i < changeLogSets.size(); i++) {
+                        def entries = changeLogSets[i].items
+                        for (int j = 0; j < entries.length; j++) {
+                            if (count <= 10) {
+                                def entry = entries[j]
+                                def commitId = entry.commitId.substring(0, 6)
+                                message += "\n   - [`${commitId}`](${repositoryUrl}/commit/${entry.commitId}) ${entry.msg}"
+                                count++
+                            } else {
+                                extra++;
+                            }
+                        }
+                    }
+
+                    if (extra != 0) {
+                        message += "\n   - ${extra} more commits"
+                    }
+                }
+
+                env.changes = message
+            }
             deleteDir()
             withCredentials([string(credentialsId: 'geyser-discord-webhook', variable: 'DISCORD_WEBHOOK')]) {
-                discordSend description: "**Build:** [${currentBuild.id}](${env.BUILD_URL})\n**Status:** [${currentBuild.currentResult}](${env.BUILD_URL})\n\n[**Artifacts on Jenkins**](https://ci.nukkitx.com/job/Geyser)", footer: 'NukkitX Jenkins', link: env.BUILD_URL, successful: currentBuild.resultIsBetterOrEqualTo('SUCCESS'), title: "${env.JOB_NAME} #${currentBuild.id}", webhookURL: DISCORD_WEBHOOK
+                discordSend description: "**Build:** [${currentBuild.id}](${env.BUILD_URL})\n**Status:** [${currentBuild.currentResult}](${env.BUILD_URL})\n${changes}\n\n[**Artifacts on Jenkins**](https://ci.nukkitx.com/job/Geyser)", footer: 'Cloudburst Jenkins', link: env.BUILD_URL, successful: currentBuild.resultIsBetterOrEqualTo('SUCCESS'), title: "${env.JOB_NAME} #${currentBuild.id}", webhookURL: DISCORD_WEBHOOK
             }
         }
     }

diff --git a/...d/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandExecutor.java b/...d/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandExecutor.java
@@ -64,10 +64,10 @@ public void execute(CommandSender sender, String[] args) {
                     sender.sendMessage(TextComponent.fromLegacyText(ChatColor.RED + message));
                     return;
                 }
-                getCommand(args[0]).execute(new BungeeCommandSender(sender), Arrays.copyOfRange(args, 1, args.length-1));
+                getCommand(args[0]).execute(new BungeeCommandSender(sender), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
             }
         } else {
-            getCommand("help").execute(new BungeeCommandSender(sender), Arrays.copyOfRange(args, 1, args.length-1));
+            getCommand("help").execute(new BungeeCommandSender(sender), new String[0]);
         }
     }
 

diff --git a/...pigot/src/main/java/org/geysermc/platform/spigot/command/GeyserSpigotCommandExecutor.java b/...pigot/src/main/java/org/geysermc/platform/spigot/command/GeyserSpigotCommandExecutor.java
@@ -59,11 +59,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                     sender.sendMessage(ChatColor.RED + message);
                     return true;
                 }
-                getCommand(args[0]).execute(new SpigotCommandSender(sender), Arrays.copyOfRange(args, 1, args.length-1));
+                getCommand(args[0]).execute(new SpigotCommandSender(sender), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
                 return true;
             }
         } else {
-            getCommand("help").execute(new SpigotCommandSender(sender), Arrays.copyOfRange(args, 1, args.length-1));
+            getCommand("help").execute(new SpigotCommandSender(sender), new String[0]);
             return true;
         }
         return true;

diff --git a/...ponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandExecutor.java b/...ponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandExecutor.java
@@ -59,10 +59,10 @@ public CommandResult process(CommandSource source, String arguments) throws Comm
                     source.sendMessage(Text.of(ChatColor.RED + LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail")));
                     return CommandResult.success();
                 }
-                getCommand(args[0]).execute(new SpongeCommandSender(source), Arrays.copyOfRange(args, 1, args.length-1));
+                getCommand(args[0]).execute(new SpongeCommandSender(source), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
             }
         } else {
-            getCommand("help").execute(new SpongeCommandSender(source), Arrays.copyOfRange(args, 1, args.length-1));
+            getCommand("help").execute(new SpongeCommandSender(source), new String[0]);
         }
         return CommandResult.success();
     }

diff --git a/...y/src/main/java/org/geysermc/platform/velocity/command/GeyserVelocityCommandExecutor.java b/...y/src/main/java/org/geysermc/platform/velocity/command/GeyserVelocityCommandExecutor.java
@@ -53,10 +53,10 @@ public void execute(CommandSource source, String[] args) {
                     source.sendMessage(TextComponent.of(ChatColor.RED + LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail")));
                     return;
                 }
-                getCommand(args[0]).execute(new VelocityCommandSender(source), Arrays.copyOfRange(args, 1, args.length-1));
+                getCommand(args[0]).execute(new VelocityCommandSender(source), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
             }
         } else {
-            getCommand("help").execute(new VelocityCommandSender(source), Arrays.copyOfRange(args, 1, args.length-1));
+            getCommand("help").execute(new VelocityCommandSender(source), new String[0]);
         }
     }
 

diff --git a/connector/pom.xml b/connector/pom.xml
@@ -109,9 +109,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.GeyserMC</groupId>
+            <groupId>com.github.steveice10</groupId>
             <artifactId>mcprotocollib</artifactId>
-            <version>e4a3aa636a</version>
+            <version>976c2d0f89</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
@@ -336,15 +336,16 @@ public WorldManager getWorldManager() {
     }
 
     /**
-     * Get the production status of the current runtime.
-     * Will return true if the version number is not 'DEV'.
-     * Should only happen in compiled jars.
+     * Whether to use XML reflections in the jar or manually find the reflections.
+     * Will return true if the version number is not 'DEV' and the platform is not Fabric.
+     * On Fabric - it complains about being unable to create a default XMLReader.
+     * On other platforms this should only be true in compiled jars.
      *
-     * @return If we are in a production build/environment
+     * @return whether to use XML reflections
      */
-    public boolean isProduction() {
+    public boolean useXmlReflections() {
         //noinspection ConstantConditions
-        return !"DEV".equals(GeyserConnector.VERSION);
+        return !this.getPlatformType().equals(PlatformType.FABRIC) && !"DEV".equals(GeyserConnector.VERSION);
     }
 
     /**

diff --git a/connector/src/main/java/org/geysermc/connector/common/PlatformType.java b/connector/src/main/java/org/geysermc/connector/common/PlatformType.java
@@ -34,10 +34,11 @@ public enum PlatformType {
 
     ANDROID("Android"),
     BUNGEECORD("BungeeCord"),
+    FABRIC("Fabric"),
     SPIGOT("Spigot"),
     SPONGE("Sponge"),
     STANDALONE("Standalone"),
     VELOCITY("Velocity");
 
-    private String platformName;
+    private final String platformName;
 }
diff --git a/connector/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java b/connector/src/main/java/org/geysermc/connector/entity/TippedArrowEntity.java
@@ -25,12 +25,39 @@
 
 package org.geysermc.connector.entity;
 
+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 org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.item.TippedArrowPotion;
 
+/**
+ * Internally this is known as TippedArrowEntity but is used with tipped arrows and normal arrows
+ */
 public class TippedArrowEntity extends AbstractArrowEntity {
 
     public TippedArrowEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
         super(entityId, geyserId, entityType, position, motion, rotation);
     }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        // Arrow potion effect color
+        if (entityMetadata.getId() == 9) {
+            int potionColor = (int) entityMetadata.getValue();
+            // -1 means no color
+            if (potionColor == -1) {
+                metadata.remove(EntityData.CUSTOM_DISPLAY);
+            } else {
+                TippedArrowPotion potion = TippedArrowPotion.getByJavaColor(potionColor);
+                if (potion != null && potion.getJavaColor() != -1) {
+                    metadata.put(EntityData.CUSTOM_DISPLAY, (byte) potion.getBedrockId());
+                } else {
+                    metadata.remove(EntityData.CUSTOM_DISPLAY);
+                }
+            }
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -28,6 +28,7 @@
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.exception.request.InvalidCredentialsException;
 import com.github.steveice10.mc.auth.exception.request.RequestException;
+import com.github.steveice10.mc.protocol.MinecraftConstants;
 import com.github.steveice10.mc.protocol.MinecraftProtocol;
 import com.github.steveice10.mc.protocol.data.SubProtocol;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
@@ -139,8 +140,6 @@ public class GeyserSession implements CommandSender {
      */
     private final Object2LongMap<Vector3i> itemFrameCache = new Object2LongOpenHashMap<>();
 
-    private DataCache<Packet> javaPacketCache;
-
     @Setter
     private Vector2i lastChunkPosition = null;
     private int renderDistance;
@@ -206,6 +205,12 @@ public void setSneaking(boolean sneaking) {
     @Setter
     private long lastWindowCloseTime = 0;
 
+    /**
+     * Saves the timestamp of the last keep alive packet
+     */
+    @Setter
+    private long lastKeepAliveTimestamp = 0;
+
     @Setter
     private VillagerTrade[] villagerTrades;
     @Setter
@@ -313,8 +318,6 @@ public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServ
         this.playerEntity = new PlayerEntity(new GameProfile(UUID.randomUUID(), "unknown"), 1, 1, Vector3f.ZERO, Vector3f.ZERO, Vector3f.ZERO, this);
         this.inventory = new PlayerInventory();
 
-        this.javaPacketCache = new DataCache<>();
-
         this.spawned = false;
         this.loggedIn = false;
 
@@ -437,6 +440,8 @@ public void authenticate(String username, String password) {
                 }
 
                 downstream = new Client(remoteServer.getAddress(), remoteServer.getPort(), protocol, new TcpSessionFactory());
+                // Let Geyser handle sending the keep alive
+                downstream.getSession().setFlag(MinecraftConstants.AUTOMATIC_KEEP_ALIVE_MANAGEMENT, false);
                 downstream.getSession().addListener(new SessionAdapter() {
                     @Override
                     public void packetSending(PacketSendingEvent event) {

diff --git a/...or/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java b/...or/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java
@@ -25,7 +25,6 @@
 
 package org.geysermc.connector.network.translators;
 
-import com.github.steveice10.mc.protocol.packet.ingame.server.ServerKeepAlivePacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.ServerPlayerListDataPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateLightPacket;
 import com.github.steveice10.packetlib.packet.Packet;
@@ -53,7 +52,7 @@ public class PacketTranslatorRegistry<T> {
     public static final ObjectArrayList<Class<?>> IGNORED_PACKETS = new ObjectArrayList<>();
 
     static {
-        Reflections ref = GeyserConnector.getInstance().isProduction() ? FileUtils.getReflections("org.geysermc.connector.network.translators") : new Reflections("org.geysermc.connector.network.translators");
+        Reflections ref = GeyserConnector.getInstance().useXmlReflections() ? FileUtils.getReflections("org.geysermc.connector.network.translators") : new Reflections("org.geysermc.connector.network.translators");
         PacketTranslatorRegistryEvent event = EventManager.getInstance().triggerEvent(new PacketTranslatorRegistryEvent(
                 ref.getTypesAnnotatedWith(Translator.class))
         ).getEvent();
@@ -82,7 +81,6 @@ public class PacketTranslatorRegistry<T> {
             }
         }
 
-        IGNORED_PACKETS.add(ServerKeepAlivePacket.class); // Handled by MCProtocolLib
         IGNORED_PACKETS.add(ServerUpdateLightPacket.class); // Light is handled on Bedrock for us
         IGNORED_PACKETS.add(ServerPlayerListDataPacket.class); // Cant be implemented in bedrock
     }

diff --git a/...ctor/network/session/cache/DataCache.java → ...BedrockNetworkStackLatencyTranslator.java b/...ctor/network/session/cache/DataCache.java → ...BedrockNetworkStackLatencyTranslator.java
@@ -23,15 +23,24 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.connector.network.session.cache;
+package org.geysermc.connector.network.translators.bedrock;
 
-import lombok.Getter;
+import com.github.steveice10.mc.protocol.packet.ingame.client.ClientKeepAlivePacket;
+import com.nukkitx.protocol.bedrock.packet.NetworkStackLatencyPacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.network.translators.Translator;
 
-import java.util.HashMap;
-import java.util.Map;
-
-public class DataCache<T> {
+/**
+ * Used to send the keep alive packet back to the server
+ */
+@Translator(packet = NetworkStackLatencyPacket.class)
+public class BedrockNetworkStackLatencyTranslator extends PacketTranslator<NetworkStackLatencyPacket> {
 
-    @Getter
-    private Map<String, T> cachedValues = new HashMap<String, T>();
+    @Override
+    public void translate(NetworkStackLatencyPacket packet, GeyserSession session) {
+        // The client sends a timestamp back but it's rounded and therefore unreliable when we need the exact number
+        ClientKeepAlivePacket keepAlivePacket = new ClientKeepAlivePacket(session.getLastKeepAliveTimestamp());
+        session.sendDownstreamPacket(keepAlivePacket);
+    }
 }
diff --git a/...ain/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java b/...ain/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java
@@ -28,7 +28,10 @@
 import com.github.steveice10.mc.protocol.data.game.ClientRequest;
 import com.github.steveice10.mc.protocol.packet.ingame.client.ClientRequestPacket;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket;
 import com.nukkitx.protocol.bedrock.packet.RespawnPacket;
+import com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket;
+import org.geysermc.connector.entity.PlayerEntity;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
@@ -39,12 +42,30 @@ public class BedrockRespawnTranslator extends PacketTranslator<RespawnPacket> {
     @Override
     public void translate(RespawnPacket packet, GeyserSession session) {
         if (packet.getState() == RespawnPacket.State.CLIENT_READY) {
-            if (!session.isSpawned()) { // Otherwise when immediate respawn is on the client never loads
-                RespawnPacket respawnPacket = new RespawnPacket();
-                respawnPacket.setRuntimeEntityId(0);
-                respawnPacket.setPosition(Vector3f.ZERO);
-                respawnPacket.setState(RespawnPacket.State.SERVER_READY);
-                session.sendUpstreamPacket(respawnPacket);
+            // Previously we only sent the respawn packet before the server finished loading
+            // The message included was 'Otherwise when immediate respawn is on the client never loads'
+            // But I assume the new if statement below fixes that problem
+            RespawnPacket respawnPacket = new RespawnPacket();
+            respawnPacket.setRuntimeEntityId(0);
+            respawnPacket.setPosition(Vector3f.ZERO);
+            respawnPacket.setState(RespawnPacket.State.SERVER_READY);
+            session.sendUpstreamPacket(respawnPacket);
+
+            if (session.isSpawned()) {
+                // Client might be stuck; resend spawn information
+                PlayerEntity entity = session.getPlayerEntity();
+                if (entity == null) return;
+                SetEntityDataPacket entityDataPacket = new SetEntityDataPacket();
+                entityDataPacket.setRuntimeEntityId(entity.getGeyserId());
+                entityDataPacket.getMetadata().putAll(entity.getMetadata());
+                session.sendUpstreamPacket(entityDataPacket);
+
+                MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
+                movePlayerPacket.setRuntimeEntityId(entity.getGeyserId());
+                movePlayerPacket.setPosition(entity.getPosition());
+                movePlayerPacket.setRotation(entity.getBedrockRotation());
+                movePlayerPacket.setMode(MovePlayerPacket.Mode.RESPAWN);
+                session.sendUpstreamPacket(movePlayerPacket);
             }
 
             ClientRequestPacket javaRespawnPacket = new ClientRequestPacket(ClientRequest.RESPAWN);

diff --git a/...ava/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java b/...ava/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java
@@ -35,9 +35,8 @@
 import lombok.AllArgsConstructor;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
-import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 
 @AllArgsConstructor
 public class BlockInventoryHolder extends InventoryHolder {
@@ -60,7 +59,7 @@ public void prepareInventory(InventoryTranslator translator, GeyserSession sessi
                 .putInt("x", position.getX())
                 .putInt("y", position.getY())
                 .putInt("z", position.getZ())
-                .putString("CustomName", LocaleUtils.getLocaleString(inventory.getTitle(), session.getClientData().getLanguageCode())).build();
+                .putString("CustomName", inventory.getTitle()).build();
         BlockEntityDataPacket dataPacket = new BlockEntityDataPacket();
         dataPacket.setData(tag);
         dataPacket.setBlockPosition(position);

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java
@@ -197,7 +197,9 @@ public static ItemEntry getItem(ItemStack stack) {
      */
     public static ItemEntry getItem(ItemData data) {
         for (ItemEntry itemEntry : ITEM_ENTRIES.values()) {
-            if (itemEntry.getBedrockId() == data.getId() && (itemEntry.getBedrockData() == data.getDamage() || itemEntry.getJavaIdentifier().endsWith("potion"))) {
+            if (itemEntry.getBedrockId() == data.getId() && (itemEntry.getBedrockData() == data.getDamage() ||
+                    // Make exceptions for potions and tipped arrows, whose damage values can vary
+                    (itemEntry.getJavaIdentifier().endsWith("potion") || itemEntry.getJavaIdentifier().equals("minecraft:arrow")))) {
                 return itemEntry;
             }
         }

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
@@ -67,7 +67,7 @@ public static void init() {
 
     static {
         /* Load item translators */
-        Reflections ref = GeyserConnector.getInstance().isProduction() ? FileUtils.getReflections("org.geysermc.connector.network.translators.item") : new Reflections("org.geysermc.connector.network.translators.item");
+        Reflections ref = GeyserConnector.getInstance().useXmlReflections() ? FileUtils.getReflections("org.geysermc.connector.network.translators.item") : new Reflections("org.geysermc.connector.network.translators.item");
         Set<Class<?>> itemRemapperClasses = EventManager.getInstance().triggerEvent(new ItemRemapperRegistryEvent(
                 ref.getTypesAnnotatedWith(ItemRemapper.class)
         )).getEvent().getRegisteredTranslators();

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/Potion.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/Potion.java
@@ -48,7 +48,7 @@ public enum Potion {
     STRONG_SWIFTNESS(16),
     LONG_SWIFTNESS(15),
     SLOWNESS(17),
-    STRONG_SLOWNESS(18), //does not exist
+    STRONG_SLOWNESS(42),
     LONG_SLOWNESS(18),
     WATER_BREATHING(19),
     LONG_WATER_BREATHING(20),