Added Armadillo spawns and Wolf variants for BOP biomes. Added Spectr…

…al Wolf variant for Mystic Grove
Glitchfiend · May 5, 2024 · 1ef909c · 1ef909c
1 parent 94a1d32
commit 1ef909c
Show file tree

Hide file tree

Showing 36 changed files with 349 additions and 160 deletions.
diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,16 +1,16 @@
-// 1.20.6	2024-05-05T11:55:32.2531647	Registries
+// 1.20.6	2024-05-04T23:08:32.0085528	Registries
 bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
 41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
 1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
 60d59d29b8998f29bfbbce0cde352f0aabc0376c data/biomesoplenty/worldgen/biome/auroral_garden.json
 2f83184d9ae2b17e8fbf9cf587de7c26a92b2a0e data/biomesoplenty/worldgen/biome/bayou.json
 c58515f1fea8f8a3eb0c406357ffac7955028795 data/biomesoplenty/worldgen/biome/bog.json
-28fd22f25ece7e18098e1ff77f4f2d53300489a5 data/biomesoplenty/worldgen/biome/cold_desert.json
+eaf7159812ffbce2f7e125fa6bb635d47291544f data/biomesoplenty/worldgen/biome/cold_desert.json
 771af0c393c79eb8b0feb3d9fdec84f3828a2e1b data/biomesoplenty/worldgen/biome/coniferous_forest.json
 d0c0bdd9fc7b09e7d046e35faea8cc6d752b468a data/biomesoplenty/worldgen/biome/crag.json
 032745c9ff2f59203c72937ae4b6b55533c30f8a data/biomesoplenty/worldgen/biome/crystalline_chasm.json
 401cb408a8b99f3fd8b696f9759d9f1f8a1a945e data/biomesoplenty/worldgen/biome/dead_forest.json
-506de7d82a9bf0a7caea3390590dc9d1fa2028b0 data/biomesoplenty/worldgen/biome/dryland.json
+8da8618532dfd6f8a3ae3f4bdf00c051b9d76e01 data/biomesoplenty/worldgen/biome/dryland.json
 d4a9226ceaef3cf4eed45892e027c1eabf9fcd72 data/biomesoplenty/worldgen/biome/dune_beach.json
 9ed1682626703efc2dc7ab64360f99e116f64f63 data/biomesoplenty/worldgen/biome/end_corruption.json
 b3eae91d1d02cfda03e70a555aaaa1bc7028bd61 data/biomesoplenty/worldgen/biome/end_reef.json
@@ -29,17 +29,17 @@ c60852465ebacbddccba4c8a3ecc7fc7c958ece2 data/biomesoplenty/worldgen/biome/highl
 c1a5b54c326719b757ca2d91d84761a8d5c63a6e data/biomesoplenty/worldgen/biome/jacaranda_glade.json
 10d898d097a5ffb6d89fb0e9742fcf1dbf7cfb44 data/biomesoplenty/worldgen/biome/jade_cliffs.json
 0cb0d608c85fd521a156093c739f05dc0376b546 data/biomesoplenty/worldgen/biome/lavender_field.json
-9271f8b08e20a5b849d6b7117e4f16e17f1073b4 data/biomesoplenty/worldgen/biome/lush_desert.json
-af694b4e6d616db214b658bd0d59bf5d14c34caa data/biomesoplenty/worldgen/biome/lush_savanna.json
+f26582b2e9f707e5392ed1519731796869460195 data/biomesoplenty/worldgen/biome/lush_desert.json
+091fd23b278451868f815dfad33169bf4bb1c115 data/biomesoplenty/worldgen/biome/lush_savanna.json
 4804f4f5c89afe2a5e25b05c320f2c5aeece60d8 data/biomesoplenty/worldgen/biome/maple_woods.json
 6be1f3544c3295b99ccf7c1c9958ab9ce58e194d data/biomesoplenty/worldgen/biome/marsh.json
 720c0d07ae063e27eef09fde77687496afffbb6d data/biomesoplenty/worldgen/biome/mediterranean_forest.json
 4f7d2a54b4eb3089e102a66e882d3a83d8e3c2dd data/biomesoplenty/worldgen/biome/moor.json
 db3fa7b84f20c42269e21304b79dddbefe1ae15d data/biomesoplenty/worldgen/biome/muskeg.json
