Merge branch 'GeyserMC:master' into main

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 joined us here!
 
-### Currently supporting Minecraft Bedrock 1.17.10 - 1.17.30 and Minecraft Java 1.17.1.
+### Currently supporting Minecraft Bedrock 1.17.10 - 1.17.40 and Minecraft Java 1.17.1.
 
 ## Setting Up
 Take a look [here](https://github.com/GeyserMC/Geyser/wiki/Setup) for how to set up Geyser.

connector/pom.xml

@@ -114,8 +114,8 @@
         </dependency>
         <dependency>
             <groupId>com.github.CloudburstMC.Protocol</groupId>
-            <artifactId>bedrock-v465</artifactId>
-            <version>fa9d104</version>
+            <artifactId>bedrock-v471</artifactId>
+            <version>0bc10c8e</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

connector/src/main/java/org/geysermc/connector/entity/ItemFrameEntity.java

@@ -35,7 +35,7 @@
 import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
 import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
-import com.nukkitx.protocol.bedrock.v448.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v465.Bedrock_v465;
 import lombok.Getter;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;

connector/src/main/java/org/geysermc/connector/entity/LightningEntity.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019-2021 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.entity;
+
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+public class LightningEntity extends Entity {
+
+    public LightningEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+
+    @Override
+    public void spawnEntity(GeyserSession session) {
+        super.spawnEntity(session);
+
+        // Add these two sound effects - they're done completely clientside on Java Edition as of 1.17.1
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+
+        PlaySoundPacket thunderPacket = new PlaySoundPacket();
+        thunderPacket.setPosition(this.position);
+        thunderPacket.setSound("ambient.weather.thunder");
+        thunderPacket.setPitch(0.8f + random.nextFloat() * 0.2f);
+        thunderPacket.setVolume(10000f); // Really.
+        session.sendUpstreamPacket(thunderPacket);
+
+        PlaySoundPacket impactPacket = new PlaySoundPacket();
+        impactPacket.setPosition(this.position);
+        impactPacket.setSound("ambient.weather.lightning.impact");
+        impactPacket.setPitch(0.5f + random.nextFloat() * 0.2f);
+        impactPacket.setVolume(2.0f);
+        session.sendUpstreamPacket(impactPacket);
+    }
+}

connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java

@@ -133,7 +133,7 @@ public enum EntityType {
     WITHER_SKULL(WitherSkullEntity.class, 89, 0.3125f),
     BOAT(BoatEntity.class, 90, 0.6f, 1.6f, 1.6f, 0.35f),
     WITHER_SKULL_DANGEROUS(WitherSkullEntity.class, 91, 0f),
-    LIGHTNING_BOLT(Entity.class, 93, 0f),
+    LIGHTNING_BOLT(LightningEntity.class, 93, 0f),
     SMALL_FIREBALL(ItemedFireballEntity.class, 94, 0.3125f),
     AREA_EFFECT_CLOUD(AreaEffectCloudEntity.class, 95, 0.5f, 1.0f),
     MINECART_HOPPER(MinecartEntity.class, 96, 0.7f, 0.98f, 0.98f, 0.35f, "minecraft:hopper_minecart"),

connector/src/main/java/org/geysermc/connector/network/BedrockProtocol.java

@@ -27,7 +27,8 @@
 
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
 import com.nukkitx.protocol.bedrock.v448.Bedrock_v448;
-import com.nukkitx.protocol.bedrock.v448.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v465.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v471.Bedrock_v471;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +53,7 @@ public class BedrockProtocol {
                 .minecraftVersion("1.17.10/1.17.11")
                 .build());
         SUPPORTED_BEDROCK_CODECS.add(Bedrock_v465.V465_CODEC);
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v471.V471_CODEC);
     }
 
     /**

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

@@ -64,7 +64,7 @@
 public abstract class InventoryTranslator {
 
     public static final InventoryTranslator PLAYER_INVENTORY_TRANSLATOR = new PlayerInventoryTranslator();
-    public static final Map<WindowType, InventoryTranslator> INVENTORY_TRANSLATORS = new HashMap<WindowType, InventoryTranslator>() {
+    public static final Map<WindowType, InventoryTranslator> INVENTORY_TRANSLATORS = new HashMap<>() {
         {
             /* Player Inventory */
             put(null, PLAYER_INVENTORY_TRANSLATOR);
