Merge pull request #164 from moonfather1/switchboard

Configurability galore
GrowthcraftCE · Oct 21, 2024 · a66fd7f · a66fd7f
2 parents cdca8a2 + 363dea0
commit a66fd7f
Show file tree

Hide file tree

Showing 115 changed files with 1,538 additions and 325 deletions.
diff --git a/src/generated/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/generated/resources/data/forge/loot_modifiers/global_loot_modifiers.json
@@ -2,16 +2,17 @@
   "entries": [
     "growthcraft:thistle_seeds_from_grass",
     "growthcraft:add_loot_village",
-    "growthcraft:hops_seeds_white_from_grass",
     "growthcraft:add_loot_buried_treasure",
     "growthcraft:yeast_bayanus_from_grass",
     "growthcraft:add_loot_pillager_outpost",
     "growthcraft:add_loot_shipwreck",
     "growthcraft:bee_from_vanilla_bee_nest",
     "growthcraft:grape_seeds_red_from_grass",
+    "growthcraft:rice_from_grass_wet",
     "growthcraft:yeast_lager_from_snow",
     "growthcraft:add_loot_woodland_mansion",
     "growthcraft:grape_seeds_white_from_grass",
+    "growthcraft:hops_seeds_from_grass",
     "growthcraft:add_loot_stronghold",
     "growthcraft:grape_seeds_purple_from_grass",
     "growthcraft:yeast_brewers_from_grass",

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/bee_from_vanilla_bee_nest.json b/src/generated/resources/data/growthcraft/loot_modifiers/bee_from_vanilla_bee_nest.json
@@ -8,6 +8,10 @@
     {
       "block": "minecraft:bee_nest",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "apiary"
     }
   ],
   "item": "growthcraft_apiary:bee"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/grape_seeds_purple_from_grass.json b/src/generated/resources/data/growthcraft/loot_modifiers/grape_seeds_purple_from_grass.json
