generate

FrozenBlock · Jan 8, 2025 · 4edc90c · 4edc90c
1 parent 0199be0
commit 4edc90c
Show file tree

Hide file tree

Showing 46 changed files with 880 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,3 +54,8 @@ hi
 - Expanded the list of blocks Fireflies can "hide" in during the day.
 - Renamed the `wilderwildfireflies` mob category to `wilderwildfirefly`.
 - Removed the `wilderwild:spawn/firefly_spawnable_cave` and `wilderwild:spawn/firefly_spawnable_during_day` tags as these spawning behaviors have been removed.
+
+# Pale Mushroom Branch
+- All Shelf Fungi can now be mined faster with an Axe.
+- Added the Pale Mushroom, Pale Shelf Fungi, and Pale Mushroom Block.
+- Huge Pale Mushrooms generate naturally in the Pale Garden Biome.
diff --git a/src/main/generated/assets/wilderwild/blockstates/pale_shelf_fungi.json b/src/main/generated/assets/wilderwild/blockstates/pale_shelf_fungi.json
@@ -0,0 +1,216 @@
+{
+  "variants": {
+    "face=ceiling,facing=east,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=east,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=east,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=east,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=north,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=north,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=north,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=north,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=south,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 180
+    },
+    "face=ceiling,facing=south,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 180
+    },
+    "face=ceiling,facing=south,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 180
+    },
+    "face=ceiling,facing=south,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 180
+    },
+    "face=ceiling,facing=west,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 180,
+      "y": 90
+    },
+    "face=ceiling,facing=west,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 180,
+      "y": 90
+    },
+    "face=ceiling,facing=west,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 180,
+      "y": 90
+    },
+    "face=ceiling,facing=west,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 180,
+      "y": 90
+    },
+    "face=floor,facing=east,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "y": 90
+    },
+    "face=floor,facing=east,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "y": 90
+    },
+    "face=floor,facing=east,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "y": 90
+    },
+    "face=floor,facing=east,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "y": 90
+    },
+    "face=floor,facing=north,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1"
+    },
+    "face=floor,facing=north,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2"
+    },
+    "face=floor,facing=north,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3"
+    },
+    "face=floor,facing=north,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4"
+    },
+    "face=floor,facing=south,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "y": 180
+    },
+    "face=floor,facing=south,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "y": 180
+    },
+    "face=floor,facing=south,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "y": 180
+    },
+    "face=floor,facing=south,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "y": 180
+    },
+    "face=floor,facing=west,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "y": 270
+    },
+    "face=floor,facing=west,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "y": 270
+    },
+    "face=floor,facing=west,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "y": 270
+    },
+    "face=floor,facing=west,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "y": 270
+    },
+    "face=wall,facing=east,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=east,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=east,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=east,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=north,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 90
+    },
+    "face=wall,facing=north,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 90
+    },
+    "face=wall,facing=north,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 90
+    },
+    "face=wall,facing=north,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 90
+    },
+    "face=wall,facing=south,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=south,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=south,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=south,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=west,shelf_fungus_stage=1": {
+      "model": "wilderwild:block/pale_shelf_fungi_1",
+      "x": 90,
+      "y": 270
+    },
+    "face=wall,facing=west,shelf_fungus_stage=2": {
+      "model": "wilderwild:block/pale_shelf_fungi_2",
+      "x": 90,
+      "y": 270
+    },
+    "face=wall,facing=west,shelf_fungus_stage=3": {
+      "model": "wilderwild:block/pale_shelf_fungi_3",
+      "x": 90,
+      "y": 270
+    },
+    "face=wall,facing=west,shelf_fungus_stage=4": {
+      "model": "wilderwild:block/pale_shelf_fungi_4",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/wilderwild/items/pale_shelf_fungi.json b/src/main/generated/assets/wilderwild/items/pale_shelf_fungi.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "wilderwild:item/pale_shelf_fungi"
+  }
+}
diff --git a/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_1.json b/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_1.json
@@ -0,0 +1,7 @@
+{
+  "parent": "wilderwild:block/template_shelf_fungi_1",
+  "textures": {
+    "bottom": "wilderwild:block/pale_shelf_fungi_bottom",
+    "top": "wilderwild:block/pale_shelf_fungi"
+  }
+}
diff --git a/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_2.json b/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_2.json
@@ -0,0 +1,7 @@
+{
+  "parent": "wilderwild:block/template_shelf_fungi_2",
+  "textures": {
+    "bottom": "wilderwild:block/pale_shelf_fungi_bottom",
+    "top": "wilderwild:block/pale_shelf_fungi"
+  }
+}
diff --git a/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_3.json b/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_3.json
@@ -0,0 +1,7 @@
+{
+  "parent": "wilderwild:block/template_shelf_fungi_3",
+  "textures": {
+    "bottom": "wilderwild:block/pale_shelf_fungi_bottom",
+    "top": "wilderwild:block/pale_shelf_fungi"
+  }
+}
diff --git a/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_4.json b/src/main/generated/assets/wilderwild/models/block/pale_shelf_fungi_4.json
@@ -0,0 +1,7 @@
+{
+  "parent": "wilderwild:block/template_shelf_fungi_4",
+  "textures": {
+    "bottom": "wilderwild:block/pale_shelf_fungi_bottom",
+    "top": "wilderwild:block/pale_shelf_fungi"
+  }
+}
diff --git a/src/main/generated/assets/wilderwild/models/item/pale_shelf_fungi.json b/src/main/generated/assets/wilderwild/models/item/pale_shelf_fungi.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/pale_shelf_fungi"
+  }
+}
diff --git a/src/main/generated/data/minecraft/tags/block/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json
@@ -10,6 +10,11 @@
     "wilderwild:tumbleweed",
     "wilderwild:prickly_pear",
     "wilderwild:mycelium_growth",
