- Fix Animals not spawning in BWG Biomes due to missing block tags

- Add Goats to Howling Peaks - Add Armadillos to Araucaria, Baobab Savannas, Ironwood Gour and Red Rock Valley Signed-off-by: Joseph T. McQuigg <[email protected]>
Potion-Studios · Nov 24, 2024 · 89429d1 · 89429d1
1 parent aba8ee8
commit 89429d1
Show file tree

Hide file tree

Showing 16 changed files with 102 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 - Make Pale Pumpkin Set Compostable
 - Make GlowCane Shoots Compostable
 - Make Cattail Sprouts Compostable
+- Fix Animals not spawning in BWG Biomes due to missing block tags
+- Add Goats to Howling Peaks
+- Add Armadillos to Araucaria, Baobab Savannas, Ironwood Gour and Red Rock Valley
 
 # 2.2.4
 - Fix White Mangrove Trees Canopies Floating above trunks

diff --git a/...on/src/main/generated/resources/data/biomeswevegone/worldgen/biome/araucaria_savanna.json b/...on/src/main/generated/resources/data/biomeswevegone/worldgen/biome/araucaria_savanna.json
@@ -143,6 +143,12 @@
         "maxCount": 4,
         "minCount": 3,
         "weight": 1
+      },
+      {
+        "type": "minecraft:armadillo",
+        "maxCount": 3,
+        "minCount": 2,
+        "weight": 10
       }
     ],
     "misc": [],

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/baobab_savanna.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/baobab_savanna.json
@@ -139,6 +139,12 @@
         "maxCount": 4,
         "minCount": 3,
         "weight": 1
+      },
+      {
+        "type": "minecraft:armadillo",
+        "maxCount": 3,
+        "minCount": 2,
+        "weight": 10
       }
     ],
     "misc": [],

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/howling_peaks.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/howling_peaks.json
@@ -155,6 +155,12 @@
         "maxCount": 4,
         "minCount": 2,
         "weight": 8
+      },
+      {
+        "type": "minecraft:goat",
+        "maxCount": 3,
+        "minCount": 1,
+        "weight": 5
       }
     ],
     "misc": [],

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/ironwood_gour.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/ironwood_gour.json
@@ -112,6 +112,12 @@
         "maxCount": 3,
         "minCount": 2,
         "weight": 4
+      },
+      {
+        "type": "minecraft:armadillo",
+        "maxCount": 3,
+        "minCount": 2,
+        "weight": 10
       }
     ],
     "misc": [],

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/red_rock_valley.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/red_rock_valley.json
@@ -110,6 +110,12 @@
         "maxCount": 3,
         "minCount": 2,
         "weight": 4
+      },
+      {
+        "type": "minecraft:armadillo",
+        "maxCount": 3,
+        "minCount": 2,
+        "weight": 10
       }
     ],
     "misc": [],

