From fbffcb0eca8c52f83afe3a5977305755fd145a7a Mon Sep 17 00:00:00 2001 From: Mechalopa <92443696+Mechalopa@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:05:41 +0900 Subject: [PATCH] Add ceanothus pt1 --- .../github/mechalopa/jafohana/ModEvents.java | 2 +- .../jafohana/registry/ModBlocks.java | 1 + .../mechalopa/jafohana/registry/ModItems.java | 1 + .../jafohana/blockstates/ceanothus.json | 10 +++++ .../resources/assets/jafohana/lang/en_us.json | 1 + .../resources/assets/jafohana/lang/ja_jp.json | 1 + .../models/block/ceanothus_bottom.json | 7 ++++ .../jafohana/models/block/ceanothus_top.json | 7 ++++ .../jafohana/models/item/ceanothus.json | 6 +++ .../textures/block/ceanothus_bottom.png | Bin 0 -> 83 bytes .../jafohana/textures/block/ceanothus_top.png | Bin 0 -> 83 bytes .../jafohana/loot_table/blocks/ceanothus.json | 30 +++++++++++++++ .../recipe/blue_dye_from_ceanothus.json | 14 +++++++ .../mekanism/enriching/dye/large_blue.json | 17 +++++++++ .../pigment_extracting/flower/large_blue.json | 17 +++++++++ .../jafohana/tags/block/tall_flowers.json | 1 + .../data/jafohana/tags/item/tall_flowers.json | 1 + .../tall_flower_birch_forest.json | 36 ++++++++++++++++++ .../tall_flower_flower_forest.json | 36 ++++++++++++++++++ .../tall_flower_birch_forest.json | 15 +++++++- .../tall_flower_flower_forest.json | 2 +- 21 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/jafohana/blockstates/ceanothus.json create mode 100644 src/main/resources/assets/jafohana/models/block/ceanothus_bottom.json create mode 100644 src/main/resources/assets/jafohana/models/block/ceanothus_top.json create mode 100644 src/main/resources/assets/jafohana/models/item/ceanothus.json create mode 100644 src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png create mode 100644 src/main/resources/assets/jafohana/textures/block/ceanothus_top.png create mode 100644 src/main/resources/data/jafohana/loot_table/blocks/ceanothus.json create mode 100644 src/main/resources/data/jafohana/recipe/blue_dye_from_ceanothus.json create mode 100644 src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/large_blue.json create mode 100644 src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/large_blue.json diff --git a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java index f8267fba..818cc6d8 100644 --- 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 index 0b6293fa..60dd992d 100644 --- 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 BRAZILIAN_PLUME = REGISTRY.register("brazilian_plume", () -> new ModTallFlowerBlock()); public static final Supplier WORSLEYA = REGISTRY.register("worsleya", () -> new ModTallFlowerBlock()); public static final Supplier OAKLEAF_HYDRANGEA = REGISTRY.register("oakleaf_hydrangea", () -> new ModTallFlowerBlock()); + public static final Supplier CEANOTHUS = REGISTRY.register("ceanothus", () -> new ModTallFlowerBlock()); public static final Supplier FIREWEED = REGISTRY.register("fireweed", () -> new ModTallFlowerBlock()); public static final Supplier ALPINE_RAGWORT = REGISTRY.register("alpine_ragwort", () -> new ModTallFlowerBlock()); public static final Supplier 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 index d092bfe4..8de42add 100644 --- 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 BRAZILIAN_PLUME = REGISTRY.register("brazilian_plume", () -> new DoubleHighBlockItem(ModBlocks.BRAZILIAN_PLUME.get(), new Item.Properties())); public static final Supplier WORSLEYA = REGISTRY.register("worsleya", () -> new DoubleHighBlockItem(ModBlocks.WORSLEYA.get(), new Item.Properties())); public static final Supplier OAKLEAF_HYDRANGEA = REGISTRY.register("oakleaf_hydrangea", () -> new DoubleHighBlockItem(ModBlocks.OAKLEAF_HYDRANGEA.get(), new Item.Properties())); + public static final Supplier CEANOTHUS = REGISTRY.register("ceanothus", () -> new DoubleHighBlockItem(ModBlocks.CEANOTHUS.get(), new Item.Properties())); public static final Supplier FIREWEED = REGISTRY.register("fireweed", () -> new DoubleHighBlockItem(ModBlocks.FIREWEED.get(), new Item.Properties())); public static final Supplier ALPINE_RAGWORT = REGISTRY.register("alpine_ragwort", () -> new DoubleHighBlockItem(ModBlocks.ALPINE_RAGWORT.get(), new Item.Properties())); public static final Supplier 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 new file mode 100644 index 00000000..9d1a425a --- /dev/null +++ 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" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/lang/en_us.json b/src/main/resources/assets/jafohana/lang/en_us.json index 9796f7c1..fb10eba7 100644 --- 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 index 6b3d1384..ca5ca234 100644 --- 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 new file mode 100644 index 00000000..51a37f61 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/ceanothus_top.json b/src/main/resources/assets/jafohana/models/block/ceanothus_top.json new file mode 100644 index 00000000..035a96f5 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/item/ceanothus.json b/src/main/resources/assets/jafohana/models/item/ceanothus.json new file mode 100644 index 00000000..e0cc535e --- /dev/null +++ b/src/main/resources/assets/jafohana/models/item/ceanothus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "jafohana:block/ceanothus_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png b/src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..6a55bb943eb9172917f7799395c4136e56e5ec58 GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ql2i3Ar*6yXIOpxT<>LYcm?BP gwjL>i7#;?Ok^?e&=8IiafvOlhUHx3vIVCg!0Q!&=>Hq)$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png b/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png new file mode 100644 index 0000000000000000000000000000000000000000..6a55bb943eb9172917f7799395c4136e56e5ec58 GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ql2i3Ar*6yXIOpxT<>LYcm?BP gwjL>i7#;?Ok^?e&=8IiafvOlhUHx3vIVCg!0Q!&=>Hq)$ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/jafohana/loot_table/blocks/ceanothus.json b/src/main/resources/data/jafohana/loot_table/blocks/ceanothus.json new file mode 100644 index 00000000..a1e60bc0 --- /dev/null +++ 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" +} \ No newline at end of file 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 new file mode 100644 index 00000000..66a2b40a --- /dev/null +++ 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" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..723d6c0b --- /dev/null +++ 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" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..91e5c761 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/tags/block/tall_flowers.json b/src/main/resources/data/jafohana/tags/block/tall_flowers.json index 16a1480d..960340da 100644 --- 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 index 16a1480d..960340da 100644 --- 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 index 9fee66ad..319f227d 100644 --- 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 index d6fa6c2e..1be8c9ff 100644 --- 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 index bf4ec4b8..aee3cfe7 100644 --- 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 index 5e965303..82f91c39 100644 --- 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"