From ca21c742712000bd70f29289487070bb2ea14493 Mon Sep 17 00:00:00 2001 From: Mechalopa <92443696+Mechalopa@users.noreply.github.com> Date: Sat, 21 Sep 2024 14:50:07 +0900 Subject: [PATCH] kakuninyou2 --- .../github/mechalopa/jafohana/JAFOhana.java | 3 + .../github/mechalopa/jafohana/ModEvents.java | 8 +- .../jafohana/registry/ModBlocks.java | 15 +- .../mechalopa/jafohana/registry/ModItems.java | 8 +- .../mechalopa/jafohana/util/ModTags.java | 1 + .../level/block/BeachSpiderLilyBlock.java | 23 + .../world/level/block/ModFlowerBlock.java | 7 +- .../blockstates/beach_spider_lily.json | 7 + .../assets/jafohana/blockstates/bluebell.json | 7 - .../jafohana/blockstates/ceanothus.json | 10 + .../assets/jafohana/blockstates/harebell.json | 7 + .../blockstates/jack_in_the_pulpit.json | 7 + .../magenta_spotted_bellflower.json | 7 - .../blockstates/potted_beach_spider_lily.json | 7 + .../jafohana/blockstates/potted_bluebell.json | 7 - .../jafohana/blockstates/potted_harebell.json | 7 + .../potted_jack_in_the_pulpit.json | 7 + .../potted_magenta_spotted_bellflower.json | 7 - .../potted_white_spotted_bellflower.json | 7 - .../blockstates/white_spotted_bellflower.json | 7 - .../jafohana/blockstates/yellowflag_iris.json | 10 + .../resources/assets/jafohana/lang/en_us.json | 24 +- .../resources/assets/jafohana/lang/ja_jp.json | 18 +- .../models/block/beach_spider_lily.json | 8 + .../models/block/bells_of_ireland.json | 47 +- ..._bellflower.json => ceanothus_bottom.json} | 2 +- ...ted_bellflower.json => ceanothus_top.json} | 2 +- .../block/{bluebell.json => harebell.json} | 2 +- .../models/block/jack_in_the_pulpit.json | 8 + .../models/block/medium_flower_height_18.json | 46 ++ .../models/block/medium_flower_height_20.json | 46 ++ ...wer.json => potted_beach_spider_lily.json} | 2 +- ...ted_bluebell.json => potted_harebell.json} | 2 +- ...er.json => potted_jack_in_the_pulpit.json} | 2 +- .../jafohana/models/block/wheel_lily.json | 47 +- .../models/block/yellowflag_iris_bottom.json | 7 + .../models/block/yellowflag_iris_top.json | 7 + ...bellflower.json => beach_spider_lily.json} | 2 +- ...spotted_bellflower.json => ceanothus.json} | 2 +- .../item/{bluebell.json => harebell.json} | 2 +- .../models/item/jack_in_the_pulpit.json | 6 + .../jafohana/models/item/yellowflag_iris.json | 6 + .../textures/block/beach_spider_lily.png | Bin 0 -> 261 bytes .../textures/block/beach_spider_lily_stem.png | Bin 0 -> 138 bytes .../textures/block/blood_red_iris.png | Bin 248 -> 238 bytes .../jafohana/textures/block/bluebell.png | Bin 210 -> 0 bytes .../textures/block/ceanothus_bottom.png | Bin 0 -> 300 bytes .../jafohana/textures/block/ceanothus_top.png | Bin 0 -> 303 bytes .../jafohana/textures/block/dayflower.png | Bin 193 -> 201 bytes .../textures/block/evening_primrose.png | Bin 224 -> 218 bytes .../textures/block/fireweed_bottom.png | Bin 241 -> 242 bytes .../jafohana/textures/block/fireweed_top.png | Bin 267 -> 267 bytes .../jafohana/textures/block/harebell.png | Bin 0 -> 247 bytes .../textures/block/jack_in_the_pulpit.png | Bin 0 -> 308 bytes .../block/jack_in_the_pulpit_stem.png | Bin 0 -> 100 bytes .../block/magenta_spotted_bellflower.png | Bin 284 -> 0 bytes .../block/oakleaf_hydrangea_bottom.png | Bin 328 -> 323 bytes .../textures/block/oakleaf_hydrangea_top.png | Bin 275 -> 283 bytes .../block/potted_beach_spider_lily.png | Bin 0 -> 262 bytes .../block/potted_jack_in_the_pulpit.png | Bin 0 -> 303 bytes .../block/white_spotted_bellflower.png | Bin 273 -> 0 bytes .../textures/block/yellowflag_iris_bottom.png | Bin 0 -> 291 bytes .../textures/block/yellowflag_iris_top.png | Bin 0 -> 278 bytes .../chests/shipwreck_supply.json | 10 + .../chests/underwater_ruin_big.json | 10 + .../chests/underwater_ruin_small.json | 10 + .../additions/chests/buried_treasure.json | 21 +- .../additions/chests/pillager_outpost.json | 8 +- .../additions/chests/shipwreck_supply.json | 35 ++ .../additions/chests/underwater_ruin_big.json | 35 ++ .../chests/underwater_ruin_small.json | 35 ++ .../chests/village/village_taiga_house.json | 43 +- .../additions/chests/woodland_mansion.json | 18 +- ...bellflower.json => beach_spider_lily.json} | 4 +- .../jafohana/loot_table/blocks/ceanothus.json | 30 ++ .../blocks/{bluebell.json => harebell.json} | 4 +- ...ellflower.json => jack_in_the_pulpit.json} | 4 +- ...wer.json => potted_beach_spider_lily.json} | 4 +- ...ted_bluebell.json => potted_harebell.json} | 4 +- ...er.json => potted_jack_in_the_pulpit.json} | 4 +- .../loot_table/blocks/yellowflag_iris.json | 30 ++ .../beach_spider_lily_features.json | 34 ++ .../beach_spider_lily_features_in_beach.json | 27 + .../beach_spider_lily_features_in_river.json | 50 ++ .../bells_of_ireland_features.json | 4 + .../biome_modifier/fireweed_features.json | 4 +- .../flower_features_in_bamboo_jungle.json | 20 +- .../flower_features_in_birch_forest.json | 2 +- .../flower_features_in_coniferous_forest.json | 2 +- .../flower_features_in_dense_forest.json | 46 ++ .../flower_features_in_forest.json | 6 +- .../flower_features_in_hill.json | 2 +- .../flower_features_in_jungle.json | 13 +- .../flower_features_in_plains.json | 2 +- .../flower_features_in_sparse_jungle.json | 24 +- .../flower_features_in_spooky_forest.json | 8 + .../flower_features_in_swamp.json | 4 + ... => harebell_and_wheel_lily_features.json} | 4 +- .../biome_modifier/jade_vine_features.json | 4 + .../biome_modifier/marigold_features.json | 22 +- .../red_spider_lily_features.json | 2 +- .../red_spider_lily_features_in_river.json | 2 +- .../tall_flower_features_in_birch_forest.json | 2 +- .../tall_flower_features_in_forest.json | 31 ++ .../tall_flower_features_in_hill.json | 2 +- .../tall_flower_features_in_plains.json | 2 +- .../tall_flower_features_in_river.json | 27 + .../recipe/ars_nouveau/crush/black_dye.json | 22 + .../crush/black_dye_from_tall_flower.json | 22 + .../recipe/ars_nouveau/crush/blue_dye.json | 22 + .../crush/blue_dye_from_tall_flower.json | 22 + .../recipe/ars_nouveau/crush/creepansy.json | 30 ++ .../recipe/ars_nouveau/crush/cyan_dye.json | 22 + .../recipe/ars_nouveau/crush/green_dye.json | 22 + .../ars_nouveau/crush/light_blue_dye.json | 30 ++ .../ars_nouveau/crush/light_gray_dye.json | 30 ++ .../light_gray_dye_from_tall_flower.json | 22 + .../recipe/ars_nouveau/crush/lime_dye.json | 30 ++ .../recipe/ars_nouveau/crush/magenta_dye.json | 30 ++ .../crush/magenta_dye_from_tall_flower.json | 22 + .../recipe/ars_nouveau/crush/orange_dye.json | 30 ++ .../crush/orange_dye_from_tall_flower.json | 33 ++ .../recipe/ars_nouveau/crush/pink_dye.json | 33 ++ .../crush/pink_dye_from_tall_flower.json | 22 + .../recipe/ars_nouveau/crush/purple_dye.json | 33 ++ .../crush/purple_dye_from_tall_flower.json | 30 ++ .../recipe/ars_nouveau/crush/red_dye.json | 36 ++ .../recipe/ars_nouveau/crush/white_dye.json | 39 ++ .../crush/white_dye_from_tall_flower.json | 22 + .../recipe/ars_nouveau/crush/yellow_dye.json | 33 ++ .../crush/yellow_dye_from_tall_flower.json | 36 ++ ...bell.json => blue_dye_from_ceanothus.json} | 4 +- .../recipe/enderio/alpine_ragwort.json | 42 ++ .../recipe/enderio/beach_spider_lily.json | 40 ++ .../recipe/enderio/bells_of_ireland.json | 40 ++ .../recipe/enderio/bird_of_paradise.json | 42 ++ .../recipe/enderio/black_bat_flower.json | 42 ++ .../jafohana/recipe/enderio/black_tulip.json | 40 ++ .../recipe/enderio/blood_red_iris.json | 40 ++ .../jafohana/recipe/enderio/blue_daisy.json | 40 ++ .../recipe/enderio/brazilian_plume.json | 42 ++ .../jafohana/recipe/enderio/ceanothus.json | 42 ++ .../jafohana/recipe/enderio/creepansy.json | 40 ++ .../recipe/enderio/crimson_clover.json | 40 ++ .../recipe/enderio/dancing_ladies_ginger.json | 40 ++ .../jafohana/recipe/enderio/dayflower.json | 40 ++ .../recipe/enderio/evening_primrose.json | 40 ++ .../recipe/enderio/fasciated_dandelion.json | 42 ++ .../recipe/enderio/fasciated_oxeye_daisy.json | 42 ++ .../recipe/enderio/fireball_lily.json | 40 ++ .../jafohana/recipe/enderio/fireweed.json | 42 ++ .../recipe/enderio/forget_me_not.json | 40 ++ .../jafohana/recipe/enderio/gloriosa.json | 42 ++ .../jafohana/recipe/enderio/green_tulip.json | 40 ++ .../jafohana/recipe/enderio/harebell.json | 40 ++ .../recipe/enderio/jack_in_the_pulpit.json | 40 ++ .../jafohana/recipe/enderio/jade_vine.json | 40 ++ .../jafohana/recipe/enderio/milk_vetch.json | 40 ++ .../recipe/enderio/oakleaf_hydrangea.json | 42 ++ .../recipe/enderio/orange_marigold.json | 42 ++ .../recipe/enderio/orange_spider_lily.json | 40 ++ .../recipe/enderio/pink_african_daisy.json | 40 ++ .../recipe/enderio/pink_snapdragon.json | 40 ++ .../jafohana/recipe/enderio/purple_pansy.json | 40 ++ .../recipe/enderio/red_snapdragon.json | 40 ++ .../recipe/enderio/red_spider_lily.json | 40 ++ .../jafohana/recipe/enderio/snowdrop.json | 40 ++ .../recipe/enderio/spathiphyllum.json | 40 ++ .../recipe/enderio/tatarian_aster.json | 42 ++ .../jafohana/recipe/enderio/wheel_lily.json | 40 ++ .../recipe/enderio/white_african_daisy.json | 40 ++ .../recipe/enderio/white_egret_orchid.json | 40 ++ .../jafohana/recipe/enderio/white_pansy.json | 40 ++ .../jafohana/recipe/enderio/winter_heath.json | 40 ++ .../jafohana/recipe/enderio/worsleya.json | 42 ++ .../recipe/enderio/yellow_african_daisy.json | 40 ++ .../recipe/enderio/yellow_marigold.json | 42 ++ .../jafohana/recipe/enderio/yellow_pansy.json | 40 ++ .../recipe/enderio/yellow_snapdragon.json | 40 ++ .../recipe/enderio/yellowflag_iris.json | 42 ++ .../recipe/extradelight/mortar/black_dye.json | 17 + .../mortar/black_dye_from_tall_flower.json | 17 + .../recipe/extradelight/mortar/blue_dye.json | 17 + .../mortar/blue_dye_from_tall_flower.json | 17 + .../recipe/extradelight/mortar/cyan_dye.json | 17 + .../recipe/extradelight/mortar/green_dye.json | 25 + .../extradelight/mortar/light_blue_dye.json | 25 + .../extradelight/mortar/light_gray_dye.json | 25 + .../light_gray_dye_from_tall_flower.json | 17 + .../recipe/extradelight/mortar/lime_dye.json | 25 + .../extradelight/mortar/magenta_dye.json | 25 + .../mortar/magenta_dye_from_tall_flower.json | 17 + .../extradelight/mortar/orange_dye.json | 25 + .../mortar/orange_dye_from_tall_flower.json | 28 + .../recipe/extradelight/mortar/pink_dye.json | 28 + .../mortar/pink_dye_from_tall_flower.json | 17 + .../extradelight/mortar/purple_dye.json | 28 + .../mortar/purple_dye_from_tall_flower.json | 25 + .../recipe/extradelight/mortar/red_dye.json | 31 ++ .../recipe/extradelight/mortar/white_dye.json | 34 ++ .../mortar/white_dye_from_tall_flower.json | 17 + .../extradelight/mortar/yellow_dye.json | 28 + .../mortar/yellow_dye_from_tall_flower.json | 31 ++ .../cutting/beach_spider_lily.json | 25 + .../cutting/bells_of_ireland.json | 25 + .../farmersdelight/cutting/black_tulip.json | 25 + .../cutting/blood_red_iris.json | 25 + .../farmersdelight/cutting/blue_daisy.json | 25 + .../farmersdelight/cutting/creepansy.json | 25 + .../cutting/crimson_clover.json | 25 + .../cutting/dancing_ladies_ginger.json | 25 + .../farmersdelight/cutting/dayflower.json | 25 + .../cutting/evening_primrose.json | 25 + .../farmersdelight/cutting/fireball_lily.json | 25 + .../farmersdelight/cutting/forget_me_not.json | 25 + .../farmersdelight/cutting/green_tulip.json | 25 + .../farmersdelight/cutting/harebell.json | 25 + .../cutting/jack_in_the_pulpit.json | 25 + .../farmersdelight/cutting/jade_vine.json | 25 + .../farmersdelight/cutting/milk_vetch.json | 25 + .../cutting/orange_spider_lily.json | 25 + .../cutting/pink_african_daisy.json | 25 + .../cutting/pink_snapdragon.json | 25 + .../farmersdelight/cutting/purple_pansy.json | 25 + .../cutting/red_snapdragon.json | 25 + .../cutting/red_spider_lily.json | 25 + .../farmersdelight/cutting/snowdrop.json | 25 + .../farmersdelight/cutting/spathiphyllum.json | 25 + .../farmersdelight/cutting/wheel_lily.json | 25 + .../cutting/white_african_daisy.json | 25 + .../cutting/white_egret_orchid.json | 25 + .../farmersdelight/cutting/white_pansy.json | 25 + .../farmersdelight/cutting/winter_heath.json | 25 + .../cutting/yellow_african_daisy.json | 25 + .../farmersdelight/cutting/yellow_pansy.json | 25 + .../cutting/yellow_snapdragon.json | 25 + ...=> green_dye_from_jack_in_the_pulpit.json} | 6 +- .../mechanical_squeezer/alpine_ragwort.json | 35 ++ .../beach_spider_lily.json | 28 + .../mechanical_squeezer/bells_of_ireland.json | 28 + .../mechanical_squeezer/bird_of_paradise.json | 35 ++ .../mechanical_squeezer/black_bat_flower.json | 35 ++ .../mechanical_squeezer/black_tulip.json | 28 + .../mechanical_squeezer/blood_red_iris.json | 28 + .../mechanical_squeezer/blue_daisy.json | 28 + .../mechanical_squeezer/brazilian_plume.json | 35 ++ .../mechanical_squeezer/ceanothus.json | 35 ++ .../mechanical_squeezer/creepansy.json | 28 + .../mechanical_squeezer/crimson_clover.json | 28 + .../dancing_ladies_ginger.json | 28 + .../mechanical_squeezer/dayflower.json | 28 + .../mechanical_squeezer/evening_primrose.json | 28 + .../fasciated_dandelion.json | 35 ++ .../fasciated_oxeye_daisy.json | 35 ++ .../mechanical_squeezer/fireball_lily.json | 28 + .../mechanical_squeezer/fireweed.json | 35 ++ .../mechanical_squeezer/forget_me_not.json | 28 + .../mechanical_squeezer/gloriosa.json | 35 ++ .../mechanical_squeezer/green_tulip.json | 28 + .../mechanical_squeezer/harebell.json | 28 + .../jack_in_the_pulpit.json | 28 + .../mechanical_squeezer/jade_vine.json | 28 + .../mechanical_squeezer/milk_vetch.json | 28 + .../oakleaf_hydrangea.json | 35 ++ .../mechanical_squeezer/orange_marigold.json | 35 ++ .../orange_spider_lily.json | 28 + .../pink_african_daisy.json | 28 + .../mechanical_squeezer/pink_snapdragon.json | 28 + .../mechanical_squeezer/purple_pansy.json | 28 + .../mechanical_squeezer/red_snapdragon.json | 28 + .../mechanical_squeezer/red_spider_lily.json | 40 ++ .../mechanical_squeezer/snowdrop.json | 28 + .../mechanical_squeezer/spathiphyllum.json | 28 + .../mechanical_squeezer/tatarian_aster.json | 35 ++ .../mechanical_squeezer/wheel_lily.json | 28 + .../white_african_daisy.json | 28 + .../white_egret_orchid.json | 28 + .../mechanical_squeezer/white_pansy.json | 28 + .../mechanical_squeezer/winter_heath.json | 28 + .../mechanical_squeezer/worsleya.json | 35 ++ .../yellow_african_daisy.json | 28 + .../mechanical_squeezer/yellow_marigold.json | 35 ++ .../mechanical_squeezer/yellow_pansy.json | 28 + .../yellow_snapdragon.json | 28 + .../mechanical_squeezer/yellowflag_iris.json | 35 ++ .../squeezer/alpine_ragwort.json | 20 + .../squeezer/beach_spider_lily.json | 20 + .../squeezer/bells_of_ireland.json | 20 + .../squeezer/bird_of_paradise.json | 20 + .../squeezer/black_bat_flower.json | 20 + .../squeezer/black_tulip.json | 20 + .../squeezer/blood_red_iris.json | 20 + .../squeezer/blue_daisy.json | 20 + .../squeezer/brazilian_plume.json | 20 + .../squeezer/ceanothus.json | 20 + .../squeezer/creepansy.json | 20 + .../squeezer/crimson_clover.json | 20 + .../squeezer/dancing_ladies_ginger.json | 20 + .../squeezer/dayflower.json | 20 + .../squeezer/evening_primrose.json | 20 + .../squeezer/fasciated_dandelion.json | 20 + .../squeezer/fasciated_oxeye_daisy.json | 20 + .../squeezer/fireball_lily.json | 20 + .../integrateddynamics/squeezer/fireweed.json | 20 + .../squeezer/forget_me_not.json | 20 + .../integrateddynamics/squeezer/gloriosa.json | 20 + .../squeezer/green_tulip.json | 20 + .../integrateddynamics/squeezer/harebell.json | 20 + .../squeezer/jack_in_the_pulpit.json | 20 + .../squeezer/jade_vine.json | 20 + .../squeezer/milk_vetch.json | 20 + .../squeezer/oakleaf_hydrangea.json | 20 + .../squeezer/orange_marigold.json | 20 + .../squeezer/orange_spider_lily.json | 20 + .../squeezer/pink_african_daisy.json | 20 + .../squeezer/pink_snapdragon.json | 20 + .../squeezer/purple_pansy.json | 20 + .../squeezer/red_snapdragon.json | 20 + .../squeezer/red_spider_lily.json | 32 ++ .../integrateddynamics/squeezer/snowdrop.json | 20 + .../squeezer/spathiphyllum.json | 20 + .../squeezer/tatarian_aster.json | 20 + .../squeezer/wheel_lily.json | 20 + .../squeezer/white_african_daisy.json | 20 + .../squeezer/white_egret_orchid.json | 20 + .../squeezer/white_pansy.json | 20 + .../squeezer/winter_heath.json | 20 + .../integrateddynamics/squeezer/worsleya.json | 20 + .../squeezer/yellow_african_daisy.json | 20 + .../squeezer/yellow_marigold.json | 20 + .../squeezer/yellow_pansy.json | 20 + .../squeezer/yellow_snapdragon.json | 20 + .../squeezer/yellowflag_iris.json | 20 + .../mekanism/enriching/dye/large_blue.json | 17 + .../mekanism/enriching/dye/large_yellow.json | 3 + .../mekanism/enriching/dye/small_blue.json | 12 +- .../mekanism/enriching/dye/small_green.json | 12 +- .../mekanism/enriching/dye/small_magenta.json | 3 - .../mekanism/enriching/dye/small_purple.json | 3 + .../mekanism/enriching/dye/small_white.json | 2 +- .../pigment_extracting/flower/large_blue.json | 17 + .../flower/large_yellow.json | 3 + .../pigment_extracting/flower/small_blue.json | 12 +- .../flower/small_green.json | 12 +- .../flower/small_magenta.json | 3 - .../flower/small_purple.json | 3 + .../flower/small_white.json | 2 +- .../recipe/purple_dye_from_harebell.json | 14 + .../slicing/black_dye.json | 16 + .../slicing/black_dye_from_tall_flower.json | 16 + .../slicing/blue_dye.json | 16 + .../slicing/blue_dye_from_tall_flower.json | 16 + .../slicing/cyan_dye.json | 16 + .../slicing/green_dye.json | 24 + .../slicing/light_blue_dye.json | 24 + .../slicing/light_gray_dye.json | 24 + .../light_gray_dye_from_tall_flower.json | 16 + .../slicing/lime_dye.json | 24 + .../slicing/magenta_dye.json | 24 + .../slicing/magenta_dye_from_tall_flower.json | 16 + .../slicing/orange_dye.json | 24 + .../slicing/orange_dye_from_tall_flower.json | 27 + .../slicing/pink_dye.json | 27 + .../slicing/pink_dye_from_tall_flower.json | 16 + .../slicing/purple_dye.json | 27 + .../slicing/purple_dye_from_tall_flower.json | 24 + .../slicing/red_dye.json | 30 ++ .../slicing/white_dye.json | 33 ++ .../slicing/white_dye_from_tall_flower.json | 16 + .../slicing/yellow_dye.json | 27 + .../slicing/yellow_dye_from_tall_flower.json | 30 ++ ... => white_dye_from_beach_spider_lily.json} | 2 +- .../yellow_dye_from_yellow_marigold.json | 2 +- .../yellow_dye_from_yellowflag_iris.json | 14 + .../block/beach_spider_lily_plantable_on.json | 9 + .../block/crimson_clover_plantable_on.json | 2 +- .../data/jafohana/tags/block/flower_pots.json | 8 +- .../block/red_spider_lily_plantable_on.json | 2 +- .../jafohana/tags/block/small_flowers.json | 8 +- .../jafohana/tags/block/tall_flowers.json | 2 + .../entity_type/can_convert_to_creepansy.json | 4 + .../jafohana/tags/item/small_flowers.json | 8 +- .../data/jafohana/tags/item/tall_flowers.json | 2 + .../biome/biomesoplenty/ominous_woods.json | 9 + .../tags/worldgen/biome/is_aquatic.json | 27 + .../tags/worldgen/biome/is_bamboo_jungle.json | 42 ++ .../{is_wasteland.json => is_beach.json} | 2 +- .../tags/worldgen/biome/is_birch_forest.json | 6 +- .../jafohana/tags/worldgen/biome/is_cold.json | 4 + .../tags/worldgen/biome/is_coniferous.json | 8 + .../worldgen/biome/is_dead_or_wasteland.json | 21 + .../worldgen/biome/is_dense_vegetation.json | 8 + .../jafohana/tags/worldgen/biome/is_dry.json | 4 + .../worldgen/biome/is_hill_or_mountain.json | 8 + .../jafohana/tags/worldgen/biome/is_hot.json | 6 +- .../tags/worldgen/biome/is_ocean.json | 9 + .../tags/worldgen/biome/is_overworld.json | 4 + .../tags/worldgen/biome/is_plains.json | 12 + .../tags/worldgen/biome/is_snowy.json | 4 + .../tags/worldgen/biome/is_snowy_plains.json | 12 + .../worldgen/biome/is_sparse_vegetation.json | 8 + .../tags/worldgen/biome/is_spooky.json | 4 + .../tags/worldgen/biome/is_swamp.json | 4 + .../tags/worldgen/biome/is_windswept.json | 4 + ...lily.json => beach_spider_lily_beach.json} | 8 +- .../beach_spider_lily_waterside.json | 114 ++++ .../flower_bamboo_jungle.json | 33 ++ .../flower_birch_forest.json | 77 --- .../flower_cherry_grove.json | 44 -- .../flower_coniferous_forest.json | 33 -- .../flower_dense_forest.json | 172 ++++++ .../flower_flower_forest.json | 99 ---- .../configured_feature/flower_forest.json | 77 --- .../configured_feature/flower_hill.json | 44 -- .../flower_spooky_forest.json | 67 +-- .../configured_feature/flower_swamp.json | 40 +- .../harebell_and_wheel_lily.json | 73 +++ .../configured_feature/red_spider_lily.json | 497 ------------------ .../red_spider_lily_waterside.json | 114 ++++ .../tall_flower_birch_forest.json | 36 ++ .../tall_flower_flower_forest.json | 36 ++ .../tall_flower_forest.json | 115 ++++ .../configured_feature/tall_flower_river.json | 33 ++ .../beach_spider_lily_beach.json | 27 + .../beach_spider_lily_river.json | 19 + .../beach_spider_lily_waterside.json | 19 + .../placed_feature/fireball_lily.json | 2 +- .../placed_feature/flower_bamboo_jungle.json | 2 +- .../placed_feature/flower_cherry_grove.json | 2 +- .../placed_feature/flower_dense_forest.json | 19 + .../worldgen/placed_feature/flower_hill.json | 2 +- .../worldgen/placed_feature/flower_swamp.json | 2 +- .../harebell_and_wheel_lily.json | 19 + .../placed_feature/red_spider_lily_river.json | 8 + .../placed_feature/red_spider_lily_swamp.json | 2 +- .../red_spider_lily_waterside.json | 19 + .../tall_flower_birch_forest.json | 15 +- .../tall_flower_flower_forest.json | 2 +- ...heel_lily.json => tall_flower_forest.json} | 2 +- ...pider_lily.json => tall_flower_river.json} | 4 +- .../worldgen/placed_feature/worsleya.json | 10 +- .../loot_modifiers/global_loot_modifiers.json | 3 + 442 files changed, 9102 insertions(+), 1227 deletions(-) create mode 100644 src/main/java/com/github/mechalopa/jafohana/world/level/block/BeachSpiderLilyBlock.java create mode 100644 src/main/resources/assets/jafohana/blockstates/beach_spider_lily.json delete mode 100644 src/main/resources/assets/jafohana/blockstates/bluebell.json create mode 100644 src/main/resources/assets/jafohana/blockstates/ceanothus.json create mode 100644 src/main/resources/assets/jafohana/blockstates/harebell.json create mode 100644 src/main/resources/assets/jafohana/blockstates/jack_in_the_pulpit.json delete mode 100644 src/main/resources/assets/jafohana/blockstates/magenta_spotted_bellflower.json create mode 100644 src/main/resources/assets/jafohana/blockstates/potted_beach_spider_lily.json delete mode 100644 src/main/resources/assets/jafohana/blockstates/potted_bluebell.json create mode 100644 src/main/resources/assets/jafohana/blockstates/potted_harebell.json create mode 100644 src/main/resources/assets/jafohana/blockstates/potted_jack_in_the_pulpit.json delete mode 100644 src/main/resources/assets/jafohana/blockstates/potted_magenta_spotted_bellflower.json delete mode 100644 src/main/resources/assets/jafohana/blockstates/potted_white_spotted_bellflower.json delete mode 100644 src/main/resources/assets/jafohana/blockstates/white_spotted_bellflower.json create mode 100644 src/main/resources/assets/jafohana/blockstates/yellowflag_iris.json create mode 100644 src/main/resources/assets/jafohana/models/block/beach_spider_lily.json rename src/main/resources/assets/jafohana/models/block/{white_spotted_bellflower.json => ceanothus_bottom.json} (61%) rename src/main/resources/assets/jafohana/models/block/{magenta_spotted_bellflower.json => ceanothus_top.json} (60%) rename src/main/resources/assets/jafohana/models/block/{bluebell.json => harebell.json} (69%) create mode 100644 src/main/resources/assets/jafohana/models/block/jack_in_the_pulpit.json create mode 100644 src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json create mode 100644 src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json rename src/main/resources/assets/jafohana/models/block/{potted_white_spotted_bellflower.json => potted_beach_spider_lily.json} (64%) rename src/main/resources/assets/jafohana/models/block/{potted_bluebell.json => potted_harebell.json} (71%) rename src/main/resources/assets/jafohana/models/block/{potted_magenta_spotted_bellflower.json => potted_jack_in_the_pulpit.json} (63%) create mode 100644 src/main/resources/assets/jafohana/models/block/yellowflag_iris_bottom.json create mode 100644 src/main/resources/assets/jafohana/models/block/yellowflag_iris_top.json rename src/main/resources/assets/jafohana/models/item/{white_spotted_bellflower.json => beach_spider_lily.json} (52%) rename src/main/resources/assets/jafohana/models/item/{magenta_spotted_bellflower.json => ceanothus.json} (52%) rename src/main/resources/assets/jafohana/models/item/{bluebell.json => harebell.json} (61%) create mode 100644 src/main/resources/assets/jafohana/models/item/jack_in_the_pulpit.json create mode 100644 src/main/resources/assets/jafohana/models/item/yellowflag_iris.json create mode 100644 src/main/resources/assets/jafohana/textures/block/beach_spider_lily.png create mode 100644 src/main/resources/assets/jafohana/textures/block/beach_spider_lily_stem.png delete mode 100644 src/main/resources/assets/jafohana/textures/block/bluebell.png 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/assets/jafohana/textures/block/harebell.png create mode 100644 src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit.png create mode 100644 src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit_stem.png delete mode 100644 src/main/resources/assets/jafohana/textures/block/magenta_spotted_bellflower.png create mode 100644 src/main/resources/assets/jafohana/textures/block/potted_beach_spider_lily.png create mode 100644 src/main/resources/assets/jafohana/textures/block/potted_jack_in_the_pulpit.png delete mode 100644 src/main/resources/assets/jafohana/textures/block/white_spotted_bellflower.png create mode 100644 src/main/resources/assets/jafohana/textures/block/yellowflag_iris_bottom.png create mode 100644 src/main/resources/assets/jafohana/textures/block/yellowflag_iris_top.png create mode 100644 src/main/resources/data/jafohana/loot_modifiers/chests/shipwreck_supply.json create mode 100644 src/main/resources/data/jafohana/loot_modifiers/chests/underwater_ruin_big.json create mode 100644 src/main/resources/data/jafohana/loot_modifiers/chests/underwater_ruin_small.json create mode 100644 src/main/resources/data/jafohana/loot_table/additions/chests/shipwreck_supply.json create mode 100644 src/main/resources/data/jafohana/loot_table/additions/chests/underwater_ruin_big.json create mode 100644 src/main/resources/data/jafohana/loot_table/additions/chests/underwater_ruin_small.json rename src/main/resources/data/jafohana/loot_table/blocks/{white_spotted_bellflower.json => beach_spider_lily.json} (71%) create mode 100644 src/main/resources/data/jafohana/loot_table/blocks/ceanothus.json rename src/main/resources/data/jafohana/loot_table/blocks/{bluebell.json => harebell.json} (77%) rename src/main/resources/data/jafohana/loot_table/blocks/{magenta_spotted_bellflower.json => jack_in_the_pulpit.json} (70%) rename src/main/resources/data/jafohana/loot_table/blocks/{potted_white_spotted_bellflower.json => potted_beach_spider_lily.json} (82%) rename src/main/resources/data/jafohana/loot_table/blocks/{potted_bluebell.json => potted_harebell.json} (86%) rename src/main/resources/data/jafohana/loot_table/blocks/{potted_magenta_spotted_bellflower.json => potted_jack_in_the_pulpit.json} (81%) create mode 100644 src/main/resources/data/jafohana/loot_table/blocks/yellowflag_iris.json create mode 100644 src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features.json create mode 100644 src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_beach.json create mode 100644 src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_river.json create mode 100644 src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_dense_forest.json rename src/main/resources/data/jafohana/neoforge/biome_modifier/{wheel_lily_features.json => harebell_and_wheel_lily_features.json} (87%) create mode 100644 src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_forest.json create mode 100644 src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_river.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/black_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/black_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/blue_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/blue_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/creepansy.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/cyan_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/green_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/light_blue_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/light_gray_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/light_gray_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/lime_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/magenta_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/magenta_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/orange_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/orange_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/pink_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/pink_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/purple_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/purple_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/red_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/white_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/white_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/yellow_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/ars_nouveau/crush/yellow_dye_from_tall_flower.json rename src/main/resources/data/jafohana/recipe/{blue_dye_from_bluebell.json => blue_dye_from_ceanothus.json} (77%) create mode 100644 src/main/resources/data/jafohana/recipe/enderio/alpine_ragwort.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/beach_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/bells_of_ireland.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/bird_of_paradise.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/black_bat_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/black_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/blood_red_iris.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/blue_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/brazilian_plume.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/ceanothus.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/creepansy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/crimson_clover.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/dancing_ladies_ginger.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/dayflower.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/evening_primrose.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/fasciated_dandelion.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/fasciated_oxeye_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/fireball_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/fireweed.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/forget_me_not.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/gloriosa.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/green_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/harebell.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/jack_in_the_pulpit.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/jade_vine.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/milk_vetch.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/oakleaf_hydrangea.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/orange_marigold.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/orange_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/pink_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/pink_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/purple_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/red_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/red_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/snowdrop.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/spathiphyllum.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/tatarian_aster.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/wheel_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/white_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/white_egret_orchid.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/white_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/winter_heath.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/worsleya.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/yellow_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/yellow_marigold.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/yellow_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/yellow_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/enderio/yellowflag_iris.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/black_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/black_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/blue_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/blue_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/cyan_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/green_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/light_blue_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/light_gray_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/light_gray_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/lime_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/magenta_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/magenta_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/orange_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/orange_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/pink_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/pink_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/purple_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/purple_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/red_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/white_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/white_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/yellow_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/extradelight/mortar/yellow_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/beach_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/bells_of_ireland.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/black_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/blood_red_iris.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/blue_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/creepansy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/crimson_clover.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/dancing_ladies_ginger.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/dayflower.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/evening_primrose.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/fireball_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/forget_me_not.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/green_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/harebell.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/jack_in_the_pulpit.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/jade_vine.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/milk_vetch.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/orange_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/pink_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/pink_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/purple_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/red_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/red_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/snowdrop.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/spathiphyllum.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/wheel_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/white_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/white_egret_orchid.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/white_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/winter_heath.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/yellow_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/yellow_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/farmersdelight/cutting/yellow_snapdragon.json rename src/main/resources/data/jafohana/recipe/{magenta_dye_from_magenta_spotted_bellflower.json => green_dye_from_jack_in_the_pulpit.json} (55%) create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/alpine_ragwort.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/beach_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/bells_of_ireland.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/bird_of_paradise.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/black_bat_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/black_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/blood_red_iris.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/blue_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/brazilian_plume.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/ceanothus.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/creepansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/crimson_clover.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/dancing_ladies_ginger.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/dayflower.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/evening_primrose.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/fasciated_dandelion.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/fasciated_oxeye_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/fireball_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/fireweed.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/forget_me_not.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/gloriosa.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/green_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/harebell.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/jack_in_the_pulpit.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/jade_vine.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/milk_vetch.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/oakleaf_hydrangea.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/orange_marigold.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/orange_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/pink_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/pink_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/purple_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/red_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/red_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/snowdrop.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/spathiphyllum.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/tatarian_aster.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/wheel_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/white_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/white_egret_orchid.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/white_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/winter_heath.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/worsleya.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/yellow_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/yellow_marigold.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/yellow_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/yellow_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/mechanical_squeezer/yellowflag_iris.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/alpine_ragwort.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/beach_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/bells_of_ireland.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/bird_of_paradise.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/black_bat_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/black_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/blood_red_iris.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/blue_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/brazilian_plume.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/ceanothus.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/creepansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/crimson_clover.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/dancing_ladies_ginger.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/dayflower.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/evening_primrose.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/fasciated_dandelion.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/fasciated_oxeye_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/fireball_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/fireweed.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/forget_me_not.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/gloriosa.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/green_tulip.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/harebell.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/jack_in_the_pulpit.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/jade_vine.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/milk_vetch.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/oakleaf_hydrangea.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/orange_marigold.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/orange_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/pink_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/pink_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/purple_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/red_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/red_spider_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/snowdrop.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/spathiphyllum.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/tatarian_aster.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/wheel_lily.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/white_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/white_egret_orchid.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/white_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/winter_heath.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/worsleya.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/yellow_african_daisy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/yellow_marigold.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/yellow_pansy.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/yellow_snapdragon.json create mode 100644 src/main/resources/data/jafohana/recipe/integrateddynamics/squeezer/yellowflag_iris.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 create mode 100644 src/main/resources/data/jafohana/recipe/purple_dye_from_harebell.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/black_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/black_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/blue_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/blue_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/cyan_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/green_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/light_blue_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/light_gray_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/light_gray_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/lime_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/magenta_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/magenta_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/orange_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/orange_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/pink_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/pink_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/purple_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/purple_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/red_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/white_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/white_dye_from_tall_flower.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/yellow_dye.json create mode 100644 src/main/resources/data/jafohana/recipe/refurbished_furniture/slicing/yellow_dye_from_tall_flower.json rename src/main/resources/data/jafohana/recipe/{white_dye_from_white_spotted_bellflower.json => white_dye_from_beach_spider_lily.json} (79%) create mode 100644 src/main/resources/data/jafohana/recipe/yellow_dye_from_yellowflag_iris.json create mode 100644 src/main/resources/data/jafohana/tags/block/beach_spider_lily_plantable_on.json create mode 100644 src/main/resources/data/jafohana/tags/worldgen/biome/biomesoplenty/ominous_woods.json create mode 100644 src/main/resources/data/jafohana/tags/worldgen/biome/is_aquatic.json create mode 100644 src/main/resources/data/jafohana/tags/worldgen/biome/is_bamboo_jungle.json rename src/main/resources/data/jafohana/tags/worldgen/biome/{is_wasteland.json => is_beach.json} (71%) create mode 100644 src/main/resources/data/jafohana/tags/worldgen/biome/is_dead_or_wasteland.json create mode 100644 src/main/resources/data/jafohana/tags/worldgen/biome/is_ocean.json rename src/main/resources/data/jafohana/worldgen/configured_feature/{wheel_lily.json => beach_spider_lily_beach.json} (79%) create mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/beach_spider_lily_waterside.json create mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/flower_dense_forest.json create mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/harebell_and_wheel_lily.json delete mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily.json create mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/red_spider_lily_waterside.json create mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_forest.json create mode 100644 src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_river.json create mode 100644 src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json create mode 100644 src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_river.json create mode 100644 src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_waterside.json create mode 100644 src/main/resources/data/jafohana/worldgen/placed_feature/flower_dense_forest.json create mode 100644 src/main/resources/data/jafohana/worldgen/placed_feature/harebell_and_wheel_lily.json create mode 100644 src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json rename src/main/resources/data/jafohana/worldgen/placed_feature/{wheel_lily.json => tall_flower_forest.json} (81%) rename src/main/resources/data/jafohana/worldgen/placed_feature/{red_spider_lily.json => tall_flower_river.json} (76%) diff --git a/src/main/java/com/github/mechalopa/jafohana/JAFOhana.java b/src/main/java/com/github/mechalopa/jafohana/JAFOhana.java index c07db63e..d83397d1 100644 --- a/src/main/java/com/github/mechalopa/jafohana/JAFOhana.java +++ b/src/main/java/com/github/mechalopa/jafohana/JAFOhana.java @@ -13,6 +13,8 @@ import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.neoforged.fml.config.ModConfig; +import net.neoforged.neoforge.client.gui.ConfigurationScreen; +import net.neoforged.neoforge.client.gui.IConfigScreenFactory; @Mod(JAFOhana.MODID) public class JAFOhana @@ -25,6 +27,7 @@ public JAFOhana(IEventBus modEventBus, ModContainer modContainer) { modEventBus.addListener(ModConfigs::loadConfig); modContainer.registerConfig(ModConfig.Type.COMMON, ModConfigs.SERVER_CONFIG); + modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new); ModBlocks.register(modEventBus); ModBiomeFeatures.register(modEventBus); diff --git a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java index 0e6f1833..05b20771 100644 --- a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java +++ b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java @@ -136,7 +136,6 @@ public static void onWandererTrades(WandererTradesEvent event) genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BLACK_TULIP.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.GREEN_TULIP.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BLOOD_RED_IRIS.get()), 12, 1, 0.05F)); - genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BLUEBELL.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.RED_SNAPDRAGON.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.YELLOW_SNAPDRAGON.get()), 12, 1, 0.05F)); genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.PINK_SNAPDRAGON.get()), 12, 1, 0.05F)); @@ -152,11 +151,12 @@ 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(1, new ItemStack(ModItems.HAREBELL.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.JACK_IN_THE_PULPIT.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.BEACH_SPIDER_LILY.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/java/com/github/mechalopa/jafohana/registry/ModBlocks.java b/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java index 60f2ef27..a86564a6 100644 --- a/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java +++ b/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java @@ -3,6 +3,7 @@ import java.util.function.Supplier; import com.github.mechalopa.jafohana.JAFOhana; +import com.github.mechalopa.jafohana.world.level.block.BeachSpiderLilyBlock; import com.github.mechalopa.jafohana.world.level.block.CrimsonCloverBlock; import com.github.mechalopa.jafohana.world.level.block.FasciatedDandelionBlock; import com.github.mechalopa.jafohana.world.level.block.FasciatedOxeyeDaisyBlock; @@ -34,7 +35,6 @@ public class ModBlocks public static final Supplier BLACK_TULIP = REGISTRY.register("black_tulip", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9)); public static final Supplier GREEN_TULIP = REGISTRY.register("green_tulip", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9)); public static final Supplier BLOOD_RED_IRIS = REGISTRY.register("blood_red_iris", () -> new ModFlowerBlock(MobEffects.POISON, 12)); - public static final Supplier BLUEBELL = REGISTRY.register("bluebell", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8)); public static final Supplier RED_SNAPDRAGON = REGISTRY.register("red_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)); public static final Supplier YELLOW_SNAPDRAGON = REGISTRY.register("yellow_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)); public static final Supplier PINK_SNAPDRAGON = REGISTRY.register("pink_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)); @@ -51,11 +51,12 @@ public class ModBlocks public static final Supplier WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9)); public static final Supplier BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5)); public static final Supplier CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new CrimsonCloverBlock(MobEffects.FIRE_RESISTANCE, 4)); + public static final Supplier HAREBELL = REGISTRY.register("harebell", () -> new ModFlowerBlock(MobEffects.JUMP, 5)); public static final Supplier WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7)); - public static final Supplier MAGENTA_SPOTTED_BELLFLOWER = REGISTRY.register("magenta_spotted_bellflower", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5)); - public static final Supplier WHITE_SPOTTED_BELLFLOWER = REGISTRY.register("white_spotted_bellflower", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5)); + public static final Supplier JACK_IN_THE_PULPIT = REGISTRY.register("jack_in_the_pulpit", () -> new MediumFlowerBlock(MobEffects.POISON, 12)); public static final Supplier RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new RedSpiderLilyBlock(MobEffects.POISON, 12)); public static final Supplier BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7)); + public static final Supplier BEACH_SPIDER_LILY = REGISTRY.register("beach_spider_lily", () -> new BeachSpiderLilyBlock(MobEffects.CONFUSION, 9)); public static final Supplier ORANGE_MARIGOLD = REGISTRY.register("orange_marigold", () -> new ModTallFlowerBlock()); public static final Supplier YELLOW_MARIGOLD = REGISTRY.register("yellow_marigold", () -> new ModTallFlowerBlock()); public static final Supplier GLORIOSA = REGISTRY.register("gloriosa", () -> new ModTallFlowerBlock()); @@ -64,9 +65,11 @@ 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()); + public static final Supplier YELLOWFLAG_IRIS = REGISTRY.register("yellowflag_iris", () -> new ModTallFlowerBlock()); public static final Supplier FASCIATED_DANDELION = REGISTRY.register("fasciated_dandelion", () -> new FasciatedDandelionBlock()); public static final Supplier FASCIATED_OXEYE_DAISY = REGISTRY.register("fasciated_oxeye_daisy", () -> new FasciatedOxeyeDaisyBlock()); public static final Supplier JADE_VINE = REGISTRY.register("jade_vine", () -> new JadeVineBlock()); @@ -80,7 +83,6 @@ public class ModBlocks public static final Supplier POTTED_BLACK_TULIP = REGISTRY.register("potted_black_tulip", () -> new ModFlowerPotBlock(BLACK_TULIP.get())); public static final Supplier POTTED_GREEN_TULIP = REGISTRY.register("potted_green_tulip", () -> new ModFlowerPotBlock(GREEN_TULIP.get())); public static final Supplier POTTED_BLOOD_RED_IRIS = REGISTRY.register("potted_blood_red_iris", () -> new ModFlowerPotBlock(BLOOD_RED_IRIS.get())); - public static final Supplier POTTED_BLUEBELL = REGISTRY.register("potted_bluebell", () -> new ModFlowerPotBlock(BLUEBELL.get())); public static final Supplier POTTED_RED_SNAPDRAGON = REGISTRY.register("potted_red_snapdragon", () -> new ModFlowerPotBlock(RED_SNAPDRAGON.get())); public static final Supplier POTTED_YELLOW_SNAPDRAGON = REGISTRY.register("potted_yellow_snapdragon", () -> new ModFlowerPotBlock(YELLOW_SNAPDRAGON.get())); public static final Supplier POTTED_PINK_SNAPDRAGON = REGISTRY.register("potted_pink_snapdragon", () -> new ModFlowerPotBlock(PINK_SNAPDRAGON.get())); @@ -97,11 +99,12 @@ public class ModBlocks public static final Supplier POTTED_WINTER_HEATH = REGISTRY.register("potted_winter_heath", () -> new ModFlowerPotBlock(WINTER_HEATH.get())); public static final Supplier POTTED_BLUE_DAISY = REGISTRY.register("potted_blue_daisy", () -> new ModFlowerPotBlock(BLUE_DAISY.get())); public static final Supplier POTTED_CRIMSON_CLOVER = REGISTRY.register("potted_crimson_clover", () -> new ModFlowerPotBlock(CRIMSON_CLOVER.get())); + public static final Supplier POTTED_HAREBELL = REGISTRY.register("potted_harebell", () -> new ModFlowerPotBlock(HAREBELL.get())); public static final Supplier POTTED_WHEEL_LILY = REGISTRY.register("potted_wheel_lily", () -> new ModFlowerPotBlock(WHEEL_LILY.get())); - public static final Supplier POTTED_MAGENTA_SPOTTED_BELLFLOWER = REGISTRY.register("potted_magenta_spotted_bellflower", () -> new ModFlowerPotBlock(MAGENTA_SPOTTED_BELLFLOWER.get())); - public static final Supplier POTTED_WHITE_SPOTTED_BELLFLOWER = REGISTRY.register("potted_white_spotted_bellflower", () -> new ModFlowerPotBlock(WHITE_SPOTTED_BELLFLOWER.get())); + public static final Supplier POTTED_JACK_IN_THE_PULPIT = REGISTRY.register("potted_jack_in_the_pulpit", () -> new ModFlowerPotBlock(JACK_IN_THE_PULPIT.get())); public static final Supplier POTTED_RED_SPIDER_LILY = REGISTRY.register("potted_red_spider_lily", () -> new ModFlowerPotBlock(RED_SPIDER_LILY.get())); public static final Supplier POTTED_BELLS_OF_IRELAND = REGISTRY.register("potted_bells_of_ireland", () -> new ModFlowerPotBlock(BELLS_OF_IRELAND.get())); + public static final Supplier POTTED_BEACH_SPIDER_LILY = REGISTRY.register("potted_beach_spider_lily", () -> new ModFlowerPotBlock(BEACH_SPIDER_LILY.get())); @SubscribeEvent public static void register(IEventBus eventBus) 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 04729a44..6f2086e7 100644 --- a/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java +++ b/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java @@ -26,7 +26,6 @@ public class ModItems public static final Supplier BLACK_TULIP = REGISTRY.register("black_tulip", () -> new BlockItem(ModBlocks.BLACK_TULIP.get(), new Item.Properties())); public static final Supplier GREEN_TULIP = REGISTRY.register("green_tulip", () -> new BlockItem(ModBlocks.GREEN_TULIP.get(), new Item.Properties())); public static final Supplier BLOOD_RED_IRIS = REGISTRY.register("blood_red_iris", () -> new BlockItem(ModBlocks.BLOOD_RED_IRIS.get(), new Item.Properties())); - public static final Supplier BLUEBELL = REGISTRY.register("bluebell", () -> new BlockItem(ModBlocks.BLUEBELL.get(), new Item.Properties())); public static final Supplier RED_SNAPDRAGON = REGISTRY.register("red_snapdragon", () -> new BlockItem(ModBlocks.RED_SNAPDRAGON.get(), new Item.Properties())); public static final Supplier YELLOW_SNAPDRAGON = REGISTRY.register("yellow_snapdragon", () -> new BlockItem(ModBlocks.YELLOW_SNAPDRAGON.get(), new Item.Properties())); public static final Supplier PINK_SNAPDRAGON = REGISTRY.register("pink_snapdragon", () -> new BlockItem(ModBlocks.PINK_SNAPDRAGON.get(), new Item.Properties())); @@ -43,11 +42,12 @@ public class ModItems public static final Supplier WINTER_HEATH = REGISTRY.register("winter_heath", () -> new BlockItem(ModBlocks.WINTER_HEATH.get(), new Item.Properties())); public static final Supplier BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new BlockItem(ModBlocks.BLUE_DAISY.get(), new Item.Properties())); public static final Supplier CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new BlockItem(ModBlocks.CRIMSON_CLOVER.get(), new Item.Properties())); + public static final Supplier HAREBELL = REGISTRY.register("harebell", () -> new BlockItem(ModBlocks.HAREBELL.get(), new Item.Properties())); public static final Supplier WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new BlockItem(ModBlocks.WHEEL_LILY.get(), new Item.Properties())); - public static final Supplier MAGENTA_SPOTTED_BELLFLOWER = REGISTRY.register("magenta_spotted_bellflower", () -> new BlockItem(ModBlocks.MAGENTA_SPOTTED_BELLFLOWER.get(), new Item.Properties())); - public static final Supplier WHITE_SPOTTED_BELLFLOWER = REGISTRY.register("white_spotted_bellflower", () -> new BlockItem(ModBlocks.WHITE_SPOTTED_BELLFLOWER.get(), new Item.Properties())); + public static final Supplier JACK_IN_THE_PULPIT = REGISTRY.register("jack_in_the_pulpit", () -> new BlockItem(ModBlocks.JACK_IN_THE_PULPIT.get(), new Item.Properties())); public static final Supplier RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new BlockItem(ModBlocks.RED_SPIDER_LILY.get(), new Item.Properties())); public static final Supplier BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new BlockItem(ModBlocks.BELLS_OF_IRELAND.get(), new Item.Properties())); + public static final Supplier BEACH_SPIDER_LILY = REGISTRY.register("beach_spider_lily", () -> new BlockItem(ModBlocks.BEACH_SPIDER_LILY.get(), new Item.Properties())); public static final Supplier ORANGE_MARIGOLD = REGISTRY.register("orange_marigold", () -> new DoubleHighBlockItem(ModBlocks.ORANGE_MARIGOLD.get(), new Item.Properties())); public static final Supplier YELLOW_MARIGOLD = REGISTRY.register("yellow_marigold", () -> new DoubleHighBlockItem(ModBlocks.YELLOW_MARIGOLD.get(), new Item.Properties())); public static final Supplier GLORIOSA = REGISTRY.register("gloriosa", () -> new DoubleHighBlockItem(ModBlocks.GLORIOSA.get(), new Item.Properties())); @@ -56,9 +56,11 @@ 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())); + public static final Supplier YELLOWFLAG_IRIS = REGISTRY.register("yellowflag_iris", () -> new DoubleHighBlockItem(ModBlocks.YELLOWFLAG_IRIS.get(), new Item.Properties())); public static final Supplier FASCIATED_DANDELION = REGISTRY.register("fasciated_dandelion", () -> new DoubleHighBlockItem(ModBlocks.FASCIATED_DANDELION.get(), new Item.Properties())); public static final Supplier FASCIATED_OXEYE_DAISY = REGISTRY.register("fasciated_oxeye_daisy", () -> new DoubleHighBlockItem(ModBlocks.FASCIATED_OXEYE_DAISY.get(), new Item.Properties())); public static final Supplier JADE_VINE = REGISTRY.register("jade_vine", () -> new BlockItem(ModBlocks.JADE_VINE.get(), new Item.Properties())); diff --git a/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java b/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java index 38021e5d..42740619 100644 --- a/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java +++ b/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java @@ -13,6 +13,7 @@ public class ModTags public static final class BlockTags { public static final TagKey AFFECTS_FASCIATIONS = createBlockTag("affects_fasciations"); + public static final TagKey BEACH_SPIDER_LILY_PLANTABLE_ON = createBlockTag("beach_spider_lily_plantable_on"); public static final TagKey CONVERTABLE_TO_CREEPANSY = createBlockTag("convertable_to_creepansy"); public static final TagKey CONVERTABLE_TO_FASCIATED_DANDELION = createBlockTag("convertable_to_fasciated_dandelion"); public static final TagKey CONVERTABLE_TO_FASCIATED_OXEYE_DAISY = createBlockTag("convertable_to_fasciated_oxeye_daisy"); diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/BeachSpiderLilyBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/BeachSpiderLilyBlock.java new file mode 100644 index 00000000..088e18c8 --- /dev/null +++ b/src/main/java/com/github/mechalopa/jafohana/world/level/block/BeachSpiderLilyBlock.java @@ -0,0 +1,23 @@ +package com.github.mechalopa.jafohana.world.level.block; + +import com.github.mechalopa.jafohana.util.ModTags; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.state.BlockState; + +public class BeachSpiderLilyBlock extends MediumFlowerBlock +{ + public BeachSpiderLilyBlock(Holder effect, int effectDuration) + { + super(effect, effectDuration); + } + + @Override + protected boolean mayPlaceOn(BlockState state, BlockGetter world, BlockPos pos) + { + return state.is(ModTags.BlockTags.BEACH_SPIDER_LILY_PLANTABLE_ON); + } +} \ No newline at end of file diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java index 928a3bc9..950dae6b 100644 --- a/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java +++ b/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java @@ -16,7 +16,12 @@ public class ModFlowerBlock extends FlowerBlock { public ModFlowerBlock(Holder effect, int effectDuration) { - super(effect, effectDuration, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)); + this(effect, effectDuration, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)); + } + + public ModFlowerBlock(Holder effect, int effectDuration, BlockBehaviour.Properties properties) + { + super(effect, effectDuration, properties); } public boolean isReallyFlammable(BlockState state, BlockGetter getter, BlockPos pos, Direction direction) diff --git a/src/main/resources/assets/jafohana/blockstates/beach_spider_lily.json b/src/main/resources/assets/jafohana/blockstates/beach_spider_lily.json new file mode 100644 index 00000000..8fb6a073 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/beach_spider_lily.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/beach_spider_lily" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/bluebell.json b/src/main/resources/assets/jafohana/blockstates/bluebell.json deleted file mode 100644 index 8ee7125f..00000000 --- a/src/main/resources/assets/jafohana/blockstates/bluebell.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "jafohana:block/bluebell" - } - } -} \ No newline at end of file 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/blockstates/harebell.json b/src/main/resources/assets/jafohana/blockstates/harebell.json new file mode 100644 index 00000000..247653c8 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/harebell.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/harebell" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/blockstates/jack_in_the_pulpit.json new file mode 100644 index 00000000..d51a3915 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/jack_in_the_pulpit.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/jack_in_the_pulpit" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/magenta_spotted_bellflower.json b/src/main/resources/assets/jafohana/blockstates/magenta_spotted_bellflower.json deleted file mode 100644 index 84916d1a..00000000 --- a/src/main/resources/assets/jafohana/blockstates/magenta_spotted_bellflower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "jafohana:block/magenta_spotted_bellflower" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/potted_beach_spider_lily.json b/src/main/resources/assets/jafohana/blockstates/potted_beach_spider_lily.json new file mode 100644 index 00000000..79e0d9ed --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/potted_beach_spider_lily.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/potted_beach_spider_lily" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/potted_bluebell.json b/src/main/resources/assets/jafohana/blockstates/potted_bluebell.json deleted file mode 100644 index c8e89f56..00000000 --- a/src/main/resources/assets/jafohana/blockstates/potted_bluebell.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "jafohana:block/potted_bluebell" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/potted_harebell.json b/src/main/resources/assets/jafohana/blockstates/potted_harebell.json new file mode 100644 index 00000000..f4443342 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/potted_harebell.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/potted_harebell" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/potted_jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/blockstates/potted_jack_in_the_pulpit.json new file mode 100644 index 00000000..b594d6b0 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/potted_jack_in_the_pulpit.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/potted_jack_in_the_pulpit" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/potted_magenta_spotted_bellflower.json b/src/main/resources/assets/jafohana/blockstates/potted_magenta_spotted_bellflower.json deleted file mode 100644 index 5a8c99f4..00000000 --- a/src/main/resources/assets/jafohana/blockstates/potted_magenta_spotted_bellflower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "jafohana:block/potted_magenta_spotted_bellflower" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/potted_white_spotted_bellflower.json b/src/main/resources/assets/jafohana/blockstates/potted_white_spotted_bellflower.json deleted file mode 100644 index 98d09223..00000000 --- a/src/main/resources/assets/jafohana/blockstates/potted_white_spotted_bellflower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "jafohana:block/potted_white_spotted_bellflower" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/white_spotted_bellflower.json b/src/main/resources/assets/jafohana/blockstates/white_spotted_bellflower.json deleted file mode 100644 index 1ff752c6..00000000 --- a/src/main/resources/assets/jafohana/blockstates/white_spotted_bellflower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "jafohana:block/white_spotted_bellflower" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/yellowflag_iris.json b/src/main/resources/assets/jafohana/blockstates/yellowflag_iris.json new file mode 100644 index 00000000..9fd8eed9 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/yellowflag_iris.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "jafohana:block/yellowflag_iris_bottom" + }, + "half=upper": { + "model": "jafohana:block/yellowflag_iris_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 83f007f8..0c32b74b 100644 --- a/src/main/resources/assets/jafohana/lang/en_us.json +++ b/src/main/resources/assets/jafohana/lang/en_us.json @@ -9,7 +9,6 @@ "block.jafohana.black_tulip": "Black Tulip", "block.jafohana.green_tulip": "Green Tulip", "block.jafohana.blood_red_iris": "Blood-Red Iris", - "block.jafohana.bluebell": "Bluebell", "block.jafohana.red_snapdragon": "Red Snapdragon", "block.jafohana.yellow_snapdragon": "Yellow Snapdragon", "block.jafohana.pink_snapdragon": "Pink Snapdragon", @@ -26,11 +25,12 @@ "block.jafohana.winter_heath": "Winter Heath", "block.jafohana.blue_daisy": "Blue Daisy", "block.jafohana.crimson_clover": "Crimson Clovers", + "block.jafohana.harebell": "Harebell", "block.jafohana.wheel_lily": "Wheel Lily", - "block.jafohana.magenta_spotted_bellflower": "Magenta Spotted Bellflower", - "block.jafohana.white_spotted_bellflower": "White Spotted Bellflower", + "block.jafohana.jack_in_the_pulpit": "Jack-in-the-Pulpit", "block.jafohana.red_spider_lily": "Red Spider Lily", "block.jafohana.bells_of_ireland": "Bells of Ireland", + "block.jafohana.beach_spider_lily": "Beach Spider Lily", "block.jafohana.orange_marigold": "Orange Marigold", "block.jafohana.yellow_marigold": "Yellow Marigold", "block.jafohana.gloriosa": "Gloriosa", @@ -39,9 +39,11 @@ "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", + "block.jafohana.yellowflag_iris": "Yellowflag Iris", "block.jafohana.fasciated_dandelion": "Fasciated Dandelion", "block.jafohana.fasciated_oxeye_daisy": "Fasciated Oxeye Daisy", "block.jafohana.jade_vine": "Jade Vine", @@ -55,7 +57,6 @@ "block.jafohana.potted_black_tulip": "Potted Black Tulip", "block.jafohana.potted_green_tulip": "Potted Green Tulip", "block.jafohana.potted_blood_red_iris": "Potted Blood-Red Iris", - "block.jafohana.potted_bluebell": "Potted Bluebell", "block.jafohana.potted_red_snapdragon": "Potted Red Snapdragon", "block.jafohana.potted_yellow_snapdragon": "Potted Yellow Snapdragon", "block.jafohana.potted_pink_snapdragon": "Potted Pink Snapdragon", @@ -72,10 +73,19 @@ "block.jafohana.potted_winter_heath": "Potted Winter Heath", "block.jafohana.potted_blue_daisy": "Potted Blue Daisy", "block.jafohana.potted_crimson_clover": "Potted Crimson Clovers", + "block.jafohana.potted_harebell": "Potted Harebell", "block.jafohana.potted_wheel_lily": "Potted Wheel Lily", - "block.jafohana.potted_magenta_spotted_bellflower": "Potted Magenta Spotted Bellflower", - "block.jafohana.potted_white_spotted_bellflower": "Potted White Spotted Bellflower", + "block.jafohana.potted_jack_in_the_pulpit": "Potted Jack-in-the-Pulpit", "block.jafohana.potted_red_spider_lily": "Potted Red Spider Lily", "block.jafohana.potted_bells_of_ireland": "Potted Bells of Ireland", - "item_group.jafohana.tab": "Just a Few Ohana" + "block.jafohana.potted_beach_spider_lily": "Potted Beach Spider Lily", + "item_group.jafohana.tab": "Just a Few Ohana", + "jafohana.configuration.general": "General", + "jafohana.configuration.fasciatedDandelionDropsNormalDandelionWhenUsingBoneMeal": "Fasciated dandelion drops normal dandelion when using bone meal", + "jafohana.configuration.fasciatedOxeyeDaisyDropsNormalOxeyeDaisyWhenUsingBoneMeal": "Fasciated oxeye daisy drops normal oxeye daisy when using bone meal", + "jafohana.configuration.dandelionFasciationChance": "Dandelion fasciation chance", + "jafohana.configuration.oxeyeDaisyFasciationChance": "Oxeye daisy fasciation chance", + "jafohana.configuration.creepansyConvertChance": "Creepansy convert chance", + "jafohana.configuration.jadeVineGrowChance": "Jade vine grow chance", + "jafohana.configuration.additionalWandererTrades": "Additional wanderer trades" } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/lang/ja_jp.json b/src/main/resources/assets/jafohana/lang/ja_jp.json index ca2a0c6c..b579fc12 100644 --- a/src/main/resources/assets/jafohana/lang/ja_jp.json +++ b/src/main/resources/assets/jafohana/lang/ja_jp.json @@ -8,8 +8,7 @@ "block.jafohana.white_african_daisy": "白色のアフリカンデイジー", "block.jafohana.black_tulip": "黒色のチューリップ", "block.jafohana.green_tulip": "緑色のチューリップ", - "block.jafohana.blood_red_iris": "菖蒲", - "block.jafohana.bluebell": "ブルーベル", + "block.jafohana.blood_red_iris": "アヤメ", "block.jafohana.red_snapdragon": "赤色の金魚草", "block.jafohana.yellow_snapdragon": "黄色の金魚草", "block.jafohana.pink_snapdragon": "桃色の金魚草", @@ -26,11 +25,12 @@ "block.jafohana.winter_heath": "ウィンターヒース", "block.jafohana.blue_daisy": "ブルーデイジー", "block.jafohana.crimson_clover": "ベニバナツメクサ", + "block.jafohana.harebell": "イトシャジン", "block.jafohana.wheel_lily": "クルマユリ", - "block.jafohana.magenta_spotted_bellflower": "赤紫色のホタルブクロ", - "block.jafohana.white_spotted_bellflower": "白色のホタルブクロ", + "block.jafohana.jack_in_the_pulpit": "テンナンショウ", "block.jafohana.red_spider_lily": "彼岸花", "block.jafohana.bells_of_ireland": "カイガラサルビア", + "block.jafohana.beach_spider_lily": "ビーチスパイダーリリー", "block.jafohana.orange_marigold": "橙色のマリーゴールド", "block.jafohana.yellow_marigold": "黄色のマリーゴールド", "block.jafohana.gloriosa": "グロリオサ", @@ -39,9 +39,11 @@ "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": "シオン", + "block.jafohana.yellowflag_iris": "キショウブ", "block.jafohana.fasciated_dandelion": "帯化したタンポポ", "block.jafohana.fasciated_oxeye_daisy": "帯化したフランスギク", "block.jafohana.jade_vine": "ヒスイカズラ", @@ -54,8 +56,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_bluebell": "植えられたブルーベル", + "block.jafohana.potted_blood_red_iris": "植えられたアヤメ", "block.jafohana.potted_red_snapdragon": "植えられた赤色の金魚草", "block.jafohana.potted_yellow_snapdragon": "植えられた黄色の金魚草", "block.jafohana.potted_pink_snapdragon": "植えられた桃色の金魚草", @@ -72,10 +73,11 @@ "block.jafohana.potted_winter_heath": "植えられたウィンターヒース", "block.jafohana.potted_blue_daisy": "植えられたブルーデイジー", "block.jafohana.potted_crimson_clover": "植えられたベニバナツメクサ", + "block.jafohana.potted_harebell": "植えられたイトシャジン", "block.jafohana.potted_wheel_lily": "植えられたクルマユリ", - "block.jafohana.potted_magenta_spotted_bellflower": "植えられた赤紫色のホタルブクロ", - "block.jafohana.potted_white_spotted_bellflower": "植えられた白色のホタルブクロ", + "block.jafohana.potted_jack_in_the_pulpit": "植えられたテンナンショウ", "block.jafohana.potted_red_spider_lily": "植えられた彼岸花", "block.jafohana.potted_bells_of_ireland": "植えられたカイガラサルビア", + "block.jafohana.potted_beach_spider_lily": "植えられたビーチスパイダーリリー", "item_group.jafohana.tab": "Just a Few Ohana" } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/beach_spider_lily.json b/src/main/resources/assets/jafohana/models/block/beach_spider_lily.json new file mode 100644 index 00000000..c7911c44 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/beach_spider_lily.json @@ -0,0 +1,8 @@ +{ + "parent": "jafohana:block/medium_flower_height_20", + "textures": { + "particle": "jafohana:block/beach_spider_lily", + "cross": "jafohana:block/beach_spider_lily", + "stem": "jafohana:block/beach_spider_lily_stem" + } +} \ No newline at end of file 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/white_spotted_bellflower.json b/src/main/resources/assets/jafohana/models/block/ceanothus_bottom.json similarity index 61% rename from src/main/resources/assets/jafohana/models/block/white_spotted_bellflower.json rename to src/main/resources/assets/jafohana/models/block/ceanothus_bottom.json index c6549177..51a37f61 100644 --- a/src/main/resources/assets/jafohana/models/block/white_spotted_bellflower.json +++ b/src/main/resources/assets/jafohana/models/block/ceanothus_bottom.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cross", "render_type": "cutout", "textures": { - "cross": "jafohana:block/white_spotted_bellflower" + "cross": "jafohana:block/ceanothus_bottom" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/magenta_spotted_bellflower.json b/src/main/resources/assets/jafohana/models/block/ceanothus_top.json similarity index 60% rename from src/main/resources/assets/jafohana/models/block/magenta_spotted_bellflower.json rename to src/main/resources/assets/jafohana/models/block/ceanothus_top.json index 42d0196f..035a96f5 100644 --- a/src/main/resources/assets/jafohana/models/block/magenta_spotted_bellflower.json +++ b/src/main/resources/assets/jafohana/models/block/ceanothus_top.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cross", "render_type": "cutout", "textures": { - "cross": "jafohana:block/magenta_spotted_bellflower" + "cross": "jafohana:block/ceanothus_top" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/bluebell.json b/src/main/resources/assets/jafohana/models/block/harebell.json similarity index 69% rename from src/main/resources/assets/jafohana/models/block/bluebell.json rename to src/main/resources/assets/jafohana/models/block/harebell.json index a665ffae..1e255d07 100644 --- a/src/main/resources/assets/jafohana/models/block/bluebell.json +++ b/src/main/resources/assets/jafohana/models/block/harebell.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cross", "render_type": "cutout", "textures": { - "cross": "jafohana:block/bluebell" + "cross": "jafohana:block/harebell" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/models/block/jack_in_the_pulpit.json new file mode 100644 index 00000000..17424d3c --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/jack_in_the_pulpit.json @@ -0,0 +1,8 @@ +{ + "parent": "jafohana:block/medium_flower_height_18", + "textures": { + "particle": "jafohana:block/jack_in_the_pulpit", + "cross": "jafohana:block/jack_in_the_pulpit", + "stem": "jafohana:block/jack_in_the_pulpit_stem" + } +} \ 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/potted_white_spotted_bellflower.json b/src/main/resources/assets/jafohana/models/block/potted_beach_spider_lily.json similarity index 64% rename from src/main/resources/assets/jafohana/models/block/potted_white_spotted_bellflower.json rename to src/main/resources/assets/jafohana/models/block/potted_beach_spider_lily.json index b8adc3cd..86b6f475 100644 --- a/src/main/resources/assets/jafohana/models/block/potted_white_spotted_bellflower.json +++ b/src/main/resources/assets/jafohana/models/block/potted_beach_spider_lily.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/flower_pot_cross", "render_type": "cutout", "textures": { - "plant": "jafohana:block/white_spotted_bellflower" + "plant": "jafohana:block/potted_beach_spider_lily" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/potted_bluebell.json b/src/main/resources/assets/jafohana/models/block/potted_harebell.json similarity index 71% rename from src/main/resources/assets/jafohana/models/block/potted_bluebell.json rename to src/main/resources/assets/jafohana/models/block/potted_harebell.json index 6190aa7d..30814442 100644 --- a/src/main/resources/assets/jafohana/models/block/potted_bluebell.json +++ b/src/main/resources/assets/jafohana/models/block/potted_harebell.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/flower_pot_cross", "render_type": "cutout", "textures": { - "plant": "jafohana:block/bluebell" + "plant": "jafohana:block/harebell" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/potted_magenta_spotted_bellflower.json b/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json similarity index 63% rename from src/main/resources/assets/jafohana/models/block/potted_magenta_spotted_bellflower.json rename to src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json index ebc8d498..8591bc70 100644 --- a/src/main/resources/assets/jafohana/models/block/potted_magenta_spotted_bellflower.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/magenta_spotted_bellflower" + "plant": "jafohana:block/potted_jack_in_the_pulpit" } } \ 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 1ce95164..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,51 +1,8 @@ { - "ambientocclusion": false, - "render_type": "cutout", + "parent": "jafohana:block/medium_flower_height_18", "textures": { "particle": "jafohana:block/wheel_lily", "cross": "jafohana:block/wheel_lily", "stem": "jafohana:block/wheel_lily_stem" - }, - "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, 4 ], "texture": "#stem" }, - "south": { "uv": [ 0, 0, 16, 4 ], "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/yellowflag_iris_bottom.json b/src/main/resources/assets/jafohana/models/block/yellowflag_iris_bottom.json new file mode 100644 index 00000000..f71bdbd3 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/yellowflag_iris_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cross", + "render_type": "cutout", + "textures": { + "cross": "jafohana:block/yellowflag_iris_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/yellowflag_iris_top.json b/src/main/resources/assets/jafohana/models/block/yellowflag_iris_top.json new file mode 100644 index 00000000..6e287ab6 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/yellowflag_iris_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cross", + "render_type": "cutout", + "textures": { + "cross": "jafohana:block/yellowflag_iris_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/item/white_spotted_bellflower.json b/src/main/resources/assets/jafohana/models/item/beach_spider_lily.json similarity index 52% rename from src/main/resources/assets/jafohana/models/item/white_spotted_bellflower.json rename to src/main/resources/assets/jafohana/models/item/beach_spider_lily.json index 989dde7f..2ed23129 100644 --- a/src/main/resources/assets/jafohana/models/item/white_spotted_bellflower.json +++ b/src/main/resources/assets/jafohana/models/item/beach_spider_lily.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "jafohana:block/white_spotted_bellflower" + "layer0": "jafohana:block/beach_spider_lily" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/item/magenta_spotted_bellflower.json b/src/main/resources/assets/jafohana/models/item/ceanothus.json similarity index 52% rename from src/main/resources/assets/jafohana/models/item/magenta_spotted_bellflower.json rename to src/main/resources/assets/jafohana/models/item/ceanothus.json index ad6fce6c..e0cc535e 100644 --- a/src/main/resources/assets/jafohana/models/item/magenta_spotted_bellflower.json +++ b/src/main/resources/assets/jafohana/models/item/ceanothus.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "jafohana:block/magenta_spotted_bellflower" + "layer0": "jafohana:block/ceanothus_top" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/item/bluebell.json b/src/main/resources/assets/jafohana/models/item/harebell.json similarity index 61% rename from src/main/resources/assets/jafohana/models/item/bluebell.json rename to src/main/resources/assets/jafohana/models/item/harebell.json index 151c095b..44a5143f 100644 --- a/src/main/resources/assets/jafohana/models/item/bluebell.json +++ b/src/main/resources/assets/jafohana/models/item/harebell.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "jafohana:block/bluebell" + "layer0": "jafohana:block/harebell" } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/item/jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/models/item/jack_in_the_pulpit.json new file mode 100644 index 00000000..344b6d58 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/item/jack_in_the_pulpit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "jafohana:block/jack_in_the_pulpit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/item/yellowflag_iris.json b/src/main/resources/assets/jafohana/models/item/yellowflag_iris.json new file mode 100644 index 00000000..5d624b5d --- /dev/null +++ b/src/main/resources/assets/jafohana/models/item/yellowflag_iris.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "jafohana:block/yellowflag_iris_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/textures/block/beach_spider_lily.png b/src/main/resources/assets/jafohana/textures/block/beach_spider_lily.png new file mode 100644 index 0000000000000000000000000000000000000000..b6a46f6afd6906712ce1e0a04272da570520a2f0 GIT binary patch literal 261 zcmV+g0s8)lP)L=8pf!nqh2QhQKv|6ywr>Y$#S2plh75E&M+=1F^XR z!)Y)-A3V3@Ka73n!5OUHg1Z3bM3^ne8nM}mEQVDOWB{^e7>z9~usRE-!Mjosr_+ft zAhKEGKdxv+F#z59FgC~lTz=l9rAlm}ci0%rQ;V=sr&=sR=z{W>* z5rzxU6`->n^JFj+5;BGSuxBY zT$(WqK-Pe45W0Z`y#T^Gd17z_kl7>|0Mn?F&QF{d&@o6O$Pj#L09&NRE4jO@hX4Qo M07*qoM6N<$f&dg+%>V!Z delta 220 zcmV<203-kI0r&xsB!9n2L_t(|oMZU^|33pI7^g&@>52a!I$7)Bf07MIGu!zerZHS) z_kR$dXakTnmb!2M?=7X8~3NK$>6*ku_k` zj58g;Y{usryawo3K@=k!1QR3L0FY*E1`%ZdvLWbfq7Bfsko>_H<(%A@J zj>xnh_X{`Oso%uIkjZw@ZC84y8A~hkr5OVMzU-fTHg`i>5>KOXg4F9%_Zl)MB)0K3 z9g$|Z#9_p8(;z9PF;w8DLBx&;vb`eG4ewY>m^rgt%ow681h&YE37^QB!?s|#(*(A& zT<`uHm|aX{2;wp3IMycVvPC>$Tl0n#E9P@E6ePHRm^2$O{CsdxUasKy51=C%JYD@< J);T3K0RXMyOq&1z 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..1b7f6e96c58ac2e805702fb80fe183bafc168a2d GIT binary patch literal 300 zcmV+{0n`48P)@ zkfvWY2EFAK>IFd$7_FO~ot$By;zF6MO+Mba%We3Pe@_0000IW6LHdsQU)K6(UvJU?T7XhRat%l*86;|?Y#8wddK zh?4-pRFQ*8kgFP%t^-RD!QA<*#0rNN3^0>f083~RNvakM$USp5BSf6Ds3xtZ01yFj zDxQ}2vW>=Z$!hTINR-P$XJS+b*Tsx(N?mk5-KD<_hht00P{j+9m;7` z73A@0ts*ZEcJgPE+2B0Za@3Q5qnnpUsj#I^;6I5nd%Mr;ac2Mk002ovPDHLkV1gx8 BfCT^m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/jafohana/textures/block/dayflower.png b/src/main/resources/assets/jafohana/textures/block/dayflower.png index e45d70f876d9c850a455ff2961b7824fe399ab38..f43a3b5bce1741aa01116056aed1533f3c1ebe8b 100644 GIT binary patch delta 173 zcmV;e08;dOtQ3jxE02zYMAcFA>3I~|M*unv)Mr`3gv?dEcHo-K)!h_^!glUF( b0T%`U)kw`{pMNCq00000NkvXXu0mjflW0oP delta 165 zcmV;W09yaa0l@)~B!7rWL_t(|oMZU^|33pIm?F)zF@VAI?0*J}v;V{3f2gsiHZe~Vsx8vX~vljU>cBZ#^!vy2?=B~ j%yyV}NKT1_G=nez9hL6MX|pC!00000NkvXXu0mjf|KBu| delta 135 zcmV;20C@k}0pJ0UBmt+9B|v-qfn{(F=F^n^!{k7QqZ@+ZB=ruV|Hw}FTy65-c8&(v zP>|v1-a*j}QVg;Y=4_B*Ak82-kT{4>Fc4uHK!(9w1QNrh8LI&>SHS#^%Vxak0Gno* p%ZN@$FwJDS0EQLnx$$ZSVE`(j?N7Q7QK|p{002ovPDHLkV1k29J>viX 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 a08ffb643580a9399b2b779f898249978311ae1d..3fdbc71c3ecdf4000667666233ada2989ed62652 100644 GIT binary patch delta 214 zcmV;{04e|R0rCNmB!9U{L_t(|oQ0CH4MH&tM6(1NP}9>P(Xa$99ipOS2zK~;8X4(H z$HfkXmHgy#dFT8Q5ku>KJB6=Z-^XBNPK`?JBI^9wf7hSeB_@Mh%!7!u*sF|N0&d}O zwYMb5(QniUm<+!~BVdAfNswa7^FoHXnzWs+BD77^Ow~(3q)*M92o&@1*!|!tm6D~& z6hUKjuh2%&m++=4nHo<&k#^f7q`|TW%vH#|ijeyy0jQ4rH-Z!BH-@hL09zB0E-qeC Q!~g&Q07*qoM6N<$f&nXM<^TWy delta 213 zcmV;`04o3T0r3HlB!9R`L_t(|oQ0CH4MH&tL{qW>OHk3$P%;Pfh?a&S*x}D^I&7TRiT~LZ*i|FM~rU)VRv2Clh<*q_wfy&t|~Yd?Wp`3y(cj} gO%$0n0|Qy$301lEq3(0|DgXcg07*qoM6N<$g6v0X2LJ#7 delta 230 zcmVOV07*qoM6N<$g25t<8 diff --git a/src/main/resources/assets/jafohana/textures/block/harebell.png b/src/main/resources/assets/jafohana/textures/block/harebell.png new file mode 100644 index 0000000000000000000000000000000000000000..98c3cad95bf51d216da019ba3f1d0931824bcf2d GIT binary patch literal 247 zcmV;?JMVVcr1I zpl~7C09bgC91G}%z+!};0U(>uqYCB%^k{~q54ZuaL<7=*ED7?zZyqE7VH%Oufb@Yi z!~BV?8H589xc}p`07NsuILHb>8bD(CrLu5^=xR{Bfb4%{f7dkX!d;V|Edmcrm?3Zj zU?#&9!Zg8LfX+rvwHQelSs~0YWJ8Hc2gn*DVtH_C24MieEQ?9vx7W}B00001$^ xOX11G263MI6Y@^+D6sWQ8Dt$;!5Cu1z#w|)XRyZp&ssoj44$rjF6*2UngA9H9p(T4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/jafohana/textures/block/magenta_spotted_bellflower.png b/src/main/resources/assets/jafohana/textures/block/magenta_spotted_bellflower.png deleted file mode 100644 index 943ced0af1d218b51af108ec91244c3b3b8cfb4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmV+%0ptFOP)AU?=O zn6p8Am}Zzf&M*KOf*uwyLqM8A@*vCbMk9Jyz+3_|oM1XY4-4dwNB2Kg17KkRG6WV2 zFt1>XN(=*FeuOz07LB-Efnfl0=pzRrQ7IARJdg&Ejp(s}oUm{jfG!C$43;*qg#*Fd irjpM8AKe?s76AZ&2EbY>5C4z=00000>c83B!3D?L_t(|oMn@-3Iah4M7OoGv#}NIE$r;2wiDIK!O8Oq?=+^r@fkLg#{KQ@`!voicEP(24^6kkJD`^?*}NN<_vt40#J+% zMaJlNAry!NuU>?2ETAG3IHQt)Da=GZfv`ZaBxc!u20qq?0RIl~32=$>-3S7|C=mJ0 ua}pY2rP;X0tRX1>Cj$#C@9g_r$oc_}^i8c*+B69O0000}c8B!3S{L_t(|oMn@tZUZq8M30t*m6TQrF9<6u3oXkhiYf&qBxKWf(zE6^C++Roo*D0WebdW+T~E7*`a6Er_s>TiKHuyAnV4hkal0xp zWN^gga;($&wr7X00000NkvXXu0mjfs=A5X 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 9f1e87d0171955424fe22810b4eab3a61f1201aa..80486ee0ae89006bb24bfd14c53ee8f45f39594d 100644 GIT binary patch delta 255 zcmVkLcW);j< z!6XQR#$)7P_=eea4d;bphMoET{b%PIGi&;Mz2HpXay{7nakjq&1i#)lYujfh5l?^> zyEv&jP}E4jAoWtu3fxYtiIgtClp|b@qFQuWT_f=Ew0C&Dn|Rx7GtOWhJ2fn~)6@W< zTxY<_aTHx90Sc4VFo`GvDc5MSP9r{zr>}gTOe7V%dLC?jINN z4dT0ytLD2cS12dE2P5GMINJiZOF*+mK)D3fr>HY7`~aqe?v7ug3OfJ*002ovPDHLk FV1ja`b*lgX delta 247 zcmV4#GeXMQd?543-3ssKeo~IF7&(I1b0a)smpG zBq)+9Ff~KoCVw-#-3nT<*=c9~%b%I8%&eMnCW#Zk<9W4rd$-X5#Gmi$Z%7OfcU^0` zM>`ONGbEyxmU}~#P_2~O$y*&vmWC?0To%_TadW#w@!?$C=5V;Q(wsuU?z9dC68IP~ zd9~DYAginWJV0~{EI5u-o6Nvd5qnVX#zW#7y(JQh?JNqtlN^@3gB;@9& x;2)2Mg%dy$3+lzm7X1D>UO)_xI&S`Hc0Z6a@n@q7krV&`002ovPDHLkV1n3camN4v diff --git a/src/main/resources/assets/jafohana/textures/block/potted_beach_spider_lily.png b/src/main/resources/assets/jafohana/textures/block/potted_beach_spider_lily.png new file mode 100644 index 0000000000000000000000000000000000000000..3a3c82f7e6c6d9ccbe4c3f51d71d5c14c8881c26 GIT binary patch literal 262 zcmV+h0r~!kP)L=8pf!nqh2QhQKv|6ywr>Y$#S2plh75E&M+=1F^XR z!)Y)-A3V3@Ka73n!5OUHg1Z3bM3^ne8nM}mEQVDOWB{^e7>z9~usRE-!Mjosr_+ft zAhKEGKdxv+F#z59FwHO*z-X+ofG&V+3rHi#AY5qxs{!b?zzjg9k;8@o-8OUu$lgGg z!|DQ%0uXl0lYwglv602_8UVr|g(fM2U<_kp(~Q#q7}kvD#j6>F0s8~@ohN4CIRF3v M07*qoM6N<$f_A`e5dZ)H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..04c77dcd29ead491fc7dc369dcaaa091c2d32573 GIT binary patch literal 303 zcmV+~0nq-5P);?JMVVcr1I zpl~7C09bes9Sb0Z=phZ_gJJ|dmSE8fHvksrAe)dSVJ<+{h^z*r53CvHOk~ZlaPZAz z_>ap15X}JNAS-}5J1~J8t`J=fiWiXmkL>L9Y!SF?Kx|lG!VG~M05cg~Q+}x|RyJ~? z!$^V1hM?0VrGtoAp8p_>PcvQvK-e#s8?R;%1^^WDi>g112GRfk002ovPDHLkV1mJ@ Bds_ei literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/jafohana/textures/block/white_spotted_bellflower.png b/src/main/resources/assets/jafohana/textures/block/white_spotted_bellflower.png deleted file mode 100644 index 421af7ab453c70228eaf35be30537a46197e5fe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmV+s0q*{ZP)^I*mgJDyd*zq z0igJ2jSSVX#LoaaZw||}rb6Ei=lX=zZk|525boFe1tQR}>8>}lmj;B$MkhKGYV9H5 z(cK}4jjYUQ=e;j4J)V6JE<$)_M5WEMoOPeofDo^RAaqusk8Si?C=>6P1$Zs2^1l8M zAT0<{7gS2r$`D}RYGW>o5x}Z%MVvH=OpgwX=(}JCD+};CVO(~@zPS15Y zK30YG=F*nidtVOsuFrixZDF51@@k0Y{Mrr)1-!}cu3f)I%y*t006g44KmZXyu(rBM zfaN6wQCcB9la=%j=t2+?eDh8#inTNVgy>&@U;s8yp%;z-*~AoU$=lP)s3De$n6&_{ zqoa65^j=kFb#m8i~`tH`jo=ilKo{B9S(PJ7D!dHFd(Kr67TSo0t$q p0%u3Ljf9{Akyg9}_yNe#JWy8tRgC}u002ovPDHLkV1l^fdi?+Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/jafohana/textures/block/yellowflag_iris_top.png b/src/main/resources/assets/jafohana/textures/block/yellowflag_iris_top.png new file mode 100644 index 0000000000000000000000000000000000000000..ac80eaa033a452a6eb17edaf0b015b053573bd03 GIT binary patch literal 278 zcmV+x0qOpUP)01i>1fpA-ClbvG}V4KomC0NyZwX}o=i78W?e0A`ay05^v1pxD40jWClznn4)k3YY<~ cn86kc0L9~`a~