Skip to content

Commit d593f6e

Browse files
committed
Updated species files, misc fixes
- resolves player vs player battles crashing overall due to code in meltanbox - adds pt_br from GenerationsMod#118 1.6 branch, thanks ednzinho! - adds species and spawns changes from cobb 1.6 GenerationsMod#119 - let cobblemon handle the species and spawns for pokemon they added models for from 1.7.0 - adds updated cobblemon species files as of 1.7.1 and set to implemented for gens - adjusts ub spawnrates to account for new end spawns - reverts pokemon uuid random since it wasn't the issue - note: revert jade orb commit to fix compile error in testing - bumped mod version - updated changelog draft 💀
1 parent 26e57d6 commit d593f6e

File tree

609 files changed

+29660
-60062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

609 files changed

+29660
-60062
lines changed

CHANGELOG.md

Lines changed: 205 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,204 @@
1-
# 5.0.0
1+
# 1.2.0
2+
3+
Additions
4+
- Added Cobblemon 1.7 compatibility
5+
6+
# 1.1.0
7+
8+
Additions
9+
- Added Cobblemon 1.6 compatibility
10+
- Please be sure to update your Generations 1-9 Resource Packs to avoid any model issues!
11+
- Added Terastallization!
12+
13+
- ---Explaination---
14+
- Comes with a Tera battle overlay effect, Tera sound, and visual effect
15+
- Legendary Pokemon will now be guaranteed 3 Perfect IVs
16+
- Added Pokemon icons for profiles and portraits
17+
- Added Exp All functionality
18+
- Added world and Time Capsule conversions for all Generations items
19+
- Added external transformations to the shift right click wheel
20+
- Perfect for Mega Evolving your favorites outside of battle!
21+
- Added Statue functionality for non-OP players
22+
- Up to 2 statues can be placed per chunk
23+
- Added a Brazilian Portuguese translation— thanks ednzinho!
24+
- Rewrote a majority of the codebase from Java to Kotlin
25+
26+
Changes
27+
- Updated to Cobblemon species and spawn files for all new Cobblemon
28+
- Moved Ruby Rod to use Cobblemon 1.6's fishing loot table
29+
- Improved Pokemon shoulder rendering
30+
31+
Bug Fixes
32+
- Fixed shift clicking RKS Machine output items disappearing
33+
- Fixed Aqua armor set having no texture on armor stands
34+
- Fixed Zygarde Cubes disappearing when used in offhand
35+
- Fixed Dusk Ball Displays showing as Dive Ball
36+
- Fixed Calyrex Rider form not receiving typing, ability, or stats
37+
- Fixed Kyurem retaining Fusion Bolt/Flare after fusing and unfusing
38+
- Fixed Rotom being unable to learn certain moves in certain forms
39+
- Fixed Rusty Shield not transforming into Crowned Shield upon summoning of Doggo
40+
- Add movepool to Crowned forms of Doggos
41+
- Zacian/Zamazenta: Iron Head should transform into Behemoth Blade/Bash in battle
42+
- Fixed Abundant Shrine lang
43+
- Fixed Special textures not working for statues on servers
44+
- Fixed High Plains Vivillon texture
45+
- Fixed Shiny Entei Doll appearing as a regular Entei
46+
47+
# 1.0.2
48+
49+
Changelog
50+
- Fixed an invisibility, rendering, and crashing bug with 1.0.1— please update if you're experiencing issues!
51+
- Fixed Megas causing HA to not revert properly
52+
- Fixed Megas not reverting if not active in battle
53+
- Tweaked Ogerpon details to support future Tera implementation
54+
55+
Next up: 1.21.1!
56+
57+
# 1.0.1
58+
59+
Changelog
60+
- Added Ore Generation for Mega Stone, Z-Crystals, and Meteorite.
61+
- Mega Shards are now stackable.
62+
- Raised legend spawn rates across the board based on player feedback, and moved Diancie to spawn in mountains.
63+
- Adjusted spawns for Ditto, Unown, Rotom, Togepi, Marill, Solosis, Gothita, and Bagon evo lines based on player feedback.
64+
- Fixed spawns for Bronzor, Corphish, Drilbur, and Noibat evo lines.
65+
- Added about a dozen Pokemon to ocean land spawns
66+
- Added config option 'enableZygardeCubeOverflow' to allow Zygarde Cubes to continue collecting cells when full.
67+
- Fixed Zygarde Cell spawn rate with the addition of the collectibles spawn bucket.
68+
- Zygarde's abilities are no longer affected by ability changing items.
69+
- Added Zygarde to default Caught section of the config.
70+
- Zygarde cell spawning is now prevented by scarecrows.
71+
- Scarecrow is now based on a configurable radius on the x, y, and z axis vs per chunk. Default is 32 in every direction.
72+
- Fixed an issue with Lake Trio Crystals causing crashes.
73+
- Ruby Rod should now break after getting enough Lake Trio Shards.
74+
- Fixed an issue with Bird Shrine interaction.
75+
- Fixed Cooking Pots not dropping their inventory.
76+
- Fixed Pokemon changed by the RKS machine lacking moves when the new species shares no moves with the old one.
77+
- Fixed errors in a few RKS recipes.
78+
- Chisel statues now have upper/lower scale bounds of 5x and 0.5x, respectively.
79+
- Fixed statues of Pokemon with aspects displaying incorrectly.
80+
- Added Ultrite Smithing Template to Ancient Cities, End Cities, Beast Ball loot.
81+
- Added TMs 230-237 to the loot ball pool.
82+
- Added Ogerpon masks and Genesect drives to loot ball pool.
83+
- Fixed X and Y Mega evolutions not working correctly in battle.
84+
- Fixed full-set bonus buffs for armor being applied incorrectly.
85+
86+
Known Issues
87+
- Client-side invisibility and log spam at times, fixed in 1.0.2.
88+
89+
# 1.0
90+
Haven't been following the BETA's? Here's a quick recap:
91+
- We are a Cobblemon sidemod that hooks in and adds extra features, including gamelike Pokémon models you're familiar with
92+
- You can disable our models if you wish, they are just resourcepacks and use Cobblemon's blocky models instead.
93+
- We highly recommend our modpack- there's several mods/resourcepacks you need for the full Generations experience
94+
- Check out our wiki for a general guide on things- most mechanics have received overhauls. Our wiki is at generations.gg. You can also create an account, and edit pages to fix any issues you spot
95+
- We said we were keeping it simple, but turns out we ended up with most of our previous features. Some missing mechanics such as Ultra Space are being worked on now. Others, such as outbreaks can often be found as Cobblemon sidemods- we're compatible with most! We'll add our own toggleable features for missing mechanics over time as well, for things such as Outbreaks in this example
96+
- You must download the new resourcepacks if you have old ones, the ones from the previous BETA's are no longer compatible
97+
- Yes, we have the full dex
98+
99+
From our last beta, here's the changes/fixes:
100+
- Added 6,875 Special Pokémon using shaders, rather than textures for zero bloat
101+
- All Pokémon now have the following specials:
102+
- Galaxy: Darkens Pokémon and adds dark, heavy purples/blacks, while also applying an animated star-y mask
103+
- Sketch: Shifts Pokémon mostly black, while adding a sketch-like white outline effect
104+
- Shadow: Converts Pokemon to a grayscale, then Darkens Pokémon towards mostly deep, dark blues
105+
- Vintage: Applies a nice soft grayscale texture that looks good on pretty much everyone
106+
- Pastel: A brightened effect with pink & blue pastel shading. This will mostly only look good on Pokémon that are brighter to begin with
107+
- These won't be perfect for every Pokémon, experiment! We'll still add normal nice specials with textures over time such as cosplay's and whatnot we had before- that'll take some time
108+
- Creators: These are not a global configuration, they are individually configured in each of their config.jsons, so you can turn off any of these on anyone in favor of a custom one (ie if you want to have a custom textures Shadow Pikachu instead of using the Shadow shader)
109+
- Added Mew DNA Fiber extraction using DNA Splicers
110+
- Added DNA Extraction information on Mew Summary screen
111+
- Added Ultrite tier of tools and armors, end game content which can also have trimming on
112+
- Added tooltips to moves in battle when you hover over them to display their description
113+
- Added Syrupy Apple
114+
- Added Ball Loot messages to inform you what you've received
115+
- Added Timed PokeBall Loots
116+
- Added Silver Knowledge Symbol
117+
- Added JEI/REI compatibility support for RKS Machine
118+
- Added JourneyMap and Xaero's compatibility support for entity icons
119+
- Added some support for Mr Crayfish's catalogue
120+
- Changed Curry to be a bit more basic for now, due to the constant issues, we'll tackle this in a future update
121+
- Reworked RKS recipes to allow for shapeless recipes instead of specific placements
122+
- Reworked Iceroot/Shaderoot so they vanish on use instead of enchanted/unenchanted versions
123+
- Fixed crash with mail
124+
- Fixed statue bounding box
125+
- Fixed Chisel menu not updating
126+
- Fixed crash when flavor is null on Curry
127+
- Fixed Compressed Stone recipe due to conflict with Deeplsate Tiles
128+
- Fixed Elevator sound being too loud
129+
- Fixed Tao and Regigigas Shrine not rendering
130+
- Fixed sprite shading in GUI's
131+
- Fixed MultiBlocks replacing other blocks when placed nearby
132+
- Fixed some misc blocks missing tags, such as being breakable
133+
- Fixed Time Capsules ignoring untradeable tag
134+
- Fixed Scarecrows being per chunk, now 32 block radius
135+
- Fixed Lighting Lantern missing data
136+
- Fixed Megas losing their abilities
137+
- Fixed Shaderoot and Iceroot not dropping from carrots
138+
- Fixed Rotom Catalog not working
139+
- Fixed Psychic TMs displaying as Bug type
140+
- Fixed Reveal Glass not toggling Therian Forms
141+
- Fixed Iron Valiant unable to be made from Gallade
142+
- Fixed Krabby PokeDoll texture
143+
- Fixed Shadow Lugia's eyes
144+
- Fixed HDTV's lang entry
145+
- Fixed Ditto being stretchy in animations
146+
- Fixed Terapagos Stellar being a bit wonky
147+
- Fixed Vivillon being a bit wonky
148+
- Fixed Zubat glowing
149+
- Fixed Shoulder Mounts being invisible
150+
- Fixed an error with Heartflame Mask
151+
- Fixed couch sitting positions and heights
152+
- Fixed Pastel Bean Bags
153+
- Fixed Box's sprite being too basic
154+
- Fixed Female Pikachu missing sprite
155+
- Fixed Park Ball texture being wrong color
156+
- Fixed a handful of blocks not dropping when broken such as Double Street Lamps
157+
- Fixed Defog, Mystical Fire, Roost showing as Blank TMs
158+
- Fixed Pokémon able to have moves they aren't supposed to when converted to another species in an RSK Machine
159+
- Fixed Plasma Armor textures missing
160+
- Fixed RKS Machine giving you a blank Pokémon sprite item if you click the Time Capsule before it is finished the process of making a Pokemon
161+
- Fixed BiomesOPlenty Dryland, Wasteland, Wasteland Steppe having no spawns
162+
- Fixed Corsola, Clauncher, Clawitzer, Mareanie, Toxapex, Bruxish, Pincurchin not spawning due to invalid is_reef spawn set, now spawn in is_warm_ocean
163+
- Fixed Silicon tools being better than Netherite
164+
- Fixed Solgaleo's face
165+
- Fixed Hisuian Electrode missing its mouth
166+
- Fixed Genesect form change to match the drive it holds
167+
- Changed Curry to be a bit more basic curry-ntly, due to the constant issues. Curry will default to Milcery Rating for now until Curry Dex is implemented in full. We'll tackle this in a future update.
168+
- Fixed Yet Another Chance Booster in the modpack conflicting with shiny rate config edits
169+
- Fixed armors not having armor values
170+
- Fixed Zygarde Cell spawnrates
171+
- Fixed Zygarde 50% being able to be created from only 10 Cells
172+
- Fixed Zygarde Cube opening menus when collecting
173+
- Decreased Zygarde Cell collection noise
174+
- Fixed Zygarde Cell collection text firing off twice
175+
- Fixed lang typos
176+
- Fixed and added new lang to Chinese and French
177+
- Fixed Arceus's eyes
178+
- Fixed RKS Machine causing multiplayer networking issues
179+
- Fixed recipe for crafting Unown Block letters
180+
- Fixed Dacite Shore no spawns
181+
- Fixed a few dozen Pokemon spawns
182+
- Fixed Swift, Substitute, Grassy Terrain, Supercell Slam showing as Blank TMs
183+
- Fixed Supercell Slam lang
184+
- Fixed an error with Heartflame Mask
185+
- Fixed Tentacool/Tentacruel having gray instead of red orbs
186+
- Fixed Kyruem fusion and defusion with DNA Splicer
187+
- Fixed Shaderoot and Iceroot not dropping from carrots
188+
- Reworked Iceroots and Shaderoots so they vanish on use instead of enchanted and unenchanted versions
189+
- Pillars should now connect properly
190+
- Fixed Pokeball chests being 1 pixel up
191+
- Fixed overwriting Time Capsule Pokemon
192+
- Fixed Ruby, Sapphire, Silicon, Crystal, Evolution Stone Blocks un-craft recipe
193+
- Fixed and reogranized symbol loading order
194+
- Fixed Kantoian Pikachu not being able to evolve
195+
- Fixed Arceus/Silvally type changes when holding their respective item
196+
- Fixed Silvally/Arceus being able to have any type without having to hold the respective plate
197+
- Fixed Pokémon able to have moves they aren't supposed to when converted to another species in an RKS Machine
198+
- Fixed Chisel menu not updating. Statue GUI picture should now update when you change things
199+
- Fixed Time Capsules ignoring untradeable tags
200+
201+
# BETA 5.0.0
2202
Our FINAL BETA is here!
3203
Please report bugs- new and old in case we missed something important. We hope to have our official release in a couple weeks, we just want some time to collect new bug report and have some time to fix any that arise.
4204

