Merge branch 'master' of https://github.com/GeyserMC/Geyser

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

@@ -128,6 +128,29 @@ public class CustomItemRegistryPopulator {
             computeBlockItemProperties(mapping.getBedrockIdentifier(), componentBuilder);
         }
 
+        if (mapping.isEdible()) {
+            computeConsumableProperties(itemProperties, componentBuilder, 1, false);
+        }
+
+        if (mapping.isEntityPlacer()) {
+            computeEntityPlacerProperties(componentBuilder);
+        }
+
+        switch (mapping.getBedrockIdentifier()) {
+            case "minecraft:fire_charge", "minecraft:flint_and_steel" -> {
+                computeBlockItemProperties("minecraft:fire", componentBuilder);
+            }
+            case "minecraft:bow", "minecraft:crossbow", "minecraft:trident" -> {
+                computeChargeableProperties(itemProperties, componentBuilder);
+            }
+            case "minecraft:honey_bottle", "minecraft:milk_bucket", "minecraft:potion" -> {
+                computeConsumableProperties(itemProperties, componentBuilder, 2, true);
+            }
+            case "minecraft:experience_bottle", "minecraft:egg", "minecraft:ender_pearl", "minecraft:ender_eye", "minecraft:lingering_potion", "minecraft:snowball", "minecraft:splash_potion" -> {
+                computeThrowableProperties(componentBuilder);
+            }
+        }
+
         computeRenderOffsets(false, customItemData, componentBuilder);
 
         componentBuilder.putCompound("item_properties", itemProperties.build());
@@ -273,6 +296,39 @@ public class CustomItemRegistryPopulator {
         componentBuilder.putCompound("minecraft:block_placer", NbtMap.builder().putString("block", blockItem).build());
     }
 
+    private static void computeChargeableProperties(NbtMapBuilder itemProperties, NbtMapBuilder componentBuilder) {
+        // setting high use_duration prevents the consume animation from playing
+        itemProperties.putInt("use_duration", Integer.MAX_VALUE);
+        // display item as tool (mainly for crossbow and bow)
+        itemProperties.putBoolean("hand_equipped", true);
+        // ensure client moves at slow speed while charging (note: this was calculated by hand as the movement modifer value does not seem to scale linearly)
+        componentBuilder.putCompound("minecraft:chargeable", NbtMap.builder().putFloat("movement_modifier", 0.35F).build());
+    }
+
+    private static void computeConsumableProperties(NbtMapBuilder itemProperties, NbtMapBuilder componentBuilder, int useAnimation, boolean canAlwaysEat) {
+        // this is the duration of the use animation in ticks; note that in behavior packs this is set as a float in seconds, but over the network it is an int in ticks
+        itemProperties.putInt("use_duration", 32);
+        // this dictates that the item will use the eat or drink animation (in the first person) and play eat or drink sounds
+        // note that in behavior packs this is set as the string "eat" or "drink", but over the network it as an int, with these values being 1 and 2 respectively
+        itemProperties.putInt("use_animation", useAnimation);
+        // this component is required to allow the eat animation to play
+        componentBuilder.putCompound("minecraft:food", NbtMap.builder().putBoolean("can_always_eat", canAlwaysEat).build());
+    }
+
+    private static void computeEntityPlacerProperties(NbtMapBuilder componentBuilder) {
+        // all items registered that place entities should be given this component to prevent double placement
+        // it is okay that the entity here does not match the actual one since we control what entity actually spawns 
+        componentBuilder.putCompound("minecraft:entity_placer", NbtMap.builder().putString("entity", "minecraft:minecart").build());
+    }
+
+    private static void computeThrowableProperties(NbtMapBuilder componentBuilder) {
+        // allows item to be thrown when holding down right click (individual presses are required w/o this component)
+        componentBuilder.putCompound("minecraft:throwable", NbtMap.builder().putBoolean("do_swing_animation", true).build());
+        // this must be set to something for the swing animation to play
+        // it is okay that the projectile here does not match the actual one since we control what entity actually spawns
+        componentBuilder.putCompound("minecraft:projectile", NbtMap.builder().putString("projectile_entity", "minecraft:snowball").build());
+    }
+
     private static void computeRenderOffsets(boolean isHat, CustomItemData customItemData, NbtMapBuilder componentBuilder) {
         if (isHat) {
             componentBuilder.remove("minecraft:render_offsets");

core/src/main/java/org/geysermc/geyser/registry/type/GeyserMappingItem.java

@@ -48,4 +48,6 @@ public class GeyserMappingItem {
     @JsonProperty("repair_materials") List<String> repairMaterials;
     @JsonProperty("has_suspicious_stew_effect") boolean hasSuspiciousStewEffect = false;
     @JsonProperty("dye_color") int dyeColor = -1;
+    @JsonProperty("is_edible") boolean edible = false;
+    @JsonProperty("is_entity_placer") boolean entityPlacer = false;
 }

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

@@ -27,6 +27,7 @@ package org.geysermc.geyser.translator.level.block.entity;
 
 import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.nukkitx.nbt.NbtMapBuilder;
 import org.geysermc.geyser.entity.EntityDefinition;
@@ -68,18 +69,20 @@ public class SpawnerBlockEntityTranslator extends BlockEntityTranslator {
 
         CompoundTag spawnData = tag.get("SpawnData");
         if (spawnData != null) {
-            String entityID = (String) ((CompoundTag) spawnData.get("entity"))
+            StringTag idTag = ((CompoundTag) spawnData.get("entity")).get("id");
-                    .get("id")
+            if (idTag != null) {
-                    .getValue();
+                // As of 1.19.3, spawners can be empty
-            builder.put("EntityIdentifier", entityID);
+                String entityId = idTag.getValue();
+                builder.put("EntityIdentifier", entityId);
 
-            EntityDefinition<?> definition = Registries.JAVA_ENTITY_IDENTIFIERS.get(entityID);
+                EntityDefinition<?> definition = Registries.JAVA_ENTITY_IDENTIFIERS.get(entityId);
                 if (definition != null) {
                     builder.put("DisplayEntityWidth", definition.width());
                     builder.put("DisplayEntityHeight", definition.height());
                     builder.put("DisplayEntityScale", 1.0f);
                 }
             }
+        }
 
         builder.put("id", "MobSpawner");
         builder.put("isMovable", (byte) 1);

core/src/main/resources/mappings

@@ -1 +1 @@
-Subproject commit e8703ccb187f98cd845357395d7b4ecfafbcd864
+Subproject commit f9d62b3f73db270bd4e0c833b7728b30d29e1369