@@ -1,13 +1,17 @@
 {
-  "type": "growthcraft:add_item",
+  "type": "growthcraft:add_item_replacing_seeds",
   "conditions": [
     {
-      "chance": 0.2,
+      "chance": 0.1,
       "condition": "minecraft:random_chance"
     },
     {
       "block": "minecraft:grass",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "grapes"
     }
   ],
   "item": "growthcraft_cellar:grape_seeds_purple"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/grape_seeds_red_from_grass.json b/src/generated/resources/data/growthcraft/loot_modifiers/grape_seeds_red_from_grass.json
@@ -1,13 +1,17 @@
 {
-  "type": "growthcraft:add_item",
+  "type": "growthcraft:add_item_replacing_seeds",
   "conditions": [
     {
-      "chance": 0.2,
+      "chance": 0.1,
       "condition": "minecraft:random_chance"
     },
     {
       "block": "minecraft:grass",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "grapes"
     }
   ],
   "item": "growthcraft_cellar:grape_seeds_red"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/grape_seeds_white_from_grass.json b/src/generated/resources/data/growthcraft/loot_modifiers/grape_seeds_white_from_grass.json
@@ -1,13 +1,17 @@
 {
-  "type": "growthcraft:add_item",
+  "type": "growthcraft:add_item_replacing_seeds",
   "conditions": [
     {
-      "chance": 0.2,
+      "chance": 0.1,
       "condition": "minecraft:random_chance"
     },
     {
       "block": "minecraft:grass",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "grapes"
     }
   ],
   "item": "growthcraft_cellar:grape_seeds_white"

diff --git a/...odifiers/hops_seeds_white_from_grass.json → ...loot_modifiers/hops_seeds_from_grass.json b/...odifiers/hops_seeds_white_from_grass.json → ...loot_modifiers/hops_seeds_from_grass.json
@@ -2,12 +2,16 @@
   "type": "growthcraft:add_item",
   "conditions": [
     {
-      "chance": 0.2,
+      "chance": 0.07,
       "condition": "minecraft:random_chance"
     },
     {
       "block": "minecraft:grass",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "cellar"
     }
   ],
   "item": "growthcraft_cellar:hops_seeds"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/rice_from_grass.json b/src/generated/resources/data/growthcraft/loot_modifiers/rice_from_grass.json
@@ -2,12 +2,25 @@
   "type": "growthcraft:add_item",
   "conditions": [
     {
-      "chance": 0.2,
+      "chance": 0.005,
       "condition": "minecraft:random_chance"
     },
     {
-      "block": "minecraft:grass",
-      "condition": "minecraft:block_state_property"
+      "condition": "minecraft:any_of",
+      "terms": [
+        {
+          "block": "minecraft:grass",
+          "condition": "minecraft:block_state_property"
+        },
+        {
+          "block": "minecraft:tall_grass",
+          "condition": "minecraft:block_state_property"
+        }
+      ]
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "rice"
     }
   ],
   "item": "growthcraft_rice:rice_grains"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/rice_from_grass_wet.json b/src/generated/resources/data/growthcraft/loot_modifiers/rice_from_grass_wet.json
@@ -0,0 +1,38 @@
+{
+  "type": "growthcraft:weighted_seed_replacer",
+  "conditions": [
+    {
+      "condition": "minecraft:any_of",
+      "terms": [
+        {
+          "block": "minecraft:grass",
+          "condition": "minecraft:block_state_property"
+        },
+        {
+          "block": "minecraft:tall_grass",
+          "condition": "minecraft:block_state_property"
+        }
+      ]
+    },
+    {
+      "condition": "minecraft:any_of",
+      "terms": [
+        {
+          "biome_tag": "forge:is_swamp",
+          "condition": "growthcraft:biome_loot_check"
+        },
+        {
+          "biome_tag": "minecraft:is_river",
+          "condition": "growthcraft:biome_loot_check"
+        }
+      ]
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "rice"
+    }
+  ],
+  "item": "growthcraft_rice:rice_grains",
+  "percent_to_replace": 30,
+  "percent_to_void": 55
+}
diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/thistle_seeds_from_grass.json b/src/generated/resources/data/growthcraft/loot_modifiers/thistle_seeds_from_grass.json
@@ -1,13 +1,21 @@
 {
-  "type": "growthcraft:add_item",
+  "type": "growthcraft:add_item_replacing_seeds",
   "conditions": [
     {
-      "chance": 0.2,
+      "chance": 0.15,
       "condition": "minecraft:random_chance"
     },
     {
       "block": "minecraft:grass",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "biome_tag": "forge:is_cold/overworld",
+      "condition": "growthcraft:biome_loot_check"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "milk"
     }
   ],
   "item": "growthcraft_milk:thistle_seed"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/yeast_bayanus_from_grass.json b/src/generated/resources/data/growthcraft/loot_modifiers/yeast_bayanus_from_grass.json
@@ -1,5 +1,5 @@
 {
-  "type": "growthcraft:add_item",
+  "type": "growthcraft:add_item_replacing_seeds",
   "conditions": [
     {
       "chance": 0.1,
@@ -8,6 +8,10 @@
     {
       "block": "minecraft:grass",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "cellar"
     }
   ],
   "item": "growthcraft_cellar:yeast_bayanus"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/yeast_brewers_from_grass.json b/src/generated/resources/data/growthcraft/loot_modifiers/yeast_brewers_from_grass.json
@@ -1,5 +1,5 @@
 {
-  "type": "growthcraft:add_item",
+  "type": "growthcraft:add_item_replacing_seeds",
   "conditions": [
     {
       "chance": 0.1,
@@ -8,6 +8,10 @@
     {
       "block": "minecraft:grass",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "cellar"
     }
   ],
   "item": "growthcraft_cellar:yeast_brewers"

diff --git a/...enerated/resources/data/growthcraft/loot_modifiers/yeast_ethereal_from_chorus_flower.json b/...enerated/resources/data/growthcraft/loot_modifiers/yeast_ethereal_from_chorus_flower.json
@@ -2,12 +2,16 @@
   "type": "growthcraft:add_item",
   "conditions": [
     {
-      "chance": 0.4,
+      "chance": 0.2,
       "condition": "minecraft:random_chance"
     },
     {
       "block": "minecraft:chorus_flower",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "cellar"
     }
   ],
   "item": "growthcraft_cellar:yeast_ethereal"

diff --git a/src/generated/resources/data/growthcraft/loot_modifiers/yeast_lager_from_snow.json b/src/generated/resources/data/growthcraft/loot_modifiers/yeast_lager_from_snow.json
@@ -2,12 +2,16 @@
   "type": "growthcraft:add_item",
   "conditions": [
     {
-      "chance": 0.2,
+      "chance": 0.1,
       "condition": "minecraft:random_chance"
     },
     {
       "block": "minecraft:snow",
       "condition": "minecraft:block_state_property"
+    },
+    {
+      "condition": "growthcraft:module_loaded_loot_check",
+      "module": "cellar"
     }
   ],
   "item": "growthcraft_cellar:yeast_lager"

diff --git a/...nerated/resources/data/growthcraft/worldgen/placed_feature/deepslate_salt_ore_placed.json b/...nerated/resources/data/growthcraft/worldgen/placed_feature/deepslate_salt_ore_placed.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 50
+      "count": 10
     },
     {
       "type": "minecraft:in_square"

diff --git a/src/generated/resources/data/growthcraft/worldgen/placed_feature/end_salt_ore_placed.json b/src/generated/resources/data/growthcraft/worldgen/placed_feature/end_salt_ore_placed.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 50
+      "count": 10
     },
     {
       "type": "minecraft:in_square"

diff --git a/src/generated/resources/data/growthcraft/worldgen/placed_feature/nether_salt_ore_placed.json b/src/generated/resources/data/growthcraft/worldgen/placed_feature/nether_salt_ore_placed.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 50
+      "count": 10
     },
     {
       "type": "minecraft:in_square"

diff --git a/...ed/resources/data/growthcraft_apiary/advancements/recipes/decorations/bee_box_bamboo.json b/...ed/resources/data/growthcraft_apiary/advancements/recipes/decorations/bee_box_bamboo.json
@@ -8,6 +8,11 @@
             "items": [
               "minecraft:bamboo_planks"
             ]
+          },
+          {
+            "items": [
+              "minecraft:bamboo_mosaic"
+            ]
           }
         ]
       },

diff --git a/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_acacia.json b/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_acacia.json
@@ -1,6 +1,12 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
+  "conditions": [
+    {
+      "type": "growthcraft:feature_enabled",
+      "feature": "apiary"
+    }
+  ],
   "group": "growthcraft_apiary",
   "key": {
     "B": {

diff --git a/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_bamboo.json b/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_bamboo.json
@@ -1,7 +1,13 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
-  "group": "growthcraft_bamboo",
+  "conditions": [
+    {
+      "type": "growthcraft:feature_enabled",
+      "feature": "apiary"
+    }
+  ],
+  "group": "growthcraft_apiary",
   "key": {
     "B": [
       {

diff --git a/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_birch.json b/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_birch.json
@@ -1,6 +1,12 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
+  "conditions": [
+    {
+      "type": "growthcraft:feature_enabled",
+      "feature": "apiary"
+    }
+  ],
   "group": "growthcraft_apiary",
   "key": {
     "B": {

diff --git a/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_cherry.json b/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_cherry.json
@@ -1,6 +1,12 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
+  "conditions": [
+    {
+      "type": "growthcraft:feature_enabled",
+      "feature": "apiary"
+    }
+  ],
   "group": "growthcraft_apiary",
   "key": {
     "B": {

diff --git a/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_crimson.json b/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_crimson.json
@@ -1,6 +1,12 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
+  "conditions": [
+    {
+      "type": "growthcraft:feature_enabled",
+      "feature": "apiary"
+    }
+  ],
   "group": "growthcraft_apiary",
   "key": {
     "B": {

diff --git a/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_dark_oak.json b/src/generated/resources/data/growthcraft_apiary/recipes/bee_box_dark_oak.json
@@ -1,6 +1,12 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
+  "conditions": [
+    {
+      "type": "growthcraft:feature_enabled",
+      "feature": "apiary"
+    }
+  ],
   "group": "growthcraft_apiary",
   "key": {
     "B": {