@@ -395,7 +395,9 @@ public ItemStackResponsePacket.Response translateRequest(GeyserSession session,
                 case CRAFT_RECIPE_AUTO: // Called by villagers
                 case CRAFT_NON_IMPLEMENTED_DEPRECATED: // Tends to be called for UI inventories
                 case CRAFT_RESULTS_DEPRECATED: // Tends to be called for UI inventories
-                case CRAFT_RECIPE_OPTIONAL: { // Anvils and cartography tables will handle this
+                case CRAFT_RECIPE_OPTIONAL: // Anvils and cartography tables will handle this
+                case CRAFT_LOOM: // Looms 1.17.40+
+                case CRAFT_REPAIR_AND_DISENCHANT: { // Grindstones 1.17.40+
                     break;
                 }
                 default:

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

@@ -34,6 +34,7 @@
 import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
 import com.nukkitx.protocol.bedrock.data.inventory.ItemStackRequest;
 import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
+import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.CraftLoomStackRequestActionData;
 import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.CraftResultsDeprecatedStackRequestActionData;
 import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequestActionData;
 import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.StackRequestActionType;
@@ -118,12 +119,14 @@ public boolean shouldRejectItemPlace(GeyserSession session, Inventory inventory,
     @Override
     public boolean shouldHandleRequestFirst(StackRequestActionData action, Inventory inventory) {
         // If the LOOM_MATERIAL slot is not empty, we are crafting a pattern that does not come from an item
-        return action.getType() == StackRequestActionType.CRAFT_NON_IMPLEMENTED_DEPRECATED && inventory.getItem(2).isEmpty();
+        // Remove the CRAFT_NON_IMPLEMENTED_DEPRECATED when 1.17.30 is dropped
+        return (action.getType() == StackRequestActionType.CRAFT_NON_IMPLEMENTED_DEPRECATED || action.getType() == StackRequestActionType.CRAFT_LOOM)
+                && inventory.getItem(2).isEmpty();
     }
 
     @Override
     public ItemStackResponsePacket.Response translateSpecialRequest(GeyserSession session, Inventory inventory, ItemStackRequest request) {
-        // TODO: I anticipate this will be changed in the future to use something non-deprecated. Keep an eye out.
+        StackRequestActionData headerData = request.getActions()[0];
         StackRequestActionData data = request.getActions()[1];
         if (!(data instanceof CraftResultsDeprecatedStackRequestActionData craftData)) {
             return rejectRequest(request);
@@ -133,8 +136,18 @@ public ItemStackResponsePacket.Response translateSpecialRequest(GeyserSession se
         List<NbtMap> newBlockEntityTag = craftData.getResultItems()[0].getTag().getList("Patterns", NbtType.COMPOUND);
         // Get the pattern that the Bedrock client requests - the last pattern in the Patterns list
         NbtMap pattern = newBlockEntityTag.get(newBlockEntityTag.size() - 1);
+        String bedrockPattern;
+
+        if (headerData instanceof CraftLoomStackRequestActionData loomData) {
+            // Prioritize this if on 1.17.40
+            // Remove the below if statement when 1.17.30 is dropped
+            bedrockPattern = loomData.getPatternId();
+        } else {
+            bedrockPattern = pattern.getString("Pattern");
+        }
+
         // Get the Java index of this pattern
-        int index = PATTERN_TO_INDEX.getOrDefault(pattern.getString("Pattern"), -1);
+        int index = PATTERN_TO_INDEX.getOrDefault(bedrockPattern, -1);
         if (index == -1) {
             return rejectRequest(request);
         }

connector/src/main/java/org/geysermc/connector/network/translators/item/translators/BannerTranslator.java

@@ -145,7 +145,7 @@ public static ListTag convertBannerPattern(List<NbtMap> patterns) {
     /**
      * Convert the Bedrock edition banner pattern nbt to Java edition
      *
-     * @param pattern Bedorck edition pattern nbt
+     * @param pattern Bedrock edition pattern nbt
      * @return The Java edition format pattern nbt
      */
     public static CompoundTag getJavaBannerPattern(NbtMap pattern) {

connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayEffectTranslator.java

@@ -33,7 +33,7 @@
 import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
 import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
 import com.nukkitx.protocol.bedrock.packet.TextPacket;
-import com.nukkitx.protocol.bedrock.v448.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v465.Bedrock_v465;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;

connector/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java

@@ -29,7 +29,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.nukkitx.nbt.*;
 import com.nukkitx.protocol.bedrock.v448.Bedrock_v448;
-import com.nukkitx.protocol.bedrock.v448.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v465.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v471.Bedrock_v471;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -66,7 +67,8 @@ public class BlockRegistryPopulator {
     static {
         ImmutableMap.Builder<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> stateMapperBuilder = ImmutableMap.<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>>builder()
                 .put(ObjectIntPair.of("1_17_10", Bedrock_v448.V448_CODEC.getProtocolVersion()), EMPTY_MAPPER)
-                .put(ObjectIntPair.of("1_17_30", Bedrock_v465.V465_CODEC.getProtocolVersion()), EMPTY_MAPPER);
+                .put(ObjectIntPair.of("1_17_30", Bedrock_v465.V465_CODEC.getProtocolVersion()), EMPTY_MAPPER)
+                .put(ObjectIntPair.of("1_17_40", Bedrock_v471.V471_CODEC.getProtocolVersion()), EMPTY_MAPPER);
 
         BLOCK_MAPPERS = stateMapperBuilder.build();
     }

connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java

@@ -36,7 +36,8 @@
 import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
 import com.nukkitx.protocol.bedrock.v448.Bedrock_v448;
-import com.nukkitx.protocol.bedrock.v448.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v465.Bedrock_v465;
+import com.nukkitx.protocol.bedrock.v471.Bedrock_v471;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -69,6 +70,7 @@ public class ItemRegistryPopulator {
         }
 
         PALETTE_VERSIONS.put("1_17_30", new PaletteVersion(Bedrock_v465.V465_CODEC.getProtocolVersion(), Collections.emptyMap()));
+        PALETTE_VERSIONS.put("1_17_40", new PaletteVersion(Bedrock_v471.V471_CODEC.getProtocolVersion(), Collections.emptyMap()));
     }
 
     private record PaletteVersion(int protocolVersion, Map<String, String> additionalTranslatedItems) {

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

@@ -150,6 +150,13 @@ public void onUpdate() {
                 continue;
             }
 
+            // there's nothing we can do with inactive objectives
+            // after checking if the objective has been deleted,
+            // except waiting for the objective to become activated (:
+            if (!objective.isActive()) {
+                continue;
+            }
+
             if (playerTeam != null && playerTeam.getColor() == objective.getTeamColor()) {
                 correctSidebar = objective;
             }