From eded1ef7589042bbb9800688ed9cde36cea2d21a Mon Sep 17 00:00:00 2001
From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com>
Date: Sat, 19 Oct 2024 13:06:25 +0200
Subject: [PATCH] wip: Fix some defaults groups to be more consistent

---
 .../recipe/market/biomesoplenty/glowshroom.json                 | 2 +-
 .../recipe/market/biomesoplenty/toadstool.json                  | 2 +-
 .../recipe/market/create/tree_fertilizer.json                   | 2 +-
 .../recipe/market/farmersdelight/wild_beetroots.json            | 2 +-
 .../recipe/market/farmersdelight/wild_cabbages.json             | 2 +-
 .../recipe/market/farmersdelight/wild_carrots.json              | 2 +-
 .../recipe/market/farmersdelight/wild_onions.json               | 2 +-
 .../recipe/market/farmersdelight/wild_potatoes.json             | 2 +-
 .../recipe/market/farmersdelight/wild_rice.json                 | 2 +-
 .../recipe/market/farmersdelight/wild_tomatoes.json             | 2 +-
 .../recipe/market/farmingforblockheads/green_fertilizer.json    | 2 +-
 .../recipe/market/farmingforblockheads/red_fertilizer.json      | 2 +-
 .../recipe/market/farmingforblockheads/yellow_fertilizer.json   | 2 +-
 .../recipe/market/minecraft_earth_mod/buttercup.json            | 2 +-
 .../recipe/market/minecraft_earth_mod/pink_daisy.json           | 2 +-
 .../recipe/market/nethers_delight/rich_soul_soil.json           | 2 +-
 .../recipe/market/nethers_delight/soul_compost.json             | 2 +-
 .../recipe/market/outer_end/azure_berries.json                  | 2 +-
 .../farmingforblockheads/recipe/market/outer_end/azure_bud.json | 2 +-
 .../recipe/market/outer_end/azure_grass.json                    | 2 +-
 .../recipe/market/tropicraft/tropical_fertilizer.json           | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/glowshroom.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/glowshroom.json
index 68e88cc..1df1998 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/glowshroom.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/glowshroom.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "biomesoplenty:glowshroom"
   },
-  "defaults": "selling.mushroom.biomesoplenty.glowshroom",
+  "defaults": "selling.mushrooms.biomesoplenty.glowshroom",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/toadstool.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/toadstool.json
index 8e7fc17..9f867df 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/toadstool.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/biomesoplenty/toadstool.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "biomesoplenty:toadstool"
   },
-  "defaults": "selling.mushroom.biomesoplenty.toadstool",
+  "defaults": "selling.mushrooms.biomesoplenty.toadstool",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/create/tree_fertilizer.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/create/tree_fertilizer.json
index b9331ff..c0c5bbe 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/create/tree_fertilizer.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/create/tree_fertilizer.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "create:tree_fertilizer"
   },
-  "defaults": "selling.fertilizer.create.tree_fertilizer",
+  "defaults": "selling.fertilizers.create.tree_fertilizer",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_beetroots.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_beetroots.json
index a50853a..298c43d 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_beetroots.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_beetroots.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "farmersdelight:wild_beetroots"
   },
-  "defaults": "selling.wildplants.farmersdelight.wild_beetroots",
+  "defaults": "selling.wild.crops.farmersdelight.wild_beetroots",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_cabbages.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_cabbages.json
index 635dfd3..b123251 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_cabbages.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_cabbages.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "farmersdelight:wild_cabbages"
   },
-  "defaults": "selling.wildplants.farmersdelight.wild_cabbages",
+  "defaults": "selling.wild.crops.farmersdelight.wild_cabbages",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_carrots.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_carrots.json
index 45594ae..d99f648 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_carrots.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_carrots.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "farmersdelight:wild_carrots"
   },
-  "defaults": "selling.wildplants.farmersdelight.wild_carrots",
+  "defaults": "selling.wild.crops.farmersdelight.wild_carrots",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_onions.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_onions.json
index 42b8da9..4a1e62b 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_onions.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_onions.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "farmersdelight:wild_onions"
   },
-  "defaults": "selling.wildplants.farmersdelight.wild_onions",
+  "defaults": "selling.wild.crops.farmersdelight.wild_onions",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_potatoes.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_potatoes.json
index 5dac854..83b7ba3 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_potatoes.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_potatoes.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "farmersdelight:wild_potatoes"
   },
-  "defaults": "selling.wildplants.farmersdelight.wild_potatoes",
+  "defaults": "selling.wild.crops.farmersdelight.wild_potatoes",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_rice.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_rice.json
index 3b77b95..e167673 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_rice.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_rice.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "farmersdelight:wild_rice"
   },
