1.2.1 Various fixes

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.2.1
+
+Bug Fixes
+- Resolved FPS decay when using smooth models (finally!)
+- Fixed a Fridge crash
+- Fixed a client crash that occurred with RKS Machine
+- Fixed a post battle conditional crash
+- Fixed Cobblemon profiles and portraits appearing a couple pixels up
+- Fixed Therian form changes
+- Adjusted Gible and Clefairy evolution line spawn rates in the End to account for some modded biomes and Ultra Beast rates
+- Adjusted sound volumes for Elevator and Meloetta Relic Song
+
+
 # 1.2.0
 
 Additions

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/legends/MeltanBox.kt

@@ -17,13 +17,13 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.Level
 
-fun <T> Iterable<T>?.any(predicate: (T) -> Boolean): Boolean = this?.any(predicate) ?: false
+fun <T> Iterable<T>?.anySafe(predicate: (T) -> Boolean): Boolean = this?.any(predicate) ?: false
 
 class MeltanBox(settings: Properties) : PostBattleUpdatingWithItem(
     settings,
     LegendKeys.MELMETAL,
     "pixelmon.meltanbox.amountfull", { player, _, battle: BattleData ->
-        player.entity?.party()?.map(Pokemon::species)?.map(Species::resourceIdentifier)?.map(ResourceLocation::toString).any { it == "cobblemon:meltan" } && battle.pokemon.types.any { it == ElementalTypes.STEEL }
+        player.entity?.party()?.map(Pokemon::species)?.map(Species::resourceIdentifier)?.map(ResourceLocation::toString).anySafe { it == "cobblemon:meltan" } && battle.pokemon.types.anySafe { it == ElementalTypes.STEEL }
     }) {
 
     override fun postSpawn(level: Level, player: Player, usedHand: InteractionHand) {

common/src/main/resources/assets/generations_core/lang/zh_cn.json

@@ -2035,7 +2035,7 @@
 "item.generations_core.griseous_orb.tooltip": "§7提示：此物品似乎与创神话的宝可梦。如果你制作了一条红色锁链，你可以激活祭坛。",
 "item.generations_core.ground_candy": "地板糖果",
 "item.generations_core.ground_memory_drive": "大地存储碟",
-"item.generations_core.groundium_z": "地板Ｚ",
+"item.generations_core.groundium_z": "地面Ｚ",
 "item.generations_core.grubby_hanky": "脏手帕",
 "item.generations_core.grubby_hanky.desc": "目前尚未实施",
 "item.generations_core.guts_symbol": "毅力象徵金",

common/src/main/resources/assets/generations_core/sounds.json

@@ -9,7 +9,8 @@
   "generations_core.item.meloettas_relic_song": {
     "sounds": [
       {
-        "name": "generations_core:items/meloettas_relic_song"
+        "name": "generations_core:items/meloettas_relic_song",
+		"volume": 0.5
       }
     ]
   },
@@ -37,7 +38,8 @@
   "generations_core.block.elevator": {
     "sounds": [
       {
-        "name": "generations_core:block/elevator"
+        "name": "generations_core:block/elevator",
+		"volume": 0.3
       }
     ]
   },

common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json

@@ -0,0 +1,112 @@
+{
+    "enabled": true,
+    "neededInstalledMods": [],
+    "neededUninstalledMods": [],
+    "spawns": [
+        {
+            "id": "clefairy-1",
+            "pokemon": "clefairy",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "17-32",
+            "weight": 1.52,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_dripstone"
+                ],
+                "timeRange": "night"
+            }
+        },
+        {
+            "id": "clefairy-2",
+            "pokemon": "clefairy",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "17-32",
+            "weight": 1.52,
+            "condition": {
+                "minSkyLight": 0,
+                "maxSkyLight": 7,
+                "biomes": [
+                    "#aether:is_aether",
+                    "#cobblemon:is_dripstone"
+                ]
+            }
+        },
+        {
+            "id": "clefairy-3",
+            "pokemon": "clefairy",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "17-32",
+            "weight": 1.52,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_hills"
+                ],
+                "timeRange": "night",
+                "moonPhase": "0"
+            }
+        },
+        {
+            "id": "clefairy-4",
+            "pokemon": "clefairy",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "17-32",
+            "weight": 1.52,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_magical"
+                ],
+                "timeRange": "night"
+            },
+            "anticondition": {
+                "biomes": [
+                    "#cobblemon:is_spooky"
+                ]
+            }
+        },
+		{
+            "id": "clefairy-5",
+            "pokemon": "clefairy",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "ultra-rare",
+            "level": "5-30",
+            "weight": 3.0,
+            "condition": {
+                "minSkyLight": 0,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#minecraft:is_end"
+                ]
+            }
+        }
+    ]
+}

common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json

@@ -0,0 +1,112 @@
+{
+    "enabled": true,
+    "neededInstalledMods": [],
+    "neededUninstalledMods": [],
+    "spawns": [
+        {
+            "id": "clefable-1",
+            "pokemon": "clefable",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "27-48",
+            "weight": 0.08,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_dripstone"
+                ],
+                "timeRange": "night"
+            }
+        },
+        {
+            "id": "clefable-2",
+            "pokemon": "clefable",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "27-48",
+            "weight": 0.08,
+            "condition": {
+                "minSkyLight": 0,
+                "maxSkyLight": 7,
+                "biomes": [
+                    "#aether:is_aether",
+                    "#cobblemon:is_dripstone"
+                ]
+            }
+        },
+        {
+            "id": "clefable-3",
+            "pokemon": "clefable",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "27-48",
+            "weight": 0.08,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_hills"
+                ],
+                "timeRange": "night",
+                "moonPhase": "0"
+            }
+        },
+        {
+            "id": "clefable-4",
+            "pokemon": "clefable",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "27-48",
+            "weight": 0.08,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_magical"
+                ],
+                "timeRange": "night"
+            },
+            "anticondition": {
+                "biomes": [
+                    "#cobblemon:is_spooky"
+                ]
+            }
+        },
+		{
+            "id": "clefable-5",
+            "pokemon": "clefable",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "ultra-rare",
+            "level": "5-30",
+            "weight": 1.75,
+            "condition": {
+                "minSkyLight": 0,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#minecraft:is_end"
+                ]
+            }
+        }
+    ]
+}