Add entity definitions for cushions and poplar boats, temporarily disable 2 gametests pending MCPL updates

Author: eclipseisoffline

bootstrap/mod/gametest/src/main/generated/data/geyser/test_instance/minecraft_version.json

@@ -1,4 +1,6 @@
 {
   "type": "geyser:minecraft_version",
-  "version": "26.3"
-}
+  "version": "26.3",
+  "required": false,
+  "COMMENT": "MCPL is not at release yet"
+}

bootstrap/mod/gametest/src/main/resources/data/geyser/test_instance/hashing/block_transformer.json

@@ -1,5 +1,7 @@
 {
   "type": "geyser:component_hash",
+  "COMMENT": "Requires fix in MCPL, registry data can now be any tag and this one is a list",
+  "required": false,
   "component": "minecraft:block_transformer",
   "value": [
     "minecraft:shovel",

core/src/main/java/org/geysermc/geyser/entity/VanillaEntities.java

@@ -36,6 +36,7 @@
 import org.geysermc.geyser.entity.type.BoatEntity;
 import org.geysermc.geyser.entity.type.ChestBoatEntity;
 import org.geysermc.geyser.entity.type.CommandBlockMinecartEntity;
+import org.geysermc.geyser.entity.type.CushionEntity;
 import org.geysermc.geyser.entity.type.DisplayBaseEntity;
 import org.geysermc.geyser.entity.type.EnderCrystalEntity;
 import org.geysermc.geyser.entity.type.EnderEyeEntity;
@@ -200,6 +201,7 @@ public final class VanillaEntities {
     public static final VanillaEntityType<CowEntity> COW;
     public static final VanillaEntityType<CreakingEntity> CREAKING;
     public static final VanillaEntityType<CreeperEntity> CREEPER;
+    public static final VanillaEntityType<CushionEntity> CUSHION;
     public static final VanillaEntityType<BoatEntity> DARK_OAK_BOAT;
     public static final VanillaEntityType<ChestBoatEntity> DARK_OAK_CHEST_BOAT;
     public static final VanillaEntityType<DolphinEntity> DOLPHIN;
@@ -272,6 +274,8 @@ public final class VanillaEntities {
     public static final VanillaEntityType<PillagerEntity> PILLAGER;
     public static final VanillaEntityType<PlayerEntity> PLAYER;
     public static final VanillaEntityType<PolarBearEntity> POLAR_BEAR;
+    public static final VanillaEntityType<BoatEntity> POPLAR_BOAT;
+    public static final VanillaEntityType<ChestBoatEntity> POPLAR_CHEST_BOAT;
     public static final VanillaEntityType<ThrownPotionEntity> SPLASH_POTION;
     public static final VanillaEntityType<ThrownPotionEntity> LINGERING_POTION;
     public static final VanillaEntityType<PufferFishEntity> PUFFERFISH;
@@ -352,6 +356,11 @@ public final class VanillaEntities {
                     .addTranslator(null) // Waiting
                     .addTranslator(MetadataTypes.PARTICLE, AreaEffectCloudEntity::setParticle)
                     .build();
+            CUSHION = VanillaEntityType.inherited(CushionEntity::new, entityBase)
+                    .type(EntityType.CUSHION)
+                    .width(1.0F).height(0.25F)
+                    .addTranslator(MetadataTypes.DYE_COLOR, CushionEntity::setDyeColor)
+                    .build();
             DRAGON_FIREBALL = VanillaEntityType.inherited(FireballEntity::new, entityBase)
                     .type(EntityType.DRAGON_FIREBALL)
                     .heightAndWidth(1.0f)
@@ -643,6 +652,7 @@ public final class VanillaEntities {
             OAK_BOAT = buildBoat(boatBase, EntityType.OAK_BOAT, BoatEntity.BoatVariant.OAK);
             SPRUCE_BOAT = buildBoat(boatBase, EntityType.SPRUCE_BOAT, BoatEntity.BoatVariant.SPRUCE);
             PALE_OAK_BOAT = buildBoat(boatBase, EntityType.PALE_OAK_BOAT, BoatEntity.BoatVariant.PALE_OAK);
+            POPLAR_BOAT = buildBoat(boatBase, EntityType.POPLAR_BOAT, BoatEntity.BoatVariant.POPLAR);
 
             EntityTypeBase<ChestBoatEntity> chestBoatBase = EntityTypeBase.baseInherited(ChestBoatEntity.class, boatBase)
                 .build();
@@ -657,6 +667,7 @@ public final class VanillaEntities {
             OAK_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.OAK_CHEST_BOAT, BoatEntity.BoatVariant.OAK);
             SPRUCE_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.SPRUCE_CHEST_BOAT, BoatEntity.BoatVariant.SPRUCE);
             PALE_OAK_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.PALE_OAK_CHEST_BOAT, BoatEntity.BoatVariant.PALE_OAK);
+            POPLAR_CHEST_BOAT = buildChestBoat(chestBoatBase, EntityType.POPLAR_CHEST_BOAT, BoatEntity.BoatVariant.POPLAR);
         }
 
         EntityTypeBase<LivingEntity> livingEntityBase = EntityTypeBase.baseInherited(LivingEntity.class, entityBase)

core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java

@@ -254,7 +254,8 @@ public enum BoatVariant {
         MANGROVE,
         BAMBOO,
         CHERRY,
-        PALE_OAK;
+        PALE_OAK,
+        POPLAR;
 
         BoatVariant() {}
     }

core/src/main/java/org/geysermc/geyser/entity/type/CushionEntity.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 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.entity.type;
+
+import org.geysermc.geyser.entity.spawn.EntitySpawnContext;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
+
+public class CushionEntity extends Entity {
+
+    public CushionEntity(EntitySpawnContext context) {
+        super(context);
+    }
+
+    public void setDyeColor(IntEntityMetadata dyeColor) {
+
+    }
+}