From 74d20d84836c7f23b7ed21af665a71158426a257 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Sun, 9 Nov 2025 14:59:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E9=98=B2=E6=9C=AA=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E5=9F=BA=E4=BA=8E=E7=BA=B9=E9=A5=B0=E7=9B=94=E7=94=B2?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=94=81=E9=93=BE=E7=94=B2=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E7=9A=84=E7=BD=91=E7=BB=9C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/factory/ComponentItemFactory1_20_5.java  | 15 +++++++++++----
 .../resources/resources/legacy_armor/pack.yml     |  4 +---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
index 7a24b32f8..01539c1b0 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
@@ -501,10 +501,17 @@ public class ComponentItemFactory1_20_5 extends BukkitItemFactory<ComponentItemW
         if (trim == null) {
             item.resetComponent(DataComponentTypes.TRIM);
         } else {
-            item.setJavaComponent(DataComponentTypes.TRIM, Map.of(
-                    "pattern", trim.pattern().asString(),
-                    "material", trim.material().asString()
-            ));
+            try {
+                item.setJavaComponent(DataComponentTypes.TRIM, Map.of(
+                        "pattern", trim.pattern().asString(),
+                        "material", trim.material().asString()
+                ));
+            } catch (Exception e) {
+                // 预防未启用基于纹饰盔甲时，锁链甲可能产生的网络问题（由用户配置决定）
+                if (!trim.material().equals(Key.of("minecraft", "custom")) && !trim.pattern().equals(Key.of("minecraft", "chainmail"))) {
+                    this.plugin.logger().warn("Failed to apply trim " + trim, e);
+                }
+            }
         }
     }
 
diff --git a/common-files/src/main/resources/resources/legacy_armor/pack.yml b/common-files/src/main/resources/resources/legacy_armor/pack.yml
index f73b20dc9..86e3cb1cf 100644
--- a/common-files/src/main/resources/resources/legacy_armor/pack.yml
+++ b/common-files/src/main/resources/resources/legacy_armor/pack.yml
@@ -2,6 +2,4 @@ author: XiaoMoMi
 version: 0.0.1
 description: Fix broken vanilla armor
 namespace: minecraft
-enable:
-  $$>=1.21.2: false
-  $$<1.21.2: true
+enable: false

From 8809c354db91207d8a12c5999656375eab1b170e Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Sun, 9 Nov 2025 15:10:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8l10n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/blocks/amethyst_torch.yml   |  6 ++--
 .../configuration/blocks/chessboard_block.yml |  2 +-
 .../configuration/blocks/chinese_lantern.yml  |  2 +-
 .../configuration/blocks/copper_coil.yml      |  2 +-
 .../blocks/ender_pearl_flower.yml             |  2 +-
 .../configuration/blocks/fairy_flower.yml     |  2 +-
 .../configuration/blocks/flame_cane.yml       |  2 +-
 .../configuration/blocks/gunpowder_block.yml  |  4 +--
 .../configuration/blocks/hami_melon.yml       |  6 ++--
 .../configuration/blocks/magma_plant.yml      |  2 +-
 .../configuration/blocks/netherite_anvil.yml  |  2 +-
 .../configuration/blocks/palm_tree.yml        | 30 +++++++++----------
 .../default/configuration/blocks/pebble.yml   |  2 +-
 .../default/configuration/blocks/reed.yml     |  2 +-
 .../configuration/blocks/safe_block.yml       |  4 +--
 .../default/configuration/blocks/sofa.yml     |  4 +--
 .../configuration/blocks/table_lamp.yml       |  2 +-
 .../configuration/blocks/topaz_ore.yml        |  6 ++--
 .../default/configuration/categories.yml      | 10 +++----
 .../resources/default/configuration/emoji.yml |  2 +-
 .../default/configuration/furniture/bench.yml |  2 +-
 .../configuration/furniture/flower_basket.yml |  2 +-
 .../configuration/furniture/wooden_chair.yml  |  2 +-
 .../default/configuration/items/cap.yml       |  2 +-
 .../configuration/items/flame_elytra.yml      |  2 +-
 .../configuration/items/topaz_armor.yml       |  2 +-
 .../configuration/items/topaz_tool_weapon.yml | 20 ++++++-------
 27 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml b/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml
