Skip to content

Commit e90fb31

Browse files
soupbagsoupbag
authored
1.2.1 various fixes (#121)
- Fixed a post battle conditional crash - 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 parent 6d2ac69 commit e90fb31

14 files changed

Lines changed: 774 additions & 10 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# 1.2.1
2+
3+
Bug Fixes
4+
- Resolved FPS decay when using smooth models (finally!)
5+
- Fixed a Fridge crash
6+
- Fixed a client crash that occurred with RKS Machine
7+
- Fixed a post battle conditional crash
8+
- Fixed Cobblemon profiles and portraits appearing a couple pixels up
9+
- Fixed Therian form changes
10+
- Adjusted Gible and Clefairy evolution line spawn rates in the End to account for some modded biomes and Ultra Beast rates
11+
- Adjusted sound volumes for Elevator and Meloetta Relic Song
12+
13+
114
# 1.2.0
215

316
Additions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import net.minecraft.world.entity.player.Player
1717
import net.minecraft.world.item.ItemStack
1818
import net.minecraft.world.level.Level
1919

20-
fun <T> Iterable<T>?.any(predicate: (T) -> Boolean): Boolean = this?.any(predicate) ?: false
20+
fun <T> Iterable<T>?.anySafe(predicate: (T) -> Boolean): Boolean = this?.any(predicate) ?: false
2121

2222
class MeltanBox(settings: Properties) : PostBattleUpdatingWithItem(
2323
settings,
2424
LegendKeys.MELMETAL,
2525
"pixelmon.meltanbox.amountfull", { player, _, battle: BattleData ->
26-
player.entity?.party()?.map(Pokemon::species)?.map(Species::resourceIdentifier)?.map(ResourceLocation::toString).any { it == "cobblemon:meltan" } && battle.pokemon.types.any { it == ElementalTypes.STEEL }
26+
player.entity?.party()?.map(Pokemon::species)?.map(Species::resourceIdentifier)?.map(ResourceLocation::toString).anySafe { it == "cobblemon:meltan" } && battle.pokemon.types.anySafe { it == ElementalTypes.STEEL }
2727
}) {
2828

2929
override fun postSpawn(level: Level, player: Player, usedHand: InteractionHand) {

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

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

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"generations_core.item.meloettas_relic_song": {
1010
"sounds": [
1111
{
12-
"name": "generations_core:items/meloettas_relic_song"
12+
"name": "generations_core:items/meloettas_relic_song",
13+
"volume": 0.5
1314
}
1415
]
1516
},
@@ -37,7 +38,8 @@
3738
"generations_core.block.elevator": {
3839
"sounds": [
3940
{
40-
"name": "generations_core:block/elevator"
41+
"name": "generations_core:block/elevator",
42+
"volume": 0.3
4143
}
4244
]
4345
},

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"enabled": true,
3+
"neededInstalledMods": [],
4+
"neededUninstalledMods": [],
5+
"spawns": [
6+
{
7+
"id": "clefairy-1",
8+
"pokemon": "clefairy",
9+
"presets": [
10+
"natural"
11+
],
12+
"type": "pokemon",
13+
"spawnablePositionType": "grounded",
14+
"bucket": "uncommon",
15+
"level": "17-32",
16+
"weight": 1.52,
17+
"condition": {
18+
"minSkyLight": 8,
19+
"maxSkyLight": 15,
20+
"biomes": [
21+
"#cobblemon:is_dripstone"
22+
],
23+
"timeRange": "night"
24+
}
25+
},
26+
{
27+
"id": "clefairy-2",
28+
"pokemon": "clefairy",
29+
"presets": [
30+
"natural"
31+
],
32+
"type": "pokemon",
33+
"spawnablePositionType": "grounded",
34+
"bucket": "uncommon",
35+
"level": "17-32",
36+
"weight": 1.52,
37+
"condition": {
38+
"minSkyLight": 0,
39+
"maxSkyLight": 7,
40+
"biomes": [
41+
"#aether:is_aether",
42+
"#cobblemon:is_dripstone"
43+
]
44+
}
45+
},
46+
{
47+
"id": "clefairy-3",
48+
"pokemon": "clefairy",
49+
"presets": [
50+
"natural"
51+
],
52+
"type": "pokemon",
53+
"spawnablePositionType": "grounded",
54+
"bucket": "uncommon",
55+
"level": "17-32",
56+
"weight": 1.52,
57+
"condition": {
58+
"minSkyLight": 8,
59+
"maxSkyLight": 15,
60+
"biomes": [
61+
"#cobblemon:is_hills"
62+
],
63+
"timeRange": "night",
64+
"moonPhase": "0"
65+
}
66+
},
67+
{
68+
"id": "clefairy-4",
69+
"pokemon": "clefairy",
70+
"presets": [
71+
"natural"
72+
],
73+
"type": "pokemon",
74+
"spawnablePositionType": "grounded",
75+
"bucket": "uncommon",
76+
"level": "17-32",
77+
"weight": 1.52,
78+
"condition": {
79+
"minSkyLight": 8,
80+
"maxSkyLight": 15,
81+
"biomes": [
82+
"#cobblemon:is_magical"
83+
],
84+
"timeRange": "night"
85+
},
86+
"anticondition": {
87+
"biomes": [
88+
"#cobblemon:is_spooky"
89+
]
90+
}
91+
},
92+
{
93+
"id": "clefairy-5",
94+
"pokemon": "clefairy",
95+
"presets": [
96+
"natural"
97+
],
98+
"type": "pokemon",
99+
"spawnablePositionType": "grounded",
100+
"bucket": "ultra-rare",
101+
"level": "5-30",
102+
"weight": 3.0,
103+
"condition": {
104+
"minSkyLight": 0,
105+
"maxSkyLight": 15,
106+
"biomes": [
107+
"#minecraft:is_end"
108+
]
109+
}
110+
}
111+
]
112+
}

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"enabled": true,
3+
"neededInstalledMods": [],
4+
"neededUninstalledMods": [],
5+
"spawns": [
6+
{
7+
"id": "clefable-1",
8+
"pokemon": "clefable",
9+
"presets": [
10+
"natural"
11+
],
12+
"type": "pokemon",
13+
"spawnablePositionType": "grounded",
14+
"bucket": "uncommon",
15+
"level": "27-48",
16+
"weight": 0.08,
17+
"condition": {
18+
"minSkyLight": 8,
19+
"maxSkyLight": 15,
20+
"biomes": [
21+
"#cobblemon:is_dripstone"
22+
],
23+
"timeRange": "night"
24+
}
25+
},
26+
{
27+
"id": "clefable-2",
28+
"pokemon": "clefable",
29+
"presets": [
30+
"natural"
31+
],
32+
"type": "pokemon",
33+
"spawnablePositionType": "grounded",
34+
"bucket": "uncommon",
35+
"level": "27-48",
36+
"weight": 0.08,
37+
"condition": {
38+
"minSkyLight": 0,
39+
"maxSkyLight": 7,
40+
"biomes": [
41+
"#aether:is_aether",
42+
"#cobblemon:is_dripstone"
43+
]
44+
}
45+
},
46+
{
47+
"id": "clefable-3",
48+
"pokemon": "clefable",
49+
"presets": [
50+
"natural"
51+
],
52+
"type": "pokemon",
53+
"spawnablePositionType": "grounded",
54+
"bucket": "uncommon",
55+
"level": "27-48",
56+
"weight": 0.08,
57+
"condition": {
58+
"minSkyLight": 8,
59+
"maxSkyLight": 15,
60+
"biomes": [
61+
"#cobblemon:is_hills"
62+
],
63+
"timeRange": "night",
64+
"moonPhase": "0"
65+
}
66+
},
67+
{
68+
"id": "clefable-4",
69+
"pokemon": "clefable",
70+
"presets": [
71+
"natural"
72+
],
73+
"type": "pokemon",
74+
"spawnablePositionType": "grounded",
75+
"bucket": "uncommon",
76+
"level": "27-48",
77+
"weight": 0.08,
78+
"condition": {
79+
"minSkyLight": 8,
80+
"maxSkyLight": 15,
81+
"biomes": [
82+
"#cobblemon:is_magical"
83+
],
84+
"timeRange": "night"
85+
},
86+
"anticondition": {
87+
"biomes": [
88+
"#cobblemon:is_spooky"
89+
]
90+
}
91+
},
92+
{
93+
"id": "clefable-5",
94+
"pokemon": "clefable",
95+
"presets": [
96+
"natural"
97+
],
98+
"type": "pokemon",
99+
"spawnablePositionType": "grounded",
100+
"bucket": "ultra-rare",
101+
"level": "5-30",
102+
"weight": 1.75,
103+
"condition": {
104+
"minSkyLight": 0,
105+
"maxSkyLight": 15,
106+
"biomes": [
107+
"#minecraft:is_end"
108+
]
109+
}
110+
}
111+
]
112+
}

0 commit comments

Comments
 (0)