Item Models Support (Experimental)

Author: xSquishyLiam

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "me.geyserextensionists"
-version = "1.0-SNAPSHOT"
+version = "1.0.2"
 
 repositories {
     mavenCentral()
@@ -36,3 +36,12 @@ tasks.shadowJar {
 tasks.build {
     dependsOn("shadowJar")
 }
+
+tasks.processResources {
+    val props = mapOf("version" to version)
+    inputs.properties(props)
+    filteringCharset = "UTF-8"
+    filesMatching("extension.yml") {
+        expand(props)
+    }
+}

src/main/java/me/geyserextensionists/geyserdisplayentity/entity/ItemDisplayEntity.java

@@ -67,12 +67,6 @@ public void setDisplayedItem(EntityMetadata<ItemStack, ?> entityMetadata) {
 
         String type = session.getItemMappings().getMapping(stack.getId()).getJavaItem().javaIdentifier();
 
-
-        CustomModelData modelData = null;
-        DataComponents components = stack.getDataComponentsPatch();
-
-        if (components != null) modelData = components.get(DataComponentTypes.CUSTOM_MODEL_DATA);
-
         for (FileConfiguration mappingsConfig : GeyserDisplayEntity.getExtension().getConfigManager().getConfigMappingsCache().values()) {
             for (Object mappingKey : mappingsConfig.getRootNode().childrenMap().keySet()) {
                 String mappingString = mappingKey.toString();
@@ -81,19 +75,13 @@ public void setDisplayedItem(EntityMetadata<ItemStack, ?> entityMetadata) {
                 if (mappingConfig == null) continue;
                 if (!mappingConfig.getString("type").equals(type)) continue;
 
-                if (mappingConfig.getInt("model-data") == -1) {
-                    config = mappingConfig.getConfigurationSection("displayentityoptions");
-                    setOffset(config.getDouble("y-offset"));
-                    if (config.getBoolean("vanilla-scale")) applyScale();
+                if (GeyserDisplayEntity.getExtension().getConfigManager().getConfig().getBoolean("general.use-legacy-models")) {
+                    applyLegacyModelData(stack, mappingConfig);
                     break;
                 }
 
-                if (modelData != null && Math.abs(mappingConfig.getInt("model-data") - modelData.floats().get(0)) < 0.5) {
-                    config = mappingConfig.getConfigurationSection("displayentityoptions");
-                    setOffset(config.getDouble("y-offset"));
-                    if (config.getBoolean("vanilla-scale")) applyScale();
-                    break;
-                }
+                applyModernItemModels(item, mappingConfig);
+                break;
             }
         }
 
@@ -120,6 +108,43 @@ public void setDisplayedItem(EntityMetadata<ItemStack, ?> entityMetadata) {
         updateMainHand(session);
     }
 
+    private void applyLegacyModelData(ItemStack item, FileConfiguration mappingConfig) {
+        CustomModelData modelData = null;
+        DataComponents components = item.getDataComponentsPatch();
+
+        if (components != null) modelData = components.get(DataComponentTypes.CUSTOM_MODEL_DATA);
+
+        if (mappingConfig.getInt("model-data") == -1) {
+            entityApplyDisplayConfig(mappingConfig);
+            return;
+        }
+
+        if (modelData == null) return;
+
+        if (Math.abs(mappingConfig.getInt("model-data") - modelData.floats().get(0)) < 0.5) {
+            entityApplyDisplayConfig(mappingConfig);
+        }
+    }
+
+    private void applyModernItemModels(ItemData itemData, FileConfiguration mappingConfig) {
+        String itemBedrockIdentifier = itemData.getDefinition().getIdentifier().replace("geyser_custom:", "");
+
+        if (mappingConfig.getString("item-identifier").equals("none")) {
+            entityApplyDisplayConfig(mappingConfig);
+            return;
+        }
+
+        if (mappingConfig.getString("item-identifier").equalsIgnoreCase(itemBedrockIdentifier)) {
+            entityApplyDisplayConfig(mappingConfig);
+        }
+    }
+
+    private void entityApplyDisplayConfig(FileConfiguration mappingConfig) {
+        config = mappingConfig.getConfigurationSection("displayentityoptions");
+        setOffset(config.getDouble("y-offset"));
+        if (config.getBoolean("vanilla-scale")) applyScale();
+    }
+
     @Override
     protected void applyScale() {
         if (needHide) {

src/main/resources/Extension/Mappings/example.yml

@@ -1,9 +1,15 @@
+# Legacy Model format:
+# model-data: -1
+
+# Modern Model format:
+# item-identifier: "none"
+
 mappings:
   example:
     # Item type
     type: "minecraft:iron_sword"
-    # Custom model data, -1 represent ignore custom model data
-    model-data: -1
+    # Item identifier, Set to "none" to ignore the item model
+    item-identifier: "none"
     # options
     displayentityoptions:
       # The y-offset of display entity

src/main/resources/Extension/config.yml

@@ -1,5 +1,7 @@
 # General display options
 general:
+  # Uses the custom data model numbers (please switch to item models)
+  use-legacy-models: false
   # The height of display entity
   height: 1.7
   # The y-offset of display entity

src/main/resources/extension.yml

@@ -2,7 +2,7 @@ name: GeyserDisplayEntity
 id: geyserdisplayentity
 main: me.geyserextensionists.geyserdisplayentity.GeyserDisplayEntity
 api: 2.7.0
-version: 1.0.0
+version: "${version}"
 authors:
   - zimzaza4
   - xSquishyLiam