index 773ea9c4e..5abdab95c 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml
@@ -2,7 +2,7 @@ items:
   default:amethyst_torch:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.amethyst_torch>
+      item-name: <!i><l10n:item.amethyst_torch>
     model:
       type: minecraft:model
       path: minecraft:item/custom/amethyst_torch
@@ -20,7 +20,7 @@ items:
   default:amethyst_standing_torch:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.amethyst_torch>
+      item-name: <!i><l10n:item.amethyst_torch>
     model:
       type: minecraft:model
       path: minecraft:block/custom/amethyst_torch
@@ -31,7 +31,7 @@ items:
   default:amethyst_wall_torch:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.amethyst_torch>
+      item-name: <!i><l10n:item.amethyst_torch>
     model:
       type: minecraft:model
       path: minecraft:block/custom/amethyst_wall_torch
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml b/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml
index 7e36d6d45..cb6bfdb18 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml
@@ -2,7 +2,7 @@ items:
   default:chessboard_block:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.chessboard_block>
+      item-name: <!i><l10n:item.chessboard_block>
     model:
       type: minecraft:model
       path: minecraft:item/custom/chessboard_block
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml b/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml
index 420809bc8..1dadb3500 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml
@@ -2,7 +2,7 @@ items:
   default:chinese_lantern:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.chinese_lantern>
+      item-name: <!i><l10n:item.chinese_lantern>
     model:
       type: minecraft:model
       path: minecraft:item/custom/chinese_lantern
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml b/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml
index 9d9b8bf83..7615f1fb6 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml
@@ -2,7 +2,7 @@ items:
   default:copper_coil:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.copper_coil>
+      item-name: <!i><l10n:item.copper_coil>
     model:
       type: minecraft:model
       path: minecraft:item/custom/copper_coil
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml b/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml
index 0847ee653..258f99c92 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml
@@ -2,7 +2,7 @@ items:
   default:ender_pearl_flower_seeds:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.ender_pearl_flower_seeds>
+      item-name: <!i><l10n:item.ender_pearl_flower_seeds>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml b/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml
index ef42b7638..08debd5e8 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml
@@ -2,7 +2,7 @@ items:
   default:fairy_flower:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.fairy_flower>
+      item-name: <!i><l10n:item.fairy_flower>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml b/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml
index 4213b62bd..dd50822f0 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml
@@ -2,7 +2,7 @@ items:
   default:flame_cane:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.flame_cane>
+      item-name: <!i><l10n:item.flame_cane>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml b/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml
index e114b183c..17bf82ce5 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml
@@ -2,7 +2,7 @@ items:
   default:gunpowder_block:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.gunpowder_block>
+      item-name: <!i><l10n:item.gunpowder_block>
     model:
       type: minecraft:model
       path: minecraft:item/custom/gunpowder_block
@@ -37,7 +37,7 @@ items:
   default:solid_gunpowder_block:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.solid_gunpowder_block>
+      item-name: <!i><l10n:item.solid_gunpowder_block>
     model:
       type: minecraft:model
       path: minecraft:item/custom/solid_gunpowder_block
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml b/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml
index 03592440a..67de31a05 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml
@@ -2,7 +2,7 @@ items:
   default:hami_melon_slice:
     material: melon_slice
     data:
-      item-name: <!i><i18n:item.hami_melon_slice>
+      item-name: <!i><l10n:item.hami_melon_slice>
       $$>=1.20.5:
         food:
           nutrition: 2
@@ -20,7 +20,7 @@ items:
   default:hami_melon:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.hami_melon>