-  "defaults": "selling.wildplants.farmersdelight.wild_rice",
+  "defaults": "selling.wild.crops.farmersdelight.wild_rice",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_tomatoes.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_tomatoes.json
index 35ec78d..f4b6e8f 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_tomatoes.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmersdelight/wild_tomatoes.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "farmersdelight:wild_tomatoes"
   },
-  "defaults": "selling.wildplants.farmersdelight.wild_tomatoes",
+  "defaults": "selling.wild.crops.farmersdelight.wild_tomatoes",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/green_fertilizer.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/green_fertilizer.json
index 71d6e91..6a09485 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/green_fertilizer.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/green_fertilizer.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "farmingforblockheads:green_fertilizer"
   },
-  "defaults": "selling.fertilizer.farmingforblockheads.green_fertilizer",
+  "defaults": "selling.fertilizers.farmingforblockheads.green_fertilizer",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/red_fertilizer.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/red_fertilizer.json
index c2f7348..e095f03 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/red_fertilizer.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/red_fertilizer.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "farmingforblockheads:red_fertilizer"
   },
-  "defaults": "selling.fertilizer.farmingforblockheads.red_fertilizer",
+  "defaults": "selling.fertilizers.farmingforblockheads.red_fertilizer",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/yellow_fertilizer.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/yellow_fertilizer.json
index 19c3ab4..c285ca8 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/yellow_fertilizer.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/farmingforblockheads/yellow_fertilizer.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "farmingforblockheads:yellow_fertilizer"
   },
-  "defaults": "selling.fertilizer.farmingforblockheads.yellow_fertilizer",
+  "defaults": "selling.fertilizers.farmingforblockheads.yellow_fertilizer",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/buttercup.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/buttercup.json
index d39ab7b..657ac2a 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/buttercup.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/buttercup.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "minecraft_earth_mod:buttercup"
   },
-  "defaults": "selling.earth.minecraft_earth_mod.buttercup",
+  "defaults": "selling.flowers.minecraft_earth_mod.buttercup",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/pink_daisy.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/pink_daisy.json
index a9d6057..eb8338b 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/pink_daisy.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/minecraft_earth_mod/pink_daisy.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "minecraft_earth_mod:pink_daisy"
   },
-  "defaults": "selling.earth.minecraft_earth_mod.pink_daisy",
+  "defaults": "selling.flowers.minecraft_earth_mod.pink_daisy",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/rich_soul_soil.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/rich_soul_soil.json
index 7689e02..e457395 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/rich_soul_soil.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/rich_soul_soil.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "nethers_delight:rich_soul_soil"
   },
-  "defaults": "selling.delight.nethers_delight.rich_soul_soil",
+  "defaults": "selling.nether.soils.nethers_delight.rich_soul_soil",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/soul_compost.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/soul_compost.json
index d1d3b6d..0f65227 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/soul_compost.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/nethers_delight/soul_compost.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "nethers_delight:soul_compost"
   },
-  "defaults": "selling.delight.nethers_delight.soul_compost",
+  "defaults": "selling.nether.soils.nethers_delight.soul_compost",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_berries.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_berries.json
index 9e1a3ac..0418e95 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_berries.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_berries.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "outer_end:azure_berries"
   },
-  "defaults": "selling.end.outer_end.azure_berries",
+  "defaults": "selling.end.berries.outer_end.azure_berries",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_bud.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_bud.json
index 9c92b92..aa98c7b 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_bud.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_bud.json
@@ -4,7 +4,7 @@
   "result": {
     "item": "outer_end:azure_bud"
   },
-  "defaults": "selling.end.outer_end.azure_bud",
+  "defaults": "selling.end.flowers.outer_end.azure_bud",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_grass.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_grass.json
index 676c350..3fe3780 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_grass.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/outer_end/azure_grass.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "outer_end:azure_grass"
   },
-  "defaults": "selling.end.outer_end.azure_grass",
+  "defaults": "selling.end.grass.outer_end.azure_grass",
   "conditions": [
     {
       "type": "forge:mod_loaded",
diff --git a/common/src/main/resources/data/farmingforblockheads/recipe/market/tropicraft/tropical_fertilizer.json b/common/src/main/resources/data/farmingforblockheads/recipe/market/tropicraft/tropical_fertilizer.json
index d4abc27..64c2ca3 100644
--- a/common/src/main/resources/data/farmingforblockheads/recipe/market/tropicraft/tropical_fertilizer.json
+++ b/common/src/main/resources/data/farmingforblockheads/recipe/market/tropicraft/tropical_fertilizer.json
@@ -3,7 +3,7 @@
   "result": {
     "item": "tropicraft:tropical_fertilizer"
   },
-  "defaults": "selling.fertilizer.tropicraft.tropical_fertilizer",
+  "defaults": "selling.fertilizers.tropicraft.tropical_fertilizer",
   "conditions": [
     {
       "type": "forge:mod_loaded",