Merge e4bef7b4ba into 9d299ee83b

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+tab_width = 4
+max_line_length = off
+
+[*.java]
+ij_java_class_count_to_use_import_on_demand = 9999
+ij_java_doc_align_exception_comments = false
+ij_java_doc_align_param_comments = false

bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java

@@ -26,6 +26,7 @@
 package org.geysermc.geyser.platform.velocity;
 
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.network.ProtocolState;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.InboundConnection;
 import com.velocitypowered.api.proxy.ProxyServer;
@@ -88,6 +89,11 @@ public class GeyserVelocityPingPassthrough implements IGeyserPingPassthrough {
         public ProtocolVersion getProtocolVersion() {
             return ProtocolVersion.MAXIMUM_VERSION;
         }
+
+        @Override
+        public ProtocolState getProtocolState() {
+            return ProtocolState.STATUS;
+        }
     }
 
 }

core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java

@@ -61,7 +61,8 @@ public class PandaEntity extends AnimalEntity {
             EntityEventPacket packet = new EntityEventPacket();
             packet.setRuntimeEntityId(geyserId);
             packet.setType(EntityEventType.EATING_ITEM);
-            packet.setData(session.getItemMappings().getStoredItems().bamboo().getBedrockDefinition().getRuntimeId() << 16);
+            // As of 1.20.5 - pandas can eat cake
+            packet.setData(this.hand.getDefinition().getRuntimeId() << 16);
             session.sendUpstreamPacket(packet);
         }
     }

core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java

@@ -40,7 +40,6 @@ import java.util.Map;
 @Getter
 @Accessors(fluent = true)
 public class StoredItemMappings {
-    private final ItemMapping bamboo;
     private final ItemMapping banner;
     private final ItemMapping barrier;
     private final ItemMapping compass;
@@ -56,7 +55,6 @@ public class StoredItemMappings {
     private final ItemMapping writtenBook;
 
     public StoredItemMappings(Map<Item, ItemMapping> itemMappings) {
-        this.bamboo = load(itemMappings, Items.BAMBOO);
         this.banner = load(itemMappings, Items.WHITE_BANNER); // As of 1.17.10, all banners have the same Bedrock ID
         this.barrier = load(itemMappings, Items.BARRIER);
         this.compass = load(itemMappings, Items.COMPASS);

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ protocol-connection = "3.0.0.Beta1-20240411.165033-128"
 raknet = "1.0.0.CR3-20240416.144209-1"
 blockstateupdater="1.20.80-20240411.142413-1"
 mcauthlib = "d9d773e"
-mcprotocollib = "209e79f8" # Revert from jitpack after release
+mcprotocollib = "9b96ebda" # Revert from jitpack after release
 adventure = "4.14.0"
 adventure-platform = "4.3.0"
 junit = "5.9.2"
@@ -28,7 +28,7 @@ viaversion = "4.9.2"
 adapters = "1.12-SNAPSHOT"
 commodore = "2.2"
 bungeecord = "a7c6ede"
-velocity = "3.1.1"
+velocity = "3.3.0-SNAPSHOT"
 viaproxy = "3.2.1"
 fabric-minecraft = "1.20.5"
 fabric-loader = "0.15.10"