@@ -41,13 +241,13 @@ Note: This is BETA 5.0. When we release, we're going back down to 1.0 and adjust
41241

42242

43243

44-
# 4.1.1
244+
# BETA 4.1.1
45245
- Fix Server Load Crash
46246
- Fix Wooden Fence Gates missing from Forge fence_gates/wooden tag
47247
- Fix Gates ItemTag missing
48248
- Make Snow Layer not survival on Ball Loots, Display Blocks and Pokedolls
49249

50-
# 4.1.0
250+
# BETA 4.1.0
51251
Model Loading:
52252
- Adjusted model loading to ensure proper unloading over time; added config triggered logging for loading/unloading processes.
53253
Spawns:
@@ -67,9 +267,9 @@ Shrines:
67267
Overlays:
68268
- Revised overlay code to support hotbar display in the camera and accommodate pumpkin overlays.
69269

70-
# 4.0.2
270+
# BETA 4.0.2
71271
- Fix Crash when trying to render the Celestial Altar
72272

73-
# 4.0.1
273+
# BETA 4.0.1
74274
- Fix Rendering not displaying on MacOS and Linux
75275
- Update Glowing Charge Cobblestone texture

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ abstract class PokemonStoringItem(properties: Properties) : Item(properties), Po
3232
val item = player.getItemInHand(usedHand)
3333
val pokemon = item.getPokemon()
3434
if (pokemon != null) {
35-
storage.getParty((player as ServerPlayer)).add(pokemon.also { it.uuid = UUID.randomUUID() }.also { it.refreshOriginalTrainer() })
35+
storage.getParty((player as ServerPlayer)).add(pokemon.also { it.refreshOriginalTrainer() })
3636
item.shrink(1)
3737
item.removePokemon()
3838
item.setLore(mutableListOf<Component>())

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ 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(function: (T) -> Boolean): Boolean = this?.any(function) ?: 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:metalan" } && 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) {
3030
player.setItemInHand(usedHand, ItemStack(MELTAN_BOX_CHARGED))
3131
}
32-
}
32+
}

0 commit comments

Comments
 (0)