-cd76f720c7dcfd56cdaa5dba0e106cc6635ebca7 data/biomesoplenty/worldgen/biome/mystic_grove.json
+a3c56c292e30125c7a908cc5d82d4c133769376a data/biomesoplenty/worldgen/biome/mystic_grove.json
 2fbdefd52c85777803d3cbed2b56142859f377f4 data/biomesoplenty/worldgen/biome/old_growth_dead_forest.json
 6dccb4534ce310c171dce7c0d4052e1d8aa9fb8c data/biomesoplenty/worldgen/biome/old_growth_woodland.json
-c46a887c298443a7db55164200e36e23d9bfa2f0 data/biomesoplenty/worldgen/biome/ominous_woods.json
+c83328054c6e848cc4ef7aaaec30e93d3ac8593e data/biomesoplenty/worldgen/biome/ominous_woods.json
 70c669571abe0a1a84c4f626109e7acd49f03509 data/biomesoplenty/worldgen/biome/orchard.json
 de4c57b15aa7ccae2a9a0ff2d23ce72f75732550 data/biomesoplenty/worldgen/biome/origin_valley.json
 e8f9c99cf8202e2c050cc729a63f41c688d12e56 data/biomesoplenty/worldgen/biome/overgrown_greens.json
@@ -50,7 +50,7 @@ c192e14c69fed976327bb9429a643ae0a77a7cac data/biomesoplenty/worldgen/biome/pumpk
 21389471c642c1b46eb6679d54d2fcbd0aa966db data/biomesoplenty/worldgen/biome/redwood_forest.json
 122e84e01443f60de57a87d443c3a918d7093167 data/biomesoplenty/worldgen/biome/rocky_rainforest.json
 7d21568158ce2c30daf4205345f0c0826c264551 data/biomesoplenty/worldgen/biome/rocky_shrubland.json
-c4777c88bf889161d1c20bf6e998341fc77493ec data/biomesoplenty/worldgen/biome/scrubland.json
+0f587ba6b9d97f441fdbc13f30ffcc391381f79d data/biomesoplenty/worldgen/biome/scrubland.json
 a90275f0d3e81663844572072a0359edf138f00f data/biomesoplenty/worldgen/biome/seasonal_forest.json
 915f6c670c2e93c0139193b39ea6520077170567 data/biomesoplenty/worldgen/biome/shrubland.json
 1e23aaa20dad73d6b069d0e090e4dd55f0992035 data/biomesoplenty/worldgen/biome/snowblossom_grove.json

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/cold_desert.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/cold_desert.json
@@ -96,6 +96,12 @@
         "maxCount": 2,
         "minCount": 1,
         "weight": 1
+      },
+      {
+        "type": "minecraft:wolf",
+        "maxCount": 4,
+        "minCount": 2,
+        "weight": 2
       }
     ],
     "misc": [],

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/dryland.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/dryland.json
@@ -111,6 +111,12 @@
         "maxCount": 4,
         "minCount": 4,
         "weight": 8
+      },
+      {
+        "type": "minecraft:wolf",
+        "maxCount": 4,
+        "minCount": 2,
+        "weight": 4
       }
     ],
     "misc": [],

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_desert.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_desert.json
@@ -111,6 +111,12 @@
         "maxCount": 3,
         "minCount": 2,
         "weight": 4
+      },
+      {
+        "type": "minecraft:armadillo",
+        "maxCount": 2,
+        "minCount": 1,
+        "weight": 6
       }
     ],
     "misc": [],

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_savanna.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_savanna.json
@@ -145,6 +145,18 @@
         "maxCount": 3,
         "minCount": 2,
         "weight": 4
