Skip to content

Commit

Permalink
Firefly Bushes now generate in Mangrove Swamps.
Browse files Browse the repository at this point in the history
  • Loading branch information
AViewFromTheTop committed Feb 6, 2025
1 parent 7843ea7 commit 74162ff
Show file tree
Hide file tree
Showing 11 changed files with 371 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,4 @@ hi
- Renamed Wilder Wild's `Bush` to `Shrub.`
- Updated all Maple Leaf Litters to be consistent with Vanilla's new Leaf Litter block.
- Dry Grass now generates on Beaches.
- Firefly Bushes now generate in Mangrove Swamps.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"values": [
"minecraft:old_growth_spruce_taiga",
"minecraft:old_growth_pine_taiga",
"minecraft:jungle",
"minecraft:bamboo_jungle",
"minecraft:sparse_jungle",
"minecraft:windswept_forest",
"minecraft:windswept_hills",
"minecraft:windswept_gravelly_hills",
"minecraft:plains",
"minecraft:sunflower_plains",
"minecraft:snowy_plains",
"minecraft:mushroom_fields",
"minecraft:frozen_ocean",
"minecraft:taiga",
"minecraft:snowy_taiga",
"minecraft:dark_forest",
"minecraft:forest",
"minecraft:flower_forest",
"minecraft:birch_forest",
"minecraft:old_growth_birch_forest",
"minecraft:river",
"minecraft:frozen_river",
"minecraft:beach",
"minecraft:snowy_beach",
"minecraft:savanna",
"minecraft:savanna_plateau",
"minecraft:windswept_savanna",
"minecraft:ocean",
"minecraft:deep_ocean",
"minecraft:lukewarm_ocean",
"minecraft:deep_lukewarm_ocean",
"minecraft:warm_ocean",
"minecraft:cold_ocean",
"minecraft:deep_cold_ocean",
"minecraft:frozen_ocean",
"minecraft:deep_frozen_ocean",
{
"id": "wilderwild:snowy_old_growth_pine_taiga",
"required": false
},
{
"id": "wilderwild:birch_taiga",
"required": false
},
{
"id": "wilderwild:dark_taiga",
"required": false
},
{
"id": "wilderwild:old_growth_birch_taiga",
"required": false
},
{
"id": "wilderwild:birch_jungle",
"required": false
},
{
"id": "wilderwild:sparse_birch_jungle",
"required": false
},
{
"id": "wilderwild:dark_birch_forest",
"required": false
},
{
"id": "wilderwild:semi_birch_forest",
"required": false
},
{
"id": "wilderwild:parched_forest",
"required": false
},
{
"id": "wilderwild:dying_forest",
"required": false
},
{
"id": "wilderwild:dying_mixed_forest",
"required": false
},
{
"id": "wilderwild:snowy_dying_forest",
"required": false
},
{
"id": "wilderwild:snowy_dying_mixed_forest",
"required": false
},
{
"id": "wilderwild:rainforest",
"required": false
},
{
"id": "wilderwild:mixed_forest",
"required": false
},
{
"id": "wilderwild:warm_beach",
"required": false
},
{
"id": "wilderwild:warm_river",
"required": false
},
{
"id": "wilderwild:old_growth_dark_forest",
"required": false
},
{
"id": "wilderwild:temperate_rainforest",
"required": false
},
{
"id": "wilderwild:maple_forest",
"required": false
},
{
"id": "wilderwild:tundra",
"required": false
},
{
"id": "wilderwild:flower_field",
"required": false
},
{
"id": "wilderwild:cypress_wetlands",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"minecraft:swamp",
"minecraft:mangrove_swamp"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"feature": "minecraft:patch_firefly_bush_near_water",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 6
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "MOTION_BLOCKING"
},
{
"type": "minecraft:biome"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"feature": "minecraft:patch_firefly_bush",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 4
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "MOTION_BLOCKING"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:all_of",
"predicates": [
{
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
},
{
"type": "minecraft:would_survive",
"state": {
"Name": "minecraft:firefly_bush"
}
},
{
"type": "minecraft:any_of",
"predicates": [
{
"type": "minecraft:matching_fluids",
"fluids": [
"minecraft:water",
"minecraft:flowing_water"
],
"offset": [
1,
-1,
0
]
},
{
"type": "minecraft:matching_fluids",
"fluids": [
"minecraft:water",
"minecraft:flowing_water"
],
"offset": [
-1,
-1,
0
]
},
{
"type": "minecraft:matching_fluids",
"fluids": [
"minecraft:water",
"minecraft:flowing_water"
],
"offset": [
0,
-1,
1
]
},
{
"type": "minecraft:matching_fluids",
"fluids": [
"minecraft:water",
"minecraft:flowing_water"
],
"offset": [
0,
-1,
-1
]
}
]
}
]
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"feature": "minecraft:patch_firefly_bush",
"placement": [
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "MOTION_BLOCKING"
},
{
"type": "minecraft:biome"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,6 @@ private void generateClimateAndVegetationTags() {
}

private void generateUtilityTags() {
this.getOrCreateTagBuilder(WWBiomeTags.HAS_FIREFLY)
.add(Biomes.SWAMP)
.add(Biomes.MANGROVE_SWAMP)
.addOptional(WWBiomes.CYPRESS_WETLANDS);

this.getOrCreateTagBuilder(WWBiomeTags.HAS_BUTTERFLY)
.add(Biomes.MEADOW)
.addOptional(WWBiomes.MAPLE_FOREST)
Expand Down Expand Up @@ -1686,6 +1681,71 @@ private void generateFeatureTags() {
.addOptionalTag(WWBiomeTags.SAND_BEACHES)
.addOptionalTag(WWBiomeTags.MULTI_LAYER_SAND_BEACHES);

this.getOrCreateTagBuilder(WWBiomeTags.HAS_FIREFLY_BUSH)
.add(Biomes.OLD_GROWTH_SPRUCE_TAIGA)
.add(Biomes.OLD_GROWTH_PINE_TAIGA)
.add(Biomes.JUNGLE)
.add(Biomes.BAMBOO_JUNGLE)
.add(Biomes.SPARSE_JUNGLE)
.add(Biomes.WINDSWEPT_FOREST)
.add(Biomes.WINDSWEPT_HILLS)
.add(Biomes.WINDSWEPT_GRAVELLY_HILLS)
.add(Biomes.PLAINS)
.add(Biomes.SUNFLOWER_PLAINS)
.add(Biomes.SNOWY_PLAINS)
.add(Biomes.MUSHROOM_FIELDS)
.add(Biomes.FROZEN_OCEAN)
.add(Biomes.TAIGA)
.add(Biomes.SNOWY_TAIGA)
.add(Biomes.DARK_FOREST)
.add(Biomes.FOREST)
.add(Biomes.FLOWER_FOREST)
.add(Biomes.BIRCH_FOREST)
.add(Biomes.OLD_GROWTH_BIRCH_FOREST)
.add(Biomes.RIVER)
.add(Biomes.FROZEN_RIVER)
.add(Biomes.BEACH)
.add(Biomes.SNOWY_BEACH)
.add(Biomes.SAVANNA)
.add(Biomes.SAVANNA_PLATEAU)
.add(Biomes.WINDSWEPT_SAVANNA)
.add(Biomes.OCEAN)
.add(Biomes.DEEP_OCEAN)
.add(Biomes.LUKEWARM_OCEAN)
.add(Biomes.DEEP_LUKEWARM_OCEAN)
.add(Biomes.WARM_OCEAN)
.add(Biomes.COLD_OCEAN)
.add(Biomes.DEEP_COLD_OCEAN)
.add(Biomes.FROZEN_OCEAN)
.add(Biomes.DEEP_FROZEN_OCEAN)
.addOptional(WWBiomes.SNOWY_OLD_GROWTH_PINE_TAIGA)
.addOptional(WWBiomes.BIRCH_TAIGA)
.addOptional(WWBiomes.DARK_TAIGA)
.addOptional(WWBiomes.OLD_GROWTH_BIRCH_TAIGA)
.addOptional(WWBiomes.BIRCH_JUNGLE)
.addOptional(WWBiomes.SPARSE_BIRCH_JUNGLE)
.addOptional(WWBiomes.DARK_BIRCH_FOREST)
.addOptional(WWBiomes.SEMI_BIRCH_FOREST)
.addOptional(WWBiomes.PARCHED_FOREST)
.addOptional(WWBiomes.DYING_FOREST)
.addOptional(WWBiomes.DYING_MIXED_FOREST)
.addOptional(WWBiomes.SNOWY_DYING_FOREST)
.addOptional(WWBiomes.SNOWY_DYING_MIXED_FOREST)
.addOptional(WWBiomes.RAINFOREST)
.addOptional(WWBiomes.MIXED_FOREST)
.addOptional(WWBiomes.WARM_BEACH)
.addOptional(WWBiomes.WARM_RIVER)
.addOptional(WWBiomes.OLD_GROWTH_DARK_FOREST)
.addOptional(WWBiomes.TEMPERATE_RAINFOREST)
.addOptional(WWBiomes.MAPLE_FOREST)
.addOptional(WWBiomes.TUNDRA)
.addOptional(WWBiomes.FLOWER_FIELD)
.addOptional(WWBiomes.CYPRESS_WETLANDS);

this.getOrCreateTagBuilder(WWBiomeTags.HAS_FIREFLY_BUSH_SWAMP)
.add(Biomes.SWAMP)
.add(Biomes.MANGROVE_SWAMP);

this.getOrCreateTagBuilder(WWBiomeTags.HAS_MOSS_PILE)
.add(Biomes.SPARSE_JUNGLE)
.add(Biomes.BAMBOO_JUNGLE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public final class WWBiomeTags {
public static final TagKey<Biome> STRAYS_CAN_SPAWN_UNDERGROUND = bind("entity/spawn/underground_stray");
public static final TagKey<Biome> HAS_BUTTERFLY = bind("entity/spawn/butterfly");
public static final TagKey<Biome> HAS_COMMON_BUTTERFLY = bind("entity/spawn/common_butterfly");
public static final TagKey<Biome> HAS_FIREFLY = bind("entity/spawn/firefly");
public static final TagKey<Biome> HAS_JELLYFISH = bind("entity/spawn/jellyfish");
public static final TagKey<Biome> JELLYFISH_SPECIAL_SPAWN = bind("entity/spawn/jellyfish_special_spawn");
public static final TagKey<Biome> HAS_MOOBLOOM = bind("entity/spawn/moobloom");
Expand Down Expand Up @@ -252,6 +251,8 @@ public final class WWBiomeTags {
public static final TagKey<Biome> HAS_DRY_GRASS_DESERT = bind("feature/has_dry_grass_desert");
public static final TagKey<Biome> HAS_DRY_GRASS_BEACH = bind("feature/has_dry_grass_beach");
public static final TagKey<Biome> HAS_DRY_GRASS_BETA_BEACH = bind("feature/has_dry_grass_beta_beach");
public static final TagKey<Biome> HAS_FIREFLY_BUSH = bind("feature/has_firefly_bush");
public static final TagKey<Biome> HAS_FIREFLY_BUSH_SWAMP = bind("feature/has_firefly_bush_swamp");
public static final TagKey<Biome> HAS_COMMON_PUMPKIN = bind("feature/has_common_pumpkin");
public static final TagKey<Biome> HAS_MOSS_PILE = bind("feature/has_moss_pile");
public static final TagKey<Biome> HAS_STONE_PILE_COMMON = bind("feature/has_stone_pile_common");
Expand Down
Loading

0 comments on commit 74162ff

Please sign in to comment.