diff --git a/Common/src/main/generated/resources/data/minecraft/tags/block/animals_spawnable_on.json b/Common/src/main/generated/resources/data/minecraft/tags/block/animals_spawnable_on.json
@@ -0,0 +1,10 @@
+{
+  "values": [
+    "biomeswevegone:lush_dirt",
+    "biomeswevegone:lush_grass_block",
+    "biomeswevegone:overgrown_dacite",
+    "biomeswevegone:overgrown_stone",
+    "biomeswevegone:peat",
+    "biomeswevegone:podzol_dacite"
+  ]
+}
diff --git a/Common/src/main/generated/resources/data/minecraft/tags/block/foxes_spawnable_on.json b/Common/src/main/generated/resources/data/minecraft/tags/block/foxes_spawnable_on.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "biomeswevegone:lush_grass_block",
+    "biomeswevegone:podzol_dacite"
+  ]
+}
diff --git a/Common/src/main/generated/resources/data/minecraft/tags/block/frogs_spawnable_on.json b/Common/src/main/generated/resources/data/minecraft/tags/block/frogs_spawnable_on.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "biomeswevegone:pale_mud",
+    "biomeswevegone:spirit_roots"
+  ]
+}
diff --git a/Common/src/main/generated/resources/data/minecraft/tags/block/parrots_spawnable_on.json b/Common/src/main/generated/resources/data/minecraft/tags/block/parrots_spawnable_on.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:lush_grass_block"
+  ]
+}
diff --git a/...ain/generated/resources/data/minecraft/tags/block/polar_bears_spawnable_on_alternate.json b/...ain/generated/resources/data/minecraft/tags/block/polar_bears_spawnable_on_alternate.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "biomeswevegone:black_ice",
+    "biomeswevegone:borealis_ice"
+  ]
+}
diff --git a/Common/src/main/generated/resources/data/minecraft/tags/block/rabbits_spawnable_on.json b/Common/src/main/generated/resources/data/minecraft/tags/block/rabbits_spawnable_on.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "biomeswevegone:lush_grass_block",
+    "biomeswevegone:red_rock"
+  ]
+}
diff --git a/Common/src/main/generated/resources/data/minecraft/tags/block/snaps_goat_horn.json b/Common/src/main/generated/resources/data/minecraft/tags/block/snaps_goat_horn.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "biomeswevegone:packed_black_ice",
+    "biomeswevegone:packed_borealis_ice"
+  ]
+}
diff --git a/Common/src/main/generated/resources/data/minecraft/tags/block/wolves_spawnable_on.json b/Common/src/main/generated/resources/data/minecraft/tags/block/wolves_spawnable_on.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "biomeswevegone:lush_grass_block",
+    "biomeswevegone:podzol_dacite"
+  ]
+}
diff --git a/.../java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGOverworldBiomes.java b/.../java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGOverworldBiomes.java
@@ -116,6 +116,7 @@ protected static Biome araucariaSavanna(HolderGetter<PlacedFeature> placedFeatur
         MobSpawnSettings.Builder spawnSettings = new MobSpawnSettings.Builder();
         BiomeDefaultFeatures.plainsSpawns(spawnSettings);
         addSpawn(spawnSettings, EntityType.LLAMA, 1, 3, 4);
+        addSpawn(spawnSettings, EntityType.ARMADILLO, 10, 2, 3);
 
         float temperature = 1.2F;
         return new Biome.BiomeBuilder().hasPrecipitation(false).temperature(temperature).downfall(0.0F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).grassColorOverride(10860373).foliageColorOverride(10860373).fogColor(12638463).skyColor(OverworldBiomes.calculateSkyColor(temperature)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).mobSpawnSettings(spawnSettings.build()).generationSettings(generationSettings.build()).build();
@@ -191,6 +192,7 @@ protected static Biome baobabSavanna(HolderGetter<PlacedFeature> placedFeatureGe
         addSpawn(spawnSettings, EntityType.HORSE, 1, 2, 6);
         addSpawn(spawnSettings, EntityType.DONKEY, 1, 1, 1);
         addSpawn(spawnSettings, EntityType.LLAMA, 1, 3, 4);
+        addSpawn(spawnSettings, EntityType.ARMADILLO, 10, 2, 3);
 
         float temperature = 1.2F;
         return new Biome.BiomeBuilder().hasPrecipitation(false).temperature(temperature).downfall(0.0F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).grassColorOverride(10860373).foliageColorOverride(10860373).fogColor(12638463).skyColor(OverworldBiomes.calculateSkyColor(temperature)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).mobSpawnSettings(spawnSettings.build()).generationSettings(generationSettings.build()).build();
@@ -1056,6 +1058,7 @@ protected static Biome redRockValley(HolderGetter<PlacedFeature> placedFeatureGe
 
         MobSpawnSettings.Builder spawnSettings = new MobSpawnSettings.Builder();
         addSpawn(spawnSettings, EntityType.RABBIT, 4, 2, 3);
+        addSpawn(spawnSettings, EntityType.ARMADILLO, 10, 2, 3);
         addSpawn(spawnSettings, EntityType.BAT, 10, 8, 8);
         addSpawn(spawnSettings, EntityType.SPIDER, 100, 4, 4);
         addSpawn(spawnSettings, EntityType.HUSK, 95, 4, 4);
@@ -1257,7 +1260,6 @@ protected static Biome canyon(HolderGetter<PlacedFeature> placedFeatureGetter, H
         return new Biome.BiomeBuilder().hasPrecipitation(true).temperature(temperature).downfall(0.1F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).grassColorOverride(10855786).foliageColorOverride(10855786).fogColor(12638463).skyColor(OverworldBiomes.calculateSkyColor(temperature)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).mobSpawnSettings(spawnSettings.build()).generationSettings(generationSettings.build()).build();
     }
 
-    //TODO: Configure properties
     protected static Biome ironwoodGour(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
         BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
 
@@ -1277,6 +1279,7 @@ protected static Biome ironwoodGour(HolderGetter<PlacedFeature> placedFeatureGet
 
         MobSpawnSettings.Builder spawnSettings = new MobSpawnSettings.Builder();
         addSpawn(spawnSettings, EntityType.RABBIT, 4, 2, 3);
+        addSpawn(spawnSettings, EntityType.ARMADILLO, 10, 2, 3);
         addSpawn(spawnSettings, EntityType.BAT, 10, 8, 8);
         addSpawn(spawnSettings, EntityType.SPIDER, 100, 4, 4);
         addSpawn(spawnSettings, EntityType.HUSK, 95, 4, 4);
@@ -1385,6 +1388,7 @@ protected static Biome howlingPeaks(HolderGetter<PlacedFeature> placedFeatureGet
         addSpawn(spawnSettings, EntityType.RABBIT, 10, 2, 3);
         addSpawn(spawnSettings, EntityType.FOX, 8, 2, 4);
         addSpawn(spawnSettings, EntityType.STRAY, 80, 4, 4);
+        addSpawn(spawnSettings, EntityType.GOAT, 5, 1, 3);
 
         float temperature = -0.5F;
         return new Biome.BiomeBuilder().hasPrecipitation(true).temperature(temperature).downfall(1.0F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(6200521).waterFogColor(6200521).grassColorOverride(15834405).foliageColorOverride(15834405).fogColor(12638463).skyColor(12700876).ambientParticle(new AmbientParticleSettings(ParticleTypes.WHITE_ASH, 0.01428F)).ambientLoopSound(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_LOOP).build()).mobSpawnSettings(spawnSettings.build()).generationSettings(generationSettings.build()).build();

diff --git a/...main/java/net/potionstudios/biomeswevegone/neoforge/datagen/generators/TagsGenerator.java b/...main/java/net/potionstudios/biomeswevegone/neoforge/datagen/generators/TagsGenerator.java
@@ -145,7 +145,6 @@ else if (blocks.get() instanceof LeavesBlock) {
             tag(BWGBlockTags.BOREALIS_ICE).add(BWGBlocks.BOREALIS_ICE.get(), BWGBlocks.PACKED_BOREALIS_ICE.get());
             tag(BlockTags.SNOW_LAYER_CANNOT_SURVIVE_ON).addTag(BWGBlockTags.BLACK_ICE).addTag(BWGBlockTags.BOREALIS_ICE);
             tag(BlockTags.ICE).addTag(BWGBlockTags.BLACK_ICE).addTag(BWGBlockTags.BOREALIS_ICE);
-            tag(BlockTags.FROG_PREFER_JUMP_TO).add(BWGBlocks.FLOWERING_TINY_LILY_PADS.get(), BWGBlocks.TINY_LILY_PADS.get());
             tag(BlockTags.WOOL_CARPETS).add(BWGBlocks.CATTAIL_THATCH_CARPET.get());
             tag(BlockTags.MUSHROOM_GROW_BLOCK).add(BWGBlocks.PODZOL_DACITE.get());
             tag(BWGBlockTags.SNOWY_PLANT_PLACEABLE).add(Blocks.SNOW_BLOCK, Blocks.POWDER_SNOW).addTag(BlockTags.DIRT);
@@ -172,6 +171,19 @@ else if (blocks.get() instanceof LeavesBlock) {
             tag(Tags.Blocks.VILLAGER_FARMLANDS).add(BWGBlocks.LUSH_FARMLAND.get());
             tag(BlockTags.ENDERMAN_HOLDABLE).add(BWGBlocks.PALE_PUMPKIN.get(), BWGBlocks.CARVED_PALE_PUMPKIN.get());
             tag(BlockTags.SWORD_EFFICIENT).add(BWGBlocks.PALE_PUMPKIN.get(), BWGBlocks.CARVED_PALE_PUMPKIN.get(), BWGBlocks.ATTACHED_PALE_PUMPKIN_STEM.get(), BWGBlocks.PALE_JACK_O_LANTERN.get());
+
+            // Entity Integration Tags
+            tag(BlockTags.ANIMALS_SPAWNABLE_ON).add(BWGBlocks.LUSH_GRASS_BLOCK.get(), BWGBlocks.LUSH_DIRT.get(), BWGBlocks.PODZOL_DACITE.get(), BWGBlocks.OVERGROWN_STONE.get(), BWGBlocks.OVERGROWN_DACITE.get(), BWGBlocks.PEAT.get());
+            tag(BlockTags.FROGS_SPAWNABLE_ON).add(BWGBlocks.PALE_MUD.get(), BWGWood.SPIRIT_ROOTS.get());
+            tag(BlockTags.PARROTS_SPAWNABLE_ON).add(BWGBlocks.LUSH_GRASS_BLOCK.get());
+            tag(BlockTags.POLAR_BEARS_SPAWNABLE_ON_ALTERNATE).add(BWGBlocks.BLACK_ICE.get(), BWGBlocks.BOREALIS_ICE.get());
+            tag(BlockTags.RABBITS_SPAWNABLE_ON).add(BWGBlocks.LUSH_GRASS_BLOCK.get(), BWGBlocks.RED_ROCK_SET.getBase());
+            tag(BlockTags.FOXES_SPAWNABLE_ON).add(BWGBlocks.LUSH_GRASS_BLOCK.get(), BWGBlocks.PODZOL_DACITE.get());
+            tag(BlockTags.WOLVES_SPAWNABLE_ON).add(BWGBlocks.LUSH_GRASS_BLOCK.get(), BWGBlocks.PODZOL_DACITE.get());
+
+            tag(BlockTags.FROG_PREFER_JUMP_TO).add(BWGBlocks.FLOWERING_TINY_LILY_PADS.get(), BWGBlocks.TINY_LILY_PADS.get());
+            tag(BlockTags.SNAPS_GOAT_HORN).add(BWGBlocks.PACKED_BLACK_ICE.get(), BWGBlocks.PACKED_BOREALIS_ICE.get());
+
             sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders);
         }