working on lang and advancements

src/main/resources/assets/guarding/lang/en_us.json

@@ -1,19 +1,21 @@
 {
- "item.guarding.netherite_shield": "Netherite Shield",
+ "advancements.guarding.nether.on_guard": "On Guard!",
+ "advancements.guarding.nether.on_guard.desc": "Use a Netherite Ingot to upgrade a Shield.",
+ "advancements.guarding.story.parry_this_you_casual": "Parry This, You Casual!",
+ "advancements.guarding.story.parry_this_you_casual.desc": "Kill an enemy by parrying their own Arrow",
+ "advancements.guarding.story.symbolic_shield": "Symbolic Shield",
+ "advancements.guarding.story.symbolic_shield.desc": "Decorate a Shield with a Banner",
+
  "enchantment.guarding.barbed": "Barbed",
+ "enchantment.guarding.barbed.desc": "Causes damage to enemies attacking you while blocking.",
  "enchantment.guarding.pummeling": "Pummeling",
- "enchantment.guarding.barbed.description": "Applies thorns to the shield",
- "enchantment.guarding.pummeling.description": "Increases parry knockback",
+ "enchantment.guarding.pummeling.desc": "Increases the knockback strength of a parry.",
+
+ "item.guarding.netherite_shield": "Netherite Shield",
+
  "subtitle.guarding.item.shield.parry": "Shield parries",
  "subtitle.guarding.item.netherite_shield.block": "Shield blocks",
  "subtitle.guarding.item.netherite_shield.break": "Shield breaks",
  "subtitle.guarding.item.netherite_shield.parry": "Shield parries",
- "subtitle.guarding.item.netherite_shield.equip": "Gear equips",
-
- "advancements.guarding.story.decorate_shield_with_banner.title": "Stylish Shield!",
- "advancements.guarding.story.decorate_shield_with_banner.desc": "Decorate a shield with a banner.",
- "advancements.guarding.story.kill_mob_with_own_arrow.title": "Parry This, You Casual!",
- "advancements.guarding.story.kill_mob_with_own_arrow.desc": "Kill a Skeleton or Pillager by parrying their own arrow.",
- "advancements.guarding.nether.obtain_netherite_shield.title": "On Guard!",
- "advancements.guarding.nether.obtain_netherite_shield.desc": "Use a Netherite Ingot to upgrade a shield."
+ "subtitle.guarding.item.netherite_shield.equip": "Gear equips"
 }

src/main/resources/assets/guarding/lang/es_mx.json

@@ -0,0 +1,18 @@
+{
+ "advancements.guarding.nether.on_guard": "¡En guardia!",
+ "advancements.guarding.nether.on_guard.desc": "Usa un lingote de netherita para mejorar un escudo",
+ "advancements.guarding.story.parry_this_you_casual": "¡Bloquea esto! Novato",
+ "advancements.guarding.story.parry_this_you_casual.desc": "Mata a un enemigo desviando su propia flecha",
+ "advancements.guarding.story.symbolic_shield": "Escudo simbólico",
+ "advancements.guarding.story.symbolic_shield.desc": "Decora un escudo con un estandarte",
+ "enchantment.guarding.barbed": "Púas",
+ "enchantment.guarding.barbed.desc": "Causes damage to enemies attacking you while blocking.",
+ "enchantment.guarding.pummeling": "Apalear",
+ "enchantment.guarding.pummeling.desc": "Aumenta la fuerza de empuje de un bloqueo perfecto.",
+ "item.guarding.netherite_shield": "Escudo de netherita",
+ "subtitle.guarding.item.netherite_shield.block": "Bloqueo con escudo",
+ "subtitle.guarding.item.netherite_shield.break": "Ítem destruido",
+ "subtitle.guarding.item.netherite_shield.equip": "Armadura equipada",
+ "subtitle.guarding.item.netherite_shield.parry": "Bloqueo perfecto con escudo",
+ "subtitle.guarding.item.shield.parry": "Bloqueo perfecto con escudo"
+}

src/main/resources/assets/guarding/lang/uk_ua.json

