From c24cfb752c67663c6e3ea2bbf507dd2af9bd2670 Mon Sep 17 00:00:00 2001
From: Sergeant Acoustic <sergeantacoustic@noreply.localhost>
Date: Tue, 27 Jan 2026 21:50:35 +0000
Subject: [PATCH] Replace Item Components mod with Defaulted

---
 modrinth.index.json                           | 30 +++++++++---------
 .../gold/tools/durability.json                | 12 -------
 .../item_components/stack_size/banner.json    | 24 --------------
 .../item_components/stack_size/bed.json       | 24 --------------
 .../item_components/stack_size/boat.json      | 26 ----------------
 .../item_components/stack_size/sign.json      | 31 -------------------
 .../item_components/stack_size/soup.json      | 12 -------
 .../gold/boots.json                           |  4 +--
 .../gold/chestplate.json                      |  4 +--
 .../gold/helmet.json                          |  4 +--
 .../gold/leggings.json                        |  4 +--
 .../gold/tools/axe.json                       | 10 ++++--
 .../gold/tools/durability.json                |  8 +++++
 .../gold/tools/hoe.json                       | 10 ++++--
 .../gold/tools/pickaxe.json                   | 10 ++++--
 .../gold/tools/shovel.json                    | 10 ++++--
 .../gold/tools/sword.json                     |  4 +--
 .../stack_size/16.json                        |  9 ++++--
 .../stack_size/64.json                        | 11 +++++--
 19 files changed, 80 insertions(+), 167 deletions(-)
 delete mode 100644 overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/durability.json
 delete mode 100644 overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/banner.json
 delete mode 100644 overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/bed.json
 delete mode 100644 overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/boat.json
 delete mode 100644 overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/sign.json
 delete mode 100644 overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/soup.json
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/boots.json (87%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/chestplate.json (88%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/helmet.json (87%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/leggings.json (87%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/tools/axe.json (66%)
 create mode 100644 overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/durability.json
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/tools/hoe.json (65%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/tools/pickaxe.json (65%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/tools/shovel.json (65%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/gold/tools/sword.json (93%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/stack_size/16.json (82%)
 rename overrides/global_packs/mc_rebalance_datapack/data/{mc_rebalance/item_components => minecraft/defaulted/default_component_patches}/stack_size/64.json (77%)

diff --git a/modrinth.index.json b/modrinth.index.json
index d9cc773..ae9a667 100644
--- a/modrinth.index.json
+++ b/modrinth.index.json
@@ -23,21 +23,6 @@
       },
       "path": "mods/globalpacks-fabric-1.21.1-21.0.6.jar"
     },
-    {
-      "downloads": [
-        "https://cdn.modrinth.com/data/wOl8aLro/versions/BXT6xC81/item-components-1.1%2B1.21.jar"
-      ],
-      "env": {
-        "client": "required",
-        "server": "required"
-      },
-      "fileSize": 48525,
-      "hashes": {
-        "sha1": "d8dc2f5bfc64cd0d0e6bdebb7a5f9db1c9d995d2",
-        "sha512": "762ee17c4d8fc07c6fac552864550534eba3c89dea2c22cf2e79c7abec398570d9992074bd12b1521a89aa472e703d2d969a7b7b7a7d0c75e975becccd3e8e3a"
-      },
-      "path": "mods/item-components-1.1+1.21.jar"
-    },
     {
       "downloads": [
         "https://cdn.modrinth.com/data/91hOfmS6/versions/YoDcA59K/bundle-backportish-1.1.5%2Bmc1.21.1.jar"
@@ -97,6 +82,21 @@
         "sha512": "872c2c6562b76fd1b1876871845cf3480bdc47f33305f28144876c0d50a6441f057c9f9bf450385ac64e92d916e918d167d7ca439386f6bd06c27062ba0b2f1d"
       },
       "path": "mods/treesmakesound-1.2.1.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/LxgPJAAy/versions/tA4yLWwA/defaulted-fabric-1.21.1-1.2.1.2.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 565418,
+      "hashes": {
+        "sha1": "f5d0606c90da8d67dbb74524aeedcb0c689141c5",
+        "sha512": "e589b6f31e8ab7f9858da2d6cfde07f6c5b4d679b492830e05458c921ddb8f828294b69f451e01f070a6745bf7004cb1c81415533918c799197c4efa207e7208"
+      },
+      "path": "mods/defaulted-fabric-1.21.1-1.2.1.2.jar"
     }
   ]
 }
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/durability.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/durability.json
deleted file mode 100644
index 1c21993..0000000
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/durability.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "targets": [
-    "minecraft:golden_sword",
-    "minecraft:golden_shovel",
-    "minecraft:golden_pickaxe",
-    "minecraft:golden_axe",
-    "minecraft:golden_hoe"
-  ],
-  "components": {
-    "minecraft:max_damage": 510
-  }
-}
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/banner.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/banner.json
deleted file mode 100644
index 03ac471..0000000
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/banner.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"targets": [
-		"minecraft:red_banner",
-		"minecraft:black_banner",
-		"minecraft:blue_banner",
-		"minecraft:brown_banner",
-		"minecraft:cyan_banner",
-		"minecraft:gray_banner",
-		"minecraft:green_banner",
-		"minecraft:light_blue_banner",
-		"minecraft:light_gray_banner",
-		"minecraft:lime_banner",
-		"minecraft:magenta_banner",
-		"minecraft:orange_banner",
-		"minecraft:pink_banner",
-		"minecraft:purple_banner",
-		"minecraft:white_banner",
-		"minecraft:yellow_banner",
-		"#minecraft:banners"
-	],
-	"components": {
-		"minecraft:max_stack_size": 64
-	}
-}
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/bed.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/bed.json
deleted file mode 100644
index cc87b81..0000000
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/bed.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"targets": [
-		"minecraft:red_bed",
-		"minecraft:black_bed",
-		"minecraft:blue_bed",
-		"minecraft:brown_bed",
-		"minecraft:cyan_bed",
-		"minecraft:gray_bed",
-		"minecraft:green_bed",
-		"minecraft:light_blue_bed",
-		"minecraft:light_gray_bed",
-		"minecraft:lime_bed",
-		"minecraft:magenta_bed",
-		"minecraft:orange_bed",
-		"minecraft:pink_bed",
-		"minecraft:purple_bed",
-		"minecraft:white_bed",
-		"minecraft:yellow_bed",
-		"#minecraft:beds"
-	],
-	"components": {
-		"minecraft:max_stack_size": 16
-	}
-}
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/boat.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/boat.json
deleted file mode 100644
index d3e1844..0000000
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/boat.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"targets": [
-		"minecraft:oak_boat",
-		"minecraft:spruce_boat",
-		"minecraft:birch_boat",
-		"minecraft:jungle_boat",
-		"minecraft:acacia_boat",
-		"minecraft:dark_oak_boat",
-		"minecraft:mangrove_boat",
-		"minecraft:cherry_boat",
-		"minecraft:bamboo_raft",
-		"minecraft:oak_chest_boat",
-		"minecraft:spruce_chest_boat",
-		"minecraft:birch_chest_boat",
-		"minecraft:jungle_chest_boat",
-		"minecraft:acacia_chest_boat",
-		"minecraft:dark_chest_oak_boat",
-		"minecraft:mangrove_chest_boat",
-		"minecraft:cherry_chest_boat",
-		"minecraft:bamboo_chest_raft",
-		"#minecraft:boats"
-	],
-	"components": {
-		"minecraft:max_stack_size": 16
-	}
-}
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/sign.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/sign.json
deleted file mode 100644
index 9f6e8d5..0000000
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/sign.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"targets": [
-		"minecraft:oak_sign",
-		"minecraft:spruce_sign",
-		"minecraft:birch_sign",
-		"minecraft:jungle_sign",
-		"minecraft:acacia_sign",
-		"minecraft:dark_oak_sign",
-		"minecraft:mangrove_sign",
-		"minecraft:cherry_sign",
-		"minecraft:bamboo_sign",
-		"minecraft:crimson_sign",
-		"minecraft:warped_sign",
-		"minecraft:oak_hanging_sign",
-		"minecraft:spruce_hanging_sign",
-		"minecraft:birch_hanging_sign",
-		"minecraft:jungle_hanging_sign",
-		"minecraft:acacia_hanging_sign",
-		"minecraft:dark_oak_hanging_sign",
-		"minecraft:mangrove_hanging_sign",
-		"minecraft:cherry_hanging_sign",
-		"minecraft:bamboo_hanging_sign",
-		"minecraft:crimson_hanging_sign",
-		"minecraft:warped_hanging_sign",
-		"#minecraft:signs",
-		"#minecraft:hanging_signs"
-	],
-	"components": {
-		"minecraft:max_stack_size": 64
-	}
-}
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/soup.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/soup.json
deleted file mode 100644
index e1dc621..0000000
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/soup.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"targets": [
-		"minecraft:beetroot_soup",
-		"minecraft:mushroom_stew",
-		"minecraft:rabbit_stew",
-		"minecraft:suspicious_stew",
-		"#c:foods/soup"
-	],
-	"components": {
-		"minecraft:max_stack_size": 16
-	}
-}
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/boots.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/boots.json
similarity index 87%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/boots.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/boots.json
index f92a1a4..58c800a 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/boots.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/boots.json
@@ -1,8 +1,8 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_boots"
   ],
