Add ceanothus pt1

Mechalopa · Aug 2, 2024 · fbffcb0 · fbffcb0
1 parent ee17647
commit fbffcb0
Show file tree

Hide file tree

Showing 21 changed files with 202 additions and 3 deletions.
diff --git a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java
@@ -152,7 +152,7 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BLUE_DAISY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WINTER_HEATH.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.CRIMSON_CLOVER.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHEEL_LILY.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.WHEEL_LILY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.MAGENTA_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHITE_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.RED_SPIDER_LILY.get()), 12, 1, 0.05F));

diff --git a/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java b/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java
@@ -67,6 +67,7 @@ public class ModBlocks
 	public static final Supplier<Block> BRAZILIAN_PLUME = REGISTRY.register("brazilian_plume", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> WORSLEYA = REGISTRY.register("worsleya", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> OAKLEAF_HYDRANGEA = REGISTRY.register("oakleaf_hydrangea", () -> new ModTallFlowerBlock());
+	public static final Supplier<Block> CEANOTHUS = REGISTRY.register("ceanothus", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> FIREWEED = REGISTRY.register("fireweed", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> ALPINE_RAGWORT = REGISTRY.register("alpine_ragwort", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> TATARIAN_ASTER = REGISTRY.register("tatarian_aster", () -> new ModTallFlowerBlock());

diff --git a/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java b/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java
@@ -58,6 +58,7 @@ public class ModItems
 	public static final Supplier<Item> BRAZILIAN_PLUME = REGISTRY.register("brazilian_plume", () -> new DoubleHighBlockItem(ModBlocks.BRAZILIAN_PLUME.get(), new Item.Properties()));
 	public static final Supplier<Item> WORSLEYA = REGISTRY.register("worsleya", () -> new DoubleHighBlockItem(ModBlocks.WORSLEYA.get(), new Item.Properties()));
 	public static final Supplier<Item> OAKLEAF_HYDRANGEA = REGISTRY.register("oakleaf_hydrangea", () -> new DoubleHighBlockItem(ModBlocks.OAKLEAF_HYDRANGEA.get(), new Item.Properties()));
+	public static final Supplier<Item> CEANOTHUS = REGISTRY.register("ceanothus", () -> new DoubleHighBlockItem(ModBlocks.CEANOTHUS.get(), new Item.Properties()));
 	public static final Supplier<Item> FIREWEED = REGISTRY.register("fireweed", () -> new DoubleHighBlockItem(ModBlocks.FIREWEED.get(), new Item.Properties()));
 	public static final Supplier<Item> ALPINE_RAGWORT = REGISTRY.register("alpine_ragwort", () -> new DoubleHighBlockItem(ModBlocks.ALPINE_RAGWORT.get(), new Item.Properties()));
 	public static final Supplier<Item> TATARIAN_ASTER = REGISTRY.register("tatarian_aster", () -> new DoubleHighBlockItem(ModBlocks.TATARIAN_ASTER.get(), new Item.Properties()));

diff --git a/src/main/resources/assets/jafohana/blockstates/ceanothus.json b/src/main/resources/assets/jafohana/blockstates/ceanothus.json
@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "half=lower": {
+      "model": "jafohana:block/ceanothus_bottom"
+    },
+    "half=upper": {
+      "model": "jafohana:block/ceanothus_top"
+    }
+  }
+}
diff --git a/src/main/resources/assets/jafohana/lang/en_us.json b/src/main/resources/assets/jafohana/lang/en_us.json
@@ -40,6 +40,7 @@
   "block.jafohana.brazilian_plume": "Brazilian Plume",
   "block.jafohana.worsleya": "Worsleya",
   "block.jafohana.oakleaf_hydrangea": "Oakleaf Hydrangea",
+  "block.jafohana.ceanothus": "Ceanothus",
   "block.jafohana.fireweed": "Fireweeds",
   "block.jafohana.alpine_ragwort": "Alpine Ragwort",
   "block.jafohana.tatarian_aster": "Tatarian Aster",

diff --git a/src/main/resources/assets/jafohana/lang/ja_jp.json b/src/main/resources/assets/jafohana/lang/ja_jp.json
@@ -40,6 +40,7 @@
   "block.jafohana.brazilian_plume": "サンゴバナ",
   "block.jafohana.worsleya": "ブルーアマリリス",
   "block.jafohana.oakleaf_hydrangea": "カシワバアジサイ",
+  "block.jafohana.ceanothus": "セアノサス",
   "block.jafohana.fireweed": "ヤナギラン",
   "block.jafohana.alpine_ragwort": "キオン",
   "block.jafohana.tatarian_aster": "シオン",

diff --git a/src/main/resources/assets/jafohana/models/block/ceanothus_bottom.json b/src/main/resources/assets/jafohana/models/block/ceanothus_bottom.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "cutout",
+  "textures": {
+    "cross": "jafohana:block/ceanothus_bottom"
+  }
+}
diff --git a/src/main/resources/assets/jafohana/models/block/ceanothus_top.json b/src/main/resources/assets/jafohana/models/block/ceanothus_top.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "cutout",
+  "textures": {
+    "cross": "jafohana:block/ceanothus_top"
+  }
+}
diff --git a/src/main/resources/assets/jafohana/models/item/ceanothus.json b/src/main/resources/assets/jafohana/models/item/ceanothus.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "jafohana:block/ceanothus_top"
+  }
+}
diff --git a/src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png b/src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png
diff --git a/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png b/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png
diff --git a/src/main/resources/data/jafohana/loot_table/blocks/ceanothus.json b/src/main/resources/data/jafohana/loot_table/blocks/ceanothus.json
@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "conditions": [
+            {
+              "block": "jafohana:ceanothus",
+              "condition": "minecraft:block_state_property",
+              "properties": {
+                "half": "lower"
+              }
+            }
+          ],
+          "name": "jafohana:ceanothus"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "jafohana:blocks/ceanothus"
+}
diff --git a/src/main/resources/data/jafohana/recipe/blue_dye_from_ceanothus.json b/src/main/resources/data/jafohana/recipe/blue_dye_from_ceanothus.json
@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "group": "blue_dye",
+  "ingredients": [
+    {
+      "item": "jafohana:dayflower"
+    }
+  ],
+  "result": {
+    "count": 2,
+    "id": "minecraft:blue_dye"
+  }
+}
diff --git a/src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/large_blue.json b/src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/large_blue.json
@@ -0,0 +1,17 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
+  "type": "mekanism:enriching",
+  "input": {
+    "count": 1,
+    "item": "jafohana:ceanothus"
+  },
+  "output": {
+    "count": 4,
+    "id": "minecraft:blue_dye"
+  }
+}
diff --git a/src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/large_blue.json b/src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/large_blue.json
@@ -0,0 +1,17 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
+  "type": "mekanism:pigment_extracting",
+  "input": {
+    "count": 1,
+    "item": "jafohana:ceanothus"
+  },
+  "output": {
+    "amount": 1536,
+    "id": "mekanism:blue"
+  }
+}
diff --git a/src/main/resources/data/jafohana/tags/block/tall_flowers.json b/src/main/resources/data/jafohana/tags/block/tall_flowers.json
@@ -9,6 +9,7 @@
     "jafohana:brazilian_plume",
     "jafohana:worsleya",
     "jafohana:oakleaf_hydrangea",
