Advertise and map custom core_rings entity

Author: NicklasMatzulla

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

@@ -181,6 +181,7 @@ public final class EntityDefinitions {
     public static final EntityDefinition<ChestBoatEntity> CHERRY_CHEST_BOAT;
     public static final EntityDefinition<MinecartEntity> CHEST_MINECART;
     public static final EntityDefinition<ChickenEntity> CHICKEN;
+    public static final EntityDefinition<ArmorStandEntity> CORE_RINGS;
     public static final EntityDefinition<AbstractFishEntity> COD;
     public static final EntityDefinition<CommandBlockMinecartEntity> COMMAND_BLOCK_MINECART;
     public static final EntityDefinition<CowEntity> COW;
@@ -651,6 +652,10 @@ public final class EntityDefinitions {
                 .addTranslator(MetadataTypes.ROTATIONS, ArmorStandEntity::setLeftLegRotation)
                 .addTranslator(MetadataTypes.ROTATIONS, ArmorStandEntity::setRightLegRotation)
                 .build();
+        CORE_RINGS = EntityDefinition.inherited(ArmorStandEntity::new, ARMOR_STAND)
+                .identifier("playunlimited:core_rings")
+                .build(false);
+        Registries.JAVA_ENTITY_IDENTIFIERS.get().put("playunlimited:core_rings", CORE_RINGS);
         PLAYER = EntityDefinition.<PlayerEntity>inherited(null, livingEntityBase)
                 .type(EntityType.PLAYER)
                 .height(1.8f).width(0.6f)

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

@@ -293,6 +293,18 @@ public void setBoots(GeyserItemStack boots) {
     public void setHand(GeyserItemStack hand) {
         super.setHand(hand);
         updateSecondEntityStatus(true);
+
+        if (!hand.isEmpty() && hand.asItem() == Items.GRASS_BLOCK) {
+            if (this.definition != EntityDefinitions.CORE_RINGS) {
+                despawnEntity();
+                this.definition = EntityDefinitions.CORE_RINGS;
+                spawnEntity();
+            }
+        } else if (this.definition == EntityDefinitions.CORE_RINGS) {
+            despawnEntity();
+            this.definition = EntityDefinitions.ARMOR_STAND;
+            spawnEntity();
+        }
     }
 
     @Override

core/src/main/java/org/geysermc/geyser/registry/Registries.java

@@ -208,13 +208,20 @@ public static void load() {
         // (by using the Items or Blocks class, which loads all the blocks)
 
         BEDROCK_ENTITY_IDENTIFIERS.load();
-        // Add custom entity identifier for playunlimited
+        // Add custom entity identifiers for PlayUnlimited entities
         NbtMap identifiers = BEDROCK_ENTITY_IDENTIFIERS.get();
         List<NbtMap> idList = new ArrayList<>(identifiers.getList("idlist", NbtType.COMPOUND));
         int nextRid = idList.stream().mapToInt(map -> map.getInt("rid")).max().orElse(-1) + 1;
         idList.add(NbtMap.builder()
                 .putString("id", "playunlimited:playunlimited")
                 .putShort("bid", (short) 0)
+                .putInt("rid", nextRid++)
+                .putBoolean("summonable", true)
+                .putBoolean("hasSpawnEgg", false)
+                .build());
+        idList.add(NbtMap.builder()
+                .putString("id", "playunlimited:core_rings")
+                .putShort("bid", (short) 0)
                 .putInt("rid", nextRid)
                 .putBoolean("summonable", true)
                 .putBoolean("hasSpawnEgg", false)