+      },
+      {
+        "type": "minecraft:armadillo",
+        "maxCount": 2,
+        "minCount": 1,
+        "weight": 6
+      },
+      {
+        "type": "minecraft:wolf",
+        "maxCount": 8,
+        "minCount": 4,
+        "weight": 8
       }
     ],
     "misc": [],

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/mystic_grove.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/mystic_grove.json
@@ -118,13 +118,19 @@
         "type": "minecraft:fox",
         "maxCount": 4,
         "minCount": 2,
-        "weight": 8
+        "weight": 4
       },
       {
         "type": "minecraft:allay",
         "maxCount": 1,
         "minCount": 1,
-        "weight": 10
+        "weight": 8
+      },
+      {
+        "type": "minecraft:wolf",
+        "maxCount": 1,
+        "minCount": 1,
+        "weight": 4
       }
     ],
     "misc": [],

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/ominous_woods.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/ominous_woods.json
@@ -94,7 +94,14 @@
       }
     ],
     "axolotls": [],
-    "creature": [],
+    "creature": [
+      {
+        "type": "minecraft:wolf",
+        "maxCount": 1,
+        "minCount": 1,
+        "weight": 2
+      }
+    ],
     "misc": [],
     "monster": [
       {

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/scrubland.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/scrubland.json
@@ -130,6 +130,12 @@
         "maxCount": 3,
         "minCount": 1,
         "weight": 1
+      },
+      {
+        "type": "minecraft:armadillo",
+        "maxCount": 2,
+        "minCount": 1,
+        "weight": 6
       }
     ],
     "misc": [],

diff --git a/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java b/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java
@@ -225,6 +225,7 @@ public static Biome coldDesert(HolderGetter<PlacedFeature> placedFeatureGetter,
         MobSpawnSettings.Builder spawnBuilder = new MobSpawnSettings.Builder();
         BiomeDefaultFeatures.commonSpawns(spawnBuilder);
         spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.POLAR_BEAR, 1, 1, 2));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 2, 2, 4));
 
         // Biome features
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
@@ -321,6 +322,7 @@ public static Biome dryland(HolderGetter<PlacedFeature> placedFeatureGetter, Hol
         BiomeDefaultFeatures.commonSpawns(spawnBuilder);
         spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.CHICKEN, 10, 4, 4));
         spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.COW, 8, 4, 4));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 4, 2, 4));
 
         // Biome features
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
@@ -666,6 +668,7 @@ public static Biome lushDesert(HolderGetter<PlacedFeature> placedFeatureGetter,
         BiomeDefaultFeatures.commonSpawns(spawnBuilder);
         spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3));
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.HUSK, 80, 4, 4));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.ARMADILLO, 6, 1, 2));
 
         // Biome features
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
@@ -691,6 +694,8 @@ public static Biome lushSavanna(HolderGetter<PlacedFeature> placedFeatureGetter,
         BiomeDefaultFeatures.plainsSpawns(spawnBuilder);
         spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3));
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.HUSK, 80, 4, 4));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.ARMADILLO, 6, 1, 2));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 8, 4, 8));
 
         // Biome features
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
@@ -847,8 +852,9 @@ public static Biome mysticGrove(HolderGetter<PlacedFeature> placedFeatureGetter,
         MobSpawnSettings.Builder spawnBuilder = new MobSpawnSettings.Builder();
         BiomeDefaultFeatures.caveSpawns(spawnBuilder);
         spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.RABBIT, 4, 2, 3));
-        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.FOX, 8, 2, 4));
-        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.ALLAY, 10, 1, 1));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.FOX, 4, 2, 4));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.ALLAY, 8, 1, 1));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 4, 1, 1));
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.ZOMBIE_VILLAGER, 5, 1, 1));
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.SLIME, 100, 4, 4));
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.WITCH, 20, 1, 1));
@@ -903,6 +909,7 @@ public static Biome ominousWoods(HolderGetter<PlacedFeature> placedFeatureGetter
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.SLIME, 100, 4, 4));
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.ENDERMAN, 10, 1, 4));
         spawnBuilder.addSpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.WITCH, 5, 1, 1));
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.WOLF, 2, 1, 1));
 
         // Biome features
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
@@ -1182,6 +1189,7 @@ public static Biome scrubland(HolderGetter<PlacedFeature> placedFeatureGetter, H
         // Mob spawns
         MobSpawnSettings.Builder spawnBuilder = new MobSpawnSettings.Builder();
         BiomeDefaultFeatures.plainsSpawns(spawnBuilder);
+        spawnBuilder.addSpawn(MobCategory.CREATURE, new MobSpawnSettings.SpawnerData(EntityType.ARMADILLO, 6, 1, 2));
 
         // Biome features
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);

