Merge branch 'master' of git://github.com/GeyserMC/Geyser into Geyser…

…MC-master
RoryMCDev · Apr 14, 2021 · 9757c12 · 9757c12
2 parents 922abc3 + 22c492f
commit 9757c12
Show file tree

Hide file tree

Showing 58 changed files with 2,689 additions and 1,773 deletions.
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-bungeecord</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-parent</artifactId>
     <packaging>pom</packaging>

diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-spigot</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-sponge</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-standalone</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-velocity</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/common/pom.xml b/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>common</artifactId>
 

diff --git a/connector/pom.xml b/connector/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>connector</artifactId>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>common</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -31,8 +31,8 @@
         </dependency>
         <dependency>
             <groupId>com.github.CloudburstMC.Protocol</groupId>
-            <artifactId>bedrock-v428</artifactId>
-            <version>42da92f</version>
+            <artifactId>bedrock-v431</artifactId>
+            <version>f8ecf54</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
@@ -187,7 +187,7 @@ private GeyserConnector(PlatformType platformType, GeyserBootstrap bootstrap) {
 
         defaultAuthType = AuthType.getByName(config.getRemote().getAuthType());
 
-        CooldownUtils.setShowCooldown(config.isShowCooldown());
+        CooldownUtils.setShowCooldown(config.getShowCooldown());
         DimensionUtils.changeBedrockNetherId(config.isAboveBedrockNetherBuilding()); // Apply End dimension ID workaround to Nether
         SkullBlockEntityTranslator.ALLOW_CUSTOM_SKULLS = config.isAllowCustomSkulls();
 

diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/DumpCommand.java
@@ -27,6 +27,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.CommandSender;
 import org.geysermc.connector.command.GeyserCommand;
@@ -56,6 +57,12 @@ public DumpCommand(GeyserConnector connector, String name, String description, S
 
     @Override
     public void execute(GeyserSession session, CommandSender sender, String[] args) {
+        // Only allow the console to create dumps on Geyser Standalone
+        if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
+            sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
+            return;
+        }
+
         boolean showSensitive = false;
         boolean offlineDump = false;
         if (args.length >= 1) {

diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java
@@ -30,6 +30,7 @@
 import org.geysermc.connector.command.CommandSender;
 import org.geysermc.connector.command.GeyserCommand;
 import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.utils.LanguageUtils;
 
 import java.util.Collections;
 
@@ -47,6 +48,7 @@ public StopCommand(GeyserConnector connector, String name, String description, S
     @Override
     public void execute(GeyserSession session, CommandSender sender, String[] args) {
         if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
+            sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", sender.getLocale()));
             return;
         }
 

diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/VersionCommand.java
@@ -27,6 +27,7 @@
 
 import com.github.steveice10.mc.protocol.MinecraftConstants;
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
+import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.CommandSender;
 import org.geysermc.connector.command.GeyserCommand;
@@ -45,8 +46,12 @@
 
 public class VersionCommand extends GeyserCommand {
 
+    private final GeyserConnector connector;
+
     public VersionCommand(GeyserConnector connector, String name, String description, String permission) {
         super(name, description, permission);
+
+        this.connector = connector;
     }
 
     @Override
@@ -61,9 +66,9 @@ public void execute(GeyserSession session, CommandSender sender, String[] args)
 
         sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.version", sender.getLocale(), GeyserConnector.NAME, GeyserConnector.VERSION, GeyserConnector.MINECRAFT_VERSION, bedrockVersions));
 
-        // Disable update checking in dev mode
+        // Disable update checking in dev mode and for players in Geyser Standalone
         //noinspection ConstantConditions - changes in production
-        if (!GeyserConnector.VERSION.equals("DEV")) {
+        if (!GeyserConnector.VERSION.equals("DEV") && !(!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE)) {
             sender.sendMessage(LanguageUtils.getPlayerLocaleString("geyser.commands.version.checking", sender.getLocale()));
             try {
                 Properties gitProp = new Properties();

diff --git a/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java b/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java
@@ -73,7 +73,7 @@ public interface GeyserConfiguration {
 
     boolean isAllowThirdPartyEars();
 
-    boolean isShowCooldown();
+    String getShowCooldown();
 
     boolean isShowCoordinates();
 

diff --git a/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java b/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java
@@ -95,7 +95,7 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
     private boolean allowThirdPartyCapes = true;
 
     @JsonProperty("show-cooldown")
-    private boolean showCooldown = true;
+    private String showCooldown = "title";
 
     @JsonProperty("show-coordinates")
     private boolean showCoordinates = true;

diff --git a/connector/src/main/java/org/geysermc/connector/entity/Entity.java b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
@@ -263,7 +263,7 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
                     metadata.getFlags().setFlag(EntityFlag.ON_FIRE, ((xd & 0x01) == 0x01) && !metadata.getFlags().getFlag(EntityFlag.FIRE_IMMUNE)); // Otherwise immune entities sometimes flicker onfire
                     metadata.getFlags().setFlag(EntityFlag.SNEAKING, (xd & 0x02) == 0x02);
                     metadata.getFlags().setFlag(EntityFlag.SPRINTING, (xd & 0x08) == 0x08);
-                    metadata.getFlags().setFlag(EntityFlag.SWIMMING, ((xd & 0x10) == 0x10) && metadata.getFlags().getFlag(EntityFlag.SPRINTING)); // Otherwise swimming is enabled on older servers
+                    // Swimming is ignored here and instead we rely on the pose
                     metadata.getFlags().setFlag(EntityFlag.GLIDING, (xd & 0x80) == 0x80);
 
                     // Armour stands are handled in their own class
@@ -297,16 +297,37 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
             case 5: // no gravity
                 metadata.getFlags().setFlag(EntityFlag.HAS_GRAVITY, !(boolean) entityMetadata.getValue());
                 break;
-            case 6: // Pose change
-                if (entityMetadata.getValue().equals(Pose.SLEEPING)) {
-                    metadata.getFlags().setFlag(EntityFlag.SLEEPING, true);
-                    metadata.put(EntityData.BOUNDING_BOX_WIDTH, 0.2f);
-                    metadata.put(EntityData.BOUNDING_BOX_HEIGHT, 0.2f);
-                } else if (metadata.getFlags().getFlag(EntityFlag.SLEEPING)) {
-                    metadata.getFlags().setFlag(EntityFlag.SLEEPING, false);
-                    metadata.put(EntityData.BOUNDING_BOX_WIDTH, getEntityType().getWidth());
-                    metadata.put(EntityData.BOUNDING_BOX_HEIGHT, getEntityType().getHeight());
+            case 6: // Pose change - typically used for bounding box and not animation
+                Pose pose = (Pose) entityMetadata.getValue();
+
+                metadata.getFlags().setFlag(EntityFlag.SLEEPING, pose.equals(Pose.SLEEPING));
+                // Triggered when crawling
+                metadata.getFlags().setFlag(EntityFlag.SWIMMING, pose.equals(Pose.SWIMMING));
+                float width = entityType.getWidth();
+                float height = entityType.getHeight();
+                switch (pose) {
+                    case SLEEPING:
+                        if (this instanceof LivingEntity) {
+                            width = 0.2f;
+                            height = 0.2f;
+                        }
+                        break;
+                    case SNEAKING:
+                        if (entityType == EntityType.PLAYER) {
+                            height = 1.5f;
+                        }
+                        break;
+                    case FALL_FLYING:
+                    case SPIN_ATTACK:
+                    case SWIMMING:
+                        if (entityType == EntityType.PLAYER) {
+                            // Seems like this is only cared about for players; nothing else
+                            height = 0.6f;
+                        }
+                        break;
                 }
+                metadata.put(EntityData.BOUNDING_BOX_WIDTH, width);
+                metadata.put(EntityData.BOUNDING_BOX_HEIGHT, height);
                 break;
         }
     }

diff --git a/connector/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java b/connector/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java
@@ -107,7 +107,7 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
             if (itemData.getTag() != null) {
                 builder.put("tag", itemData.getTag().toBuilder().build());
             }
-            builder.putShort("Damage", itemData.getDamage());
+            builder.putShort("Damage", (short) itemData.getDamage());
             builder.putString("Name", itemEntry.getBedrockIdentifier());
             NbtMapBuilder tag = getDefaultTag().toBuilder();
             tag.put("Item", builder.build());

diff --git a/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java b/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java
@@ -113,9 +113,28 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
         super.updateBedrockMetadata(entityMetadata, session);
     }
 
-    public void updateEquipment(GeyserSession session) {
-        if (!valid)
-            return;
+    public void updateAllEquipment(GeyserSession session) {
+        if (!valid) return;
+
+        updateArmor(session);
+        updateMainHand(session);
+        updateOffHand(session);
+    }
+
+    public void updateArmor(GeyserSession session) {
+        if (!valid) return;
+
+        ItemData helmet = this.helmet;
+        ItemData chestplate = this.chestplate;
+        // If an entity has a banner on them, it will be in the helmet slot in Java but the chestplate spot in Bedrock
+        // But don't overwrite the chestplate if it isn't empty
+        if (chestplate.getId() == ItemData.AIR.getId() && helmet.getId() == ItemRegistry.BANNER.getBedrockId()) {
+            chestplate = this.helmet;
+            helmet = ItemData.AIR;
+        } else if (chestplate.getId() == ItemRegistry.BANNER.getBedrockId()) {
+            // Prevent chestplate banners from showing erroneously
+            chestplate = ItemData.AIR;
+        }
 
         MobArmorEquipmentPacket armorEquipmentPacket = new MobArmorEquipmentPacket();
         armorEquipmentPacket.setRuntimeEntityId(geyserId);
@@ -124,22 +143,32 @@ public void updateEquipment(GeyserSession session) {
         armorEquipmentPacket.setLeggings(leggings);
         armorEquipmentPacket.setBoots(boots);
 
+        session.sendUpstreamPacket(armorEquipmentPacket);
+    }
+
+    public void updateMainHand(GeyserSession session) {
+        if (!valid) return;
+
         MobEquipmentPacket handPacket = new MobEquipmentPacket();
         handPacket.setRuntimeEntityId(geyserId);
         handPacket.setItem(hand);
         handPacket.setHotbarSlot(-1);
         handPacket.setInventorySlot(0);
         handPacket.setContainerId(ContainerId.INVENTORY);
 
+        session.sendUpstreamPacket(handPacket);
+    }
+
+    public void updateOffHand(GeyserSession session) {
+        if (!valid) return;
+
         MobEquipmentPacket offHandPacket = new MobEquipmentPacket();
         offHandPacket.setRuntimeEntityId(geyserId);
         offHandPacket.setItem(offHand);
         offHandPacket.setHotbarSlot(-1);
         offHandPacket.setInventorySlot(0);
         offHandPacket.setContainerId(ContainerId.OFFHAND);
 
-        session.sendUpstreamPacket(armorEquipmentPacket);
-        session.sendUpstreamPacket(handPacket);
         session.sendUpstreamPacket(offHandPacket);
     }
 

diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java
@@ -56,9 +56,12 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
             // -1 means no armor
             if ((int) entityMetadata.getValue() != -1) {
                 // The damage value is the dye color that Java sends us
-                // Always going to be a carpet so we can hardcode 171 in BlockTranslator
-                // The int then short conversion is required or we get a ClassCastException
-                equipmentPacket.setChestplate(ItemData.of(BlockTranslator.CARPET, (short) ((int) entityMetadata.getValue()), 1));
+                // The item is always going to be a carpet
+                equipmentPacket.setChestplate(ItemData.builder()
+                        .id(BlockTranslator.CARPET)
+                        .damage((int) entityMetadata.getValue())
+                        .count(1)
+                        .build());
             } else {
                 equipmentPacket.setChestplate(ItemData.AIR);
             }