Merge branch 'master' into 1.21.2

FrozenBlock · Feb 18, 2025 · c093617 · c093617
2 parents cab34a9 + f032ae3
commit c093617
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 0 deletions.
diff --git a/src/main/generated/data/wilderwild/loot_table/blocks/potted_frozen_fern.json b/src/main/generated/data/wilderwild/loot_table/blocks/potted_frozen_fern.json
@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:frozen_fern"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/generated/data/wilderwild/loot_table/blocks/potted_frozen_short_grass.json b/src/main/generated/data/wilderwild/loot_table/blocks/potted_frozen_short_grass.json
@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "wilderwild:frozen_short_grass"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/java/net/frozenblock/wilderwild/datagen/loot/WWBlockLootProvider.java b/src/main/java/net/frozenblock/wilderwild/datagen/loot/WWBlockLootProvider.java
@@ -415,6 +415,8 @@ public void generate() {
 		this.dropPottedContents(WWBlocks.POTTED_WILDFLOWERS);
 		this.dropPottedContents(WWBlocks.POTTED_PHLOX);
 		this.dropPottedContents(WWBlocks.POTTED_LANTANAS);
+		this.dropPottedContents(WWBlocks.POTTED_FROZEN_SHORT_GRASS);
+		this.dropPottedContents(WWBlocks.POTTED_FROZEN_FERN);
 
 		this.dropSelf(WWBlocks.NULL_BLOCK);
 		this.dropSelf(WWBlocks.CHISELED_MUD_BRICKS);

diff --git a/src/main/resources/assets/wilderwild/blockstates/potted_frozen_short_grass.json b/src/main/resources/assets/wilderwild/blockstates/potted_frozen_short_grass.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "wilderwild:block/potted_frozen_short_grass"
+    }
+  }
+}
diff --git a/src/main/resources/assets/wilderwild/models/block/potted_frozen_short_grass.json b/src/main/resources/assets/wilderwild/models/block/potted_frozen_short_grass.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/flower_pot_cross",
+  "textures": {
+    "plant": "wilderwild:block/potted_frozen_short_grass"
+  }
+}