+    "jafohana:ceanothus",
     "jafohana:fireweed",
     "jafohana:alpine_ragwort",
     "jafohana:tatarian_aster",

diff --git a/src/main/resources/data/jafohana/tags/item/tall_flowers.json b/src/main/resources/data/jafohana/tags/item/tall_flowers.json
@@ -9,6 +9,7 @@
     "jafohana:brazilian_plume",
     "jafohana:worsleya",
     "jafohana:oakleaf_hydrangea",
+    "jafohana:ceanothus",
     "jafohana:fireweed",
     "jafohana:alpine_ragwort",
     "jafohana:tatarian_aster",

diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_birch_forest.json b/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_birch_forest.json
@@ -38,6 +38,42 @@
         },
         "placement": []
       },
+      {
+        "feature": {
+          "type": "minecraft:random_patch",
+          "config": {
+            "feature": {
+              "feature": {
+                "type": "minecraft:simple_block",
+                "config": {
+                  "to_place": {
+                    "type": "minecraft:simple_state_provider",
+                    "state": {
+                      "Name": "jafohana:ceanothus",
+                      "Properties": {
+                        "half": "lower"
+                      }
+                    }
+                  }
+                }
+              },
+              "placement": [
+                {
+                  "type": "minecraft:block_predicate_filter",
+                  "predicate": {
+                    "type": "minecraft:matching_blocks",
+                    "blocks": "minecraft:air"
+                  }
+                }
+              ]
+            },
+            "tries": 96,
+            "xz_spread": 7,
+            "y_spread": 3
+          }
+        },
+        "placement": []
+      },
       {
         "feature": {
           "type": "minecraft:random_patch",

diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_flower_forest.json b/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_flower_forest.json
@@ -182,6 +182,42 @@
         },
         "placement": []
       },
+      {
+        "feature": {
+          "type": "minecraft:random_patch",
+          "config": {
+            "feature": {
+              "feature": {
+                "type": "minecraft:simple_block",
+                "config": {
+                  "to_place": {
+                    "type": "minecraft:simple_state_provider",
+                    "state": {
+                      "Name": "jafohana:ceanothus",
+                      "Properties": {
+                        "half": "lower"
+                      }
+                    }
+                  }
+                }
+              },
+              "placement": [
+                {
+                  "type": "minecraft:block_predicate_filter",
+                  "predicate": {
+                    "type": "minecraft:matching_blocks",
+                    "blocks": "minecraft:air"
+                  }
+                }
+              ]
+            },
+            "tries": 96,
+            "xz_spread": 7,
+            "y_spread": 3
+          }
+        },
+        "placement": []
+      },
       {
         "feature": {
           "type": "minecraft:random_patch",

diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_birch_forest.json b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_birch_forest.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 20
+      "chance": 7
     },
     {
       "type": "minecraft:in_square"
@@ -12,6 +12,19 @@
       "type": "minecraft:heightmap",
       "heightmap": "MOTION_BLOCKING"
     },
+    {
+      "type": "minecraft:count",
+      "count": {
+        "type": "minecraft:clamped",
+        "max_inclusive": 1,
+        "min_inclusive": 0,
+        "source": {
+          "type": "minecraft:uniform",
+          "max_inclusive": 1,
+          "min_inclusive": -3
+        }
+      }
+    },
     {
       "type": "minecraft:biome"
     }

diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_flower_forest.json b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_flower_forest.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 18
+      "chance": 16
     },
     {
       "type": "minecraft:in_square"