retexture & ancient plants

common/src/generated/resources/assets/blissful/blockstates/bliss_bloom.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "half=lower": {
+      "model": "blissful:block/bliss_bloom_lower"
+    },
+    "half=upper": {
+      "model": "blissful:block/bliss_bloom_upper"
+    }
+  }
+}

common/src/generated/resources/assets/blissful/blockstates/feral_hemp.json

@@ -0,0 +1,15 @@
+{
+  "variants": {
+    "": [
+      {
+        "model": "blissful:block/feral_hemp"
+      },
+      {
+        "model": "blissful:block/feral_hemp_2"
+      },
+      {
+        "model": "blissful:block/feral_hemp_3"
+      }
+    ]
+  }
+}

common/src/generated/resources/assets/blissful/lang/en_ud.json

@@ -1,4 +1,6 @@
 {
+  "block.blissful.bliss_bloom": "ɯooןᗺ ssıןᗺ",
+  "block.blissful.feral_hemp": "dɯǝH ןɐɹǝℲ",
   "block.blissful.hemp": "dɯǝH",
   "block.blissful.hemp_crate": "ǝʇɐɹƆ dɯǝH",
   "block.blissful.weed_crate": "ǝʇɐɹƆ pǝǝM",

common/src/generated/resources/assets/blissful/lang/en_us.json

@@ -1,4 +1,6 @@
 {
+  "block.blissful.bliss_bloom": "Bliss Bloom",
+  "block.blissful.feral_hemp": "Feral Hemp",
   "block.blissful.hemp": "Hemp",
   "block.blissful.hemp_crate": "Hemp Crate",
   "block.blissful.weed_crate": "Weed Crate",

common/src/generated/resources/assets/blissful/models/block/bliss_bloom_lower.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "blissful:block/bliss_bloom_lower"
+  }
+}

common/src/generated/resources/assets/blissful/models/block/bliss_bloom_upper.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "blissful:block/bliss_bloom_upper"
+  }
+}

common/src/generated/resources/assets/blissful/models/item/bliss_bloom.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "blissful:block/bliss_bloom_upper"
+  }
+}

common/src/generated/resources/assets/blissful/models/item/feral_hemp.json

@@ -0,0 +1,3 @@
+{
+  "parent": "blissful:block/feral_hemp"
+}

common/src/generated/resources/data/blissful/loot_tables/blocks/bliss_bloom.json

@@ -0,0 +1,28 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        },
+        {
+          "block": "blissful:bliss_bloom",
+          "condition": "minecraft:block_state_property",
+          "properties": {
+            "half": "lower"
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "blissful:bliss_bloom"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "blissful:blocks/bliss_bloom"
+}

common/src/generated/resources/data/blissful/loot_tables/blocks/feral_hemp.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "blissful:feral_hemp"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "blissful:blocks/feral_hemp"
+}

common/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "blissful:feral_hemp"
+  ]
+}

common/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "blissful:bliss_bloom"
+  ]
+}

common/src/main/java/galena/blissful/index/BlissfulBlocks.java

@@ -10,6 +10,8 @@
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.BushBlock;
+import net.minecraft.world.level.block.DoublePlantBlock;
 
 import static galena.blissful.platform.Services.DATAGEN;
 
@@ -49,6 +51,30 @@ public class BlissfulBlocks {
             .build()
             .register();
 
+    public static final BlockEntry<DoublePlantBlock> BLISS_BLOOM = REGISTRATE
+            .block("bliss_bloom", DoublePlantBlock::new)
+            .initialProperties(() -> Blocks.ROSE_BUSH)
+            .addLayer(() -> RenderType::cutout)
+            .blockstate(DATAGEN::blissBloom)
+            .loot(DATAGEN::blissBloom)
+            .tag(BlockTags.TALL_FLOWERS)
+            .item()
+            .tab(CreativeModeTabs.NATURAL_BLOCKS)
+            .model((c, p) -> p.generated(c, p.modLoc("block/" + c.getName() + "_upper")))
+            .build()
+            .register();
+
+    public static final BlockEntry<BushBlock> FERAL_HEMP = REGISTRATE
+            .block("feral_hemp", BushBlock::new)
+            .initialProperties(() -> Blocks.FERN)
+            .addLayer(() -> RenderType::cutout)
+            .blockstate(DATAGEN::feralHemp)
+            .tag(BlockTags.SMALL_FLOWERS)
+            .item()
+            .tab(CreativeModeTabs.NATURAL_BLOCKS)
+            .build()
+            .register();
+
     public static void register() {
         // loads this class
     }

common/src/main/java/galena/blissful/platform/services/IDataGenHelper.java

@@ -7,6 +7,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CropBlock;
+import net.minecraft.world.level.block.DoublePlantBlock;
 
 public interface IDataGenHelper {
 
@@ -18,4 +19,9 @@ public interface IDataGenHelper {
 
     void joint(DataGenContext<Item, ? extends Item> context, RegistrateItemModelProvider provider);
 
+    void blissBloom(DataGenContext<Block, ? extends DoublePlantBlock> context, RegistrateBlockstateProvider provider);
+
+    void blissBloom(RegistrateBlockLootTables provider, DoublePlantBlock block);
+
+    void feralHemp(DataGenContext<Block, ? extends Block> context, RegistrateBlockstateProvider provider);
 }