+    "wilderwild:brown_shelf_fungi",
+    "wilderwild:red_shelf_fungi",
+    "wilderwild:pale_shelf_fungi",
+    "wilderwild:crimson_shelf_fungi",
+    "wilderwild:warped_shelf_fungi",
     "wilderwild:pale_mushroom_block",
     "wilderwild:pale_mushroom"
   ]

diff --git a/src/main/generated/data/minecraft/tags/block/sword_efficient.json b/src/main/generated/data/minecraft/tags/block/sword_efficient.json
@@ -10,6 +10,7 @@
     "wilderwild:algae",
     "wilderwild:brown_shelf_fungi",
     "wilderwild:red_shelf_fungi",
+    "wilderwild:pale_shelf_fungi",
     "wilderwild:crimson_shelf_fungi",
     "wilderwild:warped_shelf_fungi",
     "wilderwild:sponge_bud",

diff --git a/src/main/generated/data/wilderwild/loot_table/blocks/pale_mushroom.json b/src/main/generated/data/wilderwild/loot_table/blocks/pale_mushroom.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:pale_mushroom"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/generated/data/wilderwild/loot_table/blocks/pale_mushroom_block.json b/src/main/generated/data/wilderwild/loot_table/blocks/pale_mushroom_block.json
@@ -0,0 +1,61 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
+                        }
+                      ]
+                    }
+                  }
+                }
+              ],
+              "name": "wilderwild:pale_mushroom_block"
+            },
+            {
+              "type": "minecraft:item",
+              "functions": [
+                {
+                  "add": false,
+                  "count": {
+                    "type": "minecraft:uniform",
+                    "max": 2.0,
+                    "min": -6.0
+                  },
+                  "function": "minecraft:set_count"
+                },
+                {
+                  "function": "minecraft:limit_count",
+                  "limit": {
+                    "min": 0.0
+                  }
+                },
+                {
+                  "function": "minecraft:explosion_decay"
+                }
+              ],
+              "name": "wilderwild:pale_mushroom"
+            }
+          ]
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}