@@ -1,12 +1,20 @@
 {
  "enchantment.guarding.barbed": "Колючки",
- "enchantment.guarding.barbed.description": "У разі успішного парирування щит завдасть шкоди нападнику.",
+ "enchantment.guarding.barbed.desc": "У разі успішного парирування щит завдасть шкоди нападнику.",
  "enchantment.guarding.pummeling": "Розбивання",
- "enchantment.guarding.pummeling.description": "При успішному парируванні щит відкидає нападника назад.",
+ "enchantment.guarding.pummeling.desc": "При успішному парируванні щит відкидає нападника назад.",
  "item.guarding.netherite_shield": "Незеритовий щит",
  "subtitle.guarding.item.shield.parry": "Парирування щитом",
  "subtitle.guarding.item.netherite_shield.block": "Блокування щитом",
  "subtitle.guarding.item.netherite_shield.break": "Зломався шит",
  "subtitle.guarding.item.netherite_shield.parry": "Парирування щитом",
- "subtitle.guarding.item.netherite_shield.equip": "Остащення щита"
+ "subtitle.guarding.item.netherite_shield.equip": "Остащення щита",
+ "advancements.guarding.nether.on_guard": "On Guard!",
+ "advancements.guarding.nether.on_guard.desc": "Use a Netherite Ingot to upgrade a Shield.",
+ "advancements.guarding.story.parry_this_you_casual": "Parry This, You Casual!",
+ "advancements.guarding.story.parry_this_you_casual.desc": "Kill an enemy by parrying their own Arrow",
+ "advancements.guarding.story.symbolic_shield": "Symbolic Shield",
+ "advancements.guarding.story.symbolic_shield.desc": "Decorate a Shield with a Banner",
+ "enchantment.guarding.barbed.desc": "Causes damage to enemies attacking you while blocking.",
+ "enchantment.guarding.pummeling.desc": "Increases the knockback strength of a parry."
 }

src/main/resources/data/guarding/advancement/nether/obtain_netherite_shield.json → src/main/resources/data/guarding/advancement/nether/on_guard.json

@@ -5,10 +5,10 @@
  "count": 1
  },
  "title": {
- "translate": "advancements.guarding.nether.obtain_netherite_shield.title"
+ "translate": "advancements.guarding.nether.on_guard"
  },
  "description": {
- "translate": "advancements.guarding.nether.obtain_netherite_shield.desc"
+ "translate": "advancements.guarding.nether.on_guard.desc"
  },
  "frame": "challenge"
  },

src/main/resources/data/guarding/advancement/story/parry_this_you_casual.json

@@ -0,0 +1,27 @@
+{
+ "display": {
+ "icon": {
+ "id": "minecraft:shield",
+ "count": 1
+ },
+ "title": {
+ "translate": "advancements.guarding.story.parry_this_you_casual"
+ },
+ "description": {
+ "translate": "advancements.guarding.story.parry_this_you_casual.desc"
+ },
+ "hidden": true,
+ "frame": "challenge"
+ },
+ "parent": "guarding:story/decorate_shield_with_banner",
+ "criteria": {
+ "killed_by_parried_arrow": {
+ "trigger": "guarding:killed_by_parried_arrow",
+ "conditions": {}
+ }
+ },
+ "requirements": [["killed_by_parried_arrow"]],
+ "rewards": {
+ "experience": 100
+ }
+}

src/main/resources/data/guarding/advancement/story/decorate_shield_with_banner.json → src/main/resources/data/guarding/advancement/story/symbolic_shield.json

@@ -15,10 +15,10 @@
  }
  },
  "title": {
- "translate": "advancements.guarding.story.decorate_shield_with_banner.title"
+ "translate": "advancements.guarding.story.symbolic_shield"
  },
  "description": {
- "translate": "advancements.guarding.story.decorate_shield_with_banner.desc"
+ "translate": "advancements.guarding.story.symbolic_shield.desc"
  }
  },
  "parent": "minecraft:story/deflect_arrow",

src/main/resources/guarding.mixins.json

@@ -1,22 +1,21 @@
 {
- "required": true,
- "minVersion": "0.8",
- "plugin": "com.teamabode.guarding.core.mixin.GuardingMixinPlugin",
- "package": "com.teamabode.guarding.core.mixin",
- "compatibilityLevel": "JAVA_21",
- "mixins": [
- "NetheriteShieldMixin",
- "ShieldItemMixin",
- "SmithingMenuMixin",
- "KilledByParriedArrowTriggerMixin",
- "NetheriteShieldSoundMixin",
- "ProjectileMixin",
- "ShieldDelayMixin",
- "SmithingTemplateItemMixin"
- ],
- "client": [
- ],
- "injectors": {
- "defaultRequire": 1
+ "required": true,
+ "minVersion": "0.8",
+ "plugin": "com.teamabode.guarding.core.mixin.GuardingMixinPlugin",
+ "package": "com.teamabode.guarding.core.mixin",
+ "compatibilityLevel": "JAVA_21",
+ "mixins": [
+ "KilledByParriedArrowTriggerMixin",
+ "NetheriteShieldMixin",
+ "NetheriteShieldSoundMixin",
+ "ProjectileMixin",
+ "ShieldDelayMixin",
+ "ShieldItemMixin",
+ "SmithingMenuMixin",
+ "SmithingTemplateItemMixin"
+ ],
+ "client": [],
+ "injectors": {
+ "defaultRequire": 1
  }
 }