+      item-name: <!i><l10n:item.hami_melon>
     model:
       path: minecraft:item/custom/hami_melon
       generation:
@@ -31,7 +31,7 @@ items:
   default:hami_melon_seeds:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.hami_melon_seeds>
+      item-name: <!i><l10n:item.hami_melon_seeds>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml b/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml
index 7eb0e196b..b608b57b9 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml
@@ -6,7 +6,7 @@ items:
       arguments:
         path: minecraft:item/custom/magma_fruit
     data:
-      item-name: <!i><white><i18n:item.magma_fruit>
+      item-name: <!i><white><l10n:item.magma_fruit>
       $$>=1.20.5:
         food:
           nutrition: 3
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml b/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml
index 467ff359b..86fbecd35 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml
@@ -2,7 +2,7 @@ items:
   default:netherite_anvil:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.netherite_anvil>
+      item-name: <!i><l10n:item.netherite_anvil>
     model:
       type: minecraft:model
       path: minecraft:item/custom/netherite_anvil
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml b/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml
index d628ff0d8..b3835f599 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml
@@ -8,7 +8,7 @@ items:
         - minecraft:logs
         - minecraft:logs_that_burn
     data:
-      item-name: <!i><i18n:item.palm_log>
+      item-name: <!i><l10n:item.palm_log>
     model:
       type: minecraft:model
       path: minecraft:item/custom/palm_log
@@ -40,7 +40,7 @@ items:
         - minecraft:logs
         - minecraft:logs_that_burn
     data:
-      item-name: <!i><i18n:item.stripped_palm_log>
+      item-name: <!i><l10n:item.stripped_palm_log>
     model:
       type: minecraft:model
       path: minecraft:item/custom/stripped_palm_log
@@ -69,7 +69,7 @@ items:
         - minecraft:logs
         - minecraft:logs_that_burn
     data:
-      item-name: <!i><i18n:item.palm_wood>
+      item-name: <!i><l10n:item.palm_wood>
     model:
       type: minecraft:model
       path: minecraft:item/custom/palm_wood
@@ -101,7 +101,7 @@ items:
         - minecraft:logs
         - minecraft:logs_that_burn
     data:
-      item-name: <!i><i18n:item.stripped_palm_wood>
+      item-name: <!i><l10n:item.stripped_palm_wood>
     model:
       type: minecraft:model
       path: minecraft:item/custom/stripped_palm_wood
@@ -129,7 +129,7 @@ items:
         - minecraft:planks
         - minecraft:wooden_tool_materials
     data:
-      item-name: <!i><i18n:item.palm_planks>
+      item-name: <!i><l10n:item.palm_planks>
     model:
       type: minecraft:model
       path: minecraft:item/custom/palm_planks
@@ -153,7 +153,7 @@ items:
     settings:
       fuel-time: 100
     data:
-      item-name: <!i><i18n:item.palm_sapling>
+      item-name: <!i><l10n:item.palm_sapling>
       lore:
         - "<!i><gray>Requires the datapack tree configuration to function."
         - "<!i><gray>If not configured, an oak tree will grow by default."
@@ -197,7 +197,7 @@ items:
   default:palm_leaves:
     material: oak_leaves
     data:
-      item-name: <!i><i18n:item.palm_leaves>
+      item-name: <!i><l10n:item.palm_leaves>
       block-state: default:palm_leaves[persistent=true,waterlogged=false,distance=7]
     model:
       type: minecraft:model
@@ -227,7 +227,7 @@ items:
   default:palm_trapdoor:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.palm_trapdoor>
+      item-name: <!i><l10n:item.palm_trapdoor>
     settings:
       fuel-time: 300
     model:
@@ -281,7 +281,7 @@ items:
   default:palm_door:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.palm_door>
+      item-name: <!i><l10n:item.palm_door>
     settings:
       fuel-time: 200
     model:
@@ -355,7 +355,7 @@ items:
   default:palm_fence_gate:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.palm_fence_gate>