-  "components": {
+  "patch": {
     "max_damage": 275,
     "attribute_modifiers": [{
       "type": "generic.armor",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/chestplate.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/chestplate.json
similarity index 88%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/chestplate.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/chestplate.json
index 3a7a940..ef38183 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/chestplate.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/chestplate.json
@@ -1,8 +1,8 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_chestplate"
   ],
-  "components": {
+  "patch": {
     "max_damage": 350,
     "attribute_modifiers": [{
       "type": "generic.armor",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/helmet.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/helmet.json
similarity index 87%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/helmet.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/helmet.json
index 3c29098..77000ad 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/helmet.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/helmet.json
@@ -1,8 +1,8 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_helmet"
   ],
-  "components": {
+  "patch": {
     "max_damage": 245,
     "attribute_modifiers": [{
       "type": "generic.armor",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/leggings.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/leggings.json
similarity index 87%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/leggings.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/leggings.json
index 54dc77a..cc47e13 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/leggings.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/leggings.json
@@ -1,8 +1,8 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_leggings"
   ],
-  "components": {
+  "patch": {
     "max_damage": 335,
     "attribute_modifiers": [{
       "type": "generic.armor",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/axe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/axe.json
similarity index 66%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/axe.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/axe.json
index 64d4af3..7010f4e 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/axe.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/axe.json
@@ -1,8 +1,14 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_axe"
   ],
-  "components": {
+  "patch": {
+    "tool": {
+      "rules": [
+        {"blocks": "#minecraft:incorrect_for_gold_tool", "correct_for_drops": false},
+        {"blocks": "#mineable/axe", "speed": 10.0, "correct_for_drops": true}
+      ]
+    },
     "attribute_modifiers": [
       {
         "type": "generic.attack_damage",
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/gold/tools/durability.json
new file mode 100644
index 0000000..3da8949
--- /dev/null
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/durability.json
@@ -0,0 +1,8 @@
+{
+  "tags": [
+    "defaulted:golden_tools"
+  ],
+  "patch": {
+    "minecraft:max_damage": 510
+  }
+}
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/hoe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/hoe.json
similarity index 65%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/hoe.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/hoe.json
index 94c29ec..5c59df0 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/hoe.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/hoe.json
@@ -1,8 +1,14 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_hoe"
   ],
-  "components": {
+  "patch": {
+    "tool": {
+      "rules": [
+        {"blocks": "#minecraft:incorrect_for_gold_tool", "correct_for_drops": false},
+        {"blocks": "#mineable/hoe", "speed": 10.0, "correct_for_drops": true}
+      ]
+    },
     "attribute_modifiers": [
       {
         "type": "generic.attack_damage",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/pickaxe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/pickaxe.json
similarity index 65%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/pickaxe.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/pickaxe.json
index 67fe3b0..4d3da05 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/pickaxe.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/pickaxe.json
@@ -1,8 +1,14 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_pickaxe"
   ],
-  "components": {
+  "patch": {
+    "tool": {
+      "rules": [
+        {"blocks": "#minecraft:incorrect_for_gold_tool", "correct_for_drops": false},
+        {"blocks": "#mineable/pickaxe", "speed": 10.0, "correct_for_drops": true}
+      ]
+    },
     "attribute_modifiers": [
       {
         "type": "generic.attack_damage",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/shovel.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/shovel.json
similarity index 65%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/shovel.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/shovel.json
index 962f7cf..3d1d8e7 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/shovel.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/shovel.json
@@ -1,8 +1,14 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_shovel"
   ],
-  "components": {
+  "patch": {
+    "tool": {
+      "rules": [
+        {"blocks": "#minecraft:incorrect_for_gold_tool", "correct_for_drops": false},
+        {"blocks": "#mineable/shovel", "speed": 10.0, "correct_for_drops": true}
+      ]
+    },
     "attribute_modifiers": [
       {
         "type": "generic.attack_damage",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/sword.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/sword.json
similarity index 93%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/sword.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/sword.json
index 291fe44..699655e 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/sword.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/sword.json
@@ -1,8 +1,8 @@
 {
-  "targets": [
+  "items": [
     "minecraft:golden_sword"
   ],
-  "components": {
+  "patch": {
     "attribute_modifiers": [
       {
         "type": "generic.attack_damage",
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/16.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/stack_size/16.json
similarity index 82%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/16.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/stack_size/16.json
index 7474675..a84120a 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/16.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/stack_size/16.json
@@ -1,5 +1,5 @@
 {
-	"targets": [
+	"items": [
 		"minecraft:potion",
 		"minecraft:lingering_potion",
 		"minecraft:splash_potion",
@@ -15,7 +15,12 @@
 		"minecraft:golden_horse_armor",
 		"minecraft:diamond_horse_armor"
 	],
-	"components": {
+	"tags": [
+		"minecraft:beds",
+		"minecraft:boats",
+		"c:foods/soup"
+	],
+	"patch": {
 		"minecraft:max_stack_size": 16
 	}
 }
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/64.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/stack_size/64.json
similarity index 77%
rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/64.json
rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/stack_size/64.json
index 0198d32..e78511b 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/64.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/stack_size/64.json
@@ -1,7 +1,6 @@
 {
-	"targets": [
+	"items": [
 		"minecraft:enchanted_book",
-		"#c:music_discs",
 		"minecraft:goat_horn",
 		"minecraft:flower_banner_pattern",
 		"minecraft:creeper_banner_pattern",
@@ -14,7 +13,13 @@
 		"minecraft:armor_stand",
 		"minecraft:written_book"
 	],
-	"components": {
+	"tags": [
+		"c:music_discs",
+		"minecraft:banners",
+		"minecraft:signs",
+		"minecraft:hanging_signs"
+	],
+	"patch": {
 		"minecraft:max_stack_size": 64
 	}
 }