Merge remote-tracking branch 'upstream/master' into client-vehicle

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java

@@ -265,7 +265,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
                     this.geyserWorldManager = new GeyserSpigotNativeWorldManager(this, isPaper);
                 }
                 geyserLogger.debug("Using world manager of type: " + this.geyserWorldManager.getClass().getSimpleName());
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 if (geyserConfig.isDebugMode()) {
                     geyserLogger.debug("Error while attempting to find NMS adapter. Most likely, this can be safely ignored. :)");
                     e.printStackTrace();

core/src/main/java/org/geysermc/geyser/entity/type/living/merchant/VillagerEntity.java

@@ -34,6 +34,7 @@ import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
 import org.cloudburstmc.protocol.bedrock.packet.MoveEntityAbsolutePacket;
 import org.geysermc.geyser.entity.EntityDefinition;
 import org.geysermc.geyser.level.block.property.Properties;
+import org.geysermc.geyser.level.block.type.BedBlock;
 import org.geysermc.geyser.level.block.type.BlockState;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
@@ -125,6 +126,7 @@ public class VillagerEntity extends AbstractMerchantEntity {
         int bedRotation = 0;
         float xOffset = 0;
         float zOffset = 0;
+        if (state.block() instanceof BedBlock) {
             switch (state.getValue(Properties.HORIZONTAL_FACING)) {
                 case SOUTH -> {
                     bedRotation = 180;
@@ -143,6 +145,7 @@ public class VillagerEntity extends AbstractMerchantEntity {
                     zOffset = .5f;
                 }
             }
+        }
 
         setYaw(yaw);
         setPitch(pitch);

core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java

@@ -290,7 +290,8 @@ public final class BlockRegistryPopulator {
                 }
 
                 boolean waterlogged = blockState.getValue(Properties.WATERLOGGED, false)
-                        || block == Blocks.BUBBLE_COLUMN || block == Blocks.KELP || block == Blocks.SEAGRASS;
+                        || block == Blocks.BUBBLE_COLUMN || block == Blocks.KELP || block == Blocks.KELP_PLANT
+                        || block == Blocks.SEAGRASS || block == Blocks.TALL_SEAGRASS;
 
                 if (waterlogged) {
                     BlockRegistries.WATERLOGGED.get().set(javaRuntimeId);

core/src/main/java/org/geysermc/geyser/registry/populator/Conversion685_671.java

@@ -51,16 +51,16 @@ public class Conversion685_671 {
 
         if (NEW_CORAL_BLOCKS.contains(identifer)) {
             switch (identifer) {
-                case "minecraft:tube_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(0); }
+                case "minecraft:tube_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(0); }
-                case "minecraft:brain_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(1); }
+                case "minecraft:brain_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(1); }
-                case "minecraft:bubble_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(2); }
+                case "minecraft:bubble_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(2); }
-                case "minecraft:fire_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(3); }
+                case "minecraft:fire_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(3); }
-                case "minecraft:horn_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(4); }
+                case "minecraft:horn_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(4); }
-                case "minecraft:dead_tube_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(8); }
+                case "minecraft:dead_tube_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(8); }
-                case "minecraft:dead_brain_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(9); }
+                case "minecraft:dead_brain_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(9); }
-                case "minecraft:dead_bubble_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(10); }
+                case "minecraft:dead_bubble_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(10); }
-                case "minecraft:dead_fire_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(11); }
+                case "minecraft:dead_fire_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(11); }
-                case "minecraft:dead_horn_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(12); }
+                case "minecraft:dead_horn_coral_block" -> { return mapping.withBedrockIdentifier("minecraft:coral_block").withBedrockData(12); }
             }
         }
 

core/src/main/java/org/geysermc/geyser/translator/collision/BlockCollision.java

@@ -61,7 +61,7 @@ public class BlockCollision {
     }
 
     /**
-     * Overridden in classes like SnowCollision and GrassPathCollision when correction code needs to be run before the
+     * Overridden in classes like GrassPathCollision when correction code needs to be run before the
      * main correction
      */
     public void beforeCorrectPosition(int x, int y, int z, BoundingBox playerCollision) {}

core/src/main/java/org/geysermc/geyser/translator/collision/SnowCollision.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.geyser.translator.collision;
-
-import lombok.EqualsAndHashCode;
-import org.geysermc.geyser.level.physics.BoundingBox;
-import org.geysermc.geyser.session.GeyserSession;
-
-@EqualsAndHashCode(callSuper = true)
-//@CollisionRemapper(regex = "^snow$", passDefaultBoxes = true, usesParams = true) TODO remove if no bugs are found. Seems fine with Bedrock 1.20.80 and 1.20.5
-public class SnowCollision extends BlockCollision {
-    private final int layers;
-
-    public SnowCollision(String params, BoundingBox[] defaultBoxes) {
-        super(defaultBoxes);
-        int layerCharIndex = params.indexOf("=") + 1;
-        layers = Integer.parseInt(params.substring(layerCharIndex, layerCharIndex + 1));
-
-        pushUpTolerance = 0.125;
-    }
-
-    // Needs to run before the main correction code or it can move the player into blocks
-    // This is counteracted by the main collision code pushing them out
-    @Override
-    public void beforeCorrectPosition(int x, int y, int z, BoundingBox playerCollision) {
-        // In Bedrock, snow layers round down to half blocks but you can't sink into them at all
-        // This means the collision each half block reaches above where it should be on Java so the player has to be
-        // pushed down
-        if (layers == 4 || layers == 8) {
-            double playerMinY = playerCollision.getMiddleY() - (playerCollision.getSizeY() / 2);
-            double boxMaxY = (boundingBoxes[0].getMiddleY() + y) + (boundingBoxes[0].getSizeY() / 2);
-            // If the player is in the buggy area, push them down
-            if (playerMinY > boxMaxY &&
-                    playerMinY <= (boxMaxY + 0.125)) {
-                playerCollision.translate(0, boxMaxY - playerMinY, 0);
-            }
-        }
-    }
-
-    @Override
-    public boolean correctPosition(GeyserSession session, int x, int y, int z, BoundingBox playerCollision) {
-        if (layers == 1) {
-            // 1 layer of snow does not have collision
-            return true;
-        }
-        // Hack to prevent false positives
-        playerCollision.setSizeX(playerCollision.getSizeX() - 0.0001);
-        playerCollision.setSizeY(playerCollision.getSizeY() - 0.0001);
-        playerCollision.setSizeZ(playerCollision.getSizeZ() - 0.0001);
-
-        if (this.checkIntersection(x, y, z, playerCollision)) {
-            double playerMinY = playerCollision.getMiddleY() - (playerCollision.getSizeY() / 2);
-            double boxMaxY = (boundingBoxes[0].getMiddleY() + y) + (boundingBoxes[0].getSizeY() / 2);
-            // If the player actually can't step onto it (they can step onto it from other snow layers)
-            if ((boxMaxY - playerMinY) > 0.5) {
-                // Cancel the movement
-                return false;
-            }
-        }
-
-        playerCollision.setSizeX(playerCollision.getSizeX() + 0.0001);
-        playerCollision.setSizeY(playerCollision.getSizeY() + 0.0001);
-        playerCollision.setSizeZ(playerCollision.getSizeZ() + 0.0001);
-        return super.correctPosition(session, x, y, z, playerCollision);
-    }
-}

core/src/main/java/org/geysermc/geyser/translator/inventory/chest/DoubleChestInventoryTranslator.java

@@ -64,7 +64,7 @@ public class DoubleChestInventoryTranslator extends ChestInventoryTranslator {
         if (session.getLastInteractionPlayerPosition().equals(session.getPlayerEntity().getPosition())) {
             BlockState state = session.getGeyser().getWorldManager().blockAt(session, session.getLastInteractionBlockPosition());
             if (!BlockRegistries.CUSTOM_BLOCK_STATE_OVERRIDES.get().containsKey(state.javaId())) {
-                if (state.block() == Blocks.CHEST || state.block() == Blocks.TRAPPED_CHEST
+                if ((state.block() == Blocks.CHEST || state.block() == Blocks.TRAPPED_CHEST)
                         && state.getValue(Properties.CHEST_TYPE) != ChestType.SINGLE) {
                     inventory.setHolderPosition(session.getLastInteractionBlockPosition());
                     ((Container) inventory).setUsingRealBlock(true, state.block());

core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java

@@ -27,6 +27,7 @@ package org.geysermc.geyser.translator.level.block.entity;
 
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
+import org.geysermc.geyser.level.block.Blocks;
 import org.geysermc.geyser.level.block.property.ChestType;
 import org.geysermc.geyser.level.block.property.Properties;
 import org.geysermc.geyser.level.block.type.BlockState;
@@ -38,14 +39,19 @@ import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType
  * Chests have more block entity properties in Bedrock, which is solved by implementing the BedrockChunkWantsBlockEntityTag
  */
 @BlockEntity(type = { BlockEntityType.CHEST, BlockEntityType.TRAPPED_CHEST })
-public class DoubleChestBlockEntityTranslator extends BlockEntityTranslator {
+public class DoubleChestBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
 
     @Override
     public void translateTag(GeyserSession session, NbtMapBuilder bedrockNbt, NbtMap javaNbt, BlockState blockState) {
+        if (!(blockState.is(Blocks.CHEST) || blockState.is(Blocks.TRAPPED_CHEST))) {
+            return;
+        }
+        if (blockState.getValue(Properties.CHEST_TYPE) != ChestType.SINGLE) {
             int x = (int) bedrockNbt.get("x");
             int z = (int) bedrockNbt.get("z");
             translateChestValue(bedrockNbt, blockState, x, z);
         }
+    }
 
     /**
      * Add Bedrock block entity tags to a NbtMap based on Java properties