diff --git a/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json index 910002f2..8591bc70 100644 --- a/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json +++ b/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/flower_pot_cross", "render_type": "cutout", "textures": { - "plant": "jafohana:block/jack_in_the_pulpit" + "plant": "jafohana:block/potted_jack_in_the_pulpit" } } \ 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 index b66d7368..ddf1880b 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png and b/src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png b/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png index 7212d480..78a61cdb 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png and b/src/main/resources/assets/jafohana/textures/block/ceanothus_top.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit.png b/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit.png new file mode 100644 index 00000000..c28ff5ab Binary files /dev/null and b/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit_stem.png b/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit_stem.png new file mode 100644 index 00000000..66d6ceef Binary files /dev/null and b/src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit_stem.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/potted_jack_in_the_pulpit.png b/src/main/resources/assets/jafohana/textures/block/potted_jack_in_the_pulpit.png new file mode 100644 index 00000000..9350024c Binary files /dev/null and b/src/main/resources/assets/jafohana/textures/block/potted_jack_in_the_pulpit.png differ diff --git a/src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json b/src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json index 3abd7c97..ccec012d 100644 --- a/src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json +++ b/src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json @@ -64,9 +64,39 @@ ], "name": "jafohana:wheel_lily" }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "jafohana:fireweed" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "jafohana:jack_in_the_pulpit" + }, { "type": "minecraft:empty", - "weight": 8 + "weight": 10 } ], "rolls": { diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json index eae02a06..a33637da 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json @@ -6,29 +6,9 @@ "name": "#jafohana:is_overworld" }, { - "name": "#jafohana:is_birch_forest", + "name": "#jafohana:is_forest", "negate": true }, - { - "name": "minecraft:flower_forest", - "negate": true - }, - { - "name": "#jafohana:is_cold", - "negate": true - }, - { - "name": "#jafohana:is_dead_or_wasteland", - "negate": true - }, - { - "name": "#jafohana:is_forest" - } - ], - [ - { - "name": "#jafohana:is_overworld" - }, { "name": "#jafohana:is_windswept" }, diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_forest.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_forest.json new file mode 100644 index 00000000..d8aff266 --- /dev/null +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_forest.json @@ -0,0 +1,31 @@ +{ + "type": "jafohana:add_features", + "biomes": [ + [ + { + "name": "#jafohana:is_overworld" + }, + { + "name": "#jafohana:is_birch_forest", + "negate": true + }, + { + "name": "minecraft:flower_forest", + "negate": true + }, + { + "name": "#jafohana:is_cold", + "negate": true + }, + { + "name": "#jafohana:is_dead_or_wasteland", + "negate": true + }, + { + "name": "#jafohana:is_forest" + } + ] + ], + "features": "jafohana:tall_flower_forest", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_forest.json b/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_forest.json new file mode 100644 index 00000000..228b7a45 --- /dev/null +++ b/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_forest.json @@ -0,0 +1,115 @@ +{ + "type": "minecraft:simple_random_selector", + "config": { + "features": [ + { + "feature": { + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "jafohana:orange_marigold", + "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", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "jafohana:yellow_marigold", + "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", + "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": [] + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json index 753f80f3..aabf246a 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json @@ -11,7 +11,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 32 + "chance": 64 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json index ebe129a2..ea19049b 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 16 + "chance": 20 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json new file mode 100644 index 00000000..143761a6 --- /dev/null +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json @@ -0,0 +1,19 @@ +{ + "feature": "jafohana:tall_flower_forest", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 56 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file