diff --git a/src/main/resources/data/c/tags/entity_type/creepers.json b/src/main/resources/data/c/tags/entity_type/creepers.json new file mode 100644 index 00000000..fd832f1b --- /dev/null +++ b/src/main/resources/data/c/tags/entity_type/creepers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:creeper" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_birch_forest.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_birch_forest.json index 68e5f301..c228ac73 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_birch_forest.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_birch_forest.json @@ -8,6 +8,10 @@ { "name": "#jafohana:is_birch_forest" }, + { + "name": "#jafohana:is_old_growth", + "negate": true + }, { "name": "#jafohana:is_hot", "negate": true @@ -17,7 +21,7 @@ "negate": true }, { - "name": "#jafohana:is_coniferous", + "name": "#jafohana:is_dense_vegetation", "negate": true }, { diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_coniferous_forest.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_coniferous_forest.json index e93b9494..5767e625 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_coniferous_forest.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_coniferous_forest.json @@ -17,6 +17,10 @@ "name": "#jafohana:is_spooky", "negate": true }, + { + "name": "#jafohana:is_birch_forest", + "negate": true + }, { "name": "#jafohana:is_dead_or_wasteland", "negate": true diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/harebell_and_wheel_lily_features.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_mountain.json similarity index 91% rename from src/main/resources/data/jafohana/neoforge/biome_modifier/harebell_and_wheel_lily_features.json rename to src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_mountain.json index 6deddf1f..75cd2285 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/harebell_and_wheel_lily_features.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_mountain.json @@ -54,6 +54,6 @@ } ] ], - "features": "jafohana:harebell_and_wheel_lily", + "features": "jafohana:flower_mountain", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_old_growth_birch_forest.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_old_growth_birch_forest.json new file mode 100644 index 00000000..0173e727 --- /dev/null +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_old_growth_birch_forest.json @@ -0,0 +1,61 @@ +{ + "type": "jafohana:add_features", + "biomes": [ + [ + { + "name": "#jafohana:is_overworld" + }, + { + "name": "#jafohana:is_birch_forest" + }, + { + "name": "#jafohana:is_old_growth" + }, + { + "name": "#jafohana:is_hot", + "negate": true + }, + { + "name": "#jafohana:is_snowy", + "negate": true + }, + { + "name": "#jafohana:is_spooky", + "negate": true + }, + { + "name": "#jafohana:is_dead_or_wasteland", + "negate": true + } + ], + [ + { + "name": "#jafohana:is_overworld" + }, + { + "name": "#jafohana:is_birch_forest" + }, + { + "name": "#jafohana:is_dense_vegetation" + }, + { + "name": "#jafohana:is_hot", + "negate": true + }, + { + "name": "#jafohana:is_snowy", + "negate": true + }, + { + "name": "#jafohana:is_spooky", + "negate": true + }, + { + "name": "#jafohana:is_dead_or_wasteland", + "negate": true + } + ] + ], + "features": "jafohana:flower_old_growth_birch_forest", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_hill.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_windswept_hills.json similarity index 91% rename from src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_hill.json rename to src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_windswept_hills.json index f52b2eb2..bcf85dd9 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_hill.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/flower_features_in_windswept_hills.json @@ -55,6 +55,6 @@ } ] ], - "features": "jafohana:flower_hill", + "features": "jafohana:flower_windswept_hills", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_hill.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_mountain.json similarity index 90% rename from src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_hill.json rename to src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_mountain.json index 58a9ec02..bd44bc12 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_hill.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_mountain.json @@ -42,6 +42,6 @@ } ] ], - "features": "jafohana:tall_flower_hill", + "features": "jafohana:tall_flower_mountain", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_windswept_savanna.json similarity index 81% rename from src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json rename to src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_windswept_savanna.json index a33637da..95e00822 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_windswept_savanna.json @@ -17,6 +17,6 @@ } ] ], - "features": "jafohana:marigold", + "features": "jafohana:tall_flower_windswept_savanna", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json b/src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json index cfb4adc0..0f2e9a14 100644 --- a/src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json +++ b/src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json @@ -1,247 +1,7 @@ { "replace": false, "values": [ - "minecraft:creeper", - { - "id": "#forge:creepers", - "required": false - }, - { - "id": "#c:creepers", - "required": false - }, - { - "id": "cactusmod:cactus_creeper", - "required": false - }, - { - "id": "graveyard:skeleton_creeper", - "required": false - }, - { - "id": "camocreepers:camo_creeper", - "required": false - }, - { - "id": "apocalypse:breecher", - "required": false - }, - { - "id": "dungeons_mobs:icy_creeper", - "required": false - }, - { - "id": "creeperoverhaul:birch_creeper", - "required": false - }, - { - "id": "creeperoverhaul:ocean_creeper", - "required": false - }, - { - "id": "specialmobs:creeper", - "required": false - }, - { - "id": "specialmobs:darkcreeper", - "required": false - }, - { - "id": "specialmobs:deathcreeper", - "required": false - }, - { - "id": "specialmobs:dirtcreeper", - "required": false - }, - { - "id": "specialmobs:doomcreeper", - "required": false - }, - { - "id": "specialmobs:drowningcreeper", - "required": false - }, - { - "id": "specialmobs:endercreeper", - "required": false - }, - { - "id": "specialmobs:firecreeper", - "required": false - }, - { - "id": "specialmobs:gravelcreeper", - "required": false - }, - { - "id": "specialmobs:jumpingcreeper", - "required": false - }, - { - "id": "specialmobs:lightningcreeper", - "required": false - }, - { - "id": "specialmobs:minicreeper", - "required": false - }, - { - "id": "specialmobs:sandcreeper", - "required": false - }, - { - "id": "specialmobs:scopecreeper", - "required": false - }, - { - "id": "specialmobs:skeletoncreeper", - "required": false - }, - { - "id": "specialmobs:snowcreeper", - "required": false - }, - { - "id": "specialmobs:splittingcreeper", - "required": false - }, - { - "id": "more_babies:creeper", - "required": false - }, - { - "id": "tofucraft:tofucreeper", - "required": false - }, - { - "id": "enderzoology:concussion_creeper", - "required": false - }, - { - "id": "good_nights_sleep:baby_creeper", - "required": false - }, - { - "id": "alexscaves:nucleeper", - "required": false - }, - { - "id": "creepycreepers:ghostly_creeper", - "required": false - }, - { - "id": "creepycreepers:snowy_creeper", - "required": false - }, - { - "id": "creepycreepers:halloween_creeper", - "required": false - }, - { - "id": "creepycreepers:tuff_creeper", - "required": false - }, - { - "id": "creepycreepers:corrupted_creeper", - "required": false - }, - { - "id": "majruszsdifficulty:creeperling", - "required": false - }, - { - "id": "immersiveweapons:storm_creeper", - "required": false - }, - { - "id": "lcrdrfs:laser_creeper", - "required": false - }, - { - "id": "caverns_and_chasms:deeper", - "required": false - }, - { - "id": "caverns_and_chasms:peeper", - "required": false - }, - { - "id": "arsmagicalegacy:mana_creeper", - "required": false - }, - { - "id": "#takumicraft:takumi", - "required": false - }, - { - "id": "elementalcreepers:celebration_creeper", - "required": false - }, - { - "id": "elementalcreepers:cookie_creeper", - "required": false - }, - { - "id": "elementalcreepers:dark_creeper", - "required": false - }, - { - "id": "elementalcreepers:earth_creeper", - "required": false - }, - { - "id": "elementalcreepers:electric_creeper", - "required": false - }, - { - "id": "elementalcreepers:fake_illusion_creeper", - "required": false - }, - { - "id": "elementalcreepers:fire_creeper", - "required": false - }, - { - "id": "elementalcreepers:ice_creeper", - "required": false - }, - { - "id": "elementalcreepers:illusion_creeper", - "required": false - }, - { - "id": "elementalcreepers:ghost_creeper", - "required": false - }, - { - "id": "elementalcreepers:light_creeper", - "required": false - }, - { - "id": "elementalcreepers:magma_creeper", - "required": false - }, - { - "id": "elementalcreepers:psychic_creeper", - "required": false - }, - { - "id": "elementalcreepers:reverse_creeper", - "required": false - }, - { - "id": "elementalcreepers:spider_creeper", - "required": false - }, - { - "id": "elementalcreepers:water_creeper", - "required": false - }, - { - "id": "elementalcreepers:friendly_creeper", - "required": false - }, + "#jafohana:creepers", { "id": "grimoireofgaia:creep", "required": false diff --git a/src/main/resources/data/jafohana/tags/entity_type/creepers.json b/src/main/resources/data/jafohana/tags/entity_type/creepers.json new file mode 100644 index 00000000..0ed5e369 --- /dev/null +++ b/src/main/resources/data/jafohana/tags/entity_type/creepers.json @@ -0,0 +1,246 @@ +{ + "replace": false, + "values": [ + "#c:creepers", + { + "id": "#forge:creepers", + "required": false + }, + { + "id": "cactusmod:cactus_creeper", + "required": false + }, + { + "id": "graveyard:skeleton_creeper", + "required": false + }, + { + "id": "camocreepers:camo_creeper", + "required": false + }, + { + "id": "apocalypse:breecher", + "required": false + }, + { + "id": "dungeons_mobs:icy_creeper", + "required": false + }, + { + "id": "creeperoverhaul:birch_creeper", + "required": false + }, + { + "id": "creeperoverhaul:ocean_creeper", + "required": false + }, + { + "id": "specialmobs:creeper", + "required": false + }, + { + "id": "specialmobs:darkcreeper", + "required": false + }, + { + "id": "specialmobs:deathcreeper", + "required": false + }, + { + "id": "specialmobs:dirtcreeper", + "required": false + }, + { + "id": "specialmobs:doomcreeper", + "required": false + }, + { + "id": "specialmobs:drowningcreeper", + "required": false + }, + { + "id": "specialmobs:endercreeper", + "required": false + }, + { + "id": "specialmobs:firecreeper", + "required": false + }, + { + "id": "specialmobs:gravelcreeper", + "required": false + }, + { + "id": "specialmobs:jumpingcreeper", + "required": false + }, + { + "id": "specialmobs:lightningcreeper", + "required": false + }, + { + "id": "specialmobs:minicreeper", + "required": false + }, + { + "id": "specialmobs:sandcreeper", + "required": false + }, + { + "id": "specialmobs:scopecreeper", + "required": false + }, + { + "id": "specialmobs:skeletoncreeper", + "required": false + }, + { + "id": "specialmobs:snowcreeper", + "required": false + }, + { + "id": "specialmobs:splittingcreeper", + "required": false + }, + { + "id": "more_babies:creeper", + "required": false + }, + { + "id": "tofucraft:tofucreeper", + "required": false + }, + { + "id": "enderzoology:concussion_creeper", + "required": false + }, + { + "id": "good_nights_sleep:baby_creeper", + "required": false + }, + { + "id": "alexscaves:nucleeper", + "required": false + }, + { + "id": "creepycreepers:ghostly_creeper", + "required": false + }, + { + "id": "creepycreepers:snowy_creeper", + "required": false + }, + { + "id": "creepycreepers:halloween_creeper", + "required": false + }, + { + "id": "creepycreepers:tuff_creeper", + "required": false + }, + { + "id": "creepycreepers:corrupted_creeper", + "required": false + }, + { + "id": "majruszsdifficulty:creeperling", + "required": false + }, + { + "id": "immersiveweapons:storm_creeper", + "required": false + }, + { + "id": "lcrdrfs:laser_creeper", + "required": false + }, + { + "id": "caverns_and_chasms:deeper", + "required": false + }, + { + "id": "caverns_and_chasms:peeper", + "required": false + }, + { + "id": "arsmagicalegacy:mana_creeper", + "required": false + }, + { + "id": "#takumicraft:takumi", + "required": false + }, + { + "id": "elementalcreepers:celebration_creeper", + "required": false + }, + { + "id": "elementalcreepers:cookie_creeper", + "required": false + }, + { + "id": "elementalcreepers:dark_creeper", + "required": false + }, + { + "id": "elementalcreepers:earth_creeper", + "required": false + }, + { + "id": "elementalcreepers:electric_creeper", + "required": false + }, + { + "id": "elementalcreepers:fake_illusion_creeper", + "required": false + }, + { + "id": "elementalcreepers:fire_creeper", + "required": false + }, + { + "id": "elementalcreepers:ice_creeper", + "required": false + }, + { + "id": "elementalcreepers:illusion_creeper", + "required": false + }, + { + "id": "elementalcreepers:ghost_creeper", + "required": false + }, + { + "id": "elementalcreepers:light_creeper", + "required": false + }, + { + "id": "elementalcreepers:magma_creeper", + "required": false + }, + { + "id": "elementalcreepers:psychic_creeper", + "required": false + }, + { + "id": "elementalcreepers:reverse_creeper", + "required": false + }, + { + "id": "elementalcreepers:spider_creeper", + "required": false + }, + { + "id": "elementalcreepers:water_creeper", + "required": false + }, + { + "id": "elementalcreepers:friendly_creeper", + "required": false + }, + { + "id": "charred_horizons:spore_creeper", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_old_growth.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_old_growth.json new file mode 100644 index 00000000..40e51f23 --- /dev/null +++ b/src/main/resources/data/jafohana/tags/worldgen/biome/is_old_growth.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:is_old_growth", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/harebell_and_wheel_lily.json b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_mountain.json similarity index 100% rename from src/main/resources/data/jafohana/worldgen/configured_feature/harebell_and_wheel_lily.json rename to src/main/resources/data/jafohana/worldgen/configured_feature/flower_mountain.json diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_hill.json b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_windswept_hills.json similarity index 100% rename from src/main/resources/data/jafohana/worldgen/configured_feature/flower_hill.json rename to src/main/resources/data/jafohana/worldgen/configured_feature/flower_windswept_hills.json diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_hill.json b/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_mountain.json similarity index 100% rename from src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_hill.json rename to src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_mountain.json diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/marigold.json b/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_windswept_savanna.json similarity index 100% rename from src/main/resources/data/jafohana/worldgen/configured_feature/marigold.json rename to src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_windswept_savanna.json diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/harebell_and_wheel_lily.json b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_mountain.json similarity index 80% rename from src/main/resources/data/jafohana/worldgen/placed_feature/harebell_and_wheel_lily.json rename to src/main/resources/data/jafohana/worldgen/placed_feature/flower_mountain.json index c41dea47..6385f8f0 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/harebell_and_wheel_lily.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_mountain.json @@ -1,5 +1,5 @@ { - "feature": "jafohana:harebell_and_wheel_lily", + "feature": "jafohana:flower_mountain", "placement": [ { "type": "minecraft:rarity_filter", diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_old_growth_birch_forest.json b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_old_growth_birch_forest.json new file mode 100644 index 00000000..d2e7f6b1 --- /dev/null +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_old_growth_birch_forest.json @@ -0,0 +1,19 @@ +{ + "feature": "jafohana:flower_birch_forest", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 14 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_hill.json b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_windswept_hills.json similarity index 80% rename from src/main/resources/data/jafohana/worldgen/placed_feature/flower_hill.json rename to src/main/resources/data/jafohana/worldgen/placed_feature/flower_windswept_hills.json index b6011743..5bea1fcf 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_hill.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_windswept_hills.json @@ -1,5 +1,5 @@ { - "feature": "jafohana:flower_hill", + "feature": "jafohana:flower_windswept_hills", "placement": [ { "type": "minecraft:rarity_filter", diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_hill.json b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_mountain.json similarity index 81% rename from src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_hill.json rename to src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_mountain.json index 31a4cfb7..c6d0e414 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_hill.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_mountain.json @@ -1,5 +1,5 @@ { - "feature": "jafohana:tall_flower_hill", + "feature": "jafohana:tall_flower_mountain", "placement": [ { "type": "minecraft:rarity_filter", diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/marigold.json b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_windswept_savanna.json similarity index 79% rename from src/main/resources/data/jafohana/worldgen/placed_feature/marigold.json rename to src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_windswept_savanna.json index 9b8dfe5f..7b492531 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/marigold.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_windswept_savanna.json @@ -1,5 +1,5 @@ { - "feature": "jafohana:marigold", + "feature": "jafohana:tall_flower_windswept_savanna", "placement": [ { "type": "minecraft:rarity_filter",