diff --git a/common/src/main/java/biomesoplenty/init/ModBlocks.java b/common/src/main/java/biomesoplenty/init/ModBlocks.java
@@ -146,11 +146,11 @@ private static void registerBlocks(BiConsumer<ResourceLocation, Block> func)
         GLOWWORM_SILK = register(func, new GlowwormSilkBottomBlock(BlockBehaviour.Properties.of().mapColor(MapColor.DIAMOND).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.WOOL).lightLevel((state) -> 2).emissiveRendering((state, world, pos) -> true)), "glowworm_silk");
         GLOWWORM_SILK_STRAND = register(func, new GlowwormSilkBlock(BlockBehaviour.Properties.of().mapColor(MapColor.DIAMOND).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.WOOL).lightLevel((state) -> 2).emissiveRendering((state, world, pos) -> true)), "glowworm_silk_strand");
 
-        SPIDER_EGG = register(func, new SpiderEggBlock(BlockBehaviour.Properties.of().strength(0.1F).mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).sound(SoundType.METAL).lightLevel((state) -> 5)), "spider_egg");
-        HANGING_COBWEB = register(func, new HangingCobwebBottomBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.WOOL)), "hanging_cobweb");
-        HANGING_COBWEB_STRAND = register(func, new HangingCobwebBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.WOOL)), "hanging_cobweb_strand");
-        STRINGY_COBWEB = register(func, new StringyCobwebBlock(BlockBehaviour.Properties.of().noLootTable().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.WOOL)), "stringy_cobweb");
-        WEBBING = register(func, new WebbingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.WOOL)), "webbing");
+        SPIDER_EGG = register(func, new SpiderEggBlock(BlockBehaviour.Properties.of().strength(0.1F).mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).sound(SoundType.COBWEB).lightLevel((state) -> 5)), "spider_egg");
+        HANGING_COBWEB = register(func, new HangingCobwebBottomBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.COBWEB)), "hanging_cobweb");
+        HANGING_COBWEB_STRAND = register(func, new HangingCobwebBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.COBWEB)), "hanging_cobweb_strand");
+        STRINGY_COBWEB = register(func, new StringyCobwebBlock(BlockBehaviour.Properties.of().noLootTable().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.COBWEB)), "stringy_cobweb");
+        WEBBING = register(func, new WebbingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).pushReaction(PushReaction.DESTROY).replaceable().ignitedByLava().noCollission().instabreak().sound(SoundType.COBWEB)), "webbing");
 
         ORIGIN_GRASS_BLOCK = register(func, new OriginGrassBlock(BlockBehaviour.Properties.of().randomTicks().mapColor(MapColor.GRASS).strength(0.6F).randomTicks().sound(SoundType.GRASS)), "origin_grass_block");
 

diff --git a/.../src/main/resources/assets/biomesoplenty/textures/entity/wolf/wolf_spectral.png b/.../src/main/resources/assets/biomesoplenty/textures/entity/wolf/wolf_spectral.png
diff --git a/...ain/resources/assets/biomesoplenty/textures/entity/wolf/wolf_spectral_angry.png b/...ain/resources/assets/biomesoplenty/textures/entity/wolf/wolf_spectral_angry.png
diff --git a/...main/resources/assets/biomesoplenty/textures/entity/wolf/wolf_spectral_tame.png b/...main/resources/assets/biomesoplenty/textures/entity/wolf/wolf_spectral_tame.png