From a782864910a77e7c22e18e5a1eb2abe840c3d6de Mon Sep 17 00:00:00 2001 From: Penal Buffalo Date: Mon, 12 Jun 2023 10:49:12 -0500 Subject: [PATCH] v3.10.3 b763 * removed internally hard-coded biome groups that were out of date * updated default biome groups in rules.yml --- pom.xml | 2 +- .../levelledmobs/rules/RulesManager.java | 40 ------------------- src/main/resources/rules.yml | 17 ++++---- 3 files changed, 8 insertions(+), 51 deletions(-) diff --git a/pom.xml b/pom.xml index 29e58b2b4..4631b5fef 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.lokka30 LevelledMobs - 3.10.3 b762 + 3.10.3 b763 LevelledMobs The Ultimate RPG Mob Levelling Solution diff --git a/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java b/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java index b1c2fe44f..d5852cab3 100644 --- a/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java +++ b/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java @@ -1254,46 +1254,6 @@ private boolean doesPlayerPassPermissionChecks(final @NotNull CachedModalList> customBiomeGroups) { this.biomeGroupMappings.clear(); - this.biomeGroupMappings.put("SNOWY_BIOMES", - List.of("SNOWY_TUNDRA", "ICE_SPIKES", "SNOWY_TAIGA", "SNOWY_TAIGA_MOUNTAINS", - "SNOWY_TAIGA_HILLS", "FROZEN_RIVER", "SNOWY_BEACH", "SNOWY_MOUNTAINS")); - - this.biomeGroupMappings.put("COLD_BIOMES", - List.of("MOUNTAINS", "GRAVELLY_MOUNTAINS", "MODIFIED_GRAVELLY_MOUNTAINS", - "WOODED_MOUNTAINS", "TAIGA", "TAIGA_MOUNTAINS", "TAIGA_HILLS", "GIANT_TREE_TAIGA", - "GIANT_TREE_TAIGA_HILLS", - "GIANT_SPRUCE_TAIGA", "GIANT_SPRUCE_TAIGA_HILLS", "STONE_SHORE")); - - this.biomeGroupMappings.put("TEMPERATE_BIOMES", - List.of("PLAINS", "SUNFLOWER_PLAINS", "FOREST", "FLOWER_FOREST", - "BIRCH_FOREST", "BIRCH_FOREST_HILLS", "TALL_BIRCH_FOREST", "TALL_BIRCH_HILLS", - "DARK_FOREST", "DARK_FOREST_HILLS", - "SWAMP", "SWAMP_HILLS", "JUNGLE", "MODIFIED_JUNGLE", "JUNGLE_HILLS", - "MODIFIED_JUNGLE_EDGE", "BAMBOO_JUNGLE", - "BAMBOO_JUNGLE_HILLS", "RIVER", "BEACH", "MUSHROOM_FIELDS", "MUSHROOM_FIELD_SHORE", - "WOODED_HILLS")); - - this.biomeGroupMappings.put("DRY_BIOMES", - List.of("DESERT", "DESERT_LAKES", "DESERT_HILLS", "SAVANNA", - "SHATTERED_SAVANNA", "SHATTERED_SAVANNA_PLATEAU", "BADLANDS", "ERODED_BADLANDS", - "WOODED_BADLANDS_PLATEAU", - "BADLANDS_PLATEAU", "SAVANNA_PLATEAU", "MODIFIED_BADLANDS_PLATEAU", - "MODIFIED_WOODED_BADLANDS_PLATEAU", "MODIFIED_SAVANNA_PLATEAU")); - - this.biomeGroupMappings.put("OCEAN_BIOMES", - List.of("WARM_OCEAN", "DEEP_WARM_OCEAN", "LUKEWARM_OCEAN", "DEEP_LUKEWARM_OCEAN", - "OCEAN", - "DEEP_OCEAN", "COLD_OCEAN", "DEEP_COLD_OCEAN", "FROZEN_OCEAN", - "DEEP_FROZEN_OCEAN")); - - this.biomeGroupMappings.put("NETHER_BIOMES", - List.of("NETHER_WASTES", "CRIMSON_FOREST", "WARPED_FOREST", "SOUL_SAND_VALLEY", - "BASALT_DELTAS")); - - this.biomeGroupMappings.put("END_BIOMES", - List.of("THE_END", "SMALL_END_ISLANDS", "END_MIDLANDS", "END_HIGHLANDS", - "END_BARRENS")); - if (customBiomeGroups == null) { return; } diff --git a/src/main/resources/rules.yml b/src/main/resources/rules.yml index 080aa54dc..ccc9e4e85 100644 --- a/src/main/resources/rules.yml +++ b/src/main/resources/rules.yml @@ -44,17 +44,14 @@ mob-groups: biome-groups: - taigas: - - TAIGA - - TAIGA_MOUNTAINS - - SNOWY_TUNDRA + cold_biomes: + - SNOWY_BEACH + - SNOWY_PLAINS + - SNOWY_SLOPES - SNOWY_TAIGA - - SNOWY_TAIGA_HILLS - - GIANT_TREE_TAIGA - - GIANT_SPRUCE_TAIGA - - GIANT_SPRUCE_TAIGA_HILLS - - GIANT_TREE_TAIGA_HILLS - - SNOWY_TAIGA_MOUNTAINS + - FROZEN_OCEAN + - FROZEN_PEAKS + - FROZEN_RIVER flowers: - FLOWER_FOREST - SUNFLOWER_PLAINS