+      item-name: <!i><l10n:item.palm_fence_gate>
     settings:
       fuel-time: 300
     model:
@@ -411,7 +411,7 @@ items:
   default:palm_slab:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.palm_slab>
+      item-name: <!i><l10n:item.palm_slab>
     settings:
       fuel-time: 150
     model:
@@ -462,7 +462,7 @@ items:
       generation:
         parent: minecraft:block/custom/palm_stairs
     data:
-      item-name: <!i><i18n:item.palm_stairs>
+      item-name: <!i><l10n:item.palm_stairs>
     settings:
       fuel-time: 300
     behavior:
@@ -511,7 +511,7 @@ items:
       generation:
         parent: minecraft:block/custom/palm_pressure_plate
     data:
-      item-name: <!i><i18n:item.palm_pressure_plate>
+      item-name: <!i><l10n:item.palm_pressure_plate>
     settings:
       fuel-time: 300
     behavior:
@@ -560,7 +560,7 @@ items#pfence:
   default:palm_fence:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.palm_fence>
+      item-name: <!i><l10n:item.palm_fence>
     model:
       type: minecraft:model
       path: minecraft:item/custom/palm_fence_inventory
@@ -632,7 +632,7 @@ items#button:
         textures:
           texture: minecraft:block/custom/palm_planks
     data:
-      item-name: <!i><i18n:item.palm_button>
+      item-name: <!i><l10n:item.palm_button>
     settings:
       fuel-time: 100
     behavior:
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml b/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml
index 6f267d5ad..d9dd1ef1f 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml
@@ -2,7 +2,7 @@ items:
   default:pebble:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.pebble>
+      item-name: <!i><l10n:item.pebble>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml b/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml
index de1e00be9..49ce9b22d 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml
@@ -2,7 +2,7 @@ items:
   default:reed:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.reed>
+      item-name: <!i><l10n:item.reed>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml b/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml
index ff538a949..103c0a95c 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml
@@ -2,7 +2,7 @@ items:
   default:safe_block:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.safe_block>
+      item-name: <!i><l10n:item.safe_block>
     model:
       type: minecraft:model
       path: minecraft:item/custom/safe_block
@@ -31,7 +31,7 @@ items:
             step: minecraft:block.stone.step
         behavior:
           type: simple_storage_block
-          title: "<i18n:item.safe_block>"
+          title: "<l10n:item.safe_block>"
           rows: 1
           sounds:
             open: minecraft:block.iron_trapdoor.open
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml
index d0b126ea1..bd5e72fd3 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml
@@ -2,7 +2,7 @@ items:
   default:sleeper_sofa:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.sofa>
+      item-name: <!i><l10n:item.sofa>
     model:
       type: minecraft:model
       path: minecraft:item/custom/sleeper_sofa
@@ -50,7 +50,7 @@ items:
   default:sofa:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.sofa>
+      item-name: <!i><l10n:item.sofa>
     model:
       type: minecraft:model
       path: minecraft:item/custom/sofa
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml b/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml
index 7f7165c56..adb60844a 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml
@@ -2,7 +2,7 @@ items:
   default:table_lamp:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.table_lamp>
+      item-name: <!i><l10n:item.table_lamp>
     model:
       type: minecraft:model
       path: minecraft:item/custom/table_lamp
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml b/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml
index f120a9776..00d5621a5 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml
@@ -2,7 +2,7 @@ items:
   default:topaz_ore:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.topaz_ore>
+      item-name: <!i><l10n:item.topaz_ore>
     model:
       type: minecraft:model
       path: minecraft:item/custom/topaz_ore
@@ -14,7 +14,7 @@ items:
   default:deepslate_topaz_ore:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.deepslate_topaz_ore>
+      item-name: <!i><l10n:item.deepslate_topaz_ore>
     model:
       type: minecraft:model
       path: minecraft:item/custom/deepslate_topaz_ore
