From 052306bd21f377de127dd71d1c5a34a2d941afce Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Sat, 21 Mar 2026 20:25:15 +0000 Subject: [PATCH] Port axe/sword attack damage changes --- .../{ => tools}/copper_armor/boots.json | 0 .../{ => tools}/copper_armor/chestplate.json | 0 .../{ => tools}/copper_armor/helmet.json | 0 .../{ => tools}/copper_armor/leggings.json | 0 .../tools/diamond/axe.json | 23 +++++++++++++++++++ .../tools/diamond/sword.json | 23 +++++++++++++++++++ .../{ => tools}/gold/boots.json | 0 .../{ => tools}/gold/chestplate.json | 0 .../{ => tools}/gold/helmet.json | 0 .../{ => tools}/gold/leggings.json | 0 .../{ => tools}/gold/tools/axe.json | 2 +- .../{ => tools}/gold/tools/durability.json | 0 .../{ => tools}/gold/tools/hoe.json | 0 .../{ => tools}/gold/tools/pickaxe.json | 0 .../{ => tools}/gold/tools/shovel.json | 0 .../{ => tools}/gold/tools/spear.json | 0 .../{ => tools}/gold/tools/sword.json | 2 +- .../tools/netherite/axe.json | 23 +++++++++++++++++++ .../tools/netherite/sword.json | 23 +++++++++++++++++++ 19 files changed, 94 insertions(+), 2 deletions(-) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/copper_armor/boots.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/copper_armor/chestplate.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/copper_armor/helmet.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/copper_armor/leggings.json (100%) create mode 100644 overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/axe.json create mode 100644 overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/sword.json rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/boots.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/chestplate.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/helmet.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/leggings.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/tools/axe.json (96%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/tools/durability.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/tools/hoe.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/tools/pickaxe.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/tools/shovel.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/tools/spear.json (100%) rename overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/{ => tools}/gold/tools/sword.json (95%) create mode 100644 overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/axe.json create mode 100644 overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/sword.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/boots.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/boots.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/boots.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/boots.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/chestplate.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/chestplate.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/chestplate.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/chestplate.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/helmet.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/helmet.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/helmet.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/helmet.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/leggings.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/leggings.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/leggings.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/leggings.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/axe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/axe.json new file mode 100644 index 0000000..5548046 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/axe.json @@ -0,0 +1,23 @@ +{ + "items": [ + "minecraft:diamond_axe" + ], + "patch": { + "attribute_modifiers": [ + { + "type": "generic.attack_damage", + "slot": "mainhand", + "id": "base_attack_damage", + "amount": 11, + "operation": "add_value" + }, + { + "type": "minecraft:generic.attack_speed", + "id": "minecraft:base_attack_speed", + "amount": -3, + "operation": "add_value", + "slot": "mainhand" + } + ] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/sword.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/sword.json new file mode 100644 index 0000000..7876c7a --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/sword.json @@ -0,0 +1,23 @@ +{ + "items": [ + "minecraft:diamond_sword" + ], + "patch": { + "attribute_modifiers": [ + { + "type": "generic.attack_damage", + "slot": "mainhand", + "id": "base_attack_damage", + "amount": 7, + "operation": "add_value" + }, + { + "type": "minecraft:generic.attack_speed", + "id": "minecraft:base_attack_speed", + "amount": -2.4000000953674316, + "operation": "add_value", + "slot": "mainhand" + } + ] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/boots.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/boots.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/boots.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/boots.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/chestplate.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/chestplate.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/chestplate.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/chestplate.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/helmet.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/helmet.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/helmet.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/helmet.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/leggings.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/leggings.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/leggings.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/leggings.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/axe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/axe.json similarity index 96% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/axe.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/axe.json index 52c9b18..e3ab9ee 100644 --- a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/axe.json +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/axe.json @@ -14,7 +14,7 @@ "type": "generic.attack_damage", "slot": "mainhand", "id": "base_attack_damage", - "amount": 8, + "amount": 9, "operation": "add_value" }, { diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/durability.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/durability.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/durability.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/durability.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/hoe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/hoe.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/hoe.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/hoe.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/pickaxe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/pickaxe.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/pickaxe.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/pickaxe.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/shovel.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/shovel.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/shovel.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/shovel.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/spear.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/spear.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/spear.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/spear.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/sword.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/sword.json similarity index 95% rename from overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/sword.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/sword.json index 699655e..29d4e33 100644 --- a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/sword.json +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/sword.json @@ -8,7 +8,7 @@ "type": "generic.attack_damage", "slot": "mainhand", "id": "base_attack_damage", - "amount": 5.5, + "amount": 6, "operation": "add_value" }, { diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/axe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/axe.json new file mode 100644 index 0000000..4157ffb --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/axe.json @@ -0,0 +1,23 @@ +{ + "items": [ + "minecraft:netherite_axe" + ], + "patch": { + "attribute_modifiers": [ + { + "type": "generic.attack_damage", + "slot": "mainhand", + "id": "base_attack_damage", + "amount": 14, + "operation": "add_value" + }, + { + "type": "minecraft:generic.attack_speed", + "id": "minecraft:base_attack_speed", + "amount": -3, + "operation": "add_value", + "slot": "mainhand" + } + ] + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/sword.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/sword.json new file mode 100644 index 0000000..0b8650f --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/sword.json @@ -0,0 +1,23 @@ +{ + "items": [ + "minecraft:netherite_sword" + ], + "patch": { + "attribute_modifiers": [ + { + "type": "generic.attack_damage", + "slot": "mainhand", + "id": "base_attack_damage", + "amount": 9, + "operation": "add_value" + }, + { + "type": "minecraft:generic.attack_speed", + "id": "minecraft:base_attack_speed", + "amount": -2.4000000953674316, + "operation": "add_value", + "slot": "mainhand" + } + ] + } +}