From cc756f5db6b19e49cc63901c19514e906bcfadb8 Mon Sep 17 00:00:00 2001 From: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com> Date: Sun, 27 Sep 2026 14:24:26 +0200 Subject: [PATCH] fix: sync the default model scheme with the live server and add bronze models The bundled basic.yml had drifted from the one TFMCMain01 uses. Its warhammer entries were spelled "warhammher", so warhammers never got a metal model, the steel spear and abyssalite polearm pointed at other metals, and shortsword, lute, shield, banner and the mage scheme were missing. Bronze now uses its own models: the shortsword on iron_sword 49, the lute on iron_shovel 24, and the tfmc_armor bronze armor set. Co-Authored-By: Claude Opus 5.5 (1M context) --- src/main/resources/model-schemes/basic.yml | 63 +++++++++++++++------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/src/main/resources/model-schemes/basic.yml b/src/main/resources/model-schemes/basic.yml index 9ab42cb..b56e54f 100644 --- a/src/main/resources/model-schemes/basic.yml +++ b/src/main/resources/model-schemes/basic.yml @@ -6,76 +6,86 @@ iron: - sword(v.iron_sword.0) - battleaxe(v.iron_axe.4) - dagger(v.iron_sword.4) - - warhammher(v.iron_shovel.2) + - warhammer(v.iron_shovel.2) - spear(v.iron_hoe.2) - polearm(v.iron_hoe.6) - greathammer(v.iron_shovel.6) - longsword(v.iron_sword.8) - greataxe(v.iron_axe.8) + - shortsword(v.iron_sword.12) + - lute(v.iron_shovel.10) - helmet(v.chainmail_helmet.0) - chestplate(v.chainmail_chestplate.0) - leggings(v.chainmail_leggings.0) - boots(v.chainmail_boots.0) - + steel: models: - sword(v.iron_sword.1) - battleaxe(v.iron_axe.5) - dagger(v.iron_sword.5) - - warhammher(v.iron_shovel.3) - - spear(v.iron_hoe.2) + - warhammer(v.iron_shovel.3) + - spear(v.iron_hoe.3) - polearm(v.iron_hoe.7) - greathammer(v.iron_shovel.7) - longsword(v.iron_sword.9) - greataxe(v.iron_axe.9) + - shortsword(v.iron_sword.13) + - lute(v.iron_shovel.11) - helmet(v.iron_helmet.0) - chestplate(v.iron_chestplate.0) - leggings(v.iron_leggings.0) - boots(v.iron_boots.0) - -bronze: #Needs weapon models, using steel rn + +bronze: models: - sword(v.iron_sword.22) - battleaxe(v.iron_axe.12) - dagger(v.iron_sword.23) - - warhammher(v.iron_shovel.14) - - spear(v.iron_hoe.3) - - polearm(v.iron_hoe.8) + - warhammer(v.iron_shovel.14) + - spear(v.iron_hoe.10) + - polearm(v.iron_hoe.11) - greathammer(v.iron_shovel.15) - longsword(v.iron_sword.24) - greataxe(v.iron_axe.13) - - helmet(v.iron_helmet.0) - - chestplate(v.iron_chestplate.0) - - leggings(v.iron_leggings.0) - - boots(v.iron_boots.0) - + - shortsword(v.iron_sword.49) + - lute(v.iron_shovel.24) + - helmet(ia.tfmc_armor:bronze_helmet) + - chestplate(ia.tfmc_armor:bronze_chestplate) + - leggings(ia.tfmc_armor:bronze_leggings) + - boots(ia.tfmc_armor:bronze_boots) + abyssalite: models: - sword(v.iron_sword.2) - battleaxe(v.iron_axe.6) - dagger(v.iron_sword.6) - - warhammher(v.iron_shovel.4) + - warhammer(v.iron_shovel.4) - spear(v.iron_hoe.4) - - polearm(v.iron_hoe.9) + - polearm(v.iron_hoe.8) - greathammer(v.iron_shovel.8) - longsword(v.iron_sword.10) - greataxe(v.iron_axe.10) + - shortsword(v.iron_sword.14) + - lute(v.iron_shovel.12) - helmet(v.netherite_helmet.0) - chestplate(v.netherite_chestplate.0) - leggings(v.netherite_leggings.0) - boots(v.netherite_boots.0) - + mythril: models: - sword(v.iron_sword.3) - battleaxe(v.iron_axe.7) - dagger(v.iron_sword.7) - - warhammher(v.iron_shovel.5) + - warhammer(v.iron_shovel.5) - spear(v.iron_hoe.5) - polearm(v.iron_hoe.9) - greathammer(v.iron_shovel.9) - longsword(v.iron_sword.11) - greataxe(v.iron_axe.11) + - shortsword(v.iron_sword.15) + - lute(v.iron_shovel.13) - helmet(v.diamond_helmet.0) - chestplate(v.diamond_chestplate.0) - leggings(v.diamond_leggings.0) @@ -88,26 +98,41 @@ infantry: - leggings(v.golden_leggings.0) - boots(v.golden_boots.0) +mage: + models: + - helmet(ia.tfmc_armor:iron_mage_helmet) + - chestplate(ia.tfmc_armor:iron_mage_chestplate) + - leggings(ia.tfmc_armor:iron_mage_leggings) + - boots(ia.tfmc_armor:iron_mage_boots) + barkwood: models: - shortbow(v.bow.0) - longbow(v.bow.4) - crossbow(v.crossbow.0) + - shield(v.shield.1) + - banner(v.bone.1) maplewood: models: - shortbow(v.bow.1) - longbow(v.bow.5) - crossbow(v.crossbow.1) + - shield(v.shield.2) + - banner(v.bone.2) elderwood: models: - shortbow(v.bow.2) - longbow(v.bow.6) - crossbow(v.crossbow.2) + - shield(v.shield.3) + - banner(v.bone.3) demonwood: models: - shortbow(v.bow.3) - longbow(v.bow.7) - - crossbow(v.crossbow.3) \ No newline at end of file + - crossbow(v.crossbow.3) + - shield(v.shield.4) + - banner(v.bone.4)