@@ -31,7 +31,7 @@ items:
             - '#default:topaz_tools'
           percent: 0.25
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz>
+      item-name: <!i><#FF8C00><l10n:item.topaz>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/categories.yml b/common-files/src/main/resources/resources/default/configuration/categories.yml
index e86e20116..2f9c69cb6 100644
--- a/common-files/src/main/resources/resources/default/configuration/categories.yml
+++ b/common-files/src/main/resources/resources/default/configuration/categories.yml
@@ -1,16 +1,16 @@
 categories:
   default:default:
     priority: 1
-    name: <!i><white><i18n:category.default.name></white>
+    name: <!i><white><l10n:category.default.name></white>
     lore:
-      - <!i><gray><i18n:category.default.lore>
+      - <!i><gray><l10n:category.default.lore>
     icon: default:topaz
     list:
       - '#default:palm_tree'
       - '#default:topaz'
       - '#default:misc'
   default:palm_tree:
-    name: <!i><green><i18n:category.palm_tree></green>
+    name: <!i><green><l10n:category.palm_tree></green>
     hidden: true
     icon: default:palm_log
     list:
@@ -30,7 +30,7 @@ categories:
       - default:palm_pressure_plate
       - default:palm_button
   default:topaz:
-    name: <!i><#FF8C00><i18n:category.topaz></#FF8C00>
+    name: <!i><#FF8C00><l10n:category.topaz></#FF8C00>
     hidden: true
     icon: default:topaz
     list:
@@ -51,7 +51,7 @@ categories:
       - default:topaz_leggings
       - default:topaz_boots
   default:misc:
-    name: <!i><gray><i18n:category.misc></gray>
+    name: <!i><gray><l10n:category.misc></gray>
     hidden: true
     icon: default:chinese_lantern
     list:
diff --git a/common-files/src/main/resources/resources/default/configuration/emoji.yml b/common-files/src/main/resources/resources/default/configuration/emoji.yml
index 4fe4b0e69..aa001996e 100644
--- a/common-files/src/main/resources/resources/default/configuration/emoji.yml
+++ b/common-files/src/main/resources/resources/default/configuration/emoji.yml
@@ -1,6 +1,6 @@
 templates:
   default:emoji/basic:
-    content: <hover:show_text:'<i18n:emoji.tip>'><!shadow><white><arg:emoji></white></!shadow></hover>
+    content: <hover:show_text:'<l10n:emoji.tip>'><!shadow><white><arg:emoji></white></!shadow></hover>
 emoji:
   default:emoji_smiley:
     template: default:emoji/basic
diff --git a/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml b/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml
index cf5688160..3b4b68471 100644
--- a/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml
+++ b/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml
@@ -2,7 +2,7 @@ items:
   default:bench:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.bench>
+      item-name: <!i><l10n:item.bench>
     model:
       type: minecraft:model
       path: minecraft:item/custom/bench
diff --git a/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml b/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml
index 63c508fde..0dd2ac5c2 100644
--- a/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml
+++ b/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml
@@ -2,7 +2,7 @@ items:
   default:flower_basket:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.flower_basket>
+      item-name: <!i><l10n:item.flower_basket>
     model:
       template: default:model/simplified_generated
       arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml b/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml
index 5d62051b1..24471cfb1 100644
--- a/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml
+++ b/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml
@@ -2,7 +2,7 @@ items:
   default:wooden_chair:
     material: nether_brick
     data:
-      item-name: <!i><i18n:item.wooden_chair>
+      item-name: <!i><l10n:item.wooden_chair>
     model:
       type: minecraft:model
       path: minecraft:item/custom/wooden_chair
diff --git a/common-files/src/main/resources/resources/default/configuration/items/cap.yml b/common-files/src/main/resources/resources/default/configuration/items/cap.yml
index aaa7a88b3..4f03b1dee 100644
--- a/common-files/src/main/resources/resources/default/configuration/items/cap.yml
+++ b/common-files/src/main/resources/resources/default/configuration/items/cap.yml
@@ -4,7 +4,7 @@ items:
     $$<=1.21.1:
       client-bound-material: leather_horse_armor
     data:
