Merge remote-tracking branch 'origin/1.6.13.beta'

# Conflicts:
#	src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

build.gradle

@@ -121,8 +121,6 @@ dependencies {
 
     implementation fg.deobf("curse.maven:curios-309927:4523009")
     implementation fg.deobf("curse.maven:cagerium-709608:4517775")
-    implementation fg.deobf("curse.maven:puzzles-lib-495476:4600775")
-    implementation fg.deobf("curse.maven:bag-of-holding-forge-593996:4111700")
     implementation fg.deobf("curse.maven:ecologics-570463:4171285")
     implementation fg.deobf("curse.maven:serene-seasons-291874:4037228")
     implementation fg.deobf("curse.maven:sophisticated-backpacks-422301:4637293")

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 minecraft_version=1.19.2
 # MCVERSION-MAJORMOD.MAJORAPI.MINOR.PATCH
-mod_version=1.5.6
+mod_version=1.6.13.beta
 mod_author=WarrenTode
 mod_domain=com.github.warrentode
 modid=todecoins

src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b

@@ -1,4 +1,4 @@
-// 1.19.2	2023-09-14T06:26:36.6415095	Tags for minecraft:item
+// 1.19.2	2023-10-06T05:51:56.2493069	Tags for minecraft:item
 2fd0dffcf31024f4fae16517342db1059a00d07e data/curios/tags/items/belt.json
 81f6cb213680b16953c427121c7b66c203384f53 data/curios/tags/items/charm.json
 4fcfed0068c13d43a8d04faea1ee3740550953a8 data/forge/tags/items/banknotes.json
@@ -47,7 +47,10 @@ c95c455fe4e6a7c8c1a280e27f6957acdeb9e2f3 data/forge/tags/items/textiles/fabric.j
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forge/tags/items/textiles/thread.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forge/tags/items/tools/chisels.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forge/tags/items/tools/knives.json
+e199d3ab5411e637e6ee5c576a46d7f243cfeba4 data/hauntedharvest/tags/items/candy.json
+771a6a57c6423ef7bfde3dc7197a239176ecb4e8 data/hauntedharvest/tags/items/sweets.json
 ecffcbf9ec1d2c7b9bcd2ad00bc07dc0f9c6a22c data/minecraft/tags/items/piglin_loved.json
+57186dd80d3d435c2ad5ca0bb7a67b89a5f05663 data/supplementaries/tags/items/chocolate_bars.json
 8831b7a7c1903bfd62992756333c08ecd55f796b data/supplementaries/tags/items/cookies.json
 1b64b170d75ce337e2786496d5c6024a2f8e6a28 data/todecoins/tags/items/bundles.json
 3fa68285540a9cacb458f465ee22db3e72f6c567 data/todecoins/tags/items/collectible_coins.json
@@ -102,6 +105,7 @@ c05901cfbc8a5491fe5f8cbf92208c8b17a66e5a data/todecoins/tags/items/collectible_c
 5491c725c9a157a27493b3bcfc08d0e91b1a8698 data/todecoins/tags/items/collectible_coins/entity_coins/phantom_coin_set.json
 57f563fbf869acfa57421702eea6f42620ff8d2e data/todecoins/tags/items/collectible_coins/entity_coins/piglin_brute_coin_set.json
 651e5e5bee9f4d3cbf0cd4a331fce3a7bbc9839e data/todecoins/tags/items/collectible_coins/entity_coins/piglin_coin_set.json
+04a47b6c42352529b8b810eb4c91bc207ac9ca5a data/todecoins/tags/items/collectible_coins/entity_coins/piglin_merchant_coin_set.json
 01b6abe3b88d27d3bfab16d5d82bf43c7b155c30 data/todecoins/tags/items/collectible_coins/entity_coins/pig_coin_set.json
 2d32a2e304be9d8f4995e3c5b88d2d9dcb8adb58 data/todecoins/tags/items/collectible_coins/entity_coins/pillager_coin_set.json
 8120af167a1f13698f25699308e61286fa5b8a42 data/todecoins/tags/items/collectible_coins/entity_coins/polar_bear_coin_set.json
@@ -142,7 +146,7 @@ ddf9725c0bd958c0fc68b3813c74d12407a8a438 data/todecoins/tags/items/collectible_c
 8272379d4d1bbd26cd5bc0becbbc3e93272c2e94 data/todecoins/tags/items/collectible_coins/entity_coins/zombie_horse_coin_set.json
 8a25dd9dff31c8c761b87282cc57d48739b8a6ea data/todecoins/tags/items/collectible_coins/entity_coins/zombie_villager_coin_set.json
 40b72318e1c4abd7bf483e932a2b01b1af83f01a data/todecoins/tags/items/collectible_coins/entity_coins/zombified_piglin_coin_set.json
-8e84b68fc5992f83d80fad6119ea76c09ab2c8af data/todecoins/tags/items/collectible_coins/entity_coin_set.json
+fe39d76c9af7931d1afb15a9107d7210891d7f24 data/todecoins/tags/items/collectible_coins/entity_coin_set.json
 a1bda6f17fa29264786ba7d4ac0a3086ba6f5d7e data/todecoins/tags/items/collectible_coins/gameplay_coins/fishing_coin_set.json
 09034aeb43660d605371c1304aa88a09b81286cd data/todecoins/tags/items/collectible_coins/gameplay_coins/hero_coin_set.json
 269fd06fc2a4c3ac662023e453de20fda55ec2c6 data/todecoins/tags/items/collectible_coins/gameplay_coin_set.json
@@ -165,7 +169,7 @@ f04960c86353f26abb0c4a476a4d3f3e838ec5f8 data/todecoins/tags/items/currency/coin
 f2aa87f54e7951ea0cf81ac252c2abe279b0c936 data/todecoins/tags/items/ingots/gold.json
 736f4ef35696340b932cdb679c5a32e7b28db783 data/todecoins/tags/items/ingots/iron.json
 70c7b129eaaed403ba88c0e9de930fab8c9d587c data/todecoins/tags/items/ingots/netherite.json
-4f6a635cbe52bff1d51f79b07da2aad2e033851f data/todecoins/tags/items/jar_placeable.json
+67728f750f934894bfd9bbdd7363b5b8a01e1b4e data/todecoins/tags/items/jar_placeable.json
 be1fe153c84ea38f0f8ff031db72aa44b97174ef data/todecoins/tags/items/no_ai_spawn_eggs.json
 63e4a7b81004b8a539f69be3a9cbdcfc9d7a060c data/todecoins/tags/items/nuggets.json
 ab1a45ae0b76cfdab8aa19e990af266825f9e610 data/todecoins/tags/items/nuggets/copper.json

src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2

@@ -1,4 +1,4 @@
-// 1.19.2	2023-09-14T06:58:03.7147804	LootTables
+// 1.19.2	2023-10-10T19:56:28.3559928	LootTables
 c7cae11272dc0484f6a2f3519cd1add9790206ea data/ecologics/loot_tables/cagerium/camel.json
 25a13337f840c73f4748adfc5b8c3d93e3183730 data/ecologics/loot_tables/cagerium/coconut_crab.json
 ef017fe8afbc1e704a7cfb4818ece7ba018f9c91 data/ecologics/loot_tables/cagerium/penguin.json
@@ -118,19 +118,19 @@ aa2c86201a1c9a382c4bf48c72e5d406350f1e04 data/todecoins/loot_tables/blocks/nethe
 8d34025bde123883f86a8f02c27ac3f4abac22ba data/todecoins/loot_tables/blocks/pot_of_gold.json
 ef017fe8afbc1e704a7cfb4818ece7ba018f9c91 data/todecoins/loot_tables/cagerium/numismatist.json
 f5a9991a7ba9877e63922b2d1f9704bae1796e07 data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack.json
-937c68d0cbbc7d40586c0cc54b88bd60f7723825 data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_autumn.json
-73ffbb992c4e02ca544769994fbf7088181d433b data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_spring.json
-192fc63e9ce73eab68b4b32c13b6d8b263335a65 data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_summer.json
-808c86786598dd1694c5123e436f73bd457d3a12 data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_winter.json
+7349829a4146e0c84198d8d7ca00fa2c2feaf7ce data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_autumn.json
+623109762b039653f42e8c91789db5be2b94d3ad data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_spring.json
+4101560b5871e2df8ebb591892d1b2e1ebcfc368 data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_summer.json
+3917fc0ec5060b7ceba6270fabbed279b7ca56b1 data/todecoins/loot_tables/chests/collectible/seasonal/mystery_coin_pack_winter.json
 913fe8b8ed1997f83da8aab8cc6a69e44973a98b data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_anniversary_coin_loot.json
-05cddcfa5f028a85d35e796c15fc125c81eb4884 data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_autumn_coin_loot.json
+fd3bab569cba3d3671c07e6973a0125377242b82 data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_autumn_coin_loot.json
 f0654b1cb686aa30fd757a64ae26823d85a4cdda data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_birthday_coin_loot.json
 f285ee9a7a642bad1a9345aeebe058f380af411d data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_christmas_coin_loot.json
 fe590475cb51a672c6077f51e67c7ac1777fc7d9 data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_collectible_coin_loot.json
 d0be19bf0d7ea64fe04cdfef9216affcf031756e data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_halloween_coin_loot.json
-c9f3c3c87655165e36637047eaef30ed1d74356a data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_spring_coin_loot.json
-30c1d39f38f6891b886f215673ea4c5e31c1fc13 data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_summer_coin_loot.json
-8528f43de2d81cddefbe32f8551c0d0487215b9b data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_winter_coin_loot.json
+db7fb3ee5f9d7fddfd1697e43b9e0b411ec718ce data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_spring_coin_loot.json
+0b56e99f39fc53b21b028a209af49702de19d34f data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_summer_coin_loot.json
+2d666aad00d2d8a647de546a4179312d4ebeedf9 data/todecoins/loot_tables/chests/collectible/seasonal/todecoins_winter_coin_loot.json
 d714760482590a309b4d8170cb199727becb889b data/todecoins/loot_tables/chests/currency/todecoins_copper_coin_loot.json
 0c0fa93d8937ab7e2f3252298640797f56fab1b6 data/todecoins/loot_tables/chests/currency/todecoins_emerald_bank_note_loot.json
 5e0221d1e222146714cff34195317a8e9b9dc2fa data/todecoins/loot_tables/chests/currency/todecoins_emerald_half_bank_note_loot.json
@@ -158,10 +158,10 @@ a02b015875f0b4dfa79c504aae9aba3d78ec5ba4 data/todecoins/loot_tables/entity/coins
 4608de8085a14fa3ace6cc39ac7bb12084ed12d8 data/todecoins/loot_tables/entity/coins/todecoins_lucky_coin_drops.json
 8a170917002438f2121fffded3b527f809dbfd28 data/todecoins/loot_tables/entity/coins/todecoins_netherite_coin_drops.json
 b25dc8bd082172867c525ec671ad035143492108 data/todecoins/loot_tables/entity/coins/todecoins_nether_gold_coin_drops.json
-ac52e1e3c9d55db5a4d45644e40e9c16c23c8ec5 data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_autumn_coin_drops.json
-18334e1eb66bb75f99fc82852ad0f144eee85d48 data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_spring_coin_drops.json
-e4121847a9399e7ca790916f2f37b1cafa517aee data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_summer_coin_drops.json
-9f5c083ad2949f351fc9db367fb5df28f591cdf5 data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_winter_coin_drops.json
+edbd315598eb0e08ca04c513e7fb89c7aea34d79 data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_autumn_coin_drops.json
+976cd3adc60e6ec07226847d04d26f38fdda30a0 data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_spring_coin_drops.json
+67ff4c8eb6074a583e06c6083894b2fd26d29d4f data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_summer_coin_drops.json
+eee2d87359c1a05c09af572c7877e4a3f5054133 data/todecoins/loot_tables/entity/collectible/seasonal/todecoins_winter_coin_drops.json
 c2e809b63494a480b98eb35adf137a3f04077228 data/todecoins/loot_tables/entity/collectible/todecoins_anniversary_coin_drops.json
 50571bdf37335bb1d9d8663914746a32572acfa1 data/todecoins/loot_tables/entity/collectible/todecoins_birthday_coin_drops.json
 d3163ddf425f460d5457d5ea683f54146e5057be data/todecoins/loot_tables/entity/collectible/todecoins_christmas_coin_drops.json
@@ -179,7 +179,7 @@ f23e22fe7ea2116db3adbacc62a3512bc2de4fd4 data/todecoins/loot_tables/gameplay/bar
 2d5cb348c9aeb00b9a1212c3011c3dd3cccf1719 data/todecoins/loot_tables/gameplay/bartering/iron_piglin_coin_barter_loot.json
 acb80bd512e1fa418552b518a64502dcce192dd9 data/todecoins/loot_tables/gameplay/bartering/netherite_piglin_coin_barter_loot.json
 9ddc6753116f4a67b5b26dee1287b1ded43fc3ca data/todecoins/loot_tables/gameplay/bartering/nether_gold_coin_piglin_bartering.json
-284f2336b64f8454a8a1cc2320c4909ba3455ec6 data/todecoins/loot_tables/gameplay/bartering/piglin_event_barter_loot.json
+b4eca1bed7df0ae7527b3b10fb79b53f9c8e7451 data/todecoins/loot_tables/gameplay/bartering/piglin_event_barter_loot.json
 5dcdfab98ab6bbdc7afc069c733b9d42f4d88e43 data/todecoins/loot_tables/gameplay/bartering/zombie_piglin_barter_loot.json
 e13a622fe201104101596dc88d8c05b3794c06c3 data/todecoins/loot_tables/gameplay/fishing/bonus.json
 c101e087b548f82b2a42a38b677d17a445df28e6 data/todecoins/loot_tables/gameplay/fishing/cod_coin.json
@@ -189,7 +189,7 @@ dc8e3e609c682d0c91fff44f8ac43026f7bdc568 data/todecoins/loot_tables/gameplay/fis
 3b5d327d001c4230f9f1d847d5d6520c17a2acee data/todecoins/loot_tables/gameplay/fishing/pufferfish_coin.json
 622f758d2a8ef6c6e74d29a1f992a33916cb217a data/todecoins/loot_tables/gameplay/fishing/salmon_coin.json
 74d55b22e4f815eecda090c92ac9d6a82db06cf7 data/todecoins/loot_tables/gameplay/fishing/tropical_fish_coin.json
-d4e993134e9efb94012ababd3c8dd5ec14e801a2 data/todecoins/loot_tables/gameplay/hero_of_the_village/banker_gift.json
-a50ae575ada011bf9c3d706804655ef2b6132236 data/todecoins/loot_tables/gameplay/hero_of_the_village/leprechaun_gift.json
+9a5fe2d642611156686e8909a08a89dff4e3cbb6 data/todecoins/loot_tables/gameplay/hero_of_the_village/banker_gift.json
+9d9410f3a2505175713ab93885b3e80e614721fa data/todecoins/loot_tables/gameplay/hero_of_the_village/leprechaun_gift.json
 334675cefd4a43c04b621d78c4a40ebed05a8997 data/todecoins/loot_tables/gameplay/hero_of_the_village/todecoins_coin_gift_loot.json
 1a9f6489f47ece6ceb8267d3cc660e5d2e2d5fde data/todecoins/loot_tables/gameplay/hero_of_the_village/todecoins_hero_coin_loot.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.19.2	2023-09-28T01:29:41.0001268	Recipes
+// 1.19.2	2023-10-10T19:56:28.3609794	Recipes
 e15dc680b9507c5c42e99fa68be32722a9b1b23e data/cagerium/recipes/spawn_eggs/cagerium/ender_dragon_spawn_egg.json
 d803ce2f901073cdd89c2190105071afdfb5bd0b data/cagerium/recipes/spawn_eggs/cagerium/iron_golem_spawn_egg.json
 ad720d63a1861522b488eb5fdcde697ec29f96c6 data/cagerium/recipes/spawn_eggs/cagerium/wither_spawn_egg.json

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.19.2	2023-09-14T08:19:44.3818961	Languages: en_us
-a78b1c20c0db12160e8b282f44aa21cbd8f9e8d3 assets/todecoins/lang/en_us.json
+// 1.19.2	2023-09-29T01:40:01.6600594	Languages: en_us
+f50753099bff64a14012b29c9b77630db9cf58aa assets/todecoins/lang/en_us.json

src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0

@@ -1,9 +1,10 @@
-// 1.19.2	2023-09-14T06:42:55.7738848	Advancements
+// 1.19.2	2023-09-28T02:03:43.6616828	Advancements
 19dfee6e968eb5937375eccad715a9a5789f2ec7 data/todecoins/advancements/main/bagging_dough.json
 f2e8099bdcdb467e9d1a820044b51231eda50bee data/todecoins/advancements/main/collectible_coins.json
 5b95ba4e754a355ae35e51d2db7a2a12171c878b data/todecoins/advancements/main/collectible_ecologics_coins.json
 a65b1511eb339865f7436ad65602ca8989f5efc1 data/todecoins/advancements/main/collectible_friendsandfoes_coins.json
 bb03c28640170a8cae1d62616e70e4738ef86d9a data/todecoins/advancements/main/collectible_guardvillagers_coins.json
+c02077b69c7d6ddc3d95f1c26302888779587d7f data/todecoins/advancements/main/collectible_todepiglins_coins.json
 4941e159fcbbf5cb26ff7f6e9b6d0fd9b0757c27 data/todecoins/advancements/main/collectible_unused_upcoming_coins.json
 91cffb0845472cec35e00626814d218780842008 data/todecoins/advancements/main/craft_coinpress.json
 56a1aa742c0b340076403fd29f2e32fec15d5376 data/todecoins/advancements/main/lucky_armor.json

src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab

@@ -1,4 +1,4 @@
-// 1.19.2	2023-09-14T05:52:03.4697014	Tags for minecraft:entity_type
+// 1.19.2	2023-09-28T02:03:43.6636838	Tags for minecraft:entity_type
 a37c8a7cf9e25ba9178196b0552e6c5e79567ffa data/cagerium/tags/entity_types/bosses.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/cagerium/tags/entity_types/cagerium_blacklist.json
 3504f8fe078a27d80d7d356babb531ddcaab3dc5 data/forge/tags/entity_types/allay.json
@@ -54,6 +54,7 @@ c1f0bbae21bdd12146775bbc29d67adcd3e28fb9 data/forge/tags/entity_types/penguin.js
 6fd0d49783f4b5ea2362c1ab12f404e430115e8e data/forge/tags/entity_types/pig.json
 fcf7bebab33ff2a152e0861b981a153d0a1e3af7 data/forge/tags/entity_types/piglin.json
 c3e2f24ee727b4294a30221f004f1a1be39f3430 data/forge/tags/entity_types/piglin_brute.json
+a9066bd882a188fe9fcd7595c827a12a1c2eea53 data/forge/tags/entity_types/piglin_merchant.json
 95c17b23e11bd7043dc871efdd5ca281a1917c1c data/forge/tags/entity_types/pillager.json
 1524d30a78de2df7d23a5d101c5662ac77752040 data/forge/tags/entity_types/polar_bear.json
 58748f381d8f3508e8f58a62b0d64e706b06bc78 data/forge/tags/entity_types/pufferfish.json

src/generated/resources/assets/todecoins/lang/en_us.json

@@ -232,6 +232,10 @@
   "advancement.find_item.todecoins.collectible_coin_piglin_copper": "Obtain the Copper Piglin Coin",
   "advancement.find_item.todecoins.collectible_coin_piglin_gold": "Obtain the Gold Piglin Coin",
   "advancement.find_item.todecoins.collectible_coin_piglin_iron": "Obtain the Iron Piglin Coin",
+  "advancement.find_item.todecoins.collectible_coin_piglin_merchant_copper": "Obtain the Copper Piglin Merchant Coin",
+  "advancement.find_item.todecoins.collectible_coin_piglin_merchant_gold": "Obtain the Gold Piglin Merchant Coin",
+  "advancement.find_item.todecoins.collectible_coin_piglin_merchant_iron": "Obtain the Iron Piglin Merchant Coin",
+  "advancement.find_item.todecoins.collectible_coin_piglin_merchant_netherite": "Obtain the Netherite Piglin Merchant Coin",
   "advancement.find_item.todecoins.collectible_coin_piglin_netherite": "Obtain the Netherite Piglin Coin",
   "advancement.find_item.todecoins.collectible_coin_pillager_copper": "Obtain the Copper Pillager Coin",
   "advancement.find_item.todecoins.collectible_coin_pillager_gold": "Obtain the Gold Pillager Coin",
@@ -534,6 +538,10 @@
   "item.minecraft.tipped_arrow.effect.unluck_potion_4": "Arrow of Bad Luck IV",
   "item.minecraft.tipped_arrow.effect.unluck_potion_5": "Arrow of Bad Luck V",
   "item.minecraft.tipped_arrow.effect.unluck_potion_6": "Arrow of Bad Luck VI",
+  "item.todecoins.chocolate_coin_crimson_spore": "Crimson Spore Chocolate Coin",
+  "item.todecoins.chocolate_coin_milk_bone": "Milk Bone Chocolate Coin",
+  "item.todecoins.chocolate_coin_ultimate_dark": "Ultimate Dark Chocolate Coin",
+  "item.todecoins.chocolate_coin_warped_spice": "Warped Spice Chocolate Coin",
   "item.todecoins.collectible_coin_allay_copper": "Collectible Copper Allay Coin",
   "item.todecoins.collectible_coin_allay_gold": "Collectible Gold Allay Coin",
   "item.todecoins.collectible_coin_allay_iron": "Collectible Iron Allay Coin",
@@ -753,6 +761,10 @@
   "item.todecoins.collectible_coin_piglin_copper": "Collectible Copper Piglin Coin",
   "item.todecoins.collectible_coin_piglin_gold": "Collectible Gold Piglin Coin",
   "item.todecoins.collectible_coin_piglin_iron": "Collectible Iron Piglin Coin",
+  "item.todecoins.collectible_coin_piglin_merchant_copper": "Collectible Copper Piglin Merchant Coin",
+  "item.todecoins.collectible_coin_piglin_merchant_gold": "Collectible Gold Piglin Merchant Coin",
+  "item.todecoins.collectible_coin_piglin_merchant_iron": "Collectible Iron Piglin Merchant Coin",
+  "item.todecoins.collectible_coin_piglin_merchant_netherite": "Collectible Netherite Piglin Merchant Coin",
   "item.todecoins.collectible_coin_piglin_netherite": "Collectible Netherite Piglin Coin",
   "item.todecoins.collectible_coin_pillager_copper": "Collectible Copper Pillager Coin",
   "item.todecoins.collectible_coin_pillager_gold": "Collectible Gold Pillager Coin",
@@ -986,7 +998,7 @@
   "tooltips.collectible_illager_coin.hover": "One of Twenty-Four Illager Seasonal Coins",
   "tooltips.collectible_mauler_coin.hover": "One of Four Mauler Seasonal Coins",
   "tooltips.collectible_patron_coin.hover": "A collectible coin to publicly honor, acknowledge, and appreciate those that support my work",
-  "tooltips.collectible_piglin_coin.hover": "One of Twelve Piglin Seasonal Coins",
+  "tooltips.collectible_piglin_coin.hover": "One of Sixteen Piglin Seasonal Coins",
   "tooltips.collectible_rabbit_coin.hover": "One of Four Rabbit Seasonal Coins",
   "tooltips.collectible_rodent_coin.hover": "One of Four Rodent Seasonal Coins",
   "tooltips.collectible_shulker_coin.hover": "One of Four Shulker Seasonal Coins",

src/generated/resources/data/forge/tags/entity_types/piglin_merchant.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "todepiglins:todepiglinmerchant",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/hauntedharvest/tags/items/candy.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#supplementaries:chocolate_bars"
+  ]
+}

src/generated/resources/data/hauntedharvest/tags/items/sweets.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#hauntedharvest:candy"
+  ]
+}

src/generated/resources/data/supplementaries/tags/items/chocolate_bars.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "todecoins:chocolate_coin_ultimate_dark",
+    "todecoins:chocolate_coin_milk_bone",
+    "todecoins:chocolate_coin_crimson_spore",
+    "todecoins:chocolate_coin_warped_spice"
+  ]
+}