diff --git a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java index ff5341d7..49cb9d0d 100644 --- a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java +++ b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java @@ -142,9 +142,9 @@ 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(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.WHEEL_LILY.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.RED_SPIDER_LILY.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.BELLS_OF_IRELAND.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.JADE_VINE.get(), 2), 5, 1, 0.05F)); diff --git a/src/main/resources/assets/jafohana/lang/ja_jp.json b/src/main/resources/assets/jafohana/lang/ja_jp.json index ca2a0c6c..ae21e4dd 100644 --- a/src/main/resources/assets/jafohana/lang/ja_jp.json +++ b/src/main/resources/assets/jafohana/lang/ja_jp.json @@ -8,7 +8,7 @@ "block.jafohana.white_african_daisy": "白色のアフリカンデイジー", "block.jafohana.black_tulip": "黒色のチューリップ", "block.jafohana.green_tulip": "緑色のチューリップ", - "block.jafohana.blood_red_iris": "菖蒲", + "block.jafohana.blood_red_iris": "アヤメ", "block.jafohana.bluebell": "ブルーベル", "block.jafohana.red_snapdragon": "赤色の金魚草", "block.jafohana.yellow_snapdragon": "黄色の金魚草", @@ -54,7 +54,7 @@ "block.jafohana.potted_white_african_daisy": "植えられた白色のアフリカンデイジー", "block.jafohana.potted_black_tulip": "植えられた黒色のチューリップ", "block.jafohana.potted_green_tulip": "植えられた緑色のチューリップ", - "block.jafohana.potted_blood_red_iris": "植えられた菖蒲", + "block.jafohana.potted_blood_red_iris": "植えられたアヤメ", "block.jafohana.potted_bluebell": "植えられたブルーベル", "block.jafohana.potted_red_snapdragon": "植えられた赤色の金魚草", "block.jafohana.potted_yellow_snapdragon": "植えられた黄色の金魚草", diff --git a/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json b/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json index 44cbba89..6a9752fe 100644 --- a/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json +++ b/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json @@ -1,51 +1,8 @@ { - "ambientocclusion": false, - "render_type": "cutout", + "parent": "jafohana:block/medium_flower_height_20", "textures": { "particle": "jafohana:block/bells_of_ireland", "cross": "jafohana:block/bells_of_ireland", "stem": "jafohana:block/bells_of_ireland_stem" - }, - "elements": [ - { - "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 4, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, - "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } - } - }, - { - "from": [ 8, 0, 0.8 ], - "to": [ 8, 4, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, - "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } - } - }, - { - "from": [ 0.8, 4, 8 ], - "to": [ 15.2, 20, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - }, - { - "from": [ 8, 4, 0.8 ], - "to": [ 8, 20, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json b/src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json new file mode 100644 index 00000000..07aedb07 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json @@ -0,0 +1,46 @@ +{ + "ambientocclusion": false, + "render_type": "cutout", + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 2, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" }, + "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 2, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" }, + "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" } + } + }, + { + "from": [ 0.8, 2, 8 ], + "to": [ 15.2, 18, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + }, + { + "from": [ 8, 2, 0.8 ], + "to": [ 8, 18, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json b/src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json new file mode 100644 index 00000000..05c63243 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json @@ -0,0 +1,46 @@ +{ + "ambientocclusion": false, + "render_type": "cutout", + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 4, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, + "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 4, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, + "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } + } + }, + { + "from": [ 0.8, 4, 8 ], + "to": [ 15.2, 20, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + }, + { + "from": [ 8, 4, 0.8 ], + "to": [ 8, 20, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/wheel_lily.json b/src/main/resources/assets/jafohana/models/block/wheel_lily.json index 1c0a59ea..0fda6b74 100644 --- a/src/main/resources/assets/jafohana/models/block/wheel_lily.json +++ b/src/main/resources/assets/jafohana/models/block/wheel_lily.json @@ -1,7 +1,8 @@ { - "parent": "minecraft:block/cross", - "render_type": "cutout", + "parent": "jafohana:block/medium_flower_height_18", "textures": { - "cross": "jafohana:block/wheel_lily" + "particle": "jafohana:block/wheel_lily", + "cross": "jafohana:block/wheel_lily", + "stem": "jafohana:block/wheel_lily_stem" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/textures/block/blood_red_iris.png b/src/main/resources/assets/jafohana/textures/block/blood_red_iris.png index 50e0f27d..ad6c8623 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/blood_red_iris.png and b/src/main/resources/assets/jafohana/textures/block/blood_red_iris.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/dayflower.png b/src/main/resources/assets/jafohana/textures/block/dayflower.png index e45d70f8..f43a3b5b 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/dayflower.png and b/src/main/resources/assets/jafohana/textures/block/dayflower.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/evening_primrose.png b/src/main/resources/assets/jafohana/textures/block/evening_primrose.png index f208d063..f4473201 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/evening_primrose.png and b/src/main/resources/assets/jafohana/textures/block/evening_primrose.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/fireweed_bottom.png b/src/main/resources/assets/jafohana/textures/block/fireweed_bottom.png index a08ffb64..3fdbc71c 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/fireweed_bottom.png and b/src/main/resources/assets/jafohana/textures/block/fireweed_bottom.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/fireweed_top.png b/src/main/resources/assets/jafohana/textures/block/fireweed_top.png index 2430bae4..a49f6c85 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/fireweed_top.png and b/src/main/resources/assets/jafohana/textures/block/fireweed_top.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_bottom.png b/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_bottom.png index 8d40db0f..2f7c83ad 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_bottom.png and b/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_bottom.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_top.png b/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_top.png index 9f1e87d0..80486ee0 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_top.png and b/src/main/resources/assets/jafohana/textures/block/oakleaf_hydrangea_top.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/wheel_lily.png b/src/main/resources/assets/jafohana/textures/block/wheel_lily.png index a15caed6..81058e19 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/wheel_lily.png and b/src/main/resources/assets/jafohana/textures/block/wheel_lily.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/wheel_lily_stem.png b/src/main/resources/assets/jafohana/textures/block/wheel_lily_stem.png new file mode 100644 index 00000000..187e1480 Binary files /dev/null and b/src/main/resources/assets/jafohana/textures/block/wheel_lily_stem.png differ diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json index 9b90fca8..871a6a59 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_bamboo_jungle.json @@ -1,6 +1,18 @@ { - "type": "neoforge:add_features", - "biomes": "minecraft:bamboo_jungle", + "type": "jafohana:add_features", + "biomes": [ + [ + { + "name": "#jafohana:is_overworld" + }, + { + "name": "#jafohana:is_bamboo_jungle" + }, + { + "name": "#jafohana:is_jungle" + } + ] + ], "features": "jafohana:flower_bamboo_jungle", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json index ffbdec76..a1015e6e 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_jungle.json @@ -6,10 +6,11 @@ "name": "#jafohana:is_overworld" }, { - "name": [ - "minecraft:sparse_jungle", - "minecraft:bamboo_jungle" - ], + "name": "#jafohana:is_sparse", + "negate": true + }, + { + "name": "#jafohana:is_bamboo_jungle", "negate": true }, { diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json index 3fa18c14..9225f6f8 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_sparse_jungle.json @@ -1,6 +1,22 @@ { - "type": "neoforge:add_features", - "biomes": "minecraft:sparse_jungle", + "type": "jafohana:add_features", + "biomes": [ + [ + { + "name": "#jafohana:is_overworld" + }, + { + "name": "#jafohana:is_sparse" + }, + { + "name": "#jafohana:is_bamboo_jungle", + "negate": true + }, + { + "name": "#jafohana:is_jungle" + } + ] + ], "features": "jafohana:flower_sparse_jungle", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_spooky_forest.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_spooky_forest.json index ee530b49..d6f92eda 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_spooky_forest.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_spooky_forest.json @@ -14,6 +14,10 @@ }, { "name": "#jafohana:is_spooky" + }, + { + "name": "#jafohana:biomesoplenty/ominous_woods", + "negate": true } ], [ @@ -29,6 +33,10 @@ }, { "name": "#jafohana:is_spooky" + }, + { + "name": "#jafohana:biomesoplenty/ominous_woods", + "negate": true } ] ], diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features.json index f1c5df1a..b69ecaab 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features.json @@ -22,6 +22,6 @@ } ] ], - "features": "jafohana:red_spider_lily", + "features": "jafohana:red_spider_lily_waterside", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features_in_river.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features_in_river.json index 5cf629b9..32e39b30 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features_in_river.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/red_spider_lily_features_in_river.json @@ -10,7 +10,7 @@ "negate": true }, { - "name": "#jafohana:is_snowy", + "name": "#jafohana:is_cold", "negate": true }, { diff --git a/src/main/resources/data/jafohana/recipes/integrateddynamics/mechanical_squeezer/red_spider_lily.json b/src/main/resources/data/jafohana/recipes/integrateddynamics/mechanical_squeezer/red_spider_lily.json index c3d57bab..431ca7e2 100644 --- a/src/main/resources/data/jafohana/recipes/integrateddynamics/mechanical_squeezer/red_spider_lily.json +++ b/src/main/resources/data/jafohana/recipes/integrateddynamics/mechanical_squeezer/red_spider_lily.json @@ -1,8 +1,20 @@ { "neoforge:conditions": [ { - "type": "neoforge:mod_loaded", - "modid": "integrateddynamics" + "type": "neoforge:and", + "values": [ + { + "type": "neoforge:mod_loaded", + "modid": "integrateddynamics" + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:mod_loaded", + "modid": "evilcraft" + } + } + ] } ], "type": "integrateddynamics:mechanical_squeezer", diff --git a/src/main/resources/data/jafohana/recipes/integrateddynamics/squeezer/red_spider_lily.json b/src/main/resources/data/jafohana/recipes/integrateddynamics/squeezer/red_spider_lily.json index e349b5e6..8db4392f 100644 --- a/src/main/resources/data/jafohana/recipes/integrateddynamics/squeezer/red_spider_lily.json +++ b/src/main/resources/data/jafohana/recipes/integrateddynamics/squeezer/red_spider_lily.json @@ -1,8 +1,20 @@ { "neoforge:conditions": [ { - "type": "neoforge:mod_loaded", - "modid": "integrateddynamics" + "type": "neoforge:and", + "values": [ + { + "type": "neoforge:mod_loaded", + "modid": "integrateddynamics" + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:mod_loaded", + "modid": "evilcraft" + } + } + ] } ], "type": "integrateddynamics:squeezer", diff --git a/src/main/resources/data/jafohana/tags/entity_types/can_convert_to_creepansy.json b/src/main/resources/data/jafohana/tags/entity_types/can_convert_to_creepansy.json index eb6ca30e..d86ba4bc 100644 --- a/src/main/resources/data/jafohana/tags/entity_types/can_convert_to_creepansy.json +++ b/src/main/resources/data/jafohana/tags/entity_types/can_convert_to_creepansy.json @@ -90,6 +90,10 @@ "id": "specialmobs:sandcreeper", "required": false }, + { + "id": "specialmobs:scopecreeper", + "required": false + }, { "id": "specialmobs:skeletoncreeper", "required": false diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/biomesoplenty/ominous_woods.json b/src/main/resources/data/jafohana/tags/worldgen/biome/biomesoplenty/ominous_woods.json new file mode 100644 index 00000000..017fa538 --- /dev/null +++ b/src/main/resources/data/jafohana/tags/worldgen/biome/biomesoplenty/ominous_woods.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "biomesoplenty:ominous_woods", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json new file mode 100644 index 00000000..2ceb0ae9 --- /dev/null +++ b/src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json @@ -0,0 +1,42 @@ +{ + "replace": false, + "values": [ + "minecraft:bamboo_jungle", + { + "id": "#forge:is_bamboo_jungle", + "required": false + }, + { + "id": "regions_unexplored:bamboo_forest", + "required": false + }, + { + "id": "eastwardjourneys:cherry_blossom_bamboo_jungle", + "required": false + }, + { + "id": "wythers:bamboo_jungle_canyon", + "required": false + }, + { + "id": "wythers:bamboo_jungle_highlands", + "required": false + }, + { + "id": "wythers:bamboo_jungle_swamp", + "required": false + }, + { + "id": "wythers:bamboo_swamp", + "required": false + }, + { + "id": "wythers:sparse_bamboo_jungle", + "required": false + }, + { + "id": "biomeswevegone:crag_gardens", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_hot.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_hot.json index cea7faa5..d73dba00 100644 --- a/src/main/resources/data/jafohana/tags/worldgen/biome/is_hot.json +++ b/src/main/resources/data/jafohana/tags/worldgen/biome/is_hot.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "minecraft:badlands", "minecraft:wooded_badlands", { "id": "#forge:is_hot", diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_overworld.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_overworld.json index 96ef2553..3746e986 100644 --- a/src/main/resources/data/jafohana/tags/worldgen/biome/is_overworld.json +++ b/src/main/resources/data/jafohana/tags/worldgen/biome/is_overworld.json @@ -86,6 +86,10 @@ "id": "mysticsbiomes:strawberry_fields", "required": false }, + { + "id": "mysticsbiomes:tropics", + "required": false + }, { "id": "snifferplus:timeless_grotto", "required": false diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_sparse.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_sparse.json index 67f6c08e..e7ea3edb 100644 --- a/src/main/resources/data/jafohana/tags/worldgen/biome/is_sparse.json +++ b/src/main/resources/data/jafohana/tags/worldgen/biome/is_sparse.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "minecraft:sparse_jungle", { "id": "#forge:is_sparse", "required": false diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_swamp.json b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_swamp.json index f8249cd0..8a7275f2 100644 --- a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_swamp.json +++ b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_swamp.json @@ -29,8 +29,8 @@ ] }, "tries": 64, - "xz_spread": 6, - "y_spread": 2 + "xz_spread": 7, + "y_spread": 3 } }, "placement": [] diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily.json b/src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily.json deleted file mode 100644 index 11170095..00000000 --- a/src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily.json +++ /dev/null @@ -1,497 +0,0 @@ -{ - "type": "minecraft:flower", - "config": { - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "jafohana:red_spider_lily" - } - } - } - }, - "placement": [ - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" - }, - { - "type": "minecraft:any_of", - "predicates": [ - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 2, - -1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - 1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - 1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - 1, - -1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 1, - 2 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 1, - -1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 1, - -2 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - 1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - 1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - 1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -2, - 1, - 0 - ] - }, - - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 2, - 0, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - 0, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - 0, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - 0, - -1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 0, - 2 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 0, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 0, - -1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - 0, - -2 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - 0, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - 0, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - 0, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -2, - 0, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 2, - -1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - -1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - -1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 1, - -1, - -1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - -1, - 2 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - -1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - -1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - -1, - -1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - 0, - -1, - -2 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - -1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - -1, - 0 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -1, - -1, - 1 - ] - }, - { - "type": "minecraft:matching_fluids", - "fluids": [ - "minecraft:water", - "minecraft:flowing_water" - ], - "offset": [ - -2, - -1, - 0 - ] - } - ] - } - ] - } - } - ] - }, - "tries": 64, - "xz_spread": 7, - "y_spread": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily_waterside.json b/src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily_waterside.json new file mode 100644 index 00000000..cd4142fa --- /dev/null +++ b/src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily_waterside.json @@ -0,0 +1,114 @@ +{ + "type": "minecraft:flower", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "jafohana:red_spider_lily" + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:any_of", + "predicates": [ + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -3, 0, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, 0, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, 0, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, 0, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, 0, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, 0, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, 0, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, 0, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, 0, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, 0, -3 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, 0, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, 0, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, 0, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, 0, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, 0, 3 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, 0, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, 0, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, 0, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, 0, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, 0, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, 0, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, 0, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, 0, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 3, 0, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -3, -1, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, -1, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, -1, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, -1, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -1, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -1, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -1, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -1, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -1, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -1, -3 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -1, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -1, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -1, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -1, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -1, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -1, 3 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -1, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -1, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -1, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -1, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -1, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, -1, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, -1, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, -1, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 3, -1, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -3, -2, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, -2, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, -2, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -2, -2, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -2, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -2, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -2, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -2, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ -1, -2, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -2, -3 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -2, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -2, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -2, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -2, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -2, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 0, -2, 3 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -2, -2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -2, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -2, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -2, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 1, -2, 2 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, -2, -1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, -2, 0 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 2, -2, 1 ] }, + { "type": "minecraft:matching_fluids", "fluids": [ "minecraft:water", "minecraft:flowing_water" ], "offset": [ 3, -2, 0 ] } + ] + } + ] + } + } + ] + }, + "tries": 72, + "xz_spread": 7, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/fireball_lily.json b/src/main/resources/data/jafohana/worldgen/placed_feature/fireball_lily.json index e2c10be2..8f2e4431 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/fireball_lily.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/fireball_lily.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 56 + "chance": 64 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json index f2c8552c..55a6c00d 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 56 + "chance": 21 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_river.json b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_river.json index e54145d2..fcae8a9c 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_river.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_river.json @@ -1,6 +1,16 @@ { "feature": "jafohana:red_spider_lily_river", "placement": [ + { + "type": "minecraft:count", + "count": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + } + }, { "type": "minecraft:rarity_filter", "chance": 24 diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_swamp.json b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_swamp.json index 1b011aa3..bbce6ebb 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_swamp.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_swamp.json @@ -1,5 +1,5 @@ { - "feature": "jafohana:red_spider_lily", + "feature": "jafohana:red_spider_lily_waterside", "placement": [ { "type": "minecraft:rarity_filter", diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily.json b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json similarity index 74% rename from src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily.json rename to src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json index 126b6e75..ea19049b 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json @@ -1,9 +1,9 @@ { - "feature": "jafohana:red_spider_lily", + "feature": "jafohana:red_spider_lily_waterside", "placement": [ { "type": "minecraft:rarity_filter", - "chance": 8 + "chance": 20 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/worsleya.json b/src/main/resources/data/jafohana/worldgen/placed_feature/worsleya.json index a72c9956..b2442747 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/worsleya.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/worsleya.json @@ -1,9 +1,19 @@ { "feature": "jafohana:worsleya", "placement": [ + { + "type": "minecraft:count", + "count": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + } + }, { "type": "minecraft:rarity_filter", - "chance": 80 + "chance": 150 }, { "type": "minecraft:in_square"