Merge branch 'master' of https://github.com/GeyserMC/Geyser into floodgate-2.0

README.md

@@ -3,7 +3,7 @@
 [![forthebadge made-with-java](http://ForTheBadge.com/images/badges/made-with-java.svg)](https://java.com/)
 
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
-[![Build Status](https://ci.nukkitx.com/job/Geyser/job/master/badge/icon)](https://ci.nukkitx.com/job/Geyser/job/master/)
+[![Build Status](https://ci.nukkitx.com/job/Geyser/job/master/badge/icon)](https://ci.nukkitx.com/job/GeyserMC/job/Geyser/job/master/)
 [![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](http://discord.geysermc.org/)
 [![HitCount](http://hits.dwyl.io/Geyser/GeyserMC.svg)](http://hits.dwyl.io/Geyser/GeyserMC)
 [![Crowdin](https://badges.crowdin.net/geyser/localized.svg)](https://translate.geysermc.org/)

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

@@ -153,8 +153,13 @@ public class GeyserSession implements CommandSender {
     @Setter
     private boolean interacting;
 
+    /**
+     * Stores the last position of the block the player interacted with. This can either be a block that the client
+     * placed or an existing block the player interacted with (for example, a chest). <br>
+     * Initialized as (0, 0, 0) so it is always not-null.
+     */
     @Setter
-    private Vector3i lastInteractionPosition;
+    private Vector3i lastInteractionPosition = Vector3i.ZERO;
 
     private boolean manyDimPackets = false;
     private ServerRespawnPacket lastDimPacket = null;
@@ -190,6 +195,13 @@ public class GeyserSession implements CommandSender {
     @Setter
     private long lastHitTime;
 
+    /**
+     * Store the last time the player interacted. Used to fix a right-click spam bug.
+     * See https://github.com/GeyserMC/Geyser/issues/503 for context.
+     */
+    @Setter
+    private long lastInteractionTime;
+
     private boolean reducedDebugInfo = false;
 
     @Setter

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java

@@ -39,8 +39,10 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlaye
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.data.LevelEventType;
+import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
 import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
 import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
+import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
 import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket;
 import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
 import org.geysermc.connector.entity.CommandBlockMinecartEntity;
@@ -78,6 +80,17 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
             case ITEM_USE:
                 switch (packet.getActionType()) {
                     case 0:
+                        // Check to make sure the client isn't spamming interaction
+                        // Based on Nukkit 1.0, with changes to ensure holding down still works
+                        boolean hasAlreadyClicked = System.currentTimeMillis() - session.getLastInteractionTime() < 110.0 &&
+                                packet.getBlockPosition().distanceSquared(session.getLastInteractionPosition()) < 0.00001;
+                        session.setLastInteractionPosition(packet.getBlockPosition());
+                        if (hasAlreadyClicked) {
+                            break;
+                        } else {
+                            // Only update the interaction time if it's valid - that way holding down still works.
+                            session.setLastInteractionTime(System.currentTimeMillis());
+                        }
 
                         // Bedrock sends block interact code for a Java entity so we send entity code back to Java
                         if (BlockTranslator.isItemFrame(packet.getBlockRuntimeId()) &&
@@ -101,12 +114,24 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
                         session.sendDownstreamPacket(blockPacket);
 
                         // Otherwise boats will not be able to be placed in survival and buckets wont work on mobile
-                        // Check actions, otherwise buckets may be activated when block inventories are accessed
+                        if (packet.getItemInHand() != null && packet.getItemInHand().getId() == ItemRegistry.BOAT.getBedrockId()) {
-                        if (packet.getItemInHand() != null && (packet.getItemInHand().getId() == ItemRegistry.BOAT.getBedrockId() ||
-                                packet.getItemInHand().getId() == ItemRegistry.BUCKET.getBedrockId()) && !packet.getActions().isEmpty()) {
                             ClientPlayerUseItemPacket itemPacket = new ClientPlayerUseItemPacket(Hand.MAIN_HAND);
                             session.sendDownstreamPacket(itemPacket);
                         }
+                        // Check actions, otherwise buckets may be activated when block inventories are accessed
+                        // But don't check actions if the item damage is 0
+                        else if (packet.getItemInHand() != null && packet.getItemInHand().getId() == ItemRegistry.BUCKET.getBedrockId() &&
+                                (packet.getItemInHand().getDamage() == 0 || !packet.getActions().isEmpty())) {
+                            ClientPlayerUseItemPacket itemPacket = new ClientPlayerUseItemPacket(Hand.MAIN_HAND);
+                            session.sendDownstreamPacket(itemPacket);
+
+                            // Let the server decide if the bucket item should change, not the client, and revert the changes the client made
+                            InventorySlotPacket slotPacket = new InventorySlotPacket();
+                            slotPacket.setContainerId(ContainerId.INVENTORY);
+                            slotPacket.setSlot(packet.getHotbarSlot());
+                            slotPacket.setItem(packet.getItemInHand());
+                            session.sendUpstreamPacket(slotPacket);
+                        }
 
                         if (packet.getActions().isEmpty()) {
                             if (session.getOpPermissionLevel() >= 2 && session.getGameMode() == GameMode.CREATIVE) {
@@ -153,7 +178,6 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
                             session.setLastBlockPlacePosition(blockPos);
                             session.setLastBlockPlacedId(handItem.getJavaIdentifier());
                         }
-                        session.setLastInteractionPosition(packet.getBlockPosition());
                         session.setInteracting(true);
                         break;
                     case 1:
@@ -164,14 +188,14 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
                         }
 
                         // Handled in ITEM_USE
-                        if (packet.getItemInHand() != null && packet.getItemInHand().getId() == ItemRegistry.BUCKET.getBedrockId()) {
+                        if (packet.getItemInHand() != null && packet.getItemInHand().getId() == ItemRegistry.BUCKET.getBedrockId() &&
+                                // Normal bucket, water bucket, lava bucket
+                                (packet.getItemInHand().getDamage() == 0 || packet.getItemInHand().getDamage() == 8 || packet.getItemInHand().getDamage() == 10)) {
                             break;
                         }
 
                         ClientPlayerUseItemPacket useItemPacket = new ClientPlayerUseItemPacket(Hand.MAIN_HAND);
                         session.sendDownstreamPacket(useItemPacket);
-                        // Used for sleeping in beds
-                        session.setLastInteractionPosition(packet.getBlockPosition());
                         break;
                     case 2:
                         int blockState = session.getConnector().getWorldManager().getBlockAt(session, packet.getBlockPosition().getX(), packet.getBlockPosition().getY(), packet.getBlockPosition().getZ());

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java

@@ -43,7 +43,7 @@ public class BedrockRespawnTranslator extends PacketTranslator<RespawnPacket> {
                 RespawnPacket respawnPacket = new RespawnPacket();
                 respawnPacket.setRuntimeEntityId(0);
                 respawnPacket.setPosition(Vector3f.ZERO);
-                respawnPacket.setState(RespawnPacket.State.SERVER_SEARCHING);
+                respawnPacket.setState(RespawnPacket.State.SERVER_READY);
                 session.sendUpstreamPacket(respawnPacket);
             }
 

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockSetPlayerGameTypeTranslator.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.bedrock.entity.player;
+
+import com.nukkitx.protocol.bedrock.packet.SetPlayerGameTypePacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.network.translators.Translator;
+
+/**
+ * In vanilla Bedrock, if you have operator status, this sets the player's gamemode without confirmation from the server.
+ * Since we have a custom server option to request the gamemode, we just reset the gamemode and ignore this.
+ */
+@Translator(packet = SetPlayerGameTypePacket.class)
+public class BedrockSetPlayerGameTypeTranslator extends PacketTranslator<SetPlayerGameTypePacket> {
+
+    @Override
+    public void translate(SetPlayerGameTypePacket packet, GeyserSession session) {
+        // no
+        SetPlayerGameTypePacket playerGameTypePacket = new SetPlayerGameTypePacket();
+        playerGameTypePacket.setGamemode(session.getGameMode().ordinal());
+        session.sendUpstreamPacket(playerGameTypePacket);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/CraftingInventoryTranslator.java

@@ -30,12 +30,9 @@ import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
 import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
 import com.nukkitx.protocol.bedrock.data.inventory.InventoryActionData;
 import com.nukkitx.protocol.bedrock.data.inventory.InventorySource;
-import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
-import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.inventory.updater.CursorInventoryUpdater;
-import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
 import org.geysermc.connector.utils.InventoryUtils;
 
 import java.util.List;
@@ -48,7 +45,7 @@ public class CraftingInventoryTranslator extends BlockInventoryTranslator {
     @Override
     public int bedrockSlotToJava(InventoryActionData action) {
         if (action.getSlot() == 50) {
-            GeyserConnector.getInstance().getLogger().warning("Slot 50 found, please report: " + action);
+            // Slot 50 is used for crafting with a controller.
             return 0;
         }
 

connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java

@@ -28,6 +28,7 @@ package org.geysermc.connector.network.translators.java;
 import com.github.steveice10.mc.protocol.data.game.entity.player.HandPreference;
 import com.github.steveice10.mc.protocol.data.game.setting.ChatVisibility;
 import com.github.steveice10.mc.protocol.data.game.setting.SkinPart;
+import com.github.steveice10.mc.protocol.packet.ingame.client.ClientPluginMessagePacket;
 import com.github.steveice10.mc.protocol.packet.ingame.client.ClientSettingsPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.ServerJoinGamePacket;
 import com.nukkitx.protocol.bedrock.data.GameRuleData;
@@ -38,6 +39,7 @@ import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
 import org.geysermc.connector.utils.DimensionUtils;
+import org.geysermc.connector.utils.PluginMessageUtils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -92,6 +94,8 @@ public class JavaJoinGameTranslator extends PacketTranslator<ServerJoinGamePacke
         ClientSettingsPacket clientSettingsPacket = new ClientSettingsPacket(locale, (byte) session.getRenderDistance(), ChatVisibility.FULL, true, skinParts, HandPreference.RIGHT_HAND);
         session.sendDownstreamPacket(clientSettingsPacket);
 
+        session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:brand", PluginMessageUtils.getGeyserBrandData()));
+
         if (!newDimension.equals(entity.getDimension())) {
             DimensionUtils.switchDimension(session, newDimension);
         }

connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityCollectItemTranslator.java

@@ -23,26 +23,32 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.connector.network.translators.java.world;
+package org.geysermc.connector.network.translators.java.entity;
 
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityCollectItemPacket;
+import com.nukkitx.protocol.bedrock.data.LevelEventType;
+import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
 import com.nukkitx.protocol.bedrock.packet.TakeItemEntityPacket;
 import org.geysermc.connector.entity.Entity;
+import org.geysermc.connector.entity.ExpOrbEntity;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
 
+/**
+ * This packet is called whenever a player picks up an item.
+ * In Java, this is called for item entities, experience orbs and arrows
+ * Bedrock uses it for arrows and item entities, but not experience orbs.
+ */
 @Translator(packet = ServerEntityCollectItemPacket.class)
-public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityCollectItemPacket> {
+public class JavaEntityCollectItemTranslator extends PacketTranslator<ServerEntityCollectItemPacket> {
 
     @Override
     public void translate(ServerEntityCollectItemPacket packet, GeyserSession session) {
-        // This is the definition of translating - both packets take the same values
+        // Collected entity is the other entity
-        TakeItemEntityPacket takeItemEntityPacket = new TakeItemEntityPacket();
-        // Collected entity is the item
         Entity collectedEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectedEntityId());
         if (collectedEntity == null) return;
-        // Collector is the entity picking up the item
+        // Collector is the entity 'picking up' the item
         Entity collectorEntity;
         if (packet.getCollectorEntityId() == session.getPlayerEntity().getEntityId()) {
             collectorEntity = session.getPlayerEntity();
@@ -50,8 +56,19 @@ public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityColl
             collectorEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectorEntityId());
         }
         if (collectorEntity == null) return;
+        if (collectedEntity instanceof ExpOrbEntity) {
+            // Player just picked up an experience orb
+            LevelEventPacket xpPacket = new LevelEventPacket();
+            xpPacket.setType(LevelEventType.SOUND_EXPERIENCE_ORB_PICKUP);
+            xpPacket.setPosition(collectedEntity.getPosition());
+            xpPacket.setData(0);
+            session.sendUpstreamPacket(xpPacket);
+        } else {
+            // Item is being picked up (visual only)
+            TakeItemEntityPacket takeItemEntityPacket = new TakeItemEntityPacket();
             takeItemEntityPacket.setRuntimeEntityId(collectorEntity.getGeyserId());
             takeItemEntityPacket.setItemRuntimeEntityId(collectedEntity.getGeyserId());
             session.sendUpstreamPacket(takeItemEntityPacket);
         }
     }
+}

connector/src/main/java/org/geysermc/connector/scoreboard/Objective.java

@@ -83,7 +83,7 @@ public class Objective {
 
     public void setScore(String id, int score) {
         if (scores.containsKey(id)) {
-            scores.get(id).setScore(score).setUpdateType(UpdateType.ADD);
+            scores.get(id).setScore(score);
             return;
         }
         registerScore(id, score);

connector/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java

@@ -26,7 +26,6 @@
 package org.geysermc.connector.scoreboard;
 
 import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition;
-import com.nukkitx.protocol.bedrock.BedrockPacket;
 import com.nukkitx.protocol.bedrock.data.ScoreInfo;
 import com.nukkitx.protocol.bedrock.packet.RemoveObjectivePacket;
 import com.nukkitx.protocol.bedrock.packet.SetDisplayObjectivePacket;
@@ -153,6 +152,10 @@ public class Scoreboard {
             boolean globalAdd = objective.getUpdateType() == ADD;
             boolean globalRemove = objective.getUpdateType() == REMOVE;
 
+            // Track if any scores changed
+            // Used to delete and resend scoreboard objectives; otherwise they won't update on Bedrock
+            boolean scoreChanged = false;
+
             for (Score score : objective.getScores().values()) {
                 Team team = score.getTeam();
 
@@ -187,6 +190,10 @@ public class Scoreboard {
                 if (remove) {
                     removeScores.add(score.getCachedInfo());
                 }
+
+                if (add || remove) {
+                    scoreChanged = true;
+                }
                 // score is pending to be updated, so we use the current score as the old score
                 score.setOldScore(score.getScore());
 
@@ -198,7 +205,7 @@ public class Scoreboard {
                 score.setUpdateType(NOTHING);
             }
 
-            if (globalRemove || globalUpdate) {
+            if (globalRemove || globalUpdate || scoreChanged) {
                 RemoveObjectivePacket removeObjectivePacket = new RemoveObjectivePacket();
                 removeObjectivePacket.setObjectiveId(objective.getObjectiveName());
                 session.sendUpstreamPacket(removeObjectivePacket);
@@ -208,7 +215,7 @@ public class Scoreboard {
                 }
             }
 
-            if (globalAdd || globalUpdate) {
+            if (globalAdd || globalUpdate || scoreChanged) {
                 SetDisplayObjectivePacket displayObjectivePacket = new SetDisplayObjectivePacket();
                 displayObjectivePacket.setObjectiveId(objective.getObjectiveName());
                 displayObjectivePacket.setDisplayName(objective.getDisplayName());

connector/src/main/java/org/geysermc/connector/utils/PluginMessageUtils.java

@@ -23,39 +23,30 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.connector.network.translators.java;
+package org.geysermc.connector.utils;
 
 import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.translators.PacketTranslator;
-import org.geysermc.connector.network.translators.Translator;
-
-import com.github.steveice10.mc.protocol.packet.ingame.client.ClientPluginMessagePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.server.ServerPluginMessagePacket;
 
 import java.nio.charset.StandardCharsets;
 
-@Translator(packet = ServerPluginMessagePacket.class)
+public class PluginMessageUtils {
-public class JavaPluginMessageTranslator extends PacketTranslator<ServerPluginMessagePacket> {
 
-    private static byte[] brandData;
+    private static final byte[] BRAND_DATA;
 
     static {
         byte[] data = GeyserConnector.NAME.getBytes(StandardCharsets.UTF_8);
         byte[] varInt = writeVarInt(data.length);
-        brandData = new byte[varInt.length + data.length];
+        BRAND_DATA = new byte[varInt.length + data.length];
-        System.arraycopy(varInt, 0, brandData, 0, varInt.length);
+        System.arraycopy(varInt, 0, BRAND_DATA, 0, varInt.length);
-        System.arraycopy(data, 0, brandData, varInt.length, data.length);
+        System.arraycopy(data, 0, BRAND_DATA, varInt.length, data.length);
     }
 
-
+    /**
-    @Override
+     * Get the prebuilt brand as a byte array
-    public void translate(ServerPluginMessagePacket packet, GeyserSession session) {
+     * @return the brand information of the Geyser client
-        if (packet.getChannel().equals("minecraft:brand")) {
+     */
-            session.sendDownstreamPacket(
+    public static byte[] getGeyserBrandData() {
-                    new ClientPluginMessagePacket(packet.getChannel(), brandData)
+        return BRAND_DATA;
-            );
-        }
     }
 
     private static byte[] writeVarInt(int value) {