-      item-name: <!i><white><i18n:item.cap>
+      item-name: <!i><white><l10n:item.cap>
       unbreakable: true
       remove-components:
         - attribute_modifiers
diff --git a/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml b/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml
index 43425ae92..e89cc0f4e 100644
--- a/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml
+++ b/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml
@@ -8,7 +8,7 @@ items:
           asset-id: flame
           wings: flame_elytra
       data:
-        item-name: <!i><#FF8C00><i18n:item.flame_elytra>
+        item-name: <!i><#FF8C00><l10n:item.flame_elytra>
       model:
         template: default:model/simplified_elytra
         arguments:
diff --git a/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml b/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml
index fcbaf8c86..8d624a490 100644
--- a/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml
+++ b/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml
@@ -2,7 +2,7 @@ templates:
   default:armor/topaz:
     material: chainmail_${part}
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_${part}>
+      item-name: <!i><#FF8C00><l10n:item.topaz_${part}>
       tooltip-style: minecraft:topaz
     settings:
       tags:
diff --git a/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml b/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml
index 3eb60e3d0..04a893078 100644
--- a/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml
+++ b/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml
@@ -5,7 +5,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_rod>
+      item-name: <!i><#FF8C00><l10n:item.topaz_rod>
       tooltip-style: minecraft:topaz
     model:
       template: default:model/simplified_fishing_rod_2d
@@ -18,7 +18,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_bow>
+      item-name: <!i><#FF8C00><l10n:item.topaz_bow>
       tooltip-style: minecraft:topaz
     model:
       template: default:model/simplified_bow_2d
@@ -33,7 +33,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_crossbow>
+      item-name: <!i><#FF8C00><l10n:item.topaz_crossbow>
       tooltip-style: minecraft:topaz
     model:
       template: default:model/simplified_crossbow_2d
@@ -50,7 +50,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_pickaxe>
+      item-name: <!i><#FF8C00><l10n:item.topaz_pickaxe>
       tooltip-style: minecraft:topaz
       max-damage: 64
     model:
@@ -63,7 +63,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_axe>
+      item-name: <!i><#FF8C00><l10n:item.topaz_axe>
       tooltip-style: minecraft:topaz
       max-damage: 64
     model:
@@ -76,7 +76,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_hoe>
+      item-name: <!i><#FF8C00><l10n:item.topaz_hoe>
       tooltip-style: minecraft:topaz
       max-damage: 64
     model:
@@ -89,7 +89,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_shovel>
+      item-name: <!i><#FF8C00><l10n:item.topaz_shovel>
       tooltip-style: minecraft:topaz
       max-damage: 64
     model:
@@ -102,7 +102,7 @@ items:
       tags:
         - default:topaz_tools
     data:
-      item-name: <!i><#FF8C00><i18n:item.topaz_sword>
+      item-name: <!i><#FF8C00><l10n:item.topaz_sword>
       tooltip-style: minecraft:topaz
       max-damage: 64
     model:
@@ -122,7 +122,7 @@ items:
         tags:
           - default:topaz_tools
       data:
-        item-name: <!i><#FF8C00><i18n:item.topaz_trident>
+        item-name: <!i><#FF8C00><l10n:item.topaz_trident>
         tooltip-style: minecraft:topaz
         max-damage: 300
       model:
@@ -163,7 +163,7 @@ items:
         $$1.20.1~1.21.1: bow
         $$1.21.2~1.21.3: honey_bottle
       data:
-        item-name: <!i><#FF8C00><i18n:item.topaz_trident>
+        item-name: <!i><#FF8C00><l10n:item.topaz_trident>
         components:
           minecraft:max_damage: 300
       $$>=1.21.2: