mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-17 13:48:53 -05:00
Compare commits
193
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1da7f76656 | ||
|
|
3e5733ceaf | ||
|
|
af29c99b03 | ||
|
|
60d596a24f | ||
|
|
4003456e5c | ||
|
|
1d21a52d28 | ||
|
|
2d49c62f85 | ||
|
|
da18b082a6 | ||
|
|
f8a16e5081 | ||
|
|
cad39d8802 | ||
|
|
00905b8c32 | ||
|
|
79b3cb8611 | ||
|
|
797e908621 | ||
|
|
3df3c395de | ||
|
|
89bba8a67a | ||
|
|
6d6e13be83 | ||
|
|
899bec77b6 | ||
|
|
6dd8325772 | ||
|
|
79faadef59 | ||
|
|
d9ca7b483d | ||
|
|
708f7fc1b8 | ||
|
|
621db85845 | ||
|
|
b09066c580 | ||
|
|
7c45f28827 | ||
|
|
9c1b2cae22 | ||
|
|
16b2f81bd4 | ||
|
|
6e0c005587 | ||
|
|
db0fb8e287 | ||
|
|
dae36a67d1 | ||
|
|
6f99862288 | ||
|
|
0377747e1e | ||
|
|
154b653c57 | ||
|
|
04489bc969 | ||
|
|
25499b3e7a | ||
|
|
bb6bda54dc | ||
|
|
9f3dbdc2d8 | ||
|
|
932148338c | ||
|
|
309f674853 | ||
|
|
dc705c7720 | ||
|
|
9bfc577444 | ||
|
|
3ca6d350fe | ||
|
|
2997ce8457 | ||
|
|
ff279d8310 | ||
|
|
cdb8ee0d8e | ||
|
|
e7d86a382c | ||
|
|
eb911df830 | ||
|
|
1c30acc53c | ||
|
|
2a0e8f6d47 | ||
|
|
e6bd8ec529 | ||
|
|
911a95e873 | ||
|
|
447cfc2ae5 | ||
|
|
8dfeb0d260 | ||
|
|
caa7b19833 | ||
|
|
64dd8ae193 | ||
|
|
156ee6f290 | ||
|
|
fe433d1417 | ||
|
|
0dc662d295 | ||
|
|
081e370bfd | ||
|
|
3ef0567287 | ||
|
|
3cad9e5481 | ||
|
|
dc8b7908be | ||
|
|
85085a1eca | ||
|
|
bff59dee6e | ||
|
|
bb5828531a | ||
|
|
cd08e98c28 | ||
|
|
bf7d40c9b5 | ||
|
|
5abb3d7f97 | ||
|
|
975ad8186a | ||
|
|
26b6419f04 | ||
|
|
331f7ca425 | ||
|
|
f445c05333 | ||
|
|
71c9ac0ff0 | ||
|
|
1404cc0ab5 | ||
|
|
a62485fc1f | ||
|
|
044f3080ff | ||
|
|
28b0cab906 | ||
|
|
82f34d651c | ||
|
|
6ca908a91d | ||
|
|
0948b8da9a | ||
|
|
22e04a53b3 | ||
|
|
df3217b41b | ||
|
|
9ff15a1913 | ||
|
|
89e43945a3 | ||
|
|
bd8dcddf35 | ||
|
|
dd372f3160 | ||
|
|
c56aab28d4 | ||
|
|
ca58801794 | ||
|
|
38fa5e2628 | ||
|
|
fae1ae7124 | ||
|
|
3ec5f76c73 | ||
|
|
5bb8aaba55 | ||
|
|
23ba41e981 | ||
|
|
29b049452b | ||
|
|
0b0f665804 | ||
|
|
3cdf28ffdd | ||
|
|
5d53fba2ce | ||
|
|
c6fb18ea51 | ||
|
|
2d851cb134 | ||
|
|
f685be0aab | ||
|
|
14cc851562 | ||
|
|
7223d1fd68 | ||
|
|
6ab5ad52ec | ||
|
|
079b2ae766 | ||
|
|
34eea827e7 | ||
|
|
06c6ee5a9c | ||
|
|
54748c20ea | ||
|
|
75f52e4cf4 | ||
|
|
55446dd4b1 | ||
|
|
02e63b6fc8 | ||
|
|
3aebcf66ec | ||
|
|
49a5f716b7 | ||
|
|
8b825d558f | ||
|
|
9a7f97f11f | ||
|
|
95b8d62e4a | ||
|
|
0bd7b4dab3 | ||
|
|
8cbada0cf5 | ||
|
|
f0784fec2d | ||
|
|
cfe0c5e0a5 | ||
|
|
f25a676bd5 | ||
|
|
a9906762a0 | ||
|
|
7b5b88eca2 | ||
|
|
291682ba52 | ||
|
|
546d403b45 | ||
|
|
c9f40e32a1 | ||
|
|
d642b8dd07 | ||
|
|
549a11116e | ||
|
|
b5468a4a4f | ||
|
|
c5d278ccb7 | ||
|
|
bf5e15de45 | ||
|
|
f4af417267 | ||
|
|
69c04acaeb | ||
|
|
83a6bb188f | ||
|
|
494a8b5e91 | ||
|
|
c8021f2f08 | ||
|
|
8cdf3af047 | ||
|
|
c90a24e1ab | ||
|
|
83e3cfc34e | ||
|
|
133dd4e5b7 | ||
|
|
a8cca14b86 | ||
|
|
9b0f356fa4 | ||
|
|
f2b0a102b6 | ||
|
|
a7d01b230a | ||
|
|
2a7db4b9b8 | ||
|
|
77e5f2501d | ||
|
|
e6513717bd | ||
|
|
0e0c98f693 | ||
|
|
528bfa4e22 | ||
|
|
83c87779d7 | ||
|
|
dc33235144 | ||
|
|
935c658c5f | ||
|
|
0426f4fbf9 | ||
|
|
75bc03fdcb | ||
|
|
46e771a062 | ||
|
|
4c0095844b | ||
|
|
10a2ef27d6 | ||
|
|
309ff3da13 | ||
|
|
3af91e2a74 | ||
|
|
2e027e3db7 | ||
|
|
fc40fb02c0 | ||
|
|
2c1c0299f9 | ||
|
|
3c7637515c | ||
|
|
08cbbaf68c | ||
|
|
6e911acf01 | ||
|
|
f6d82a1b28 | ||
|
|
702126aeab | ||
|
|
df566e8fcb | ||
|
|
c83e0f33b5 | ||
|
|
f279f936b6 | ||
|
|
f8e20bafd9 | ||
|
|
a5211ca7ff | ||
|
|
0a5abdb331 | ||
|
|
4ed7413dd2 | ||
|
|
40b66c24fc | ||
|
|
2f7bedf001 | ||
|
|
44c31a9ddb | ||
|
|
20a35de3d8 | ||
|
|
cfc8a15db1 | ||
|
|
d5ba22a86c | ||
|
|
a38505f1c5 | ||
|
|
3cf1ba1fb3 | ||
|
|
9f5d595827 | ||
|
|
75673f0204 | ||
|
|
b43a7571ff | ||
|
|
b071dc04d3 | ||
|
|
12f9ff1647 | ||
|
|
3256a302df | ||
|
|
edbe447477 | ||
|
|
2f43910368 | ||
|
|
c2e87e4cfa | ||
|
|
e40d2ee806 | ||
|
|
ba74e7603b | ||
|
|
19c3fe6dc4 | ||
|
|
d0778dd124 |
No files matched your search
+140
-34
@@ -1,41 +1,147 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
## [1.8.1 (September 13th, 2026)](#1-8-1)
|
## [1.8.2 (MONTH xth, 2026)](#1-8-2)
|
||||||
|
|
||||||
### Animation updates for the following Pokémon
|
### Additions
|
||||||
- Flapple, Appletun, Dipplin, Hydrapple (placeholder animations only).
|
- The following items can now be placed on the ground as blocks:
|
||||||
|
- King's Rock, Galarica Cuff, Unremarkable Teacup, Masterpiece Teacup, Chipped Pot, Cracked Pot, Sachet, Metal Powder, Quick Powder, Bright Powder, Icy Rock, Heat Rock, Smooth Rock, Damp Rock, Destiny Knot, Luminous Moss, Never-Melt Ice, Wide Lens, Scope Lens, and Zoom Lens.
|
||||||
|
- Iron Ball, Metal Coat, Throat Spray, HP Up, Protein, Iron, Carbos, Calcium, Zinc, PP Up, PP Max, Upgrade, Dubious Disc, and Loaded Dice.
|
||||||
|
- The following items can now be placed on various surfaces:
|
||||||
|
- Galarica Wreath, Magnet, Flame Orb, Life Orb, Toxic Orb, Light Ball, and Smoke Ball.
|
||||||
|
- The following items can now be placed as blocks and have additional functionality:
|
||||||
|
- Ring Target, Metronome, and Eject Button.
|
||||||
|
- The following items can now be worn by Players and Pokémon:
|
||||||
|
- Galarica Wreath, Cleanse Tag, Spell Tag, Sharp Beak, Covert Cloak, Shell Helmet, and Never-Melt Ice.
|
||||||
|
- Wearable items can now be equipped by a player by holding it and right-clicking (or rebound use/interact)
|
||||||
|
- Wearable items that can be placed down are exempt from this behaviour.
|
||||||
|
- New Cosmetic Item for Pikachu: Paper
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
- Fixed a potential world generation stall caused by Type Gem clusters.
|
- Fixed #updateMovesOnFormChange not properly initializing a form-swapped Pokemon's non-form_change moves.
|
||||||
- Fixed Pokémon on shoulders not animating if they are visibly holding a held item.
|
### TEST
|
||||||
- Fixed NPCs getting their own TM progress file.
|
### Pokémon Added
|
||||||
- Fixed odd NeoForge crash due to a dependency being outdated. It will now correctly flag the dependency for being outdated.
|
#### Generation 4
|
||||||
- Fixed the TM Machine refusing move selections that the `unlockAllMoveDexMovesByDefault` config had made visible, leaving the move slot blank and the craft button unresponsive.
|
- Snover
|
||||||
- Fixed the Beast Ball not applying its 0.1× penalty to Pokémon that are not Ultra Beasts.
|
- Abomasnow
|
||||||
- Fixed the Moon Ball reading the world's total elapsed time instead of the time of day, so its bonus applied during the day instead.
|
- Burmy
|
||||||
- Fixed the Love Ball never awarding its 2.5× opposite gender bonus, and matching species by display name instead of identifier.
|
- Wormadam
|
||||||
- Fixed the Timer Ball being weaker than a regular Poké Ball on early turns and only reaching 4× on turn 14 instead of turn 10.
|
- Mothim
|
||||||
- Fixed the Luxury Ball only doubling Friendship gains of 1, leaving level up and berry gains unaffected.
|
|
||||||
- Fixed Rufflet, Braviary, and Hisuian Braviary flooding logs with errors about missing sound events.
|
#### Generation 5
|
||||||
- Fixed Pokémon property typos in Pangoro and Dedenne herd spawn files.
|
- Tympole
|
||||||
- Fixed unintentional watermelon cosmetic for Hisuian Electrode.
|
- Palpitoad
|
||||||
- Fixed Blastoise having an unintentional passenger seat.
|
- Seismitoad
|
||||||
- Fixed form typo in Rockruff-Dusk spawn, preventing it from being able to spawn.
|
|
||||||
- Fixed the `stat_compare` and `stat_equal` evolution requirements crashing the game when given `special_attack` or `special_defence`, and made them treat any non-permanent stat as a failed requirement instead of crashing.
|
#### Generation 6
|
||||||
- Fixed Rowap and Jacoba berries not correctly altering Pokémon sizes when used as bait.
|
- Helioptile
|
||||||
- Fixed Ampharos' eyes not emitting particles.
|
- Heliolisk
|
||||||
- Fixed Alolan Raticate's cry not playing.
|
|
||||||
- Fixed several incorrect light-based spawning conditions for ghosts and bugs.
|
#### Generation 7
|
||||||
- Removed unused, placeholder habitat pools.
|
- Grubbin
|
||||||
- Fixed Mantyke, Mantine, and Quaxly getting stuck in a recoil 'expression' during battles due to having an expression assigned as a recoil animation.
|
- Charjabug
|
||||||
- Fixed Lucario's aura particles not emitting.
|
- Vikavolt
|
||||||
- Fixed Lycanroc's head movement.
|
- Minior
|
||||||
- Added head movement to Archaludon.
|
|
||||||
- Fixed Duraludon line not having their sleep animations.
|
#### Generation 8
|
||||||
- Fixed Diglett line not having their faint animations.
|
- Eternatus
|
||||||
- Fixed Kingambit moving its legs while walking.
|
|
||||||
|
#### Generation 9
|
||||||
|
- Greavard
|
||||||
|
- Houndstone
|
||||||
|
|
||||||
|
### Model updates for the following Pokémon
|
||||||
|
- Sudowoodo
|
||||||
|
- Spheal
|
||||||
|
- Cacnea
|
||||||
|
- Cacturne
|
||||||
|
- Binacle
|
||||||
|
- Barbaracle
|
||||||
|
- Glimmet
|
||||||
|
- Glimmora
|
||||||
|
- Deerling
|
||||||
|
- Sawsbuck (All forms)
|
||||||
|
- Absol
|
||||||
|
- Poliwag
|
||||||
|
- Politoed
|
||||||
|
- Ekans
|
||||||
|
- Oddish
|
||||||
|
- Gloom
|
||||||
|
- Vileplume
|
||||||
|
- Bellossom
|
||||||
|
- Shroomish
|
||||||
|
- Chespin
|
||||||
|
- Quilladin
|
||||||
|
- Chesnaught
|
||||||
|
- Fennekin
|
||||||
|
- Braixen
|
||||||
|
- Delphox
|
||||||
|
- Froakie
|
||||||
|
- Frogadier
|
||||||
|
- Greninja
|
||||||
|
- Shinx
|
||||||
|
- Luxio
|
||||||
|
- Luxray
|
||||||
|
- Slakoth
|
||||||
|
- Riolu
|
||||||
|
- Lucario
|
||||||
|
|
||||||
|
### Animation updates for the following Pokémon
|
||||||
|
- Treecko (New Shoulder Mount!)
|
||||||
|
- Bonsly (New Shoulder Mount!)
|
||||||
|
- Sudowoodo
|
||||||
|
- Cacnea
|
||||||
|
- Cacturne
|
||||||
|
- Ekans
|
||||||
|
- Arbok
|
||||||
|
- Oddish
|
||||||
|
- Gloom
|
||||||
|
- Vileplume
|
||||||
|
- Bellossom
|
||||||
|
- Pichu
|
||||||
|
- Pikachu
|
||||||
|
- Raichu (+ Alolan)
|
||||||
|
- Greninja
|
||||||
|
- Slakoth
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- Updated various recipes to display in Recipe Groups within the Recipe Book
|
||||||
|
- Updated most recipes to display more logically/consistently within the Recipe Book's categories
|
||||||
|
- Make ride rotations less jittery in multiplayer.
|
||||||
|
- Made regional and Vivillon split-evo locations now mutually exclusive
|
||||||
|
- Vivillon's patterns are now viewable as forms with form names and unique Pokedex entries displayed.
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Correctly grants "They're Minerals!" advancement when planting a type gem
|
||||||
|
- Type Gem Blocks now have advancements to give you the recipe in the recipe book (the data for the advancements were inside the recipes somehow??)
|
||||||
|
- Some other recipes without advancements have also been corrected
|
||||||
|
- Corrected the TM Recipes for Charge Beam and Payday
|
||||||
|
- Type Gem blocks now properly generate clusters off of the block.
|
||||||
|
- Starter Screen Categories will no longer stop rendering if they are bigger than the viewport, and you are not viewing top or bottom edges
|
||||||
|
- Random Starter option now properly handled in height calculation, so now it won't run off into other categories or be un-accessible due to scroll limits if it causes a new row
|
||||||
|
- Mochi and Feathers no longer drop glass bottles on use
|
||||||
|
- Fixed a rare set of concurrency bugs related to reloading packs on NeoForge; fixes a ModernFix issue
|
||||||
|
- Removed unnecessary conditions for Mimikyu's standing pose. Hopefully fixes the rare instance of it using its shoulder animations during battle in multiplayer scenarios.
|
||||||
|
- Fixed Rockruff line not blinking
|
||||||
|
- Fixed Flygon sometimes using its running animation instead of walking
|
||||||
|
- Fixed Bramblin always sleeping outside of battle
|
||||||
|
- Fixed Dragonair using its battle idle as a normal idle
|
||||||
|
- Fixed Lycanroc's head movement
|
||||||
|
- Added head movement to Archaludon
|
||||||
|
- Fixed Duraludon line not having any sleep animations
|
||||||
|
- Fixed Diglett line not having their faint animations
|
||||||
|
- Fixed Kingambit moving its legs while walking
|
||||||
|
- Fixed Alolan Diglett's cry not playing
|
||||||
|
- Fixed shiny alpha Snorlax using the non-shiny texture
|
||||||
|
- Various Structure fixes
|
||||||
|
|
||||||
|
### Developer
|
||||||
|
|
||||||
|
### Molang & Datapacks
|
||||||
|
- A new `negate` variant for evolution requirements has been added, which will negate (invert) the provided inner condition.
|
||||||
|
- Added Molang functions for individual Pokédex ids, wherein a subdex is passed in as a string to `dex_caught_count` etc.
|
||||||
|
|
||||||
|
### Particles
|
||||||
|
|
||||||
|
#### New Move Animations
|
||||||
|
|
||||||
### Localization
|
### Localization
|
||||||
- Updated translations for:
|
- Updated translations for:
|
||||||
- Brazilian Portuguese
|
|
||||||
- Simplified Chinese
|
|
||||||
- Japanese
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
- Some kind of particle effect for them? they're meant to have glowing eyes, so maybe some red particles on the eye locator
|
|
||||||
--- global posers? stacked posers?
|
|
||||||
--- red texture seems to be what some people wanted.
|
|
||||||
|
|
||||||
/- shoulder mounts part of it
|
|
||||||
- omni boost
|
|
||||||
- roar when player comes within reach, adjust levels
|
|
||||||
|
|
||||||
- Riding settings to control what the min scale is for a pokemon to be ridable.
|
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# Changelog
|
||||||
|
## [1.8.1 (September 13th, 2026)](#1-8-1)
|
||||||
|
|
||||||
|
### Animation updates for the following Pokémon
|
||||||
|
- Flapple, Appletun, Dipplin, Hydrapple (placeholder animations only).
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Fixed a potential world generation stall caused by Type Gem clusters.
|
||||||
|
- Fixed Pokémon on shoulders not animating if they are visibly holding a held item.
|
||||||
|
- Fixed NPCs getting their own TM progress file.
|
||||||
|
- Fixed odd NeoForge crash due to a dependency being outdated. It will now correctly flag the dependency for being outdated.
|
||||||
|
- Fixed the TM Machine refusing move selections that the `unlockAllMoveDexMovesByDefault` config had made visible, leaving the move slot blank and the craft button unresponsive.
|
||||||
|
- Fixed the Beast Ball not applying its 0.1× penalty to Pokémon that are not Ultra Beasts.
|
||||||
|
- Fixed the Moon Ball reading the world's total elapsed time instead of the time of day, so its bonus applied during the day instead.
|
||||||
|
- Fixed the Love Ball never awarding its 2.5× opposite gender bonus, and matching species by display name instead of identifier.
|
||||||
|
- Fixed the Timer Ball being weaker than a regular Poké Ball on early turns and only reaching 4× on turn 14 instead of turn 10.
|
||||||
|
- Fixed the Luxury Ball only doubling Friendship gains of 1, leaving level up and berry gains unaffected.
|
||||||
|
- Fixed Rufflet, Braviary, and Hisuian Braviary flooding logs with errors about missing sound events.
|
||||||
|
- Fixed Pokémon property typos in Pangoro and Dedenne herd spawn files.
|
||||||
|
- Fixed unintentional watermelon cosmetic for Hisuian Electrode.
|
||||||
|
- Fixed Blastoise having an unintentional passenger seat.
|
||||||
|
- Fixed form typo in Rockruff-Dusk spawn, preventing it from being able to spawn.
|
||||||
|
- Fixed the `stat_compare` and `stat_equal` evolution requirements crashing the game when given `special_attack` or `special_defence`, and made them treat any non-permanent stat as a failed requirement instead of crashing.
|
||||||
|
- Fixed Rowap and Jacoba berries not correctly altering Pokémon sizes when used as bait.
|
||||||
|
- Fixed Ampharos' eyes not emitting particles.
|
||||||
|
- Fixed Alolan Raticate's cry not playing.
|
||||||
|
- Fixed several incorrect light-based spawning conditions for ghosts and bugs.
|
||||||
|
- Removed unused, placeholder habitat pools.
|
||||||
|
- Fixed Mantyke, Mantine, and Quaxly getting stuck in a recoil 'expression' during battles due to having an expression assigned as a recoil animation.
|
||||||
|
- Fixed Lucario's aura particles not emitting.
|
||||||
|
- Fixed Lycanroc's head movement.
|
||||||
|
- Added head movement to Archaludon.
|
||||||
|
- Fixed Duraludon line not having their sleep animations.
|
||||||
|
- Fixed Diglett line not having their faint animations.
|
||||||
|
- Fixed Kingambit moving its legs while walking.
|
||||||
|
|
||||||
|
### Localization
|
||||||
|
- Updated translations for:
|
||||||
|
- Brazilian Portuguese
|
||||||
|
- Simplified Chinese
|
||||||
|
- Japanese
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
|
|
||||||
|
import utilities.isSnapshot
|
||||||
|
import utilities.version
|
||||||
import java.time.OffsetDateTime
|
import java.time.OffsetDateTime
|
||||||
import java.time.ZoneOffset
|
import java.time.ZoneOffset
|
||||||
import java.time.format.DateTimeFormatter
|
import java.time.format.DateTimeFormatter
|
||||||
import utilities.isSnapshot
|
|
||||||
import utilities.version
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
|
|||||||
Whitespace-only changes.
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.mixin;
|
package com.cobblemon.mod.common.mixin;
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.CobblemonNetwork;
|
||||||
import com.cobblemon.mod.common.OrientationControllable;
|
import com.cobblemon.mod.common.OrientationControllable;
|
||||||
import com.cobblemon.mod.common.api.orientation.OrientationController;
|
import com.cobblemon.mod.common.api.orientation.OrientationController;
|
||||||
import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
|
import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
|
||||||
@@ -17,6 +18,7 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineBehav
|
|||||||
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
|
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
|
||||||
import com.cobblemon.mod.common.client.render.MatrixWrapper;
|
import com.cobblemon.mod.common.client.render.MatrixWrapper;
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
|
import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
|
||||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
|||||||
+2
@@ -10,7 +10,9 @@ package com.cobblemon.mod.common.mixin.accessor;
|
|||||||
|
|
||||||
import net.minecraft.client.gui.components.StateSwitchingButton;
|
import net.minecraft.client.gui.components.StateSwitchingButton;
|
||||||
import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
|
import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Mutable;
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
|
||||||
@Mixin(RecipeBookComponent.class)
|
@Mixin(RecipeBookComponent.class)
|
||||||
|
|||||||
+2
-1
@@ -15,9 +15,11 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
|||||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||||
import com.llamalad7.mixinextras.sugar.Local;
|
import com.llamalad7.mixinextras.sugar.Local;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
import net.minecraft.core.NonNullList;
|
import net.minecraft.core.NonNullList;
|
||||||
import net.minecraft.world.Containers;
|
import net.minecraft.world.Containers;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
import net.minecraft.world.item.alchemy.PotionBrewing;
|
import net.minecraft.world.item.alchemy.PotionBrewing;
|
||||||
import net.minecraft.world.item.crafting.RecipeHolder;
|
import net.minecraft.world.item.crafting.RecipeHolder;
|
||||||
import net.minecraft.world.item.crafting.RecipeManager;
|
import net.minecraft.world.item.crafting.RecipeManager;
|
||||||
@@ -32,7 +34,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Mixin(BrewingStandBlockEntity.class)
|
@Mixin(BrewingStandBlockEntity.class)
|
||||||
public class BrewingStandBlockEntityMixin {
|
public class BrewingStandBlockEntityMixin {
|
||||||
|
|
||||||
|
|||||||
@@ -9,11 +9,17 @@
|
|||||||
package com.cobblemon.mod.common.mixin.brewing;
|
package com.cobblemon.mod.common.mixin.brewing;
|
||||||
|
|
||||||
import com.cobblemon.mod.common.duck.RecipeAwareSlot;
|
import com.cobblemon.mod.common.duck.RecipeAwareSlot;
|
||||||
|
import com.cobblemon.mod.common.item.crafting.brewingstand.BrewingStandRecipe;
|
||||||
|
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||||
|
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||||
|
import com.llamalad7.mixinextras.sugar.Local;
|
||||||
import net.minecraft.world.Container;
|
import net.minecraft.world.Container;
|
||||||
import net.minecraft.world.entity.player.Inventory;
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.inventory.BrewingStandMenu;
|
import net.minecraft.world.inventory.BrewingStandMenu;
|
||||||
import net.minecraft.world.inventory.ContainerData;
|
import net.minecraft.world.inventory.ContainerData;
|
||||||
import net.minecraft.world.inventory.Slot;
|
import net.minecraft.world.inventory.Slot;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.item.crafting.brewingstand.BrewingStandRecipe;
|
|||||||
import net.minecraft.world.inventory.BrewingStandMenu;
|
import net.minecraft.world.inventory.BrewingStandMenu;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.crafting.RecipeManager;
|
import net.minecraft.world.item.crafting.RecipeManager;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
import org.spongepowered.asm.mixin.Unique;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import net.minecraft.client.Camera;
|
|||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.level.BlockGetter;
|
import net.minecraft.world.level.BlockGetter;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import org.joml.Quaternionf;
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3f;
|
||||||
import org.spongepowered.asm.mixin.Final;
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
|||||||
@@ -10,7 +10,9 @@ package com.cobblemon.mod.common.mixin.client;
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonRecipeCategories;
|
import com.cobblemon.mod.common.CobblemonRecipeCategories;
|
||||||
import com.cobblemon.mod.common.item.crafting.CookingPotBookCategory;
|
import com.cobblemon.mod.common.item.crafting.CookingPotBookCategory;
|
||||||
|
import com.cobblemon.mod.common.item.crafting.CookingPotRecipe;
|
||||||
import com.cobblemon.mod.common.item.crafting.CookingPotRecipeBase;
|
import com.cobblemon.mod.common.item.crafting.CookingPotRecipeBase;
|
||||||
|
import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
|
|||||||
@@ -97,10 +97,10 @@ import com.cobblemon.mod.common.pokemon.Pokemon
|
|||||||
import com.cobblemon.mod.common.pokemon.aspects.ALPHA_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.ALPHA_ASPECT
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.CHARACTERISTIC_RAINBOW_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.CHARACTERISTIC_RAINBOW_ASPECT
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.FORM_ASPECTS
|
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.MARK_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.MARK_ASPECT
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
|
||||||
|
import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
|
||||||
import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeature
|
import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeature
|
||||||
import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatureProvider
|
import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatureProvider
|
||||||
import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
|
import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
|
||||||
@@ -115,7 +115,6 @@ import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
|
|||||||
import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
|
import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
|
||||||
import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
|
import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
|
||||||
import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
|
import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.triggers.BlockClickTrigger
|
|
||||||
import com.cobblemon.mod.common.starter.CobblemonStarterHandler
|
import com.cobblemon.mod.common.starter.CobblemonStarterHandler
|
||||||
import com.cobblemon.mod.common.util.*
|
import com.cobblemon.mod.common.util.*
|
||||||
import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
|
import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
|
||||||
@@ -274,8 +273,13 @@ object Cobblemon {
|
|||||||
PlatformEvents.RIGHT_CLICK_BLOCK.subscribe { event ->
|
PlatformEvents.RIGHT_CLICK_BLOCK.subscribe { event ->
|
||||||
val player = event.player
|
val player = event.player
|
||||||
val block = player.level().getBlockState(event.pos).block
|
val block = player.level().getBlockState(event.pos).block
|
||||||
val context = BlockClickTrigger.Context(block, player.level())
|
player.party().forEach { pokemon ->
|
||||||
player.party().forEach { pokemon -> pokemon.triggerTransformations<BlockClickTrigger>(context) }
|
pokemon.lockedEvolutions
|
||||||
|
.filterIsInstance<BlockClickEvolution>()
|
||||||
|
.forEach { evolution ->
|
||||||
|
evolution.attemptEvolution(pokemon, BlockClickEvolution.BlockInteractionContext(block, player.level()))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PlatformEvents.CHANGE_DIMENSION.subscribe {
|
PlatformEvents.CHANGE_DIMENSION.subscribe {
|
||||||
@@ -319,7 +323,6 @@ object Cobblemon {
|
|||||||
|
|
||||||
SHINY_ASPECT.register()
|
SHINY_ASPECT.register()
|
||||||
GENDER_ASPECT.register()
|
GENDER_ASPECT.register()
|
||||||
FORM_ASPECTS.register()
|
|
||||||
COSMETIC_SLOT_ASPECT.register()
|
COSMETIC_SLOT_ASPECT.register()
|
||||||
CHARACTERISTIC_RAINBOW_ASPECT.register()
|
CHARACTERISTIC_RAINBOW_ASPECT.register()
|
||||||
ALPHA_ASPECT.register()
|
ALPHA_ASPECT.register()
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
package com.cobblemon.mod.common
|
package com.cobblemon.mod.common
|
||||||
|
|
||||||
import com.bedrockk.molang.Expression
|
import com.bedrockk.molang.Expression
|
||||||
import com.cobblemon.mod.common.CobblemonBehaviours.autoPokemonBehaviours
|
|
||||||
import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
|
import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
|
||||||
import com.cobblemon.mod.common.api.ai.CobblemonBehaviour
|
import com.cobblemon.mod.common.api.ai.CobblemonBehaviour
|
||||||
import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
|
import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
|
||||||
@@ -20,7 +19,16 @@ import com.cobblemon.mod.common.api.molang.ExpressionLike
|
|||||||
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
||||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||||
import com.cobblemon.mod.common.net.messages.client.data.BehaviourSyncPacket
|
import com.cobblemon.mod.common.net.messages.client.data.BehaviourSyncPacket
|
||||||
import com.cobblemon.mod.common.util.adapters.*
|
import com.cobblemon.mod.common.util.adapters.ActivityAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.BehaviourConfigAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.ExpressionOrEntityVariableAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.MemoryModuleTypeAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.SensorTypeAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
|
||||||
|
import com.cobblemon.mod.common.util.adapters.TranslatedTextAdapter
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import com.cobblemon.mod.common.util.endsWith
|
import com.cobblemon.mod.common.util.endsWith
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ import com.cobblemon.mod.common.block.MintBlock.MintType
|
|||||||
import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
|
import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
|
||||||
import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock
|
import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock
|
||||||
import com.cobblemon.mod.common.block.chest.GildedChestBlock
|
import com.cobblemon.mod.common.block.chest.GildedChestBlock
|
||||||
|
import com.cobblemon.mod.common.block.decor.ActivatableDecorationBlock
|
||||||
|
import com.cobblemon.mod.common.block.decor.RingTargetBlock
|
||||||
import com.cobblemon.mod.common.block.general.BaleBlock
|
import com.cobblemon.mod.common.block.general.BaleBlock
|
||||||
import com.cobblemon.mod.common.block.general.HorizontalRotationCarpetBlock
|
import com.cobblemon.mod.common.block.general.HorizontalRotationCarpetBlock
|
||||||
import com.cobblemon.mod.common.block.general.HorizontalRotationalBlock
|
import com.cobblemon.mod.common.block.general.HorizontalRotationalBlock
|
||||||
@@ -620,6 +622,88 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
|
|||||||
@JvmField
|
@JvmField
|
||||||
val WEAKNESS_POLICY = create("weakness_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_PAPER_LARGE_SOUNDS).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
|
val WEAKNESS_POLICY = create("weakness_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_PAPER_LARGE_SOUNDS).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val RING_TARGET = create("ring_target", RingTargetBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).mapColor(MapColor.NONE).noOcclusion().strength(0.125f)))
|
||||||
|
@JvmField
|
||||||
|
val MAGNET = create("magnet", MagnetBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion().strength(0.075f)))
|
||||||
|
@JvmField
|
||||||
|
val GALARICA_WREATH = create("galarica_wreath", GalaricaWreathBlock(BlockBehaviour.Properties.of().sound(SoundType.AZALEA_LEAVES).mapColor(MapColor.NONE).noOcclusion().noCollission()))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val FLAME_ORB = create("flame_orb", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().lightLevel{15}))
|
||||||
|
@JvmField
|
||||||
|
val TOXIC_ORB = create("toxic_orb", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion()))
|
||||||
|
@JvmField
|
||||||
|
val LIFE_ORB = create("life_orb", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().lightLevel{7}))
|
||||||
|
@JvmField
|
||||||
|
val LIGHT_BALL = create("light_ball", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().lightLevel{13}))
|
||||||
|
@JvmField
|
||||||
|
val SMOKE_BALL = create("smoke_ball", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion()))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val KINGS_ROCK = create("kings_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.CENTERED_6x))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val GALARICA_CUFF = create("galarica_cuff", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.AZALEA_LEAVES).mapColor(MapColor.NONE).noCollission().noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_10x4))
|
||||||
|
@JvmField
|
||||||
|
val UNREMARKABLE_TEACUP = create("unremarkable_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
|
||||||
|
@JvmField
|
||||||
|
val MASTERPIECE_TEACUP = create("masterpiece_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
|
||||||
|
@JvmField
|
||||||
|
val CHIPPED_POT = create("chipped_pot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEAPOT))
|
||||||
|
@JvmField
|
||||||
|
val CRACKED_POT = create("cracked_pot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEAPOT))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val SACHET = create("sachet", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
|
||||||
|
@JvmField
|
||||||
|
val METAL_POWDER = create("metal_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
|
||||||
|
@JvmField
|
||||||
|
val QUICK_POWDER = create("quick_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
|
||||||
|
@JvmField
|
||||||
|
val BRIGHT_POWDER = create("bright_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion().lightLevel{3}, DecorativeItemBlock.DecorativeItemBlockType.POUCH))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val NEVER_MELT_ICE = create("never_melt_ice", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().friction(0.989F), DecorativeItemBlock.DecorativeItemBlockType.NEVERMELT))
|
||||||
|
@JvmField
|
||||||
|
val SCOPE_LENS = create("scope_lens", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.COPPER).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.SCOPE))
|
||||||
|
@JvmField
|
||||||
|
val WIDE_LENS = create("wide_lens", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.COPPER).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.WIDE))
|
||||||
|
@JvmField
|
||||||
|
val ZOOM_LENS = create("zoom_lens", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.COPPER).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.ZOOM))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val ICY_ROCK = create("icy_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x4))
|
||||||
|
@JvmField
|
||||||
|
val HEAT_ROCK = create("heat_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x4))
|
||||||
|
@JvmField
|
||||||
|
val SMOOTH_ROCK = create("smooth_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x4))
|
||||||
|
@JvmField
|
||||||
|
val DAMP_ROCK = create("damp_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x6))
|
||||||
|
@JvmField
|
||||||
|
val DESTINY_KNOT = create("destiny_knot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.KNOT))
|
||||||
|
@JvmField
|
||||||
|
val LUMINOUS_MOSS = create("luminous_moss", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.MOSS).mapColor(MapColor.NONE).noOcclusion().lightLevel{5}, DecorativeItemBlock.DecorativeItemBlockType.CENTERED_8x))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val METRONOME = create("metronome", ActivatableDecorationBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion(), ActivatableDecorationBlock.ActivatableDecorationBlockType.METRONOME))
|
||||||
|
@JvmField
|
||||||
|
val EJECT_BUTTON = create("eject_button", EjectButtonBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().strength(0.125f), 40))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val LOADED_DICE = create("loaded_dice", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.DICE))
|
||||||
|
@JvmField
|
||||||
|
val IRON_BALL = create("iron_ball", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.IRON_BALL))
|
||||||
|
@JvmField
|
||||||
|
val METAL_COAT = create("metal_coat", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.METAL_COAT))
|
||||||
|
@JvmField
|
||||||
|
val UPGRADE = create("upgrade", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.UPGRADE))
|
||||||
|
@JvmField
|
||||||
|
val DUBIOUS_DISC = create("dubious_disc", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.UPGRADE))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val THROAT_SPRAY = create("throat_spray", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.THROAT_SPRAY))
|
||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val FULL_HEAL = create("full_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
|
val FULL_HEAL = create("full_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
|
||||||
@JvmField
|
@JvmField
|
||||||
@@ -670,6 +754,23 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
|
|||||||
@JvmField
|
@JvmField
|
||||||
val X_SPEED = create("x_${Stats.SPEED.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
|
val X_SPEED = create("x_${Stats.SPEED.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val HP_UP = create("hp_up", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
@JvmField
|
||||||
|
val PROTEIN = create("protein", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
@JvmField
|
||||||
|
val IRON = create("iron", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
@JvmField
|
||||||
|
val CARBOS = create("carbos", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
@JvmField
|
||||||
|
val CALCIUM = create("calcium", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
@JvmField
|
||||||
|
val ZINC = create("zinc", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
@JvmField
|
||||||
|
val PP_UP = create("pp_up", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
@JvmField
|
||||||
|
val PP_MAX = create("pp_max", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
|
||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val MONITOR = create("monitor", MonitorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).lightLevel { if (it.getValue(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 13 else 0 }))
|
val MONITOR = create("monitor", MonitorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).lightLevel { if (it.getValue(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 13 else 0 }))
|
||||||
@JvmField
|
@JvmField
|
||||||
@@ -685,6 +786,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
|
|||||||
@JvmField
|
@JvmField
|
||||||
val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 13 else 0 }))
|
val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 13 else 0 }))
|
||||||
|
|
||||||
|
@JvmField
|
||||||
val TM_MACHINE = create(
|
val TM_MACHINE = create(
|
||||||
"tm_machine",
|
"tm_machine",
|
||||||
TMMachineBlock(
|
TMMachineBlock(
|
||||||
@@ -713,7 +815,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
|
|||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val PASTURE = create("pasture", PastureBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2F).noOcclusion().pushReaction(PushReaction.BLOCK).lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 13 else 0 }))
|
val PASTURE = create("pasture", PastureBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2F).noOcclusion().pushReaction(PushReaction.BLOCK).lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 13 else 0 }))
|
||||||
|
@JvmField
|
||||||
val RED_MINT = create("red_mint", MintBlock(MintType.RED, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
|
val RED_MINT = create("red_mint", MintBlock(MintType.RED, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
|
||||||
@JvmField
|
@JvmField
|
||||||
val BLUE_MINT = create("blue_mint", MintBlock(MintType.BLUE, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
|
val BLUE_MINT = create("blue_mint", MintBlock(MintType.BLUE, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
|
||||||
|
|||||||
@@ -41,8 +41,6 @@ object CobblemonCommands {
|
|||||||
HeldItemCommand.register(dispatcher, registry)
|
HeldItemCommand.register(dispatcher, registry)
|
||||||
PcCommand.register(dispatcher)
|
PcCommand.register(dispatcher)
|
||||||
SpawnPokemonFromPool.register(dispatcher)
|
SpawnPokemonFromPool.register(dispatcher)
|
||||||
SpawnMeteorCommand.register(dispatcher)
|
|
||||||
SetMegaBondCommand.register(dispatcher)
|
|
||||||
PokeboxCommand.register(dispatcher)
|
PokeboxCommand.register(dispatcher)
|
||||||
PokedexCommand.register(dispatcher)
|
PokedexCommand.register(dispatcher)
|
||||||
TestStoreCommand.register(dispatcher)
|
TestStoreCommand.register(dispatcher)
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity
|
|||||||
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
||||||
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
|
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.entity.projectile.FallingStarEntity
|
|
||||||
import com.cobblemon.mod.common.platform.PlatformRegistry
|
import com.cobblemon.mod.common.platform.PlatformRegistry
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import net.minecraft.core.Registry
|
import net.minecraft.core.Registry
|
||||||
@@ -96,15 +95,6 @@ object CobblemonEntities : PlatformRegistry<Registry<EntityType<*>>, ResourceKey
|
|||||||
EntityType.Builder.of({ _, world -> NPCEntity(world) }, MobCategory.CREATURE).build("$NPC_KEY")
|
EntityType.Builder.of({ _, world -> NPCEntity(world) }, MobCategory.CREATURE).build("$NPC_KEY")
|
||||||
)
|
)
|
||||||
|
|
||||||
@JvmField
|
|
||||||
val FALLING_STAR_KEY = cobblemonResource("falling_star")
|
|
||||||
@JvmField
|
|
||||||
val FALLING_STAR: EntityType<FallingStarEntity> = create(
|
|
||||||
FALLING_STAR_KEY.path,
|
|
||||||
EntityType.Builder.of(::FallingStarEntity, MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(8)
|
|
||||||
.build(FALLING_STAR_KEY.toString())
|
|
||||||
)
|
|
||||||
|
|
||||||
fun registerAttributes(consumer: (EntityType<out LivingEntity>, AttributeSupplier.Builder) -> Unit) {
|
fun registerAttributes(consumer: (EntityType<out LivingEntity>, AttributeSupplier.Builder) -> Unit) {
|
||||||
consumer(POKEMON, PokemonEntity.createAttributes())
|
consumer(POKEMON, PokemonEntity.createAttributes())
|
||||||
consumer(NPC, NPCEntity.createAttributes())
|
consumer(NPC, NPCEntity.createAttributes())
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import net.minecraft.server.level.ServerPlayer
|
|||||||
import net.minecraft.server.packs.PackType
|
import net.minecraft.server.packs.PackType
|
||||||
import net.minecraft.server.packs.resources.PreparableReloadListener
|
import net.minecraft.server.packs.resources.PreparableReloadListener
|
||||||
import net.minecraft.tags.TagKey
|
import net.minecraft.tags.TagKey
|
||||||
|
import net.minecraft.world.inventory.MenuType
|
||||||
import net.minecraft.world.level.GameRules
|
import net.minecraft.world.level.GameRules
|
||||||
import net.minecraft.world.level.ItemLike
|
import net.minecraft.world.level.ItemLike
|
||||||
import net.minecraft.world.level.biome.Biome
|
import net.minecraft.world.level.biome.Biome
|
||||||
|
|||||||
@@ -33,12 +33,6 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
|
|||||||
.networkSynchronized(HeldItemEffectComponent.PACKET_CODEC)
|
.networkSynchronized(HeldItemEffectComponent.PACKET_CODEC)
|
||||||
.build())
|
.build())
|
||||||
|
|
||||||
@JvmField
|
|
||||||
val MEGA_BOND: DataComponentType<MegaBondComponent> = create("mega_bond", DataComponentType.builder<MegaBondComponent>()
|
|
||||||
.persistent(MegaBondComponent.CODEC)
|
|
||||||
.networkSynchronized(MegaBondComponent.PACKET_CODEC)
|
|
||||||
.build())
|
|
||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val BAIT: DataComponentType<RodBaitComponent> = create("bait", DataComponentType.builder<RodBaitComponent>()
|
val BAIT: DataComponentType<RodBaitComponent> = create("bait", DataComponentType.builder<RodBaitComponent>()
|
||||||
.persistent(RodBaitComponent.CODEC)
|
.persistent(RodBaitComponent.CODEC)
|
||||||
|
|||||||
@@ -472,9 +472,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
// Evolution items
|
// Evolution items
|
||||||
@JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
|
@JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
|
||||||
@JvmField val DRAGON_SCALE = noSettingsItem("dragon_scale")
|
@JvmField val DRAGON_SCALE = noSettingsItem("dragon_scale")
|
||||||
@JvmField val METAL_COAT = noSettingsItem("metal_coat")
|
@JvmField val METAL_COAT = itemNameBlockItem("metal_coat", CobblemonBlocks.METAL_COAT)
|
||||||
@JvmField val UPGRADE = noSettingsItem("upgrade")
|
@JvmField val UPGRADE = itemNameBlockItem("upgrade", CobblemonBlocks.UPGRADE)
|
||||||
@JvmField val DUBIOUS_DISC = noSettingsItem("dubious_disc")
|
@JvmField val DUBIOUS_DISC = itemNameBlockItem("dubious_disc", CobblemonBlocks.DUBIOUS_DISC)
|
||||||
@JvmField val DEEP_SEA_SCALE = noSettingsItem("deep_sea_scale")
|
@JvmField val DEEP_SEA_SCALE = noSettingsItem("deep_sea_scale")
|
||||||
@JvmField val DEEP_SEA_TOOTH = noSettingsItem("deep_sea_tooth")
|
@JvmField val DEEP_SEA_TOOTH = noSettingsItem("deep_sea_tooth")
|
||||||
@JvmField val ELECTIRIZER = noSettingsItem("electirizer")
|
@JvmField val ELECTIRIZER = noSettingsItem("electirizer")
|
||||||
@@ -483,7 +483,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField val PROTECTOR = noSettingsItem("protector")
|
@JvmField val PROTECTOR = noSettingsItem("protector")
|
||||||
@JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
|
@JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
|
||||||
@JvmField val PRISM_SCALE = noSettingsItem("prism_scale")
|
@JvmField val PRISM_SCALE = noSettingsItem("prism_scale")
|
||||||
@JvmField val SACHET = noSettingsItem("sachet")
|
@JvmField val SACHET = itemNameBlockItem("sachet", CobblemonBlocks.SACHET)
|
||||||
@JvmField val WHIPPED_DREAM = create("whipped_dream", foodItem(8, 0.3f))
|
@JvmField val WHIPPED_DREAM = create("whipped_dream", foodItem(8, 0.3f))
|
||||||
@JvmField val STRAWBERRY_SWEET = create("strawberry_sweet", foodItem(6, 0.125f))
|
@JvmField val STRAWBERRY_SWEET = create("strawberry_sweet", foodItem(6, 0.125f))
|
||||||
@JvmField val LOVE_SWEET = create("love_sweet", foodItem(6, 0.125f))
|
@JvmField val LOVE_SWEET = create("love_sweet", foodItem(6, 0.125f))
|
||||||
@@ -492,22 +492,20 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField val FLOWER_SWEET = create("flower_sweet", foodItem(6, 0.125f))
|
@JvmField val FLOWER_SWEET = create("flower_sweet", foodItem(6, 0.125f))
|
||||||
@JvmField val STAR_SWEET = create("star_sweet", foodItem(6, 0.125f))
|
@JvmField val STAR_SWEET = create("star_sweet", foodItem(6, 0.125f))
|
||||||
@JvmField val RIBBON_SWEET = create("ribbon_sweet", foodItem(6, 0.125f))
|
@JvmField val RIBBON_SWEET = create("ribbon_sweet", foodItem(6, 0.125f))
|
||||||
@JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
|
@JvmField val CHIPPED_POT = itemNameBlockItem("chipped_pot", CobblemonBlocks.CHIPPED_POT)
|
||||||
@JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
|
@JvmField val CRACKED_POT = itemNameBlockItem("cracked_pot", CobblemonBlocks.CRACKED_POT)
|
||||||
@JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
|
@JvmField val MASTERPIECE_TEACUP = itemNameBlockItem("masterpiece_teacup", CobblemonBlocks.MASTERPIECE_TEACUP)
|
||||||
@JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
|
@JvmField val UNREMARKABLE_TEACUP = itemNameBlockItem("unremarkable_teacup", CobblemonBlocks.UNREMARKABLE_TEACUP)
|
||||||
@JvmField val SWEET_APPLE = compostableItem("sweet_apple", foodItem(4, 0.3f), 0.65f)
|
@JvmField val SWEET_APPLE = compostableItem("sweet_apple", foodItem(4, 0.3f), 0.65f)
|
||||||
@JvmField val TART_APPLE = compostableItem("tart_apple", foodItem(4, 0.3f), 0.65f)
|
@JvmField val TART_APPLE = compostableItem("tart_apple", foodItem(4, 0.3f), 0.65f)
|
||||||
@JvmField val SYRUPY_APPLE = compostableItem("syrupy_apple", foodItem(4, 0.3f), 0.65f)
|
@JvmField val SYRUPY_APPLE = compostableItem("syrupy_apple", foodItem(4, 0.3f), 0.65f)
|
||||||
@JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
|
@JvmField val GALARICA_CUFF = itemNameBlockItem("galarica_cuff", CobblemonBlocks.GALARICA_CUFF)
|
||||||
@JvmField val GALARICA_WREATH = noSettingsItem("galarica_wreath")
|
|
||||||
@JvmField val BLACK_AUGURITE = noSettingsItem("black_augurite")
|
@JvmField val BLACK_AUGURITE = noSettingsItem("black_augurite")
|
||||||
@JvmField val PEAT_BLOCK = noSettingsItem("peat_block")
|
@JvmField val PEAT_BLOCK = noSettingsItem("peat_block")
|
||||||
@JvmField val RAZOR_CLAW = noSettingsItem("razor_claw")
|
@JvmField val RAZOR_CLAW = noSettingsItem("razor_claw")
|
||||||
@JvmField val RAZOR_FANG = noSettingsItem("razor_fang")
|
@JvmField val RAZOR_FANG = noSettingsItem("razor_fang")
|
||||||
@JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
|
@JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
|
||||||
@JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
|
@JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
|
||||||
@JvmField val SHELL_HELMET = heldItem("shell_helmet")
|
|
||||||
@JvmField val METAL_ALLOY = noSettingsItem("metal_alloy")
|
@JvmField val METAL_ALLOY = noSettingsItem("metal_alloy")
|
||||||
@JvmField val SCROLL_OF_DARKNESS = noSettingsItem("scroll_of_darkness")
|
@JvmField val SCROLL_OF_DARKNESS = noSettingsItem("scroll_of_darkness")
|
||||||
@JvmField val SCROLL_OF_WATERS = noSettingsItem("scroll_of_waters")
|
@JvmField val SCROLL_OF_WATERS = noSettingsItem("scroll_of_waters")
|
||||||
@@ -651,17 +649,17 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val EXPERIENCE_CANDY_XL = candyItem("exp_candy_xl") { _, _ -> CandyItem.DEFAULT_XL_CANDY_YIELD }
|
val EXPERIENCE_CANDY_XL = candyItem("exp_candy_xl") { _, _ -> CandyItem.DEFAULT_XL_CANDY_YIELD }
|
||||||
@JvmField
|
@JvmField
|
||||||
val CALCIUM = create("calcium", VitaminItem(Stats.SPECIAL_ATTACK))
|
val CALCIUM = create("calcium", VitaminItem(Stats.SPECIAL_ATTACK, CobblemonBlocks.CALCIUM))
|
||||||
@JvmField
|
@JvmField
|
||||||
val CARBOS = create("carbos", VitaminItem(Stats.SPEED))
|
val CARBOS = create("carbos", VitaminItem(Stats.SPEED, CobblemonBlocks.CARBOS))
|
||||||
@JvmField
|
@JvmField
|
||||||
val HP_UP = create("hp_up", VitaminItem(Stats.HP))
|
val HP_UP = create("hp_up", VitaminItem(Stats.HP, CobblemonBlocks.HP_UP))
|
||||||
@JvmField
|
@JvmField
|
||||||
val IRON = create("iron", VitaminItem(Stats.DEFENCE))
|
val IRON = create("iron", VitaminItem(Stats.DEFENCE, CobblemonBlocks.IRON))
|
||||||
@JvmField
|
@JvmField
|
||||||
val PROTEIN = create("protein", VitaminItem(Stats.ATTACK))
|
val PROTEIN = create("protein", VitaminItem(Stats.ATTACK, CobblemonBlocks.PROTEIN))
|
||||||
@JvmField
|
@JvmField
|
||||||
val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE))
|
val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE, CobblemonBlocks.ZINC))
|
||||||
@JvmField
|
@JvmField
|
||||||
val HEALTH_MOCHI = create("health_mochi", MochiItem(Stats.HP))
|
val HEALTH_MOCHI = create("health_mochi", MochiItem(Stats.HP))
|
||||||
@JvmField
|
@JvmField
|
||||||
@@ -743,9 +741,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val MAX_REVIVE = create("max_revive", ReviveItem(max = true))
|
val MAX_REVIVE = create("max_revive", ReviveItem(max = true))
|
||||||
@JvmField
|
@JvmField
|
||||||
val PP_UP = create("pp_up", PPUpItem(1))
|
val PP_UP = create("pp_up", PPUpItem(1, CobblemonBlocks.PP_UP))
|
||||||
@JvmField
|
@JvmField
|
||||||
val PP_MAX = create("pp_max", PPUpItem(3))
|
val PP_MAX = create("pp_max", PPUpItem(3, CobblemonBlocks.PP_MAX))
|
||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val RED_MINT_SEEDS = mintSeed("red", MintType.RED.getCropBlock())
|
val RED_MINT_SEEDS = mintSeed("red", MintType.RED.getCropBlock())
|
||||||
@@ -914,10 +912,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
val THUNDER_STONE = noSettingsItem("thunder_stone")
|
val THUNDER_STONE = noSettingsItem("thunder_stone")
|
||||||
@JvmField
|
@JvmField
|
||||||
val WATER_STONE = noSettingsItem("water_stone")
|
val WATER_STONE = noSettingsItem("water_stone")
|
||||||
@JvmField
|
|
||||||
val MEGA_SHARD = noSettingsItem("mega_shard")
|
|
||||||
@JvmField
|
|
||||||
val DORMANT_MEGA_STONE = heldItem("dormant_mega_stone")
|
|
||||||
|
|
||||||
val wearables = mutableListOf<WearableItem>()
|
val wearables = mutableListOf<WearableItem>()
|
||||||
//Wearable items (these items should have a corresponding 3D model)
|
//Wearable items (these items should have a corresponding 3D model)
|
||||||
@@ -926,44 +920,31 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField val CHOICE_SPECS = wearableItem("choice_specs")
|
@JvmField val CHOICE_SPECS = wearableItem("choice_specs")
|
||||||
@JvmField val EXP_SHARE = wearableItem("exp_share")
|
@JvmField val EXP_SHARE = wearableItem("exp_share")
|
||||||
@JvmField val FOCUS_BAND = wearableItem("focus_band")
|
@JvmField val FOCUS_BAND = wearableItem("focus_band")
|
||||||
@JvmField val KINGS_ROCK = wearableItem("kings_rock")
|
@JvmField val KINGS_ROCK = wearableBlockItem("kings_rock", CobblemonBlocks.KINGS_ROCK)
|
||||||
|
@JvmField val NEVER_MELT_ICE = wearableBlockItem("never_melt_ice", CobblemonBlocks.NEVER_MELT_ICE)
|
||||||
@JvmField val MUSCLE_BAND = wearableItem("muscle_band")
|
@JvmField val MUSCLE_BAND = wearableItem("muscle_band")
|
||||||
@JvmField val ROCKY_HELMET = wearableItem("rocky_helmet")
|
@JvmField val ROCKY_HELMET = wearableItem("rocky_helmet")
|
||||||
@JvmField val SAFETY_GOGGLES = wearableItem("safety_goggles")
|
@JvmField val SAFETY_GOGGLES = wearableItem("safety_goggles")
|
||||||
@JvmField val WISE_GLASSES = wearableItem("wise_glasses")
|
@JvmField val WISE_GLASSES = wearableItem("wise_glasses")
|
||||||
|
@JvmField val SHARP_BEAK = wearableItem("sharp_beak")
|
||||||
|
@JvmField val COVERT_CLOAK = wearableItem("covert_cloak")
|
||||||
|
@JvmField val SHELL_HELMET = wearableItem("shell_helmet")
|
||||||
|
@JvmField val GALARICA_WREATH = wearableBlockItem("galarica_wreath", CobblemonBlocks.GALARICA_WREATH)
|
||||||
|
@JvmField val CLEANSE_TAG = wearableBlockItem("cleanse_tag", CobblemonBlocks.CLEANSE_TAG)
|
||||||
|
@JvmField val SPELL_TAG = wearableBlockItem("spell_tag", CobblemonBlocks.SPELL_TAG)
|
||||||
|
|
||||||
// Held Items
|
// Held Items
|
||||||
@JvmField
|
@JvmField
|
||||||
val ABILITY_SHIELD = heldItem("ability_shield")
|
val ABILITY_SHIELD = heldItem("ability_shield")
|
||||||
@JvmField
|
@JvmField
|
||||||
val ABOMASITE = heldItem("abomasite")
|
|
||||||
@JvmField
|
|
||||||
val ABSOLITE = heldItem("absolite")
|
|
||||||
@JvmField
|
|
||||||
val ABSORB_BULB = heldItem("absorb_bulb")
|
val ABSORB_BULB = heldItem("absorb_bulb")
|
||||||
@JvmField
|
@JvmField
|
||||||
val AERODACTYLITE = heldItem("aerodactylite")
|
|
||||||
@JvmField
|
|
||||||
val AGGRONITE = heldItem("aggronite")
|
|
||||||
@JvmField
|
|
||||||
val AIR_BALLOON = heldItem("air_balloon")
|
val AIR_BALLOON = heldItem("air_balloon")
|
||||||
@JvmField
|
@JvmField
|
||||||
val ALAKAZITE = heldItem("alakazite")
|
|
||||||
@JvmField
|
|
||||||
val ALTARIANITE = heldItem("altarianite")
|
|
||||||
@JvmField
|
|
||||||
val AMPHAROSITE = heldItem("ampharosite")
|
|
||||||
@JvmField
|
|
||||||
val ASSAULT_VEST = heldItem("assault_vest")
|
val ASSAULT_VEST = heldItem("assault_vest")
|
||||||
@JvmField
|
@JvmField
|
||||||
val BIG_ROOT = compostableBlockItem("big_root", CobblemonBlocks.BIG_ROOT, 0.30f)
|
val BIG_ROOT = compostableBlockItem("big_root", CobblemonBlocks.BIG_ROOT, 0.30f)
|
||||||
@JvmField
|
@JvmField
|
||||||
val AUDINITE = heldItem("audinite")
|
|
||||||
@JvmField
|
|
||||||
val BANETTITE = heldItem("banettite")
|
|
||||||
@JvmField
|
|
||||||
val BEEDRILLITE = heldItem("beedrillite")
|
|
||||||
@JvmField
|
|
||||||
val BINDING_BAND = heldItem("binding_band")
|
val BINDING_BAND = heldItem("binding_band")
|
||||||
@JvmField
|
@JvmField
|
||||||
val BLACK_BELT = heldItem("black_belt")
|
val BLACK_BELT = heldItem("black_belt")
|
||||||
@@ -972,35 +953,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val BLUNDER_POLICY = itemNameBlockItem("blunder_policy", CobblemonBlocks.BLUNDER_POLICY)
|
val BLUNDER_POLICY = itemNameBlockItem("blunder_policy", CobblemonBlocks.BLUNDER_POLICY)
|
||||||
@JvmField
|
@JvmField
|
||||||
val BLASTOISINITE = heldItem("blastoisinite")
|
|
||||||
@JvmField
|
|
||||||
val BLAZIKENITE = heldItem("blazikenite")
|
|
||||||
@JvmField
|
|
||||||
val CAMERUPTITE = heldItem("cameruptite")
|
|
||||||
@JvmField
|
|
||||||
val CELL_BATTERY = heldItem("cell_battery")
|
val CELL_BATTERY = heldItem("cell_battery")
|
||||||
@JvmField
|
@JvmField
|
||||||
val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
|
val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
|
||||||
@JvmField
|
@JvmField
|
||||||
val CHARIZARDITE_X = heldItem("charizardite_x")
|
|
||||||
@JvmField
|
|
||||||
val CHARIZARDITE_Y = heldItem("charizardite_y")
|
|
||||||
@JvmField
|
|
||||||
val CHOICE_SCARF = heldItem("choice_scarf")
|
val CHOICE_SCARF = heldItem("choice_scarf")
|
||||||
@JvmField
|
@JvmField
|
||||||
val CLEANSE_TAG = itemNameBlockItem("cleanse_tag", CobblemonBlocks.CLEANSE_TAG)
|
|
||||||
@JvmField
|
|
||||||
val CLEAR_AMULET = heldItem("clear_amulet")
|
val CLEAR_AMULET = heldItem("clear_amulet")
|
||||||
@JvmField
|
@JvmField
|
||||||
val COVERT_CLOAK = heldItem("covert_cloak")
|
val DESTINY_KNOT = itemNameBlockItem("destiny_knot", CobblemonBlocks.DESTINY_KNOT)
|
||||||
@JvmField
|
|
||||||
val DESTINY_KNOT = heldItem("destiny_knot")
|
|
||||||
@JvmField
|
|
||||||
val DIANCITE = heldItem("diancite")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val DRAGON_FANG = heldItem("dragon_fang")
|
val DRAGON_FANG = heldItem("dragon_fang")
|
||||||
@JvmField
|
@JvmField
|
||||||
val EJECT_BUTTON = heldItem("eject_button")
|
val EJECT_BUTTON = itemNameBlockItem("eject_button", CobblemonBlocks.EJECT_BUTTON)
|
||||||
@JvmField
|
@JvmField
|
||||||
val EJECT_PACK = heldItem("eject_pack")
|
val EJECT_PACK = heldItem("eject_pack")
|
||||||
@JvmField
|
@JvmField
|
||||||
@@ -1014,90 +979,46 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val FAIRY_FEATHER = heldItem("fairy_feather")
|
val FAIRY_FEATHER = heldItem("fairy_feather")
|
||||||
@JvmField
|
@JvmField
|
||||||
val FLAME_ORB = heldItem("flame_orb")
|
val FLAME_ORB = itemNameBlockItem("flame_orb", CobblemonBlocks.FLAME_ORB)
|
||||||
@JvmField
|
@JvmField
|
||||||
val FLOAT_STONE = heldItem("float_stone")
|
val FLOAT_STONE = heldItem("float_stone")
|
||||||
@JvmField
|
@JvmField
|
||||||
val FOCUS_SASH = heldItem("focus_sash")
|
val FOCUS_SASH = heldItem("focus_sash")
|
||||||
@JvmField
|
@JvmField
|
||||||
val GALLADITE = heldItem("galladite")
|
|
||||||
@JvmField
|
|
||||||
val GARCHOMPITE = heldItem("garchompite")
|
|
||||||
@JvmField
|
|
||||||
val GARDEVOIRITE = heldItem("gardevoirite")
|
|
||||||
@JvmField
|
|
||||||
val GENGARITE = heldItem("gengarite")
|
|
||||||
@JvmField
|
|
||||||
val GLALITITE = heldItem("glalitite")
|
|
||||||
@JvmField
|
|
||||||
val GRASSY_SEED = heldItem("grassy_seed")
|
val GRASSY_SEED = heldItem("grassy_seed")
|
||||||
@JvmField
|
@JvmField
|
||||||
val GRIP_CLAW = heldItem("grip_claw")
|
val GRIP_CLAW = heldItem("grip_claw")
|
||||||
@JvmField
|
@JvmField
|
||||||
val GYARADOSITE = heldItem("gyaradosite")
|
|
||||||
@JvmField
|
|
||||||
val HARD_STONE = heldItem("hard_stone")
|
val HARD_STONE = heldItem("hard_stone")
|
||||||
@JvmField
|
@JvmField
|
||||||
val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
|
val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
|
||||||
@JvmField
|
@JvmField
|
||||||
val HERACRONITE = heldItem("heracronite")
|
val IRON_BALL = itemNameBlockItem("iron_ball", CobblemonBlocks.IRON_BALL)
|
||||||
@JvmField
|
|
||||||
val HOUNDOOMINITE = heldItem("houndoominite")
|
|
||||||
@JvmField
|
|
||||||
val IRON_BALL = heldItem("iron_ball")
|
|
||||||
@JvmField
|
|
||||||
val KANGASKHANITE = heldItem("kangaskhanite")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val LAGGING_TAIL = heldItem("lagging_tail")
|
val LAGGING_TAIL = heldItem("lagging_tail")
|
||||||
@JvmField
|
@JvmField
|
||||||
val LEFTOVERS = compostableHeldItem("leftovers", null, 0.50f)
|
val LEFTOVERS = compostableHeldItem("leftovers", null, 0.50f)
|
||||||
@JvmField
|
@JvmField
|
||||||
val LATIASITE = heldItem("latiasite")
|
val LIFE_ORB = itemNameBlockItem("life_orb", CobblemonBlocks.LIFE_ORB)
|
||||||
@JvmField
|
@JvmField
|
||||||
val LATIOSITE = heldItem("latiosite")
|
val LIGHT_BALL = itemNameBlockItem("light_ball", CobblemonBlocks.LIGHT_BALL)
|
||||||
@JvmField
|
|
||||||
val LIFE_ORB = heldItem("life_orb")
|
|
||||||
@JvmField
|
|
||||||
val LIGHT_BALL = heldItem("light_ball")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val LIGHT_CLAY = heldItem("light_clay")
|
val LIGHT_CLAY = heldItem("light_clay")
|
||||||
@JvmField
|
@JvmField
|
||||||
val LOADED_DICE = heldItem("loaded_dice")
|
val LOADED_DICE = itemNameBlockItem("loaded_dice", CobblemonBlocks.LOADED_DICE)
|
||||||
@JvmField
|
|
||||||
val LOPUNNITE = heldItem("lopunnite")
|
|
||||||
@JvmField
|
|
||||||
val LUCARIONITE = heldItem("lucarionite")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val LUCKY_EGG = heldItem("lucky_egg")
|
val LUCKY_EGG = heldItem("lucky_egg")
|
||||||
@JvmField
|
@JvmField
|
||||||
val LUMINOUS_MOSS = heldItem("luminous_moss")
|
val LUMINOUS_MOSS = itemNameBlockItem("luminous_moss", CobblemonBlocks.LUMINOUS_MOSS)
|
||||||
@JvmField
|
@JvmField
|
||||||
val MAGNET = heldItem("magnet")
|
val MAGNET = itemNameBlockItem("magnet", CobblemonBlocks.MAGNET)
|
||||||
@JvmField
|
@JvmField
|
||||||
val MANECTITE = heldItem("manectite")
|
val METRONOME = itemNameBlockItem("metronome", CobblemonBlocks.METRONOME)
|
||||||
@JvmField
|
|
||||||
val MAWILITE = heldItem("mawilite")
|
|
||||||
@JvmField
|
|
||||||
val MEDICHAMITE = heldItem("medichamite")
|
|
||||||
@JvmField
|
|
||||||
val METAGROSSITE = heldItem("metagrossite")
|
|
||||||
@JvmField
|
|
||||||
val METRONOME = heldItem("metronome")
|
|
||||||
@JvmField
|
|
||||||
val MEWTWONITE_X = heldItem("mewtwonite_x")
|
|
||||||
@JvmField
|
|
||||||
val MEWTWONITE_Y = heldItem("mewtwonite_y")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val MIRACLE_SEED = heldItem("miracle_seed")
|
val MIRACLE_SEED = heldItem("miracle_seed")
|
||||||
@JvmField
|
@JvmField
|
||||||
val MYSTIC_WATER = heldItem("mystic_water")
|
val MYSTIC_WATER = heldItem("mystic_water")
|
||||||
@JvmField
|
@JvmField
|
||||||
val NEVER_MELT_ICE = heldItem("never_melt_ice")
|
|
||||||
@JvmField
|
|
||||||
val PIDGEOTITE = heldItem("pidgeotite")
|
|
||||||
@JvmField
|
|
||||||
val PINSIRITE = heldItem("pinsirite")
|
|
||||||
@JvmField
|
|
||||||
val POISON_BARB = heldItem("poison_barb")
|
val POISON_BARB = heldItem("poison_barb")
|
||||||
@JvmField
|
@JvmField
|
||||||
val POWER_ANKLET = heldItem("power_anklet")
|
val POWER_ANKLET = heldItem("power_anklet")
|
||||||
@@ -1122,23 +1043,11 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val RED_CARD = heldItem("red_card")
|
val RED_CARD = heldItem("red_card")
|
||||||
@JvmField
|
@JvmField
|
||||||
val RING_TARGET = heldItem("ring_target")
|
val RING_TARGET = itemNameBlockItem("ring_target", CobblemonBlocks.RING_TARGET)
|
||||||
@JvmField
|
@JvmField
|
||||||
val ROOM_SERVICE = heldItem("room_service")
|
val ROOM_SERVICE = heldItem("room_service")
|
||||||
@JvmField
|
@JvmField
|
||||||
val SABLENITE = heldItem("sablenite")
|
val SCOPE_LENS = itemNameBlockItem("scope_lens", CobblemonBlocks.SCOPE_LENS)
|
||||||
@JvmField
|
|
||||||
val SALAMENCITE = heldItem("salamencite")
|
|
||||||
@JvmField
|
|
||||||
val SCEPTILITE = heldItem("sceptilite")
|
|
||||||
@JvmField
|
|
||||||
val SCIZORITE = heldItem("scizorite")
|
|
||||||
@JvmField
|
|
||||||
val SCOPE_LENS = heldItem("scope_lens")
|
|
||||||
@JvmField
|
|
||||||
val SHARP_BEAK = heldItem("sharp_beak")
|
|
||||||
@JvmField
|
|
||||||
val SHARPEDONITE = heldItem("sharpedonite")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val SHED_SHELL = heldItem("shed_shell")
|
val SHED_SHELL = heldItem("shed_shell")
|
||||||
@JvmField
|
@JvmField
|
||||||
@@ -1148,41 +1057,29 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val SILVER_POWDER = heldItem("silver_powder")
|
val SILVER_POWDER = heldItem("silver_powder")
|
||||||
@JvmField
|
@JvmField
|
||||||
val SLOWBRONITE = heldItem("slowbronite")
|
|
||||||
@JvmField
|
|
||||||
val SOFT_SAND = heldItem("soft_sand")
|
val SOFT_SAND = heldItem("soft_sand")
|
||||||
@JvmField
|
@JvmField
|
||||||
val SPELL_TAG = itemNameBlockItem("spell_tag", CobblemonBlocks.SPELL_TAG)
|
val SMOKE_BALL = itemNameBlockItem("smoke_ball", CobblemonBlocks.SMOKE_BALL)
|
||||||
@JvmField
|
|
||||||
val SMOKE_BALL = heldItem("smoke_ball")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val SOOTHE_BELL = heldItem("soothe_bell")
|
val SOOTHE_BELL = heldItem("soothe_bell")
|
||||||
@JvmField
|
@JvmField
|
||||||
val STEELIXITE = heldItem("steelixite")
|
|
||||||
@JvmField
|
|
||||||
val STICKY_BARB = heldItem("sticky_barb")
|
val STICKY_BARB = heldItem("sticky_barb")
|
||||||
@JvmField
|
@JvmField
|
||||||
val SWAMPERTITE = heldItem("swampertite")
|
|
||||||
@JvmField
|
|
||||||
val TERRAIN_EXTENDER = heldItem("terrain_extender")
|
val TERRAIN_EXTENDER = heldItem("terrain_extender")
|
||||||
@JvmField
|
@JvmField
|
||||||
val THROAT_SPRAY = heldItem("throat_spray")
|
val THROAT_SPRAY = itemNameBlockItem("throat_spray", CobblemonBlocks.THROAT_SPRAY)
|
||||||
@JvmField
|
@JvmField
|
||||||
val TOXIC_ORB = heldItem("toxic_orb")
|
val TOXIC_ORB = itemNameBlockItem("toxic_orb", CobblemonBlocks.TOXIC_ORB)
|
||||||
@JvmField
|
@JvmField
|
||||||
val TWISTED_SPOON = heldItem("twisted_spoon")
|
val TWISTED_SPOON = heldItem("twisted_spoon")
|
||||||
@JvmField
|
@JvmField
|
||||||
val TYRANITARITE = heldItem("tyranitarite")
|
|
||||||
@JvmField
|
|
||||||
val UTILITY_UMBRELLA = heldItem("utility_umbrella")
|
val UTILITY_UMBRELLA = heldItem("utility_umbrella")
|
||||||
@JvmField
|
@JvmField
|
||||||
val WEAKNESS_POLICY = itemNameBlockItem("weakness_policy", CobblemonBlocks.WEAKNESS_POLICY)
|
val WEAKNESS_POLICY = itemNameBlockItem("weakness_policy", CobblemonBlocks.WEAKNESS_POLICY)
|
||||||
@JvmField
|
@JvmField
|
||||||
val VENUSAURITE = heldItem("venusaurite")
|
val WIDE_LENS = itemNameBlockItem("wide_lens", CobblemonBlocks.WIDE_LENS)
|
||||||
@JvmField
|
@JvmField
|
||||||
val WIDE_LENS = heldItem("wide_lens")
|
val ZOOM_LENS = itemNameBlockItem("zoom_lens", CobblemonBlocks.ZOOM_LENS)
|
||||||
@JvmField
|
|
||||||
val ZOOM_LENS = heldItem("zoom_lens")
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val MENTAL_HERB = compostableHeldItem("mental_herb", null, 0.85F)
|
val MENTAL_HERB = compostableHeldItem("mental_herb", null, 0.85F)
|
||||||
@JvmField
|
@JvmField
|
||||||
@@ -1194,19 +1091,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val WHITE_HERB = compostableHeldItem("white_herb", null, 0.85F)
|
val WHITE_HERB = compostableHeldItem("white_herb", null, 0.85F)
|
||||||
@JvmField
|
@JvmField
|
||||||
val BRIGHT_POWDER = heldItem("bright_powder")
|
val BRIGHT_POWDER = itemNameBlockItem("bright_powder", CobblemonBlocks.BRIGHT_POWDER)
|
||||||
@JvmField
|
@JvmField
|
||||||
val METAL_POWDER = heldItem("metal_powder")
|
val METAL_POWDER = itemNameBlockItem("metal_powder", CobblemonBlocks.METAL_POWDER)
|
||||||
@JvmField
|
@JvmField
|
||||||
val QUICK_POWDER = heldItem("quick_powder")
|
val QUICK_POWDER = itemNameBlockItem("quick_powder", CobblemonBlocks.QUICK_POWDER)
|
||||||
@JvmField
|
@JvmField
|
||||||
val DAMP_ROCK = heldItem("damp_rock")
|
val DAMP_ROCK = itemNameBlockItem("damp_rock", CobblemonBlocks.DAMP_ROCK)
|
||||||
@JvmField
|
@JvmField
|
||||||
val HEAT_ROCK = heldItem("heat_rock")
|
val HEAT_ROCK = itemNameBlockItem("heat_rock", CobblemonBlocks.HEAT_ROCK)
|
||||||
@JvmField
|
@JvmField
|
||||||
val SMOOTH_ROCK = heldItem("smooth_rock")
|
val SMOOTH_ROCK = itemNameBlockItem("smooth_rock", CobblemonBlocks.SMOOTH_ROCK)
|
||||||
@JvmField
|
@JvmField
|
||||||
val ICY_ROCK = heldItem("icy_rock")
|
val ICY_ROCK = itemNameBlockItem("icy_rock", CobblemonBlocks.ICY_ROCK)
|
||||||
|
|
||||||
// Mulch
|
// Mulch
|
||||||
@JvmField
|
@JvmField
|
||||||
@@ -1697,7 +1594,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
|
|
||||||
private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
|
private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
|
||||||
name,
|
name,
|
||||||
WearableItem(name).also {
|
WearableHatItem(name).also {
|
||||||
|
wearables.add(it)
|
||||||
|
if (heldItemRemappedName != null) {
|
||||||
|
CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
private fun wearableBlockItem(name: String, block: Block, heldItemRemappedName: String? = null): WearableBlockItem = create(
|
||||||
|
name,
|
||||||
|
WearableBlockItem(name, block).also {
|
||||||
wearables.add(it)
|
wearables.add(it)
|
||||||
if (heldItemRemappedName != null) {
|
if (heldItemRemappedName != null) {
|
||||||
CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
|
CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
|||||||
import com.mojang.serialization.Codec
|
import com.mojang.serialization.Codec
|
||||||
import com.mojang.serialization.codecs.ListCodec
|
import com.mojang.serialization.codecs.ListCodec
|
||||||
import com.mojang.serialization.codecs.PrimitiveCodec
|
import com.mojang.serialization.codecs.PrimitiveCodec
|
||||||
import java.util.Optional
|
|
||||||
import java.util.UUID
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
|
import net.minecraft.core.GlobalPos
|
||||||
import net.minecraft.core.UUIDUtil
|
import net.minecraft.core.UUIDUtil
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
object CobblemonMemories {
|
object CobblemonMemories {
|
||||||
val memories = mutableMapOf<String, MemoryModuleType<*>>()
|
val memories = mutableMapOf<String, MemoryModuleType<*>>()
|
||||||
|
|||||||
@@ -107,14 +107,10 @@ import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.Add
|
|||||||
import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
|
import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClientboundSeatAssignmentPacket
|
import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClientboundSeatAssignmentPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
|
import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.AddFormPacket
|
|
||||||
import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.ClearFormsPacket
|
|
||||||
import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.RemoveFormPacket
|
|
||||||
import com.cobblemon.mod.common.net.messages.client.settings.OpenCobblemonConfigScreenPacket
|
import com.cobblemon.mod.common.net.messages.client.settings.OpenCobblemonConfigScreenPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
|
import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
|
import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket
|
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnFallingStarPacket
|
|
||||||
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnNPCPacket
|
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnNPCPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokeballPacket
|
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokeballPacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket
|
import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket
|
||||||
@@ -198,8 +194,6 @@ import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetItemHidden
|
|||||||
import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
|
import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
|
import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
|
import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.pokemon.update.form.AcceptFormPacket
|
|
||||||
import com.cobblemon.mod.common.net.messages.server.pokemon.update.form.RevertFormPacket
|
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
|
import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
|
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdatePassengerPositionPacket
|
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdatePassengerPositionPacket
|
||||||
@@ -217,11 +211,9 @@ import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptanceP
|
|||||||
import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
|
import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
|
import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
|
import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
|
||||||
import com.cobblemon.mod.common.net.serverhandling.AcceptFormHandler
|
|
||||||
import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
|
import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
|
import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
|
import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.RevertFormHandler
|
|
||||||
import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
|
import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
|
import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
|
import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
|
||||||
@@ -465,7 +457,6 @@ object CobblemonNetwork {
|
|||||||
list.add(PacketRegisterInfo(SpawnPokemonPacket.ID, SpawnPokemonPacket::decode, SpawnExtraDataEntityHandler()))
|
list.add(PacketRegisterInfo(SpawnPokemonPacket.ID, SpawnPokemonPacket::decode, SpawnExtraDataEntityHandler()))
|
||||||
list.add(PacketRegisterInfo(SpawnPokeballPacket.ID, SpawnPokeballPacket::decode, SpawnExtraDataEntityHandler()))
|
list.add(PacketRegisterInfo(SpawnPokeballPacket.ID, SpawnPokeballPacket::decode, SpawnExtraDataEntityHandler()))
|
||||||
list.add(PacketRegisterInfo(SpawnGenericBedrockPacket.ID, SpawnGenericBedrockPacket::decode, SpawnExtraDataEntityHandler()))
|
list.add(PacketRegisterInfo(SpawnGenericBedrockPacket.ID, SpawnGenericBedrockPacket::decode, SpawnExtraDataEntityHandler()))
|
||||||
list.add(PacketRegisterInfo(SpawnFallingStarPacket.ID, SpawnFallingStarPacket::decode, SpawnExtraDataEntityHandler()))
|
|
||||||
list.add(PacketRegisterInfo(SpawnNPCPacket.ID, SpawnNPCPacket::decode, SpawnExtraDataEntityHandler()))
|
list.add(PacketRegisterInfo(SpawnNPCPacket.ID, SpawnNPCPacket::decode, SpawnExtraDataEntityHandler()))
|
||||||
list.add(PacketRegisterInfo(ToastPacket.ID, ToastPacket::decode, ToastPacketHandler))
|
list.add(PacketRegisterInfo(ToastPacket.ID, ToastPacket::decode, ToastPacketHandler))
|
||||||
|
|
||||||
@@ -515,11 +506,6 @@ object CobblemonNetwork {
|
|||||||
// Pokédex scanning
|
// Pokédex scanning
|
||||||
list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
|
list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
|
||||||
|
|
||||||
// Form packets
|
|
||||||
list.add(PacketRegisterInfo(AddFormPacket.ID, AddFormPacket::decode, PokemonUpdatePacketHandler()))
|
|
||||||
list.add(PacketRegisterInfo(ClearFormsPacket.ID, ClearFormsPacket::decode, PokemonUpdatePacketHandler()))
|
|
||||||
list.add(PacketRegisterInfo(RemoveFormPacket.ID, RemoveFormPacket::decode, PokemonUpdatePacketHandler()))
|
|
||||||
|
|
||||||
// Riding
|
// Riding
|
||||||
list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
|
list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
|
||||||
list.add(PacketRegisterInfo(ClientboundUpdateDriverInputPacket.ID, ClientboundUpdateDriverInputPacket::decode, ClientboundUpdateDriverInputHandler))
|
list.add(PacketRegisterInfo(ClientboundUpdateDriverInputPacket.ID, ClientboundUpdateDriverInputPacket::decode, ClientboundUpdateDriverInputHandler))
|
||||||
@@ -635,10 +621,6 @@ object CobblemonNetwork {
|
|||||||
// NPC packets
|
// NPC packets
|
||||||
list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
|
list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
|
||||||
|
|
||||||
// Form Packets
|
|
||||||
list.add(PacketRegisterInfo(AcceptFormPacket.ID, AcceptFormPacket::decode, AcceptFormHandler))
|
|
||||||
list.add(PacketRegisterInfo(RevertFormPacket.ID, RevertFormPacket::decode, RevertFormHandler))
|
|
||||||
|
|
||||||
// Riding packet(s)
|
// Riding packet(s)
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, ServerboundUpdateOrientationHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, ServerboundUpdateOrientationHandler))
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
|
||||||
|
|||||||
@@ -9,9 +9,9 @@
|
|||||||
package com.cobblemon.mod.common
|
package com.cobblemon.mod.common
|
||||||
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.ai.sensors.*
|
import com.cobblemon.mod.common.entity.pokemon.ai.sensors.*
|
||||||
|
import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
|
||||||
import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
|
import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
|
||||||
import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
|
import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
|
||||||
import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
|
|
||||||
import java.util.function.Supplier
|
import java.util.function.Supplier
|
||||||
import net.minecraft.world.entity.Entity
|
import net.minecraft.world.entity.Entity
|
||||||
import net.minecraft.world.entity.ai.sensing.Sensor
|
import net.minecraft.world.entity.ai.sensing.Sensor
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common
|
package com.cobblemon.mod.common
|
||||||
|
|
||||||
import java.util.Optional
|
|
||||||
import net.minecraft.core.registries.BuiltInRegistries
|
import net.minecraft.core.registries.BuiltInRegistries
|
||||||
import net.minecraft.util.RandomSource
|
import net.minecraft.util.RandomSource
|
||||||
import net.minecraft.world.entity.Entity
|
import net.minecraft.world.entity.Entity
|
||||||
@@ -19,6 +18,7 @@ import net.minecraft.world.item.ItemStack
|
|||||||
import net.minecraft.world.item.Items
|
import net.minecraft.world.item.Items
|
||||||
import net.minecraft.world.item.trading.ItemCost
|
import net.minecraft.world.item.trading.ItemCost
|
||||||
import net.minecraft.world.item.trading.MerchantOffer
|
import net.minecraft.world.item.trading.MerchantOffer
|
||||||
|
import java.util.Optional
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A generator for various trade offers in the mod.
|
* A generator for various trade offers in the mod.
|
||||||
|
|||||||
+1
-1
@@ -11,10 +11,10 @@ package com.cobblemon.mod.common.advancement.criterion
|
|||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import com.mojang.serialization.Codec
|
import com.mojang.serialization.Codec
|
||||||
import com.mojang.serialization.codecs.RecordCodecBuilder
|
import com.mojang.serialization.codecs.RecordCodecBuilder
|
||||||
import java.util.Optional
|
|
||||||
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import java.util.Optional
|
||||||
|
|
||||||
class AspectCriterion(
|
class AspectCriterion(
|
||||||
playerCtx: Optional<ContextAwarePredicate>,
|
playerCtx: Optional<ContextAwarePredicate>,
|
||||||
|
|||||||
+1
-1
@@ -14,8 +14,8 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
|
|||||||
import java.util.Optional
|
import java.util.Optional
|
||||||
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
||||||
import net.minecraft.advancements.critereon.EntityPredicate
|
import net.minecraft.advancements.critereon.EntityPredicate
|
||||||
import net.minecraft.resources.ResourceLocation
|
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import net.minecraft.resources.ResourceLocation
|
||||||
|
|
||||||
class CastPokeRodContext(val baitId: ResourceLocation)
|
class CastPokeRodContext(val baitId: ResourceLocation)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -10,10 +10,10 @@ package com.cobblemon.mod.common.advancement.criterion
|
|||||||
|
|
||||||
import com.mojang.serialization.Codec
|
import com.mojang.serialization.Codec
|
||||||
import com.mojang.serialization.codecs.RecordCodecBuilder
|
import com.mojang.serialization.codecs.RecordCodecBuilder
|
||||||
import java.util.Optional
|
|
||||||
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
||||||
import net.minecraft.advancements.critereon.EntityPredicate
|
import net.minecraft.advancements.critereon.EntityPredicate
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import java.util.Optional
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A context that is used when you require a [CountableContext] along with some type string.
|
* A context that is used when you require a [CountableContext] along with some type string.
|
||||||
|
|||||||
+1
-1
@@ -14,8 +14,8 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
|
|||||||
import java.util.Optional
|
import java.util.Optional
|
||||||
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
import net.minecraft.advancements.critereon.ContextAwarePredicate
|
||||||
import net.minecraft.advancements.critereon.EntityPredicate
|
import net.minecraft.advancements.critereon.EntityPredicate
|
||||||
import net.minecraft.resources.ResourceLocation
|
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import net.minecraft.resources.ResourceLocation
|
||||||
|
|
||||||
class ReelInPokemonContext(val species : ResourceLocation, val baitId: ResourceLocation)
|
class ReelInPokemonContext(val species : ResourceLocation, val baitId: ResourceLocation)
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
package com.cobblemon.mod.common.api.abilities
|
package com.cobblemon.mod.common.api.abilities
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.Priority
|
import com.cobblemon.mod.common.api.Priority
|
||||||
import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
|
|
||||||
import com.cobblemon.mod.common.util.codec.CodecUtils
|
import com.cobblemon.mod.common.util.codec.CodecUtils
|
||||||
import com.google.gson.JsonObject
|
import com.google.gson.JsonObject
|
||||||
import com.mojang.serialization.Codec
|
import com.mojang.serialization.Codec
|
||||||
@@ -26,7 +25,7 @@ class AbilityTemplate(
|
|||||||
var builder: (AbilityTemplate, forced: Boolean, priority: Priority) -> Ability = { template, forced, priority -> Ability(template, forced, priority) },
|
var builder: (AbilityTemplate, forced: Boolean, priority: Priority) -> Ability = { template, forced, priority -> Ability(template, forced, priority) },
|
||||||
val displayName: String = "cobblemon.ability.$name",
|
val displayName: String = "cobblemon.ability.$name",
|
||||||
val description: String = "cobblemon.ability.$name.desc"
|
val description: String = "cobblemon.ability.$name.desc"
|
||||||
) : ShowdownIdentifiable {
|
) {
|
||||||
/**
|
/**
|
||||||
* Returns the Ability or if applicable the extension connected to this template
|
* Returns the Ability or if applicable the extension connected to this template
|
||||||
*/
|
*/
|
||||||
@@ -46,8 +45,6 @@ class AbilityTemplate(
|
|||||||
*/
|
*/
|
||||||
fun create(json: JsonObject) = create().loadFromJSON(json)
|
fun create(json: JsonObject) = create().loadFromJSON(json)
|
||||||
|
|
||||||
override fun showdownId(): String = ShowdownIdentifiable.REGEX.replace(this.name.lowercase(), "")
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
|
|||||||
+1
@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
|
|||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
||||||
import com.cobblemon.mod.common.api.molang.ObjectValue
|
import com.cobblemon.mod.common.api.molang.ObjectValue
|
||||||
|
import com.cobblemon.mod.common.api.scripting.CobblemonScripts
|
||||||
import com.cobblemon.mod.common.entity.MoLangScriptingEntity
|
import com.cobblemon.mod.common.entity.MoLangScriptingEntity
|
||||||
import com.cobblemon.mod.common.util.activityRegistry
|
import com.cobblemon.mod.common.util.activityRegistry
|
||||||
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
|
|||||||
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
||||||
|
import com.cobblemon.mod.common.api.scripting.CobblemonScripts
|
||||||
import com.cobblemon.mod.common.util.asTranslated
|
import com.cobblemon.mod.common.util.asTranslated
|
||||||
import com.cobblemon.mod.common.util.resolve
|
import com.cobblemon.mod.common.util.resolve
|
||||||
import com.cobblemon.mod.common.util.withQueryValue
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.util.getBooleanOrNull
|
|||||||
import com.cobblemon.mod.common.util.getDoubleOrNull
|
import com.cobblemon.mod.common.util.getDoubleOrNull
|
||||||
import kotlin.math.sqrt
|
import kotlin.math.sqrt
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to maintain some settings around how the entity should wander this tick. The idea is you
|
* Used to maintain some settings around how the entity should wander this tick. The idea is you
|
||||||
|
|||||||
@@ -8,12 +8,16 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.ai.config
|
package com.cobblemon.mod.common.api.ai.config
|
||||||
|
|
||||||
|
import com.bedrockk.molang.runtime.MoLangRuntime
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
|
import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
||||||
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
||||||
import com.cobblemon.mod.common.util.asExpression
|
import com.cobblemon.mod.common.util.asExpression
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import com.cobblemon.mod.common.util.resolveBoolean
|
import com.cobblemon.mod.common.util.resolveBoolean
|
||||||
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
|
|
||||||
|
|||||||
@@ -11,8 +11,13 @@ package com.cobblemon.mod.common.api.ai.config.task
|
|||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
|
import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
|
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
import com.cobblemon.mod.common.util.asExpression
|
import com.cobblemon.mod.common.util.asExpression
|
||||||
|
import com.cobblemon.mod.common.util.asExpressionLike
|
||||||
|
import com.cobblemon.mod.common.util.resolveBoolean
|
||||||
import com.cobblemon.mod.common.util.weightedSelection
|
import com.cobblemon.mod.common.util.weightedSelection
|
||||||
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
import com.mojang.datafixers.util.Either
|
import com.mojang.datafixers.util.Either
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
|
|||||||
+2
@@ -8,10 +8,12 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.ai.config.task
|
package com.cobblemon.mod.common.api.ai.config.task
|
||||||
|
|
||||||
|
import com.bedrockk.molang.runtime.MoLangRuntime
|
||||||
import com.cobblemon.mod.common.CobblemonMemories
|
import com.cobblemon.mod.common.CobblemonMemories
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask.Companion.wrapped
|
import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask.Companion.wrapped
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
||||||
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
||||||
import com.cobblemon.mod.common.util.mainThreadRuntime
|
import com.cobblemon.mod.common.util.mainThreadRuntime
|
||||||
import com.cobblemon.mod.common.util.resolveBoolean
|
import com.cobblemon.mod.common.util.resolveBoolean
|
||||||
|
|||||||
+2
@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.ai.config.task
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead
|
import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead
|
||||||
|
|||||||
+2
@@ -9,7 +9,9 @@
|
|||||||
package com.cobblemon.mod.common.api.ai.config.task
|
package com.cobblemon.mod.common.api.ai.config.task
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
||||||
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
import net.minecraft.world.Difficulty
|
import net.minecraft.world.Difficulty
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
|
import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
|
||||||
|
|||||||
+1
@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
|
|||||||
import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
|
import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
|
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
||||||
|
|
||||||
class SwitchToNPCBattleTaskConfig : SingleTaskConfig {
|
class SwitchToNPCBattleTaskConfig : SingleTaskConfig {
|
||||||
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()
|
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()
|
||||||
|
|||||||
+2
@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.ai.config.task
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.PathfinderMob
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
|
|||||||
+2
@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.ai.config.task
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.PathfinderMob
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
|
|||||||
+1
@@ -25,6 +25,7 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
|||||||
import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
|
import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
|
||||||
import net.minecraft.world.entity.ai.behavior.declarative.Trigger
|
import net.minecraft.world.entity.ai.behavior.declarative.Trigger
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
||||||
|
import net.minecraft.world.entity.ai.memory.MemoryStatus
|
||||||
import net.minecraft.world.entity.ai.sensing.SensorType
|
import net.minecraft.world.entity.ai.sensing.SensorType
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,6 @@ import com.cobblemon.mod.common.util.mainThreadRuntime
|
|||||||
import com.cobblemon.mod.common.util.resolveFloat
|
import com.cobblemon.mod.common.util.resolveFloat
|
||||||
import com.cobblemon.mod.common.util.withQueryValue
|
import com.cobblemon.mod.common.util.withQueryValue
|
||||||
import com.mojang.datafixers.util.Either
|
import com.mojang.datafixers.util.Either
|
||||||
import kotlin.math.ceil
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.PathfinderMob
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
@@ -35,6 +34,7 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
|||||||
import net.minecraft.world.level.material.Fluids
|
import net.minecraft.world.level.material.Fluids
|
||||||
import net.minecraft.world.level.pathfinder.PathType
|
import net.minecraft.world.level.pathfinder.PathType
|
||||||
import net.minecraft.world.phys.Vec3
|
import net.minecraft.world.phys.Vec3
|
||||||
|
import kotlin.math.ceil
|
||||||
|
|
||||||
class WaterWanderTaskConfig : SingleTaskConfig {
|
class WaterWanderTaskConfig : SingleTaskConfig {
|
||||||
val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()
|
val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()
|
||||||
|
|||||||
+11
-12
@@ -54,9 +54,9 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
|
|||||||
import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
|
import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
|
import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
|
import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.progress.DefeatTransformationProgress
|
import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.progress.LastBattleCriticalHitsTransformationProgress
|
import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.requirements.DefeatRequirement
|
import com.cobblemon.mod.common.pokemon.requirements.DefeatRequirement
|
||||||
import com.cobblemon.mod.common.util.battleLang
|
import com.cobblemon.mod.common.util.battleLang
|
||||||
import com.cobblemon.mod.common.util.getPlayer
|
import com.cobblemon.mod.common.util.getPlayer
|
||||||
import com.cobblemon.mod.common.util.giveOrDropItemStack
|
import com.cobblemon.mod.common.util.giveOrDropItemStack
|
||||||
@@ -97,8 +97,8 @@ open class PokemonBattle(
|
|||||||
this.actors.forEach { actor ->
|
this.actors.forEach { actor ->
|
||||||
actor.battle = this
|
actor.battle = this
|
||||||
actor.pokemonList.forEach { battlePokemon ->
|
actor.pokemonList.forEach { battlePokemon ->
|
||||||
battlePokemon.effectedPokemon.requirementProgress
|
battlePokemon.effectedPokemon.evolutionProxy.current().progress()
|
||||||
.filterIsInstance<LastBattleCriticalHitsTransformationProgress>()
|
.filterIsInstance<LastBattleCriticalHitsEvolutionProgress>()
|
||||||
.forEach { it.reset() }
|
.forEach { it.reset() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -271,13 +271,12 @@ open class PokemonBattle(
|
|||||||
val facedFainted = opponentPokemon.facedOpponents.contains(faintedPokemon)
|
val facedFainted = opponentPokemon.facedOpponents.contains(faintedPokemon)
|
||||||
val pokemon = opponentPokemon.effectedPokemon
|
val pokemon = opponentPokemon.effectedPokemon
|
||||||
if (facedFainted) {
|
if (facedFainted) {
|
||||||
if (pokemon.hasMatchingRequirement<DefeatRequirement>({ it.target.matches(faintedPokemon.effectedPokemon) })) {
|
pokemon.lockedEvolutions.forEach { evolution ->
|
||||||
val requiredPokemonProperties = pokemon.getRelevantRequirements<DefeatRequirement> { it.target.matches(faintedPokemon.effectedPokemon) }
|
evolution.requirements.filterIsInstance<DefeatRequirement>().forEach { defeatRequirement ->
|
||||||
.map { it.target }
|
if (defeatRequirement.target.matches(faintedPokemon.effectedPokemon)) {
|
||||||
.distinctBy { it.asString() }
|
val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DefeatEvolutionProgress && it.currentProgress().target == defeatRequirement.target }) { DefeatEvolutionProgress() }
|
||||||
for (props in requiredPokemonProperties) {
|
progress.updateProgress(DefeatEvolutionProgress.Progress(defeatRequirement.target, progress.currentProgress().amount + 1))
|
||||||
val progress = pokemon.progressFirstOrCreate({ it is DefeatTransformationProgress && it.currentProgress().target.asString().equals(props.asString(), ignoreCase = true) }, ::DefeatTransformationProgress)
|
}
|
||||||
progress.updateProgress(DefeatTransformationProgress.Progress(props.copy(), progress.currentProgress().amount + 1))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -22,9 +22,9 @@ import com.cobblemon.mod.common.item.battle.BagItem
|
|||||||
import com.cobblemon.mod.common.net.messages.client.battle.BattleApplyPassResponsePacket
|
import com.cobblemon.mod.common.net.messages.client.battle.BattleApplyPassResponsePacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
|
import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
|
||||||
import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
|
import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
|
||||||
import java.util.UUID
|
|
||||||
import net.minecraft.network.chat.Component
|
import net.minecraft.network.chat.Component
|
||||||
import net.minecraft.network.chat.MutableComponent
|
import net.minecraft.network.chat.MutableComponent
|
||||||
|
import java.util.UUID
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
|
||||||
abstract class BattleActor(
|
abstract class BattleActor(
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import com.cobblemon.mod.common.util.adapters.*
|
|||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import com.google.gson.GsonBuilder
|
import com.google.gson.GsonBuilder
|
||||||
import com.google.gson.reflect.TypeToken
|
import com.google.gson.reflect.TypeToken
|
||||||
import java.awt.Color
|
|
||||||
import net.minecraft.advancements.critereon.MinMaxBounds
|
import net.minecraft.advancements.critereon.MinMaxBounds
|
||||||
import net.minecraft.core.registries.Registries
|
import net.minecraft.core.registries.Registries
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
@@ -31,6 +30,7 @@ import net.minecraft.tags.TagKey
|
|||||||
import net.minecraft.world.level.biome.Biome
|
import net.minecraft.world.level.biome.Biome
|
||||||
import net.minecraft.world.phys.AABB
|
import net.minecraft.world.phys.AABB
|
||||||
import net.minecraft.world.phys.Vec3
|
import net.minecraft.world.phys.Vec3
|
||||||
|
import java.awt.Color
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The data registry for [Berry].
|
* The data registry for [Berry].
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ import com.cobblemon.mod.common.util.writeBox
|
|||||||
import com.cobblemon.mod.common.util.writeEnumConstant
|
import com.cobblemon.mod.common.util.writeEnumConstant
|
||||||
import com.cobblemon.mod.common.util.writeIdentifier
|
import com.cobblemon.mod.common.util.writeIdentifier
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
import java.awt.Color
|
|
||||||
import java.util.EnumSet
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||||
|
import java.awt.Color
|
||||||
|
import java.util.EnumSet
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
import net.minecraft.tags.TagKey
|
import net.minecraft.tags.TagKey
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.drop
|
package com.cobblemon.mod.common.api.drop
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
|
import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
|
|
||||||
class EvolutionItemDropEntry : ItemDropEntry() {
|
class EvolutionItemDropEntry : ItemDropEntry() {
|
||||||
val requirements: MutableSet<TransformationRequirement> = mutableSetOf()
|
val requirements: MutableSet<Requirement> = mutableSetOf()
|
||||||
|
|
||||||
override fun canDrop(pokemon: Pokemon?): Boolean = pokemon != null && requirements.all { it.check(pokemon) }
|
override fun canDrop(pokemon: Pokemon?): Boolean = pokemon != null && requirements.all { it.check(pokemon) }
|
||||||
}
|
}
|
||||||
@@ -48,10 +48,6 @@ import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionAcceptedEv
|
|||||||
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
|
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
|
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
|
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.form.FormAcceptedEvent
|
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.form.FormCompleteEvent
|
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.form.FormDisplayEvent
|
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.form.FormTestedEvent
|
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.healing.PokemonHealedEvent
|
import com.cobblemon.mod.common.api.events.pokemon.healing.PokemonHealedEvent
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
|
import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
|
import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
|
||||||
@@ -107,18 +103,6 @@ object CobblemonEvents {
|
|||||||
@JvmField
|
@JvmField
|
||||||
val EVOLUTION_COMPLETE = EventObservable<EvolutionCompleteEvent>()
|
val EVOLUTION_COMPLETE = EventObservable<EvolutionCompleteEvent>()
|
||||||
|
|
||||||
@JvmField
|
|
||||||
val FORM_ACCEPTED = CancelableObservable<FormAcceptedEvent>()
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
val FORM_DISPLAY = EventObservable<FormDisplayEvent>()
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
val FORM_TESTED = EventObservable<FormTestedEvent>()
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
val FORM_COMPLETE = EventObservable<FormCompleteEvent>()
|
|
||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val POKEMON_NICKNAMED = CancelableObservable<PokemonNicknamedEvent>()
|
val POKEMON_NICKNAMED = CancelableObservable<PokemonNicknamedEvent>()
|
||||||
|
|
||||||
|
|||||||
+2
@@ -15,7 +15,9 @@ import com.cobblemon.mod.common.api.battles.model.actor.ActorType
|
|||||||
import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
|
import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
|
||||||
import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
|
import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
|
import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
|
||||||
import com.cobblemon.mod.common.entity.MoLangScriptingEntity
|
import com.cobblemon.mod.common.entity.MoLangScriptingEntity
|
||||||
|
import com.cobblemon.mod.common.entity.npc.NPCBattleActor
|
||||||
import com.cobblemon.mod.common.util.asArrayValue
|
import com.cobblemon.mod.common.util.asArrayValue
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import com.bedrockk.molang.runtime.value.DoubleValue
|
|||||||
import com.cobblemon.mod.common.api.events.Cancelable
|
import com.cobblemon.mod.common.api.events.Cancelable
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
||||||
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.trade.TradeParticipant
|
import com.cobblemon.mod.common.trade.TradeParticipant
|
||||||
import com.cobblemon.mod.common.util.getPlayer
|
import com.cobblemon.mod.common.util.getPlayer
|
||||||
|
|||||||
+1
-1
@@ -12,8 +12,8 @@ import com.bedrockk.molang.runtime.value.MoValue
|
|||||||
import com.cobblemon.mod.common.api.events.Cancelable
|
import com.cobblemon.mod.common.api.events.Cancelable
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fired when an evolution is accepted.
|
* Fired when an evolution is accepted.
|
||||||
|
|||||||
+1
-1
@@ -10,8 +10,8 @@ package com.cobblemon.mod.common.api.events.pokemon.evolution
|
|||||||
|
|
||||||
import com.bedrockk.molang.runtime.value.MoValue
|
import com.bedrockk.molang.runtime.value.MoValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fired after an evolution finishes.
|
* Fired after an evolution finishes.
|
||||||
|
|||||||
+2
-2
@@ -8,9 +8,9 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.pokemon.evolution
|
package com.cobblemon.mod.common.api.events.pokemon.evolution
|
||||||
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.EvolutionDisplay
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.EvolutionDisplay
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fired before an evolution is sent to clients.
|
* Fired before an evolution is sent to clients.
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.pokemon.evolution
|
package com.cobblemon.mod.common.api.events.pokemon.evolution
|
||||||
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -12,8 +12,8 @@ import com.bedrockk.molang.runtime.value.DoubleValue
|
|||||||
import com.bedrockk.molang.runtime.value.MoValue
|
import com.bedrockk.molang.runtime.value.MoValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
|
||||||
import com.cobblemon.mod.common.util.getBoolean
|
import com.cobblemon.mod.common.util.getBoolean
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
-37
@@ -1,37 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 Cobblemon Contributors
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.pokemon.form
|
|
||||||
|
|
||||||
import com.bedrockk.molang.runtime.value.StringValue
|
|
||||||
import com.cobblemon.mod.common.api.events.Cancelable
|
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a temporary form change is accepted.
|
|
||||||
* Cancelling will not notify users nor remove the form from the pending list.
|
|
||||||
*
|
|
||||||
* @param pokemon The [Pokemon] about to change form.
|
|
||||||
* @param form The [TemporaryForm] being used.
|
|
||||||
*
|
|
||||||
* @author Hiroku
|
|
||||||
* @since June 3rd, 2026
|
|
||||||
*/
|
|
||||||
data class FormAcceptedEvent(
|
|
||||||
override val pokemon: Pokemon,
|
|
||||||
override val form: TemporaryForm
|
|
||||||
) : Cancelable(), FormEvent {
|
|
||||||
val context = mutableMapOf(
|
|
||||||
"pokemon" to pokemon.struct,
|
|
||||||
"form" to StringValue(form.formOnlyShowdownId())
|
|
||||||
)
|
|
||||||
|
|
||||||
val functions = moLangFunctionMap(cancelFunc)
|
|
||||||
}
|
|
||||||
-34
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 Cobblemon Contributors
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.pokemon.form
|
|
||||||
|
|
||||||
import com.bedrockk.molang.runtime.value.StringValue
|
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired after a temporary form change finishes.
|
|
||||||
*
|
|
||||||
* @param pokemon The [Pokemon] resulting from the form change.
|
|
||||||
* @param form The [TemporaryForm] that was used.
|
|
||||||
*
|
|
||||||
* @author Hiroku
|
|
||||||
* @since June 3rd, 2026
|
|
||||||
*/
|
|
||||||
data class FormCompleteEvent(
|
|
||||||
/** The [Pokemon] that did the form change. */
|
|
||||||
override val pokemon: Pokemon,
|
|
||||||
/** The [TemporaryForm] that was used. */
|
|
||||||
override val form: TemporaryForm
|
|
||||||
) : FormEvent {
|
|
||||||
val context = mutableMapOf(
|
|
||||||
"pokemon" to pokemon.struct,
|
|
||||||
"form" to StringValue(form.formOnlyShowdownId())
|
|
||||||
)
|
|
||||||
}
|
|
||||||
-37
@@ -1,37 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 Cobblemon Contributors
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.pokemon.form
|
|
||||||
|
|
||||||
import com.bedrockk.molang.runtime.value.StringValue
|
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.FormDisplay
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired before a form is sent to clients. For modifications on the actual output when they accept it modify
|
|
||||||
* the [display] directly.
|
|
||||||
*
|
|
||||||
* @param pokemon The [Pokemon] that will change form if this proposition is accepted.
|
|
||||||
* @param display The current [FormDisplay] the client will see.
|
|
||||||
* @param form The [TemporaryForm] being used.
|
|
||||||
*
|
|
||||||
* @author Hiroku
|
|
||||||
* @since June 3rd, 2026
|
|
||||||
*/
|
|
||||||
data class FormDisplayEvent(
|
|
||||||
override val pokemon: Pokemon,
|
|
||||||
var display: FormDisplay,
|
|
||||||
override val form: TemporaryForm
|
|
||||||
) : FormEvent {
|
|
||||||
val context = mutableMapOf(
|
|
||||||
"pokemon" to pokemon.struct,
|
|
||||||
"display" to display.struct,
|
|
||||||
"form" to StringValue(form.formOnlyShowdownId())
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 Cobblemon Contributors
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.pokemon.form
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The root of the various [TemporaryForm]-related events.
|
|
||||||
*/
|
|
||||||
interface FormEvent {
|
|
||||||
/** The Pokémon impacted in this event.*/
|
|
||||||
val pokemon: Pokemon
|
|
||||||
/*** The form triggering this event.*/
|
|
||||||
val form: TemporaryForm
|
|
||||||
}
|
|
||||||
-47
@@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 Cobblemon Contributors
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.pokemon.form
|
|
||||||
|
|
||||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
|
||||||
import com.bedrockk.molang.runtime.value.StringValue
|
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
|
|
||||||
import com.cobblemon.mod.common.util.getBoolean
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event fired when [TemporaryForm.test] has been performed.
|
|
||||||
* The final state [result] will be the return value of the test function.
|
|
||||||
*
|
|
||||||
* @property pokemon The [Pokemon] being tested against.
|
|
||||||
* @property form The [TemporaryForm] instance performing the test.
|
|
||||||
* @property originalResult The base result from the Cobblemon implementation.
|
|
||||||
* @property result The final value returned by [TemporaryForm.test].
|
|
||||||
*/
|
|
||||||
data class FormTestedEvent(
|
|
||||||
override val pokemon: Pokemon,
|
|
||||||
override val form: TemporaryForm,
|
|
||||||
val originalResult: Boolean,
|
|
||||||
) : FormEvent {
|
|
||||||
var result: Boolean = originalResult
|
|
||||||
|
|
||||||
val context = mutableMapOf(
|
|
||||||
"pokemon" to pokemon.struct,
|
|
||||||
"form" to StringValue(form.formOnlyShowdownId()),
|
|
||||||
"original_result" to DoubleValue(originalResult),
|
|
||||||
)
|
|
||||||
|
|
||||||
val functions = moLangFunctionMap(
|
|
||||||
"result" to { DoubleValue(result) },
|
|
||||||
"set_result" to {
|
|
||||||
result = it.getBoolean(0)
|
|
||||||
DoubleValue.ONE
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
+1
@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
|||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
||||||
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
|
import com.cobblemon.mod.common.util.getPlayer
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.events.storage
|
package com.cobblemon.mod.common.api.events.storage
|
||||||
|
|
||||||
|
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||||
import com.bedrockk.molang.runtime.value.StringValue
|
import com.bedrockk.molang.runtime.value.StringValue
|
||||||
import com.cobblemon.mod.common.api.events.Cancelable
|
import com.cobblemon.mod.common.api.events.Cancelable
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
||||||
|
|||||||
+2
@@ -16,7 +16,9 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
|||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
|
||||||
import com.cobblemon.mod.common.api.storage.PokemonStore
|
import com.cobblemon.mod.common.api.storage.PokemonStore
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
|
import com.cobblemon.mod.common.util.getPlayer
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import java.util.UUID
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The base of the events around the release of Pokémon from pc or party.
|
* The base of the events around the release of Pokémon from pc or party.
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry
|
|||||||
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
||||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||||
import com.cobblemon.mod.common.net.messages.client.data.FossilRegistrySyncPacket
|
import com.cobblemon.mod.common.net.messages.client.data.FossilRegistrySyncPacket
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.LegacyItemConditionWrapperAdapter
|
import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
|
||||||
import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
|
import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
|
||||||
import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
|
import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
|
||||||
import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
|
import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
|
||||||
|
|||||||
+5
-5
@@ -13,13 +13,13 @@ import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
|
|||||||
import com.cobblemon.mod.common.api.data.JsonDataRegistry
|
import com.cobblemon.mod.common.api.data.JsonDataRegistry
|
||||||
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
||||||
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
|
import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
|
||||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.net.messages.client.data.PokemonInteractionsSyncPacket
|
import com.cobblemon.mod.common.net.messages.client.data.PokemonInteractionsSyncPacket
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.CobblemonRequirementAdapter
|
import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.LegacyItemConditionWrapperAdapter
|
import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.requirements.PokemonPropertiesRequirement
|
import com.cobblemon.mod.common.pokemon.requirements.PokemonPropertiesRequirement
|
||||||
import com.cobblemon.mod.common.util.adapters.*
|
import com.cobblemon.mod.common.util.adapters.*
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
@@ -46,7 +46,7 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
|
|||||||
.registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
|
.registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
|
||||||
.registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
|
.registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
|
||||||
.registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
|
.registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
|
||||||
.registerTypeAdapter(TransformationRequirement::class.java, CobblemonRequirementAdapter)
|
.registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
|
||||||
.registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
|
.registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
|
||||||
.registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
|
.registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
|
||||||
.registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
|
.registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
|
||||||
|
|||||||
+5
-10
@@ -12,16 +12,11 @@ import com.bedrockk.molang.runtime.MoLangRuntime
|
|||||||
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
|
import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
|
import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.CobblemonRequirementAdapter
|
import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
|
||||||
import com.cobblemon.mod.common.util.asExpressionLike
|
import com.cobblemon.mod.common.util.*
|
||||||
import com.cobblemon.mod.common.util.giveOrDropItemStack
|
|
||||||
import com.cobblemon.mod.common.util.readExpressionLike
|
|
||||||
import com.cobblemon.mod.common.util.withPlayerValue
|
|
||||||
import com.cobblemon.mod.common.util.withQueryValue
|
|
||||||
import com.cobblemon.mod.common.util.writeExpressionLike
|
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
import net.minecraft.core.registries.Registries
|
import net.minecraft.core.registries.Registries
|
||||||
import net.minecraft.network.FriendlyByteBuf
|
import net.minecraft.network.FriendlyByteBuf
|
||||||
@@ -34,7 +29,7 @@ import net.minecraft.world.entity.item.ItemEntity
|
|||||||
import net.minecraft.world.item.ItemStack
|
import net.minecraft.world.item.ItemStack
|
||||||
|
|
||||||
data class PokemonInteractionSet(
|
data class PokemonInteractionSet(
|
||||||
val requirements: List<TransformationRequirement> = listOf(),
|
val requirements: List<Requirement> = listOf(),
|
||||||
val interactions: List<PokemonInteraction> = listOf(),
|
val interactions: List<PokemonInteraction> = listOf(),
|
||||||
) {
|
) {
|
||||||
fun encode(buffer: FriendlyByteBuf) {
|
fun encode(buffer: FriendlyByteBuf) {
|
||||||
@@ -56,7 +51,7 @@ data class PokemonInteractionSet(
|
|||||||
}
|
}
|
||||||
|
|
||||||
data class PokemonInteraction(
|
data class PokemonInteraction(
|
||||||
val requirements: List<TransformationRequirement> = listOf(),
|
val requirements: List<Requirement> = listOf(),
|
||||||
val effects: List<InteractionEffect> = listOf(),
|
val effects: List<InteractionEffect> = listOf(),
|
||||||
val cooldown: ExpressionLike = "0".asExpressionLike()
|
val cooldown: ExpressionLike = "0".asExpressionLike()
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ abstract class RequestManager<T : ServerPlayerActionRequest> {
|
|||||||
?: this.getInboundRequest(receiver.uuid, requestID)
|
?: this.getInboundRequest(receiver.uuid, requestID)
|
||||||
|
|
||||||
/** Determines whether [player] can receive a [T]. */
|
/** Determines whether [player] can receive a [T]. */
|
||||||
open fun isBusy(player: ServerPlayer): Boolean = player.isBusy() || player.isPartyBusy()
|
open fun isBusy(player: ServerPlayer): Boolean = player.isInBattle() || player.isTrading() || player.party().find { it.entity?.isBusy == true } != null
|
||||||
|
|
||||||
/** Determines if the [target] is a valid interaction request target. */
|
/** Determines if the [target] is a valid interaction request target. */
|
||||||
abstract fun isValidInteraction(player: ServerPlayer, target: ServerPlayer): Boolean
|
abstract fun isValidInteraction(player: ServerPlayer, target: ServerPlayer): Boolean
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
package com.cobblemon.mod.common.api.item
|
package com.cobblemon.mod.common.api.item
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.data.DataRegistry
|
import com.cobblemon.mod.common.api.data.DataRegistry
|
||||||
import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
|
|
||||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||||
import com.cobblemon.mod.common.battles.runner.ShowdownService
|
import com.cobblemon.mod.common.battles.runner.ShowdownService
|
||||||
import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
|
import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
|
||||||
@@ -30,11 +29,9 @@ object HeldItems : DataRegistry {
|
|||||||
// val heldItems = PrioritizedList<BagItemLike>()
|
// val heldItems = PrioritizedList<BagItemLike>()
|
||||||
internal val heldItemsScripts = mutableMapOf<String, String>() // showdown item ID to JavaScript
|
internal val heldItemsScripts = mutableMapOf<String, String>() // showdown item ID to JavaScript
|
||||||
val showdownItems = hashSetOf<String>()
|
val showdownItems = hashSetOf<String>()
|
||||||
val megaStones = hashMapOf<String, String>()
|
|
||||||
|
|
||||||
override fun reload(manager: ResourceManager) {
|
override fun reload(manager: ResourceManager) {
|
||||||
heldItemsScripts.clear()
|
heldItemsScripts.clear()
|
||||||
megaStones.clear()
|
|
||||||
ShowdownService.service.resetRegistryData("heldItem")
|
ShowdownService.service.resetRegistryData("heldItem")
|
||||||
manager.listResources("held_items") { it.path.endsWith(".js") }.forEach { (identifier, resource) ->
|
manager.listResources("held_items") { it.path.endsWith(".js") }.forEach { (identifier, resource) ->
|
||||||
resource.open().use { stream ->
|
resource.open().use { stream ->
|
||||||
@@ -51,9 +48,6 @@ object HeldItems : DataRegistry {
|
|||||||
for (i in 0 until itemsJson.size()) {
|
for (i in 0 until itemsJson.size()) {
|
||||||
val jsItem = itemsJson[i].asJsonObject
|
val jsItem = itemsJson[i].asJsonObject
|
||||||
showdownItems += jsItem.get("id").asString
|
showdownItems += jsItem.get("id").asString
|
||||||
if (jsItem.has("megaEvolves")) {
|
|
||||||
megaStones[jsItem.get("id").asString] = ShowdownIdentifiable.REGEX.replace(jsItem.get("megaEvolves").asString.lowercase(), "")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CobblemonHeldItemManager.load()
|
CobblemonHeldItemManager.load()
|
||||||
|
|||||||
@@ -21,9 +21,34 @@ import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
|
|||||||
import com.cobblemon.mod.common.api.battles.model.PokemonBattle
|
import com.cobblemon.mod.common.api.battles.model.PokemonBattle
|
||||||
import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
|
import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
|
||||||
import com.cobblemon.mod.common.api.drop.DropEntry
|
import com.cobblemon.mod.common.api.drop.DropEntry
|
||||||
import com.cobblemon.mod.common.api.molang.function.*
|
import com.cobblemon.mod.common.api.molang.function.BattleActorMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.BattleMessageMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.BattleMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.BiomeMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.BlockMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.DimensionTypeMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.DropEntryMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.EntityMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.EvolutionMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.GeneralMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.ItemStackMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.LivingEntityMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.NPCMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PCMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PartyMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PlayerMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PokedexMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PokemonEntityMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PokemonMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PokemonPropertiesMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.PokemonStoreMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.ServerMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.SpawnablePositionMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.SpeciesMoLangFunctions
|
||||||
|
import com.cobblemon.mod.common.api.molang.function.WorldMoLangFunctions
|
||||||
import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
|
import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
|
||||||
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.api.scripting.CobblemonScripts
|
import com.cobblemon.mod.common.api.scripting.CobblemonScripts
|
||||||
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
||||||
import com.cobblemon.mod.common.api.storage.PokemonStore
|
import com.cobblemon.mod.common.api.storage.PokemonStore
|
||||||
@@ -33,10 +58,8 @@ import com.cobblemon.mod.common.entity.npc.NPCEntity
|
|||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.pokemon.Species
|
import com.cobblemon.mod.common.pokemon.Species
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
|
||||||
import com.cobblemon.mod.common.util.effectiveName
|
import com.cobblemon.mod.common.util.effectiveName
|
||||||
import com.mojang.datafixers.util.Either
|
import com.mojang.datafixers.util.Either
|
||||||
import java.util.function.Function
|
|
||||||
import net.minecraft.core.Holder
|
import net.minecraft.core.Holder
|
||||||
import net.minecraft.core.Registry
|
import net.minecraft.core.Registry
|
||||||
import net.minecraft.core.RegistryAccess
|
import net.minecraft.core.RegistryAccess
|
||||||
@@ -61,6 +84,7 @@ import net.minecraft.world.level.biome.Biome
|
|||||||
import net.minecraft.world.level.block.Block
|
import net.minecraft.world.level.block.Block
|
||||||
import net.minecraft.world.level.dimension.DimensionType
|
import net.minecraft.world.level.dimension.DimensionType
|
||||||
import net.minecraft.world.phys.Vec3
|
import net.minecraft.world.phys.Vec3
|
||||||
|
import java.util.function.Function
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds a bunch of useful MoLang trickery that can be used or extended in API
|
* Holds a bunch of useful MoLang trickery that can be used or extended in API
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import com.bedrockk.molang.runtime.value.DoubleValue
|
|||||||
import com.bedrockk.molang.runtime.value.StringValue
|
import com.bedrockk.molang.runtime.value.StringValue
|
||||||
import com.cobblemon.mod.common.api.battles.model.PokemonBattle
|
import com.cobblemon.mod.common.api.battles.model.PokemonBattle
|
||||||
import com.cobblemon.mod.common.util.asArrayValue
|
import com.cobblemon.mod.common.util.asArrayValue
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
object BattleMoLangFunctions : AbstractMoLangFunctionHolder<PokemonBattle>() {
|
object BattleMoLangFunctions : AbstractMoLangFunctionHolder<PokemonBattle>() {
|
||||||
override fun PokemonBattle.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
|
override fun PokemonBattle.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
|
||||||
|
|||||||
+17
-20
@@ -11,34 +11,31 @@ package com.cobblemon.mod.common.api.molang.function
|
|||||||
import com.bedrockk.molang.runtime.MoParams
|
import com.bedrockk.molang.runtime.MoParams
|
||||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.Transformation
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.triggers.ItemInteractionTrigger
|
import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.triggers.LevelUpTrigger
|
import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.triggers.TradeTrigger
|
|
||||||
|
|
||||||
object EvolutionMoLangFunctions : AbstractMoLangFunctionHolder<Transformation>() {
|
object EvolutionMoLangFunctions : AbstractMoLangFunctionHolder<Evolution>() {
|
||||||
override fun Transformation.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
|
override fun Evolution.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
|
||||||
val evolution = this
|
val evolution = this
|
||||||
val functions = hashMapOf<String, (MoParams) -> Any>()
|
val functions = hashMapOf<String, (MoParams) -> Any>()
|
||||||
|
|
||||||
functions["reevaluate"] = { DoubleValue(evolution.reevaluate) }
|
functions["result"] = { evolution.result.asMoLangValue() }
|
||||||
functions["is_optional"] = { DoubleValue(evolution.optional) }
|
functions["is_optional"] = { DoubleValue(evolution.optional) }
|
||||||
|
functions["consumes_held_item"] = { DoubleValue(evolution.consumeHeldItem) }
|
||||||
|
|
||||||
if (evolution is Evolution) {
|
when (evolution) {
|
||||||
functions["result"] = { evolution.result.asMoLangValue() }
|
is LevelUpEvolution -> {
|
||||||
when (evolution.trigger) {
|
functions["is_level_up"] = { DoubleValue.ONE }
|
||||||
is LevelUpTrigger -> {
|
}
|
||||||
functions["is_level_up"] = { DoubleValue.ONE }
|
|
||||||
}
|
|
||||||
|
|
||||||
is TradeTrigger -> {
|
is TradeEvolution -> {
|
||||||
functions["is_trade"] = { DoubleValue.ONE }
|
functions["is_trade"] = { DoubleValue.ONE }
|
||||||
}
|
}
|
||||||
|
|
||||||
is ItemInteractionTrigger -> {
|
is ItemInteractionEvolution -> {
|
||||||
functions["is_item"] = { DoubleValue.ONE }
|
functions["is_item"] = { DoubleValue.ONE }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+5
@@ -55,6 +55,11 @@ object GeneralMoLangFunctions {
|
|||||||
struct.map.remove(variable)
|
struct.map.remove(variable)
|
||||||
DoubleValue.ONE
|
DoubleValue.ONE
|
||||||
}
|
}
|
||||||
|
functions["delete_variables"] = { params ->
|
||||||
|
val struct = params.get<VariableStruct>(0)
|
||||||
|
struct.map.clear()
|
||||||
|
DoubleValue.ONE
|
||||||
|
}
|
||||||
functions["get_variable"] = { params ->
|
functions["get_variable"] = { params ->
|
||||||
val struct = params.get<VariableStruct>(0)
|
val struct = params.get<VariableStruct>(0)
|
||||||
val variable = params.getString(1)
|
val variable = params.getString(1)
|
||||||
|
|||||||
+22
@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
|
|||||||
import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
|
import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
|
||||||
import com.cobblemon.mod.common.api.pokedex.CaughtCount
|
import com.cobblemon.mod.common.api.pokedex.CaughtCount
|
||||||
import com.cobblemon.mod.common.api.pokedex.CaughtPercent
|
import com.cobblemon.mod.common.api.pokedex.CaughtPercent
|
||||||
|
import com.cobblemon.mod.common.api.pokedex.Dexes
|
||||||
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
|
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
|
||||||
import com.cobblemon.mod.common.api.pokedex.PokedexManager
|
import com.cobblemon.mod.common.api.pokedex.PokedexManager
|
||||||
import com.cobblemon.mod.common.api.pokedex.SeenCount
|
import com.cobblemon.mod.common.api.pokedex.SeenCount
|
||||||
@@ -74,6 +75,27 @@ object PokedexMoLangFunctions : AbstractMoLangFunctionHolder<AbstractPokedexMana
|
|||||||
functions["caught_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtPercent)) }
|
functions["caught_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtPercent)) }
|
||||||
functions["seen_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(SeenPercent)) }
|
functions["seen_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(SeenPercent)) }
|
||||||
|
|
||||||
|
functions["dex_caught_count"] = { params ->
|
||||||
|
val dexId = params.getString(0).asIdentifierDefaultingNamespace()
|
||||||
|
if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, CaughtCount))
|
||||||
|
else DoubleValue.ZERO
|
||||||
|
}
|
||||||
|
functions["dex_seen_count"] = { params ->
|
||||||
|
val dexId = params.getString(0).asIdentifierDefaultingNamespace()
|
||||||
|
if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, SeenCount))
|
||||||
|
else DoubleValue.ZERO
|
||||||
|
}
|
||||||
|
functions["dex_caught_percent"] = { params ->
|
||||||
|
val dexId = params.getString(0).asIdentifierDefaultingNamespace()
|
||||||
|
if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, CaughtPercent).toDouble())
|
||||||
|
else DoubleValue.ZERO
|
||||||
|
}
|
||||||
|
functions["dex_seen_percent"] = { params ->
|
||||||
|
val dexId = params.getString(0).asIdentifierDefaultingNamespace()
|
||||||
|
if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, SeenPercent).toDouble())
|
||||||
|
else DoubleValue.ZERO
|
||||||
|
}
|
||||||
|
|
||||||
when (pokedex) {
|
when (pokedex) {
|
||||||
is PokedexManager -> {
|
is PokedexManager -> {
|
||||||
functions["player_id"] = { StringValue(pokedex.uuid.toString()) }
|
functions["player_id"] = { StringValue(pokedex.uuid.toString()) }
|
||||||
|
|||||||
+1
-1
@@ -445,7 +445,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
|
|||||||
val idx = params.getInt(0)
|
val idx = params.getInt(0)
|
||||||
val evolution =
|
val evolution =
|
||||||
if (idx >= 0) pokemon.evolutions.elementAtOrNull(idx) else return@forceEvolve DoubleValue.ZERO
|
if (idx >= 0) pokemon.evolutions.elementAtOrNull(idx) else return@forceEvolve DoubleValue.ZERO
|
||||||
evolution?.perform(pokemon)
|
evolution?.forceEvolve(pokemon)
|
||||||
StringValue(evolution.toString())
|
StringValue(evolution.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ import com.bedrockk.molang.runtime.struct.MoStruct
|
|||||||
import com.bedrockk.molang.runtime.struct.QueryStruct
|
import com.bedrockk.molang.runtime.struct.QueryStruct
|
||||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||||
import com.bedrockk.molang.runtime.value.StringValue
|
import com.bedrockk.molang.runtime.value.StringValue
|
||||||
import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
|
|
||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
|
|
||||||
import com.cobblemon.mod.common.api.moves.categories.DamageCategories
|
import com.cobblemon.mod.common.api.moves.categories.DamageCategories
|
||||||
import com.cobblemon.mod.common.api.moves.categories.DamageCategory
|
import com.cobblemon.mod.common.api.moves.categories.DamageCategory
|
||||||
import com.cobblemon.mod.common.api.types.ElementalType
|
import com.cobblemon.mod.common.api.types.ElementalType
|
||||||
@@ -57,7 +55,7 @@ open class MoveTemplate(
|
|||||||
val critRatio: Double,
|
val critRatio: Double,
|
||||||
val effectChances: Array<Double>,
|
val effectChances: Array<Double>,
|
||||||
val weight: Float
|
val weight: Float
|
||||||
) : ShowdownIdentifiable {
|
) {
|
||||||
val struct: MoStruct by lazy {
|
val struct: MoStruct by lazy {
|
||||||
QueryStruct(hashMapOf())
|
QueryStruct(hashMapOf())
|
||||||
.addFunction("name") { StringValue(name) }
|
.addFunction("name") { StringValue(name) }
|
||||||
@@ -165,8 +163,6 @@ open class MoveTemplate(
|
|||||||
return this.elementalType
|
return this.elementalType
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun showdownId() = ShowdownIdentifiable.REGEX.replace(this.name.lowercase(), "")
|
|
||||||
|
|
||||||
fun getSelectionWeight(form: FormData): Float {
|
fun getSelectionWeight(form: FormData): Float {
|
||||||
return if (this in form.signatureMoves) {
|
return if (this in form.signatureMoves) {
|
||||||
weight * MovesetBuilder.signatureMoveWeightMultiplier
|
weight * MovesetBuilder.signatureMoveWeightMultiplier
|
||||||
|
|||||||
+4
-42
@@ -10,17 +10,13 @@ package com.cobblemon.mod.common.api.moves.animations
|
|||||||
|
|
||||||
import com.bedrockk.molang.runtime.MoLangRuntime
|
import com.bedrockk.molang.runtime.MoLangRuntime
|
||||||
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
|
|
||||||
import com.cobblemon.mod.common.api.moves.animations.keyframes.ActionEffectKeyframe
|
import com.cobblemon.mod.common.api.moves.animations.keyframes.ActionEffectKeyframe
|
||||||
import com.cobblemon.mod.common.api.scheduling.Schedulable
|
|
||||||
import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
|
|
||||||
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
|
||||||
import com.cobblemon.mod.common.util.asExpressionLike
|
import com.cobblemon.mod.common.util.asExpressionLike
|
||||||
import com.cobblemon.mod.common.util.resolveBoolean
|
import com.cobblemon.mod.common.util.resolveBoolean
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
import net.minecraft.world.entity.Entity
|
import net.minecraft.world.entity.Entity
|
||||||
import net.minecraft.world.level.Level
|
import net.minecraft.world.level.Level
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An action effect will run and execute a series of 'keyframes', with each running once
|
* An action effect will run and execute a series of 'keyframes', with each running once
|
||||||
@@ -40,7 +36,7 @@ class ActionEffectTimeline(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun run(context: ActionEffectContext): CompletableFuture<Unit> {
|
fun run(context: ActionEffectContext): CompletableFuture<Unit> {
|
||||||
val future = if (timeline.isEmpty() || !context.runtime.resolveBoolean(condition)) {
|
return if (timeline.isEmpty() || !context.runtime.resolveBoolean(condition)) {
|
||||||
CompletableFuture.completedFuture(Unit)
|
CompletableFuture.completedFuture(Unit)
|
||||||
} else {
|
} else {
|
||||||
val finalFuture = CompletableFuture<Unit>()
|
val finalFuture = CompletableFuture<Unit>()
|
||||||
@@ -51,10 +47,6 @@ class ActionEffectTimeline(
|
|||||||
it.printStackTrace()
|
it.printStackTrace()
|
||||||
CompletableFuture.completedFuture(Unit)
|
CompletableFuture.completedFuture(Unit)
|
||||||
}
|
}
|
||||||
|
|
||||||
context.future = future
|
|
||||||
future.thenRun { context.getHolds().forEach(context::removeHold) }
|
|
||||||
return future
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun chainKeyframes(context: ActionEffectContext, iterator: Iterator<ActionEffectKeyframe>, finalFuture: CompletableFuture<Unit>) {
|
fun chainKeyframes(context: ActionEffectContext, iterator: Iterator<ActionEffectKeyframe>, finalFuture: CompletableFuture<Unit>) {
|
||||||
@@ -73,45 +65,15 @@ class ActionEffectTimeline(
|
|||||||
|
|
||||||
class ActionEffectContext(
|
class ActionEffectContext(
|
||||||
val actionEffect: ActionEffectTimeline,
|
val actionEffect: ActionEffectTimeline,
|
||||||
private val holds: MutableSet<String> = mutableSetOf(),
|
val holds: MutableSet<String> = mutableSetOf(),
|
||||||
val providers: MutableList<Any> = mutableListOf(),
|
val providers: MutableList<Any> = mutableListOf(),
|
||||||
val runtime: MoLangRuntime,
|
val runtime: MoLangRuntime,
|
||||||
var canBeInterrupted: Boolean = false,
|
var canBeInterrupted: Boolean = false,
|
||||||
var interrupted: Boolean = false,
|
var interrupted: Boolean = false,
|
||||||
var currentKeyframes: MutableList<ActionEffectKeyframe> = mutableListOf(),
|
var currentKeyframes: MutableList<ActionEffectKeyframe> = mutableListOf(),
|
||||||
var level: Level? = null,
|
var level: Level? = null
|
||||||
var holdRemovalCallbacks: MutableMap<String, () -> Unit> = mutableMapOf(),
|
|
||||||
var tracker: Schedulable = ServerTaskTracker
|
|
||||||
) {
|
) {
|
||||||
companion object {
|
|
||||||
fun fromPokemonEntity(
|
|
||||||
actionEffect: ActionEffectTimeline,
|
|
||||||
pokemonEntity: PokemonEntity,
|
|
||||||
runtime: MoLangRuntime = MoLangRuntime().also { it.environment.query.addStandardFunctions() },
|
|
||||||
holds: Collection<String> = emptySet(),
|
|
||||||
holdRemovalCallbacks: Map<String, () -> Unit> = emptyMap()
|
|
||||||
): ActionEffectContext {
|
|
||||||
return ActionEffectContext(
|
|
||||||
actionEffect = actionEffect,
|
|
||||||
providers = mutableListOf(UsersProvider(listOf(pokemonEntity))),
|
|
||||||
holdRemovalCallbacks = holdRemovalCallbacks.toMutableMap(),
|
|
||||||
holds = holds.toMutableSet(),
|
|
||||||
runtime = runtime,
|
|
||||||
level = pokemonEntity.level()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lateinit var future: CompletableFuture<Unit>
|
|
||||||
inline fun <reified T> findOneProvider() = providers.filterIsInstance<T>().firstOrNull()
|
inline fun <reified T> findOneProvider() = providers.filterIsInstance<T>().firstOrNull()
|
||||||
|
|
||||||
/** Returns a reference to the internal holds set so you can keep an eye on it. */
|
|
||||||
fun getHolds(): Set<String> = holds
|
|
||||||
fun addHold(hold: String) = holds.add(hold)
|
|
||||||
fun removeHold(hold: String) {
|
|
||||||
holds.remove(hold)
|
|
||||||
holdRemovalCallbacks.remove(hold)?.invoke()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class UsersProvider(users: List<Entity>): EntityProvider {
|
class UsersProvider(users: List<Entity>): EntityProvider {
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture
|
|||||||
class AddHoldsActionEffectKeyframe : ActionEffectKeyframe {
|
class AddHoldsActionEffectKeyframe : ActionEffectKeyframe {
|
||||||
val holds = mutableSetOf<String>()
|
val holds = mutableSetOf<String>()
|
||||||
override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
|
override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
|
||||||
holds.forEach(context::addHold)
|
context.holds.addAll(holds)
|
||||||
return CompletableFuture.completedFuture(Unit)
|
return CompletableFuture.completedFuture(Unit)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -49,6 +49,6 @@ class AnimationActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityC
|
|||||||
players.forEach { it.sendPacket(pkt) }
|
players.forEach { it.sendPacket(pkt) }
|
||||||
}
|
}
|
||||||
|
|
||||||
return delayedFuture(seconds = delay.resolveFloat(context.runtime), tracker = context.tracker)
|
return delayedFuture(seconds = delay.resolveFloat(context.runtime))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -46,6 +46,6 @@ class EntityMoLangActionEffectKeyframe : ConditionalActionEffectKeyframe(), Enti
|
|||||||
players.forEach { it.sendPacket(pkt) }
|
players.forEach { it.sendPacket(pkt) }
|
||||||
}
|
}
|
||||||
|
|
||||||
return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
|
return delayedFuture(seconds = delay.resolveFloat(context.runtime))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-1
@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.entity.PosableEntity
|
|||||||
import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
|
import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
|
||||||
import com.cobblemon.mod.common.util.asExpressionLike
|
import com.cobblemon.mod.common.util.asExpressionLike
|
||||||
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
||||||
|
import net.minecraft.commands.arguments.EntityArgument.getPlayers
|
||||||
import java.util.concurrent.CompletableFuture
|
import java.util.concurrent.CompletableFuture
|
||||||
import net.minecraft.server.level.ServerLevel
|
import net.minecraft.server.level.ServerLevel
|
||||||
|
|
||||||
@@ -78,6 +79,6 @@ class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), E
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
|
return delayedFuture(seconds = delay.resolveFloat(context.runtime))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-2
@@ -15,8 +15,8 @@ import com.cobblemon.mod.common.api.moves.animations.UsersProvider
|
|||||||
import com.cobblemon.mod.common.api.scheduling.delayedFuture
|
import com.cobblemon.mod.common.api.scheduling.delayedFuture
|
||||||
import com.cobblemon.mod.common.util.asExpressionLike
|
import com.cobblemon.mod.common.util.asExpressionLike
|
||||||
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
import net.minecraft.core.registries.Registries
|
import net.minecraft.core.registries.Registries
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An action effect keyframe that plays a positioned sound for all matching entities.
|
* An action effect keyframe that plays a positioned sound for all matching entities.
|
||||||
@@ -45,6 +45,6 @@ class EntitySoundActionEffectKeyframe : ConditionalActionEffectKeyframe(), Entit
|
|||||||
entity.playSound(soundEvent, 1f, 1f)
|
entity.playSound(soundEvent, 1f, 1f)
|
||||||
}
|
}
|
||||||
|
|
||||||
return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
|
return delayedFuture(seconds = delay.resolveFloat(context.runtime))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-1
@@ -8,6 +8,8 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.moves.animations.keyframes
|
package com.cobblemon.mod.common.api.moves.animations.keyframes
|
||||||
|
|
||||||
|
import com.bedrockk.molang.runtime.struct.QueryStruct
|
||||||
|
import com.cobblemon.mod.common.Cobblemon
|
||||||
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
import com.cobblemon.mod.common.api.molang.ExpressionLike
|
||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
||||||
import com.cobblemon.mod.common.api.scheduling.delayedFuture
|
import com.cobblemon.mod.common.api.scheduling.delayedFuture
|
||||||
@@ -25,6 +27,6 @@ class MoLangActionEffectKeyframe : ActionEffectKeyframe {
|
|||||||
val delay: ExpressionLike = "0".asExpressionLike()
|
val delay: ExpressionLike = "0".asExpressionLike()
|
||||||
override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
|
override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
|
||||||
expressions.resolve(context.runtime)
|
expressions.resolve(context.runtime)
|
||||||
return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
|
return delayedFuture(seconds = delay.resolveFloat(context.runtime))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-1
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
|
|||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffects
|
import com.cobblemon.mod.common.api.moves.animations.ActionEffects
|
||||||
import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
|
import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
|
||||||
import com.cobblemon.mod.common.api.moves.animations.UsersProvider
|
import com.cobblemon.mod.common.api.moves.animations.UsersProvider
|
||||||
|
import com.cobblemon.mod.common.api.scheduling.afterOnServer
|
||||||
import com.cobblemon.mod.common.entity.ai.OmniPathNavigation.NavigationContext
|
import com.cobblemon.mod.common.entity.ai.OmniPathNavigation.NavigationContext
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.util.asExpressionLike
|
import com.cobblemon.mod.common.util.asExpressionLike
|
||||||
@@ -60,7 +61,7 @@ class MoveToTargetActionEffectKeyframe : ActionEffectKeyframe {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
context.tracker.after(seconds = timeout.resolveFloat(context.runtime)) {
|
afterOnServer(seconds = timeout.resolveFloat(context.runtime)) {
|
||||||
if (!future.isDone && !timedOut) {
|
if (!future.isDone && !timedOut) {
|
||||||
timedOut = true
|
timedOut = true
|
||||||
timeoutEffect.run(context).thenApply { future.complete(Unit) }
|
timeoutEffect.run(context).thenApply { future.complete(Unit) }
|
||||||
|
|||||||
+1
-1
@@ -14,5 +14,5 @@ import com.cobblemon.mod.common.util.asExpressionLike
|
|||||||
|
|
||||||
class PauseActionEffectKeyframe : ConditionalActionEffectKeyframe() {
|
class PauseActionEffectKeyframe : ConditionalActionEffectKeyframe() {
|
||||||
val pause = "1".asExpressionLike()
|
val pause = "1".asExpressionLike()
|
||||||
override fun playWhenTrue(context: ActionEffectContext) = delayedFuture(seconds = pause.resolveFloat(context.runtime), context.tracker)
|
override fun playWhenTrue(context: ActionEffectContext) = delayedFuture(seconds = pause.resolveFloat(context.runtime))
|
||||||
}
|
}
|
||||||
+5
-2
@@ -25,8 +25,11 @@ class RemoveHoldsActionEffectKeyframe : ActionEffectKeyframe {
|
|||||||
val holds = mutableSetOf<String>()
|
val holds = mutableSetOf<String>()
|
||||||
override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
|
override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
|
||||||
return delayedFuture(seconds = delay).thenApply {
|
return delayedFuture(seconds = delay).thenApply {
|
||||||
val holdsToRemove = if (holds.isEmpty()) context.getHolds() else holds
|
if (holds.isEmpty()) {
|
||||||
holdsToRemove.forEach(context::removeHold)
|
context.holds.clear()
|
||||||
|
} else {
|
||||||
|
context.holds.removeAll(holds)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-2
@@ -13,12 +13,13 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
|||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
|
import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
|
||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffects
|
import com.cobblemon.mod.common.api.moves.animations.ActionEffects
|
||||||
import com.cobblemon.mod.common.api.moves.animations.UsersProvider
|
import com.cobblemon.mod.common.api.moves.animations.UsersProvider
|
||||||
|
import com.cobblemon.mod.common.api.scheduling.after
|
||||||
import com.cobblemon.mod.common.entity.ai.OmniPathNavigation.NavigationContext
|
import com.cobblemon.mod.common.entity.ai.OmniPathNavigation.NavigationContext
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.util.asExpressionLike
|
import com.cobblemon.mod.common.util.asExpressionLike
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
import net.minecraft.world.phys.Vec3
|
import net.minecraft.world.phys.Vec3
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
|
||||||
class ReturnToPositionActionEffectKeyframe : ActionEffectKeyframe {
|
class ReturnToPositionActionEffectKeyframe : ActionEffectKeyframe {
|
||||||
val speed = 1F
|
val speed = 1F
|
||||||
@@ -55,7 +56,7 @@ class ReturnToPositionActionEffectKeyframe : ActionEffectKeyframe {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
context.tracker.after(seconds = timeout.resolveFloat(context.runtime)) {
|
after(seconds = timeout.resolveFloat(context.runtime)) {
|
||||||
if (!future.isDone && !timedOut) {
|
if (!future.isDone && !timedOut) {
|
||||||
timedOut = true
|
timedOut = true
|
||||||
timeoutEffect.run(context).thenApply { future.complete(Unit) }
|
timeoutEffect.run(context).thenApply { future.complete(Unit) }
|
||||||
|
|||||||
+1
@@ -29,6 +29,7 @@ import com.cobblemon.mod.common.util.withQueryValue
|
|||||||
import com.google.gson.JsonElement
|
import com.google.gson.JsonElement
|
||||||
import com.google.gson.JsonObject
|
import com.google.gson.JsonObject
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
|
import kotlin.ranges.random
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+11
-8
@@ -17,18 +17,21 @@ import com.cobblemon.mod.common.api.npc.NPCPartyProvider
|
|||||||
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
||||||
import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
|
import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
|
||||||
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
||||||
import com.cobblemon.mod.common.util.asArrayValue
|
import com.cobblemon.mod.common.util.*
|
||||||
import com.cobblemon.mod.common.util.asExpression
|
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
|
||||||
import com.cobblemon.mod.common.util.resolveFloat
|
|
||||||
import com.cobblemon.mod.common.util.resolveInt
|
|
||||||
import com.cobblemon.mod.common.util.weightedSelection
|
|
||||||
import com.cobblemon.mod.common.util.withQueryValue
|
|
||||||
import com.google.gson.JsonElement
|
import com.google.gson.JsonElement
|
||||||
import com.google.gson.JsonObject
|
import com.google.gson.JsonObject
|
||||||
import com.google.gson.JsonPrimitive
|
import com.google.gson.JsonPrimitive
|
||||||
import kotlin.random.Random
|
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import kotlin.collections.List
|
||||||
|
import kotlin.collections.any
|
||||||
|
import kotlin.collections.filter
|
||||||
|
import kotlin.collections.first
|
||||||
|
import kotlin.collections.mutableListOf
|
||||||
|
import kotlin.collections.mutableMapOf
|
||||||
|
import kotlin.collections.randomOrNull
|
||||||
|
import kotlin.collections.set
|
||||||
|
import kotlin.collections.toMutableList
|
||||||
|
import kotlin.random.Random
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A provider of a party for battling the NPC. It generates a party using a more complex process
|
* A provider of a party for battling the NPC. It generates a party using a more complex process
|
||||||
|
|||||||
+23
-7
@@ -8,8 +8,10 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.orientation
|
package com.cobblemon.mod.common.api.orientation
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.util.math.QuatSpring
|
||||||
import com.cobblemon.mod.common.util.math.geometry.toDegrees
|
import com.cobblemon.mod.common.util.math.geometry.toDegrees
|
||||||
import com.cobblemon.mod.common.util.math.geometry.toRadians
|
import com.cobblemon.mod.common.util.math.geometry.toRadians
|
||||||
|
import com.cobblemon.mod.common.util.math.simpleSpringDamperQuat
|
||||||
import net.minecraft.client.Minecraft
|
import net.minecraft.client.Minecraft
|
||||||
import net.minecraft.util.Mth
|
import net.minecraft.util.Mth
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
@@ -26,6 +28,8 @@ open class OrientationController(val entity: LivingEntity) {
|
|||||||
val FORWARDS: Vector3f = Vector3f(0.0f, 0.0f, -1.0f)
|
val FORWARDS: Vector3f = Vector3f(0.0f, 0.0f, -1.0f)
|
||||||
val UP: Vector3f = Vector3f(0.0f, 1.0f, 0.0f)
|
val UP: Vector3f = Vector3f(0.0f, 1.0f, 0.0f)
|
||||||
val LEFT: Vector3f = Vector3f(-1.0f, 0.0f, 0.0f)
|
val LEFT: Vector3f = Vector3f(-1.0f, 0.0f, 0.0f)
|
||||||
|
private const val TICK_DT = 1f / 20f // Minecraft server tick rate
|
||||||
|
private const val RENDER_SMOOTH_HALFLIFE = 0.1f // seconds to close ~half the gap
|
||||||
}
|
}
|
||||||
|
|
||||||
open var active: Boolean = false
|
open var active: Boolean = false
|
||||||
@@ -33,6 +37,8 @@ open class OrientationController(val entity: LivingEntity) {
|
|||||||
var orientation: Matrix3f? = null
|
var orientation: Matrix3f? = null
|
||||||
private set
|
private set
|
||||||
|
|
||||||
|
private val renderSpring = QuatSpring()
|
||||||
|
|
||||||
private var renderOrientationO: Matrix3f? = null
|
private var renderOrientationO: Matrix3f? = null
|
||||||
private var renderOrientation: Matrix3f? = null
|
private var renderOrientation: Matrix3f? = null
|
||||||
|
|
||||||
@@ -54,6 +60,8 @@ open class OrientationController(val entity: LivingEntity) {
|
|||||||
orientation = null
|
orientation = null
|
||||||
renderOrientationO = null
|
renderOrientationO = null
|
||||||
renderOrientation = null
|
renderOrientation = null
|
||||||
|
renderSpring.quat.identity()
|
||||||
|
renderSpring.angVel.set(0f, 0f, 0f)
|
||||||
active = false
|
active = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,18 +85,26 @@ open class OrientationController(val entity: LivingEntity) {
|
|||||||
return oldQuat
|
return oldQuat
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Every tick move the current render orientation towards the last known true orientation **/
|
||||||
fun tick() {
|
fun tick() {
|
||||||
if (!active || orientation == null) return
|
if (!active || orientation == null) return
|
||||||
renderOrientationO = renderOrientation
|
renderOrientationO = renderOrientation
|
||||||
val current = orientation
|
val current = orientation!!
|
||||||
val renderMatrix = this.renderOrientation ?: current
|
val targetQuat = Quaternionf().setFromUnnormalized(current)
|
||||||
val renderQuat = Quaternionf().setFromUnnormalized(renderMatrix)
|
|
||||||
val targetQuat = Quaternionf().setFromUnnormalized(current)
|
if (renderOrientation == null) {
|
||||||
val dampingFactor = 0.66f // Smooth interpolation to reduce jitter of orientations recieved from the server.
|
// First tick: snap the spring to the target instead of easing in from identity
|
||||||
renderQuat.slerp(targetQuat, dampingFactor)
|
renderSpring.quat.set(targetQuat)
|
||||||
|
renderSpring.angVel.set(0f, 0f, 0f)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use a "quat spring" to smoothly move the render orientation towards the goal orientation.
|
||||||
|
// It takes into account the orientations angular velocities and should be much more resilient
|
||||||
|
// to sharp changes in goal orientation or late/missed packets.
|
||||||
|
simpleSpringDamperQuat(renderSpring, targetQuat, 0.15f, TICK_DT)
|
||||||
|
|
||||||
val newRenderOrientation = Matrix3f()
|
val newRenderOrientation = Matrix3f()
|
||||||
renderQuat.get(newRenderOrientation)
|
renderSpring.quat.get(newRenderOrientation)
|
||||||
renderOrientation = newRenderOrientation
|
renderOrientation = newRenderOrientation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -67,10 +67,6 @@ object CobblemonPermissions {
|
|||||||
val SPAWN_POKEMON = this.create("${COMMAND_PREFIX}spawnpokemon", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
|
val SPAWN_POKEMON = this.create("${COMMAND_PREFIX}spawnpokemon", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
val SPAWN_NPC = this.create("${COMMAND_PREFIX}spawnnpc", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
|
val SPAWN_NPC = this.create("${COMMAND_PREFIX}spawnnpc", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
|
||||||
@JvmStatic
|
|
||||||
val SPAWN_METEOR = this.create("${COMMAND_PREFIX}spawnmeteor", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
|
|
||||||
@JvmStatic
|
|
||||||
val SET_MEGA_BOND = this.create("${COMMAND_PREFIX}setmegabond", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
|
|
||||||
|
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
|
|||||||
+1
-1
@@ -12,10 +12,10 @@ import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
|
|||||||
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
|
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
|
||||||
import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
|
import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
|
||||||
import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
|
import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.api.tms.TechnicalMachines
|
import com.cobblemon.mod.common.api.tms.TechnicalMachines
|
||||||
import com.cobblemon.mod.common.client.CobblemonClient
|
import com.cobblemon.mod.common.client.CobblemonClient
|
||||||
import com.cobblemon.mod.common.pokemon.FormData
|
import com.cobblemon.mod.common.pokemon.FormData
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
|
||||||
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
||||||
|
|
||||||
enum class PokedexCategoryFilterType {
|
enum class PokedexCategoryFilterType {
|
||||||
|
|||||||
@@ -14,11 +14,11 @@ import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
|
|||||||
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
|
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
|
||||||
import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
|
import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
|
||||||
import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
|
import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
import com.cobblemon.mod.common.api.tms.TechnicalMachines
|
import com.cobblemon.mod.common.api.tms.TechnicalMachines
|
||||||
import com.cobblemon.mod.common.client.CobblemonClient
|
import com.cobblemon.mod.common.client.CobblemonClient
|
||||||
import com.cobblemon.mod.common.pokemon.FormData
|
|
||||||
import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
|
import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
import com.cobblemon.mod.common.pokemon.FormData
|
||||||
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
||||||
import com.cobblemon.mod.common.util.asTranslated
|
import com.cobblemon.mod.common.util.asTranslated
|
||||||
import com.cobblemon.mod.common.util.itemRegistry
|
import com.cobblemon.mod.common.util.itemRegistry
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ import com.mojang.brigadier.StringReader
|
|||||||
import com.mojang.serialization.Codec
|
import com.mojang.serialization.Codec
|
||||||
import com.mojang.serialization.JsonOps
|
import com.mojang.serialization.JsonOps
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
import kotlin.jvm.optionals.getOrNull
|
|
||||||
import kotlin.math.min
|
import kotlin.math.min
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
import net.minecraft.ResourceLocationException
|
import net.minecraft.ResourceLocationException
|
||||||
@@ -66,6 +65,7 @@ import net.minecraft.resources.ResourceLocation
|
|||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
import net.minecraft.world.item.ItemStack
|
import net.minecraft.world.item.ItemStack
|
||||||
import net.minecraft.world.level.Level
|
import net.minecraft.world.level.Level
|
||||||
|
import kotlin.jvm.optionals.getOrNull
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A grouping of typical, selectable properties for a Pokémon. This is serializable
|
* A grouping of typical, selectable properties for a Pokémon. This is serializable
|
||||||
@@ -168,8 +168,8 @@ open class PokemonProperties {
|
|||||||
parseIntProperty(keyPairs, listOf("${statName}_iv"))?.coerceIn(0, IVs.MAX_VALUE)?.let { maybeIVs[stat] = it }
|
parseIntProperty(keyPairs, listOf("${statName}_iv"))?.coerceIn(0, IVs.MAX_VALUE)?.let { maybeIVs[stat] = it }
|
||||||
parseIntProperty(keyPairs, listOf("${statName}_ev"))?.coerceIn(0, EVs.MAX_STAT_VALUE)?.let { maybeEVs[stat] = it }
|
parseIntProperty(keyPairs, listOf("${statName}_ev"))?.coerceIn(0, EVs.MAX_STAT_VALUE)?.let { maybeEVs[stat] = it }
|
||||||
}
|
}
|
||||||
props.evs = maybeEVs.takeIf { it.total() > 0 }
|
props.ivs = maybeIVs
|
||||||
props.ivs = maybeIVs.takeIf { it.total() > 0 }
|
props.evs = maybeEVs
|
||||||
|
|
||||||
props.updateAspects()
|
props.updateAspects()
|
||||||
return props
|
return props
|
||||||
@@ -519,18 +519,29 @@ open class PokemonProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun matches(properties: PokemonProperties): Boolean {
|
fun matches(properties: PokemonProperties): Boolean {
|
||||||
// Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
|
return properties.asString() == this.asString()
|
||||||
return this.commonMatches(properties) && this.customProperties.containsAll(properties.customProperties)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Undefined properties will match whatever they're compared with
|
|
||||||
private fun commonMatches(pokemon: Pokemon): Boolean {
|
private fun commonMatches(pokemon: Pokemon): Boolean {
|
||||||
level?.takeIf { it != pokemon.level }?.let { return false }
|
level?.takeIf { it != pokemon.level }?.let { return false }
|
||||||
shiny?.takeIf { it != pokemon.shiny }?.let { return false }
|
shiny?.takeIf { it != pokemon.shiny }?.let { return false }
|
||||||
gender?.takeIf { it != pokemon.gender }?.let { return false }
|
gender?.takeIf { it != pokemon.gender }?.let { return false }
|
||||||
species?.takeIf { it.asSpecies() != pokemon.species }?.let { return false }
|
species?.run {
|
||||||
|
try {
|
||||||
|
val species = if (this == "random") {
|
||||||
|
PokemonSpecies.species.random()
|
||||||
|
} else {
|
||||||
|
PokemonSpecies.getByIdentifier(this.asIdentifierDefaultingNamespace()) ?: return@run
|
||||||
|
}
|
||||||
|
if (pokemon.species != species) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
} catch (e: ResourceLocationException) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
nickname?.takeIf { it.string != pokemon.nickname?.string }?.let { return false }
|
nickname?.takeIf { it.string != pokemon.nickname?.string }?.let { return false }
|
||||||
form?.takeIf { !it.equals(pokemon.form.formOnlyShowdownId(), true) }?.let { return false }
|
form?.takeIf { !it.equals(pokemon.form.name, true) }?.let { return false }
|
||||||
friendship?.takeIf { it != pokemon.friendship }?.let { return false }
|
friendship?.takeIf { it != pokemon.friendship }?.let { return false }
|
||||||
fullness?.takeIf { it != pokemon.currentFullness }?.let { return false }
|
fullness?.takeIf { it != pokemon.currentFullness }?.let { return false }
|
||||||
pokeball?.takeIf { it != pokemon.caughtBall.name.toString() }?.let { return false }
|
pokeball?.takeIf { it != pokemon.caughtBall.name.toString() }?.let { return false }
|
||||||
@@ -573,36 +584,6 @@ open class PokemonProperties {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Undefined properties will match whatever they're compared with
|
|
||||||
private fun commonMatches(properties: PokemonProperties): Boolean {
|
|
||||||
level?.takeIf { it != properties.level }?.let { return false }
|
|
||||||
shiny?.takeIf { it != properties.shiny }?.let { return false }
|
|
||||||
gender?.takeIf { it != properties.gender }?.let { return false }
|
|
||||||
species?.takeIf { it.asSpecies() != properties.species?.asSpecies() }?.let { return false }
|
|
||||||
nickname?.takeIf { it.string != properties.nickname?.string }?.let { return false }
|
|
||||||
form?.takeIf { it != properties.form }?.let { return false }
|
|
||||||
friendship?.takeIf { it != properties.friendship }?.let { return false }
|
|
||||||
pokeball?.takeIf { it != properties.pokeball }?.let { return false }
|
|
||||||
nature?.takeIf { it != properties.nature }?.let { return false }
|
|
||||||
ability?.takeIf { it != properties.ability }?.let { return false }
|
|
||||||
status?.takeIf { it != properties.status }?.let { return false }
|
|
||||||
ivs?.forEach{ stat ->
|
|
||||||
if (stat.value != properties.ivs?.get(stat.key)) { return false }
|
|
||||||
}
|
|
||||||
evs?.forEach{ stat ->
|
|
||||||
if (stat.value != properties.evs?.get(stat.key)) { return false }
|
|
||||||
}
|
|
||||||
type?.takeIf { it != properties.type }?.let { return false }
|
|
||||||
teraType?.takeIf { it != properties.teraType }?.let { return false }
|
|
||||||
dmaxLevel?.takeIf { it != properties.dmaxLevel }?.let { return false }
|
|
||||||
gmaxFactor?.takeIf { it != properties.gmaxFactor }?.let { return false }
|
|
||||||
tradeable?.takeIf { it != properties.tradeable }?.let { return false }
|
|
||||||
originalTrainer?.takeIf { it != properties.originalTrainer }?.let{ return false }
|
|
||||||
originalTrainerType?.takeIf { it != properties.originalTrainerType }?.let{ return false }
|
|
||||||
moves?.takeIf { it.any { move -> properties.moves?.none { it == move } == true } }?.let { return false }
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO Review the need for this, usage for us is in commands that deviate from the behavior established by multiple Pokémon query equivalent
|
// TODO Review the need for this, usage for us is in commands that deviate from the behavior established by multiple Pokémon query equivalent
|
||||||
fun isSubSetOf(properties: PokemonProperties): Boolean {
|
fun isSubSetOf(properties: PokemonProperties): Boolean {
|
||||||
level?.takeIf { it != properties.level }?.let { return false }
|
level?.takeIf { it != properties.level }?.let { return false }
|
||||||
@@ -923,15 +904,4 @@ open class PokemonProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun hasSpecies() = species?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) } != null
|
fun hasSpecies() = species?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) } != null
|
||||||
private fun String.asSpecies() =
|
|
||||||
try {
|
|
||||||
if (this == "random") {
|
|
||||||
PokemonSpecies.species.random()
|
|
||||||
} else {
|
|
||||||
PokemonSpecies.getByIdentifier(this.asIdentifierDefaultingNamespace())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (e: ResourceLocationException) {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -12,8 +12,6 @@ import com.bedrockk.molang.Expression
|
|||||||
import com.cobblemon.mod.common.Cobblemon
|
import com.cobblemon.mod.common.Cobblemon
|
||||||
import com.cobblemon.mod.common.api.abilities.AbilityPool
|
import com.cobblemon.mod.common.api.abilities.AbilityPool
|
||||||
import com.cobblemon.mod.common.api.abilities.AbilityTemplate
|
import com.cobblemon.mod.common.api.abilities.AbilityTemplate
|
||||||
import com.cobblemon.mod.common.api.abilities.CommonAbility
|
|
||||||
import com.cobblemon.mod.common.api.abilities.PotentialAbility
|
|
||||||
import com.cobblemon.mod.common.api.ai.SleepDepth
|
import com.cobblemon.mod.common.api.ai.SleepDepth
|
||||||
import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
|
import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
|
||||||
import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
|
import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
|
||||||
@@ -32,14 +30,14 @@ import com.cobblemon.mod.common.api.pokemon.PokemonSpecies.getByIdentifier
|
|||||||
import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffect
|
import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffect
|
||||||
import com.cobblemon.mod.common.api.pokemon.effect.adapter.ShoulderEffectAdapter
|
import com.cobblemon.mod.common.api.pokemon.effect.adapter.ShoulderEffectAdapter
|
||||||
import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
|
import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.PreEvolution
|
||||||
import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroup
|
import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroup
|
||||||
import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroupAdapter
|
import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroupAdapter
|
||||||
import com.cobblemon.mod.common.api.pokemon.moves.Learnset
|
import com.cobblemon.mod.common.api.pokemon.moves.Learnset
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
|
||||||
import com.cobblemon.mod.common.api.pokemon.stats.Stat
|
import com.cobblemon.mod.common.api.pokemon.stats.Stat
|
||||||
import com.cobblemon.mod.common.api.pokemon.stats.Stats
|
import com.cobblemon.mod.common.api.pokemon.stats.Stats
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.evolution.PreEvolution
|
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
|
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.trigger.TransformationTrigger
|
|
||||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
|
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
|
||||||
import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
|
import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
|
||||||
@@ -50,21 +48,12 @@ import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPack
|
|||||||
import com.cobblemon.mod.common.pokemon.FormData
|
import com.cobblemon.mod.common.pokemon.FormData
|
||||||
import com.cobblemon.mod.common.pokemon.Species
|
import com.cobblemon.mod.common.pokemon.Species
|
||||||
import com.cobblemon.mod.common.pokemon.SpeciesAdditions
|
import com.cobblemon.mod.common.pokemon.SpeciesAdditions
|
||||||
import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
|
import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
|
||||||
import com.cobblemon.mod.common.pokemon.abilities.SpecialAbility
|
|
||||||
import com.cobblemon.mod.common.pokemon.ai.ObtainableItemCondition
|
import com.cobblemon.mod.common.pokemon.ai.ObtainableItemCondition
|
||||||
import com.cobblemon.mod.common.pokemon.ai.ObtainableItemConditionAdapter
|
import com.cobblemon.mod.common.pokemon.ai.ObtainableItemConditionAdapter
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.CobblemonPreEvolutionAdapter
|
import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonEvolutionAdapter
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.CobblemonRequirementAdapter
|
import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonPreEvolutionAdapter
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.CobblemonTriggerAdapter
|
import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.adapters.LegacyItemConditionWrapperAdapter
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.GigantamaxForm
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.PermanentForm
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.StandardForm
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.requirements.HeldItemRequirement
|
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.requirements.MoveSetRequirement
|
|
||||||
import com.cobblemon.mod.common.util.adapters.*
|
import com.cobblemon.mod.common.util.adapters.*
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import com.google.common.collect.HashBasedTable
|
import com.google.common.collect.HashBasedTable
|
||||||
@@ -115,8 +104,10 @@ object PokemonSpecies : JsonDataRegistry<Species> {
|
|||||||
.registerTypeAdapter(ExperienceGroup::class.java, ExperienceGroupAdapter)
|
.registerTypeAdapter(ExperienceGroup::class.java, ExperienceGroupAdapter)
|
||||||
.registerTypeAdapter(EntityDimensions::class.java, EntityDimensionsAdapter)
|
.registerTypeAdapter(EntityDimensions::class.java, EntityDimensionsAdapter)
|
||||||
.registerTypeAdapter(Learnset::class.java, LearnsetAdapter)
|
.registerTypeAdapter(Learnset::class.java, LearnsetAdapter)
|
||||||
|
.registerTypeAdapter(Evolution::class.java, CobblemonEvolutionAdapter)
|
||||||
.registerTypeAdapter(AABB::class.java, BoxAdapter)
|
.registerTypeAdapter(AABB::class.java, BoxAdapter)
|
||||||
.registerTypeAdapter(AbilityPool::class.java, AbilityPoolAdapter)
|
.registerTypeAdapter(AbilityPool::class.java, AbilityPoolAdapter)
|
||||||
|
.registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
|
||||||
.registerTypeAdapter(PreEvolution::class.java, CobblemonPreEvolutionAdapter)
|
.registerTypeAdapter(PreEvolution::class.java, CobblemonPreEvolutionAdapter)
|
||||||
.registerTypeAdapter(TypeToken.getParameterized(Set::class.java, Evolution::class.java).type, LazySetAdapter(Evolution::class))
|
.registerTypeAdapter(TypeToken.getParameterized(Set::class.java, Evolution::class.java).type, LazySetAdapter(Evolution::class))
|
||||||
.registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
|
.registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
|
||||||
@@ -137,10 +128,7 @@ object PokemonSpecies : JsonDataRegistry<Species> {
|
|||||||
.registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
|
.registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
|
||||||
.registerTypeAdapter(EggGroup::class.java, EggGroupAdapter)
|
.registerTypeAdapter(EggGroup::class.java, EggGroupAdapter)
|
||||||
.registerTypeAdapter(MobEffect::class.java, RegistryElementAdapter<MobEffect>(BuiltInRegistries::MOB_EFFECT))
|
.registerTypeAdapter(MobEffect::class.java, RegistryElementAdapter<MobEffect>(BuiltInRegistries::MOB_EFFECT))
|
||||||
.registerTypeAdapter(TransformationTrigger::class.java, CobblemonTriggerAdapter)
|
|
||||||
.registerTypeAdapter(TransformationRequirement::class.java, CobblemonRequirementAdapter)
|
|
||||||
.registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
|
.registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
|
||||||
.registerTypeAdapter(FormData::class.java, FormAdapter)
|
|
||||||
.registerTypeAdapter(RidingBehaviourSettings::class.java, RidingBehaviourSettingsAdapter)
|
.registerTypeAdapter(RidingBehaviourSettings::class.java, RidingBehaviourSettingsAdapter)
|
||||||
.registerTypeAdapter(RideSoundSettingsList::class.java, RideSoundSettingsListAdapter)
|
.registerTypeAdapter(RideSoundSettingsList::class.java, RideSoundSettingsListAdapter)
|
||||||
.registerTypeAdapter(ObtainableItemCondition::class.java, ObtainableItemConditionAdapter)
|
.registerTypeAdapter(ObtainableItemCondition::class.java, ObtainableItemConditionAdapter)
|
||||||
@@ -164,9 +152,6 @@ object PokemonSpecies : JsonDataRegistry<Species> {
|
|||||||
val implemented: List<Species>
|
val implemented: List<Species>
|
||||||
get() = this.species.filter { it.implemented }
|
get() = this.species.filter { it.implemented }
|
||||||
|
|
||||||
val forms: Collection<FormData>
|
|
||||||
get() = this.species.flatMap { it.allForms }
|
|
||||||
|
|
||||||
init {
|
init {
|
||||||
SpeciesAdditions.observable.subscribe {
|
SpeciesAdditions.observable.subscribe {
|
||||||
this.species.forEach(Species::initialize)
|
this.species.forEach(Species::initialize)
|
||||||
@@ -261,18 +246,34 @@ object PokemonSpecies : JsonDataRegistry<Species> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The representation of [FormData] in the context of Showdown.
|
* The representation of a [Species] and/or [FormData] in the context of showdown.
|
||||||
* This is intended as a sort of DTO that can be easily converted between JSON and Java/JS objects.
|
* This is intended as a sort of DTO that can be easily converted between JSON and Java/JS objects.
|
||||||
*
|
*
|
||||||
* @param form The [FormData] being converted into a species (Showdown considers them species).
|
* @param species The [Species] being converted or the base species if the form is not null.
|
||||||
|
* @param form The [FormData] being converted int o species (Showdown considers them species) will be null when dealing with the base form.
|
||||||
*/
|
*/
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
internal open class ShowdownSpecies(form: FormData) {
|
internal class ShowdownSpecies(species: Species, form: FormData?) {
|
||||||
val num = form.species.nationalPokedexNumber
|
val num = species.nationalPokedexNumber
|
||||||
val name = form.showdownName()
|
val name = if (form != null) "${createShowdownName(species)}-${form.name}" else createShowdownName(species)
|
||||||
val types = form.types.map { it.name }
|
val baseSpecies = if (form != null) createShowdownName(species) else this.name
|
||||||
val eggGroups = form.eggGroups.map { it.showdownID }
|
val forme = form?.name
|
||||||
val gender: String? = when (form.maleRatio) {
|
// ToDo baseForme
|
||||||
|
val otherFormes = if (form == null && species.forms.isNotEmpty()) species.forms.map { "${this.name}-${it.name}" } else emptyList()
|
||||||
|
val formeOrder = if (form == null && this.otherFormes.isNotEmpty()) arrayListOf(this.name, *this.otherFormes.toTypedArray()) else emptyList()
|
||||||
|
val abilities: Map<String, String> = mapOf(
|
||||||
|
"0" to "No Ability",
|
||||||
|
"1" to "No Ability",
|
||||||
|
"H" to "No Ability",
|
||||||
|
"S" to "No Ability"
|
||||||
|
)
|
||||||
|
val types = (form?.types ?: species.types).map { it.name }
|
||||||
|
val preevo: String? = (form?.preEvolution ?: species.preEvolution)?.let { if (it.form == it.species.standardForm) createShowdownName(it.species) else "${createShowdownName(it.species)}-${it.form.name}" }
|
||||||
|
// For the context of battles the content here doesn't matter whatsoever and due to how PokemonProperties work we can't guarantee an actual specific species is defined.
|
||||||
|
val evos = if ((form?.evolutions ?: species.evolutions).isEmpty()) emptyList() else arrayListOf("")
|
||||||
|
val nfe = this.evos.isNotEmpty()
|
||||||
|
val eggGroups = (form?.eggGroups ?: species.eggGroups).map { it.showdownID }
|
||||||
|
val gender: String? = when (form?.maleRatio ?: species.maleRatio) {
|
||||||
0F -> "F"
|
0F -> "F"
|
||||||
1F -> "M"
|
1F -> "M"
|
||||||
-1F, 1.125F -> "N"
|
-1F, 1.125F -> "N"
|
||||||
@@ -280,145 +281,47 @@ object PokemonSpecies : JsonDataRegistry<Species> {
|
|||||||
}
|
}
|
||||||
val genderRatio = if (this.gender == null)
|
val genderRatio = if (this.gender == null)
|
||||||
mapOf(
|
mapOf(
|
||||||
"M" to (form.maleRatio),
|
"maleRatio" to (form?.maleRatio ?: species.maleRatio),
|
||||||
"F" to (1F - (form.maleRatio))
|
"femaleRation" to (1F - (form?.maleRatio ?: species.maleRatio))
|
||||||
) else null
|
) else null
|
||||||
val baseStats = Stats.PERMANENT.associateBy({ it.showdownId }, { form.baseStats[it] ?: 1 })
|
val baseStats = mapOf(
|
||||||
val heightm = form.height / 10
|
"hp" to (form?.baseStats?.get(Stats.HP) ?: species.baseStats[Stats.HP] ?: 1),
|
||||||
val weightkg = form.weight / 10
|
"atk" to (form?.baseStats?.get(Stats.ATTACK) ?: species.baseStats[Stats.ATTACK] ?: 1),
|
||||||
|
"def" to (form?.baseStats?.get(Stats.DEFENCE) ?: species.baseStats[Stats.DEFENCE] ?: 1),
|
||||||
|
"spa" to (form?.baseStats?.get(Stats.SPECIAL_ATTACK) ?: species.baseStats[Stats.SPECIAL_ATTACK] ?: 1),
|
||||||
|
"spd" to (form?.baseStats?.get(Stats.SPECIAL_DEFENCE) ?: species.baseStats[Stats.SPECIAL_DEFENCE] ?: 1),
|
||||||
|
"spe" to (form?.baseStats?.get(Stats.SPEED) ?: species.baseStats[Stats.SPEED] ?: 1)
|
||||||
|
)
|
||||||
|
val heightm = (form?.height ?: species.height) / 10
|
||||||
|
val weightkg = (form?.weight ?: species.weight) / 10
|
||||||
// This is ugly, but we already have it hardcoded in the mod anyway
|
// This is ugly, but we already have it hardcoded in the mod anyway
|
||||||
val maxHP = if (this.num == 292) 1 else null
|
val maxHP = if (species.showdownId() == "shedinja") 1 else null
|
||||||
val cannotDynamax = form.dynamaxBlocked
|
val canGigantamax: String? = if (form?.gigantamaxMove != null) form.gigantamaxMove.name else null
|
||||||
val abilities = form.showdownAbilityMapping()
|
val cannotDynamax = form?.dynamaxBlocked ?: species.dynamaxBlocked
|
||||||
// Common fields exempt from standard forms
|
// ToDo battleOnly
|
||||||
val baseSpecies = if (form !is StandardForm) form.species.standardForm.showdownName() else null
|
// ToDo changesFrom
|
||||||
val forme = if (form !is StandardForm) form.name else null
|
val requiredMove = form?.requiredMove
|
||||||
|
val requiredItem = form?.requiredItem
|
||||||
/**
|
val requiredItems = form?.requiredItems
|
||||||
* The following fields are optional and currently omitted
|
|
||||||
*
|
|
||||||
* cosmeticFormes (not needed, we have species features)
|
|
||||||
* addedType (tertiary type [by name or showdownid] added by moves or abilities)
|
|
||||||
* tier (smogon tryhard bs)
|
|
||||||
* doublesTier (smogon tryhard bs)
|
|
||||||
* natDexTier (smogon tryhard bs)
|
|
||||||
* evoType (the evolution method used to evolve from 'prevo'; trade', 'useItem', 'levelMove', 'levelExtra', 'levelFriendship', 'levelHold', 'other')
|
|
||||||
* evoMove (the move [by name or showdownid] used to evolve from 'prevo')
|
|
||||||
* evoLevel (the minimum level required to evolve from 'prevo')
|
|
||||||
* canHatch (flag for baby pokemon)
|
|
||||||
* color (color, value is arbitrary)
|
|
||||||
* tags (flags for filtering pokemon; 'Mega', 'Mythical', 'Sub-Legendary', 'Restricted Legendary', 'Paradox')
|
|
||||||
* unreleasedHidden (whether this pokemon has an unreleased hidden ability)
|
|
||||||
* maleOnlyHidden (whether it is only possible to get the hidden ability on a male pokemon)
|
|
||||||
* gmaxUnreleased (whether this pokemon has an unreleased gmax form)
|
|
||||||
* pokemonGoData (no one cares)
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private fun createShowdownName(species: Species): String {
|
||||||
* The representation of a [PermanentForm] in the context of Showdown.
|
if (species.resourceIdentifier.namespace == Cobblemon.MODID) {
|
||||||
*
|
return species.name
|
||||||
* @param form The [PermanentForm] being converted into a species.
|
|
||||||
*/
|
|
||||||
internal open class ShowdownPermanentForm(form: PermanentForm) : ShowdownSpecies(form) {
|
|
||||||
// species this form evolves from
|
|
||||||
val prevo = form.preEvolution?.form?.showdownName()
|
|
||||||
// For the context of battles the content here doesn't matter whatsoever and due to how PokemonProperties work we can't guarantee an actual specific species is defined.
|
|
||||||
val evos = form.evolutions.map { "" }
|
|
||||||
// not fully evolved
|
|
||||||
val nfe = this.evos.isNotEmpty()
|
|
||||||
// whether there is a gmax form to change to
|
|
||||||
val canGigantamax: String? = form.changeableForms.filterIsInstance<GigantamaxForm>().firstOrNull()?.name // TODO id better
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The representation of a [StandardForm] in the context of Showdown.
|
|
||||||
*
|
|
||||||
* @param form The [StandardForm] being converted into a species.
|
|
||||||
*/
|
|
||||||
internal class ShowdownStandardForm(form: StandardForm) : ShowdownPermanentForm(form) {
|
|
||||||
// list of all forms descending from this base species
|
|
||||||
val otherFormes = form.flattenForms().map { it.showdownName() }
|
|
||||||
// list of forms [by name or showdownid] in the order they appear in game [union of baseSpecies, otherFormes, and cosmeticFormes] with the exception of ending with 'Gmax' forms
|
|
||||||
val formeOrder = if (this.otherFormes.isNotEmpty()) arrayListOf(this.name, *this.otherFormes.toTypedArray()) else null
|
|
||||||
|
|
||||||
// TODO we don't enforce any form order with our Species registration - right now this looks like only a problem with Mega Rayquaza, but investigate changes needed on Showdown's end to enable these lists to be more dynamic
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The representation of a [TemporaryForm] in the context of Showdown.
|
|
||||||
*
|
|
||||||
* @param form The [TemporaryForm] being converted into a species.
|
|
||||||
*/
|
|
||||||
internal class ShowdownTemporaryForm(form: TemporaryForm) : ShowdownSpecies(form) {
|
|
||||||
// form change can occur during a battle
|
|
||||||
val battleOnly = if (form.battleOnly) form.parentForm.showdownName() else null
|
|
||||||
// form change can occur outside of battle (mutually exclusive with battleOnly)
|
|
||||||
val changesFrom = if (!form.battleOnly) form.parentForm.showdownName() else null
|
|
||||||
// pokemon must know this move to be in this form
|
|
||||||
val requiredMove = form.requirements.filterIsInstance<MoveSetRequirement>().firstOrNull()?.move?.showdownId() // TODO update showdown to support 'requiredMoves'
|
|
||||||
// pokemon must hold one of these item(s) to be in this form
|
|
||||||
val requiredItems = form.requirements.filterIsInstance<HeldItemRequirement>().firstOrNull()?.let { requirement ->
|
|
||||||
try {
|
|
||||||
requirement.itemCondition.items.get().map { BuiltInRegistries.ITEM.getKey(it.value()).path } // TODO held items on showdown are ignorant of namespace
|
|
||||||
}
|
|
||||||
catch (e: NoSuchElementException)
|
|
||||||
{
|
|
||||||
Cobblemon.LOGGER.error("Failed to resolve required held item for ${form.showdownId()}}") // TODO this needs to be done after tags are loaded...
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
return "${species.resourceIdentifier.namespace}:${species.name}"
|
||||||
|
|
||||||
/** Accommodate for Showdown bullshit. */
|
|
||||||
/*
|
|
||||||
private fun TemporaryForm.showdownParentForm(): Any {
|
|
||||||
if (this.parentOverrides.isNotEmpty())
|
|
||||||
return this.species.standardForm.flattenForms().filter {
|
|
||||||
parentOverrides.contains(it.showdownId())
|
|
||||||
}.map {
|
|
||||||
it.showdownName()
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return parentForm.showdownName()
|
|
||||||
}
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs a mapping of the [PotentialAbility]s belonging to a [FormData] in Showdown identifiable format.
|
|
||||||
*
|
|
||||||
* @return A map of type (numeric for [CommonAbility]s, H for [HiddenAbility], S for [SpecialAbility]) to showdownid.
|
|
||||||
*/
|
|
||||||
private fun FormData.showdownAbilityMapping(): Map<String, String>? {
|
|
||||||
// potential abilities
|
|
||||||
val commonAbilities = this.abilities.filterIsInstance<CommonAbility>()
|
|
||||||
val hiddenAbility = this.abilities.find { it is HiddenAbility }
|
|
||||||
val specialAbility = this.abilities.find { it is SpecialAbility }
|
|
||||||
|
|
||||||
// can have multiple common abilities
|
|
||||||
val abilities = mutableMapOf<String, String>()
|
|
||||||
val mapping: (String, PotentialAbility) -> Unit = { key, ability ->
|
|
||||||
abilities.put(key, ability.template.showdownId())
|
|
||||||
}
|
|
||||||
|
|
||||||
// can only have one hidden and one special ability
|
|
||||||
commonAbilities.forEachIndexed { index, ability -> mapping(index.toString(), ability) }
|
|
||||||
hiddenAbility?.let { ability -> mapping("H", ability) }
|
|
||||||
specialAbility?.let { ability -> mapping("S", ability) }
|
|
||||||
return if (abilities.isEmpty()) null else abilities
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun allShowdownSpecies(): Map<String, String> {
|
internal fun allShowdownSpecies(): Map<String, String> {
|
||||||
val result = mutableMapOf<String, String>()
|
val result = mutableMapOf<String, String>()
|
||||||
this.species.forEach { species ->
|
this.species.forEach {species ->
|
||||||
species.permanentForms.forEach { form ->
|
val baseSpecies = ShowdownSpecies(species, null)
|
||||||
val formSpecies = ShowdownSpecies(form)
|
result[ShowdownIdentifiable.REGEX.replace(baseSpecies.name.lowercase(), "")] = this.gson.toJson(baseSpecies)
|
||||||
result[ShowdownIdentifiable.REGEX.replace(formSpecies.name.lowercase(), "")] = this.gson.toJson(formSpecies)
|
species.forms.forEach { form ->
|
||||||
}
|
if (form != species.standardForm) {
|
||||||
species.temporaryForms.forEach { form ->
|
val formSpecies = ShowdownSpecies(species, form)
|
||||||
val formSpecies = ShowdownSpecies(form)
|
result[ShowdownIdentifiable.REGEX.replace(formSpecies.name.lowercase(), "")] = this.gson.toJson(formSpecies)
|
||||||
result[ShowdownIdentifiable.REGEX.replace(formSpecies.name.lowercase(), "")] = this.gson.toJson(formSpecies)
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
|
|||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Cobblemon Contributors
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.cobblemon.mod.common.api.pokemon.adapters
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
|
||||||
|
import com.google.gson.JsonDeserializer
|
||||||
|
import com.google.gson.JsonSerializer
|
||||||
|
import kotlin.reflect.KClass
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Saves and loads [Requirement]s with JSON.
|
||||||
|
* For the default implementation see [com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter].
|
||||||
|
*
|
||||||
|
* @author Licious
|
||||||
|
* @since March 21st, 2022
|
||||||
|
*/
|
||||||
|
interface RequirementAdapter : JsonDeserializer<Requirement>, JsonSerializer<Requirement> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers the given type of [Requirement] to it's associated ID for deserialization.
|
||||||
|
*
|
||||||
|
* @param T The type of [Requirement].
|
||||||
|
* @param id The id of the evolution event.
|
||||||
|
* @param type The [KClass] of the type.
|
||||||
|
*/
|
||||||
|
fun <T : Requirement> registerType(id: String, type: KClass<T>)
|
||||||
|
|
||||||
|
}
|
||||||
-32
@@ -1,32 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 Cobblemon Contributors
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.cobblemon.mod.common.api.pokemon.aspect
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeature
|
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A provider of aspects for a [SpeciesFeature].
|
|
||||||
*
|
|
||||||
* @author Segfault Guy
|
|
||||||
* @since Feb 12th, 2024
|
|
||||||
*/
|
|
||||||
interface FeatureAspectProvider: AspectProvider {
|
|
||||||
var default: String?
|
|
||||||
var isAspect: Boolean
|
|
||||||
|
|
||||||
/** Returns true if this [aspect] is provided by this provider. */
|
|
||||||
fun matches(aspect: String): Boolean
|
|
||||||
|
|
||||||
/** Creates a [SpeciesFeature] that provides the respective [aspect]. */
|
|
||||||
fun from(aspect: String): SpeciesFeature<*>?
|
|
||||||
|
|
||||||
/** Sets the [aspect] that's provided. */
|
|
||||||
fun set(pokemon: Pokemon, aspect: String)
|
|
||||||
}
|
|
||||||
+2
-2
@@ -24,11 +24,11 @@ interface SingleConditionalAspectProvider : AspectProvider {
|
|||||||
fun getForFeature(name: String): SingleConditionalAspectProvider {
|
fun getForFeature(name: String): SingleConditionalAspectProvider {
|
||||||
return object : SingleConditionalAspectProvider {
|
return object : SingleConditionalAspectProvider {
|
||||||
override val aspect: String = name
|
override val aspect: String = name
|
||||||
override fun meetsCondition(pokemon: Pokemon) = pokemon.getFeature<FlagSpeciesFeature>(name)?.value == true
|
override fun meetsCondition(pokemon: Pokemon) = pokemon.getFeature<FlagSpeciesFeature>(name)?.enabled == true
|
||||||
override fun meetsCondition(pokemonProperties: PokemonProperties) = pokemonProperties
|
override fun meetsCondition(pokemonProperties: PokemonProperties) = pokemonProperties
|
||||||
.customProperties
|
.customProperties
|
||||||
.filterIsInstance<FlagSpeciesFeature>()
|
.filterIsInstance<FlagSpeciesFeature>()
|
||||||
.any { it.name == name && it.value }
|
.any { it.name == name && it.enabled }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+54
@@ -0,0 +1,54 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Cobblemon Contributors
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.cobblemon.mod.common.api.pokemon.evolution
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
|
import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
|
||||||
|
import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents an evolution of a [Pokemon] that can only occur during specific actions and with added context.
|
||||||
|
* For the default implementations see [ItemInteractionEvolution] & [TradeEvolution].
|
||||||
|
*
|
||||||
|
* @param RC The context given at runtime when querying the [Evolution].
|
||||||
|
* @param TC The context that is serialized from JSON during species loading, this is what the [RC] is expected to match against.
|
||||||
|
* @author Licious
|
||||||
|
* @since March 19th, 2022
|
||||||
|
*/
|
||||||
|
interface ContextEvolution<RC, TC> : Evolution {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The target context for this [Evolution] to even be tested.
|
||||||
|
*/
|
||||||
|
val requiredContext: TC
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempts to evolve the given [Pokemon] under the given context of type [RC].
|
||||||
|
*
|
||||||
|
* @param pokemon The [Pokemon] attempting to evolve.
|
||||||
|
* @param context The context of this query.
|
||||||
|
* @return If the evolution was successful.
|
||||||
|
*/
|
||||||
|
fun attemptEvolution(pokemon: Pokemon, context: RC): Boolean {
|
||||||
|
if (this.testContext(pokemon, context) && super.test(pokemon)) {
|
||||||
|
return super.evolve(pokemon)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the given context is valid for the [requiredContext].
|
||||||
|
*
|
||||||
|
* @param pokemon The [Pokemon] attempting to evolve.
|
||||||
|
* @param context The context of this query.
|
||||||
|
* @return If the context matched the [requiredContext].
|
||||||
|
*/
|
||||||
|
fun testContext(pokemon: Pokemon, context: RC): Boolean
|
||||||
|
|
||||||
|
}
|
||||||
+77
-58
@@ -6,7 +6,7 @@
|
|||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.cobblemon.mod.common.pokemon.transformation.evolution
|
package com.cobblemon.mod.common.api.pokemon.evolution
|
||||||
|
|
||||||
import com.cobblemon.mod.common.Cobblemon.playerDataManager
|
import com.cobblemon.mod.common.Cobblemon.playerDataManager
|
||||||
import com.cobblemon.mod.common.CobblemonItems
|
import com.cobblemon.mod.common.CobblemonItems
|
||||||
@@ -17,23 +17,20 @@ import com.cobblemon.mod.common.api.drop.DropTable
|
|||||||
import com.cobblemon.mod.common.api.events.CobblemonEvents
|
import com.cobblemon.mod.common.api.events.CobblemonEvents
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.PokemonGainedEvent
|
import com.cobblemon.mod.common.api.events.pokemon.PokemonGainedEvent
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
|
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
|
|
||||||
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
|
import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
|
||||||
import com.cobblemon.mod.common.api.moves.BenchedMove
|
import com.cobblemon.mod.common.api.moves.BenchedMove
|
||||||
import com.cobblemon.mod.common.api.moves.MoveTemplate
|
import com.cobblemon.mod.common.api.moves.MoveTemplate
|
||||||
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
import com.cobblemon.mod.common.api.pokemon.PokemonProperties
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.Transformation
|
import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
|
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.trigger.ContextTrigger
|
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.trigger.PassiveTrigger
|
|
||||||
import com.cobblemon.mod.common.api.pokemon.transformation.trigger.TransformationTrigger
|
|
||||||
import com.cobblemon.mod.common.api.tags.CobblemonItemTags
|
import com.cobblemon.mod.common.api.tags.CobblemonItemTags
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.item.PokeBallItem
|
import com.cobblemon.mod.common.item.PokeBallItem
|
||||||
import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
|
import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
|
import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
|
||||||
import com.cobblemon.mod.common.pokemon.transformation.triggers.LevelUpTrigger
|
import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
|
||||||
|
import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
|
||||||
|
import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
|
||||||
import com.cobblemon.mod.common.util.lang
|
import com.cobblemon.mod.common.util.lang
|
||||||
import com.cobblemon.mod.common.util.party
|
import com.cobblemon.mod.common.util.party
|
||||||
import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
|
import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
|
||||||
@@ -44,32 +41,58 @@ import net.minecraft.world.item.ItemStack
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents an evolution of a [Pokemon], this is the server side counterpart of [EvolutionDisplay].
|
* Represents an evolution of a [Pokemon], this is the server side counterpart of [EvolutionDisplay].
|
||||||
|
* Following Pokémon these can be triggered by 3 possible events, level ups, trades or using an item.
|
||||||
|
* For the default implementations see [LevelUpEvolution], [TradeEvolution] & [ItemInteractionEvolution].
|
||||||
|
* Also see [PassiveEvolution] & [ContextEvolution].
|
||||||
*
|
*
|
||||||
* @author Licious
|
* @author Licious
|
||||||
* @since March 19th, 2022
|
* @since March 19th, 2022
|
||||||
*/
|
*/
|
||||||
class Evolution(
|
interface Evolution : EvolutionLike {
|
||||||
override val id: String = "",
|
|
||||||
/** The [TransformationRequirement]s that need to be satisfied for this evolution to start. */
|
|
||||||
override val requirements: Set<TransformationRequirement> = setOf(),
|
|
||||||
/** The [TransformationTrigger] to kickstart this evolution. */
|
|
||||||
override val trigger: TransformationTrigger = LevelUpTrigger(),
|
|
||||||
/** If this evolution can be deferred and started whenever rather than immediately on trigger. */
|
|
||||||
override val optional: Boolean = true,
|
|
||||||
/** If this evolution needs its requirements reevaluated to remain valid. */
|
|
||||||
override val reevaluate: Boolean = true,
|
|
||||||
/** The result of this evolution. */
|
|
||||||
val result: PokemonProperties = PokemonProperties(),
|
|
||||||
/** The shed result of this evolution. */
|
|
||||||
val shedder: PokemonProperties? = null,
|
|
||||||
/** The [MoveTemplate]s that will be offered to be learnt upon evolving. */
|
|
||||||
val learnableMoves: Set<MoveTemplate> = setOf(),
|
|
||||||
/** The items that will drop once the evolution finishes. */
|
|
||||||
val drops: DropTable = DropTable()
|
|
||||||
) : Transformation {
|
|
||||||
|
|
||||||
override fun test(pokemon: Pokemon, context: ContextTrigger.Context?): Boolean {
|
/**
|
||||||
val result = super.test(pokemon, context)
|
* The result of this evolution.
|
||||||
|
*/
|
||||||
|
val result: PokemonProperties
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The shed result of this evolution.
|
||||||
|
*/
|
||||||
|
val shedder: PokemonProperties?
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If this evolution allows the user to choose when to start it or not.
|
||||||
|
*/
|
||||||
|
var optional: Boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If this [Evolution] will consume the [Pokemon.heldItem]
|
||||||
|
*/
|
||||||
|
var consumeHeldItem: Boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The [Requirement]s behind this evolution.
|
||||||
|
*/
|
||||||
|
val requirements: MutableSet<Requirement>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The [MoveTemplate]s that will be offered to be learnt upon evolving.
|
||||||
|
*/
|
||||||
|
val learnableMoves: MutableSet<MoveTemplate>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The items that will drop once the evolution finishes.
|
||||||
|
*/
|
||||||
|
val drops: DropTable
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the given [Pokemon] passes all the conditions and is ready to evolve.
|
||||||
|
*
|
||||||
|
* @param pokemon The [Pokemon] being queried.
|
||||||
|
* @return If the [Evolution] can start.
|
||||||
|
*/
|
||||||
|
fun test(pokemon: Pokemon): Boolean {
|
||||||
|
val result = this.requirements.all { requirement -> requirement.check(pokemon) }
|
||||||
val event = EvolutionTestedEvent(pokemon, this, result, result)
|
val event = EvolutionTestedEvent(pokemon, this, result, result)
|
||||||
CobblemonEvents.EVOLUTION_TESTED.post(event)
|
CobblemonEvents.EVOLUTION_TESTED.post(event)
|
||||||
return event.result
|
return event.result
|
||||||
@@ -77,21 +100,20 @@ class Evolution(
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Starts this evolution or queues it if [optional] is true.
|
* Starts this evolution or queues it if [optional] is true.
|
||||||
|
* Side effects may occur based on [consumeHeldItem].
|
||||||
*
|
*
|
||||||
* @param pokemon The [Pokemon] being evolved.
|
* @param pokemon The [Pokemon] being evolved.
|
||||||
* @param context The optional [TriggerContext] needed to evolve.
|
|
||||||
* @return Whether the [Evolution] was successful.
|
|
||||||
*/
|
*/
|
||||||
override fun tryStart(pokemon: Pokemon, context: ContextTrigger.Context?): Boolean {
|
fun evolve(pokemon: Pokemon): Boolean {
|
||||||
if (this.test(pokemon, context)) {
|
if (this.consumeHeldItem) {
|
||||||
return if (this.optional)
|
pokemon.swapHeldItem(ItemStack.EMPTY)
|
||||||
pokemon.evolutionProxy.server().add(this)
|
|
||||||
else {
|
|
||||||
this.perform(pokemon)
|
|
||||||
true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return false
|
if (this.optional) {
|
||||||
|
// All the networking is handled under the hood, see EvolutionController.
|
||||||
|
return pokemon.evolutionProxy.server().add(this)
|
||||||
|
}
|
||||||
|
this.forceEvolve(pokemon)
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
fun shed(pokemon: Pokemon): Boolean {
|
fun shed(pokemon: Pokemon): Boolean {
|
||||||
@@ -131,29 +153,32 @@ class Evolution(
|
|||||||
*
|
*
|
||||||
* @param pokemon The [Pokemon] being evolved.
|
* @param pokemon The [Pokemon] being evolved.
|
||||||
*/
|
*/
|
||||||
override fun perform(pokemon: Pokemon) {
|
fun forceEvolve(pokemon: Pokemon) {
|
||||||
|
// This is a switch to enable/disable the evolution effect while we get particles improved
|
||||||
|
val useEvolutionEffect = true
|
||||||
|
|
||||||
if (pokemon.state is ShoulderedState) {
|
if (pokemon.state is ShoulderedState) {
|
||||||
pokemon.recall()
|
pokemon.tryRecallWithAnimation()
|
||||||
}
|
}
|
||||||
|
|
||||||
val preEvoName = pokemon.getDisplayName()
|
val preEvoName = pokemon.getDisplayName()
|
||||||
val pokemonEntity = pokemon.entity
|
val pokemonEntity = pokemon.entity
|
||||||
if (pokemonEntity == null) {
|
if (pokemonEntity == null || !useEvolutionEffect) {
|
||||||
pokemon.getOwnerPlayer()?.playNotifySound(CobblemonSounds.EVOLUTION_UI, SoundSource.PLAYERS, 1F, 1F)
|
pokemon.getOwnerPlayer()?.playNotifySound(CobblemonSounds.EVOLUTION_UI, SoundSource.PLAYERS, 1F, 1F)
|
||||||
fulfill(pokemon)
|
evolutionMethod(pokemon)
|
||||||
pokemon.getOwnerPlayer()?.sendSystemMessage(lang("ui.evolve.into", preEvoName, pokemon.species.translatedName))
|
pokemon.getOwnerPlayer()?.sendSystemMessage(lang("ui.evolve.into", preEvoName, pokemon.species.translatedName))
|
||||||
} else {
|
} else {
|
||||||
pokemonEntity.entityData.set(PokemonEntity.TRANSFORMATION_STARTED, true)
|
pokemonEntity.entityData.set(PokemonEntity.EVOLUTION_STARTED, true)
|
||||||
pokemonEntity.navigation.stop()
|
pokemonEntity.navigation.stop()
|
||||||
pokemonEntity.after(1F) {
|
pokemonEntity.after(1F) {
|
||||||
evolutionAnimation(pokemonEntity)
|
evolutionAnimation(pokemonEntity)
|
||||||
}
|
}
|
||||||
pokemonEntity.after(11.2F) {
|
pokemonEntity.after(11.2F) {
|
||||||
fulfill(pokemon)
|
evolutionMethod(pokemon)
|
||||||
}
|
}
|
||||||
pokemonEntity.after(seconds = 12F) {
|
pokemonEntity.after(seconds = 12F) {
|
||||||
cryAnimation(pokemonEntity)
|
cryAnimation(pokemonEntity)
|
||||||
pokemonEntity.entityData.set(PokemonEntity.TRANSFORMATION_STARTED, false)
|
pokemonEntity.entityData.set(PokemonEntity.EVOLUTION_STARTED, false)
|
||||||
pokemon.getOwnerPlayer()?.sendSystemMessage(lang("ui.evolve.into", preEvoName, pokemon.species.translatedName))
|
pokemon.getOwnerPlayer()?.sendSystemMessage(lang("ui.evolve.into", preEvoName, pokemon.species.translatedName))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -169,7 +194,7 @@ class Evolution(
|
|||||||
playPoseableAnimationPacket.sendToPlayersAround(pokemon.x, pokemon.y, pokemon.z, 128.0, pokemon.level().dimension())
|
playPoseableAnimationPacket.sendToPlayersAround(pokemon.x, pokemon.y, pokemon.z, 128.0, pokemon.level().dimension())
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun fulfill(pokemon: Pokemon) {
|
fun evolutionMethod(pokemon: Pokemon) {
|
||||||
// This ensures the Pokémon doesn't lose moves during evolution
|
// This ensures the Pokémon doesn't lose moves during evolution
|
||||||
// (e.g., Oshawott evolving at level 17 knowing Razor Shell, while Dewott only learns it at level 18).
|
// (e.g., Oshawott evolving at level 17 knowing Razor Shell, while Dewott only learns it at level 18).
|
||||||
val previousSpeciesLearnableMoves = pokemon.relearnableMoves
|
val previousSpeciesLearnableMoves = pokemon.relearnableMoves
|
||||||
@@ -199,7 +224,8 @@ class Evolution(
|
|||||||
pokemon.benchedMoves.update()
|
pokemon.benchedMoves.update()
|
||||||
|
|
||||||
// we want to instantly tick for example you might only evolve your Bulbasaur at level 34 so Venusaur should be immediately available
|
// we want to instantly tick for example you might only evolve your Bulbasaur at level 34 so Venusaur should be immediately available
|
||||||
pokemon.triggerTransformations<PassiveTrigger>()
|
pokemon.evolutions.filterIsInstance<PassiveEvolution>().forEach { evolution -> evolution.attemptEvolution(pokemon) }
|
||||||
|
pokemon.lockedEvolutions.filterIsInstance<PassiveEvolution>().forEach { evolution -> evolution.attemptEvolution(pokemon) }
|
||||||
|
|
||||||
this.shed(pokemon)
|
this.shed(pokemon)
|
||||||
|
|
||||||
@@ -214,18 +240,11 @@ class Evolution(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
super.fulfill(pokemon)
|
|
||||||
|
|
||||||
CobblemonEvents.EVOLUTION_COMPLETE.post(EvolutionCompleteEvent(pokemon, sourcePokemon, this))
|
CobblemonEvents.EVOLUTION_COMPLETE.post(EvolutionCompleteEvent(pokemon, sourcePokemon, this))
|
||||||
CobblemonEvents.POKEMON_GAINED.post(PokemonGainedEvent(pokemon.getOwnerUUID()!!, pokemon))
|
CobblemonEvents.POKEMON_GAINED.post(PokemonGainedEvent(pokemon.getOwnerUUID()!!, pokemon))
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun convertToDisplay(pokemon: Pokemon): EvolutionDisplay {
|
fun applyTo(pokemon: Pokemon) {
|
||||||
val result = pokemon.clone(true)
|
result.apply(pokemon)
|
||||||
this.result.apply(result)
|
|
||||||
val expectedDisplay = EvolutionDisplay(this.id, result)
|
|
||||||
val event = EvolutionDisplayEvent(result, expectedDisplay, this)
|
|
||||||
CobblemonEvents.EVOLUTION_DISPLAY.post(event)
|
|
||||||
return event.display
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+69
@@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Cobblemon Contributors
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.cobblemon.mod.common.api.pokemon.evolution
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.api.pokemon.evolution.progress.EvolutionProgress
|
||||||
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
|
import com.cobblemon.mod.common.pokemon.evolution.controller.ClientEvolutionController
|
||||||
|
import com.cobblemon.mod.common.pokemon.evolution.controller.ServerEvolutionController
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Responsible for holding all available [EvolutionLike]s in the [Pokemon].
|
||||||
|
* Also handles all the networking behind them.
|
||||||
|
* For the Cobblemon default implementations see [ClientEvolutionController] & [ServerEvolutionController].
|
||||||
|
*
|
||||||
|
* @author Licious
|
||||||
|
* @since April 28th, 2022
|
||||||
|
*/
|
||||||
|
interface EvolutionController<T : EvolutionLike, out I : PreProcessor> : MutableSet<T> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves the [Pokemon] attached to this controller.
|
||||||
|
*
|
||||||
|
* @return The [Pokemon] this controller is attached to.
|
||||||
|
*/
|
||||||
|
fun pokemon(): Pokemon
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts the given evolution on this controller.
|
||||||
|
* All the necessary networking will be handled.
|
||||||
|
*
|
||||||
|
* @param evolution The [EvolutionLike] starting.
|
||||||
|
*/
|
||||||
|
fun start(evolution: T)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an immutable collection of [EvolutionProgress]es attached to this controller.
|
||||||
|
*
|
||||||
|
* @return The currently tracked [EvolutionProgress]es.
|
||||||
|
*/
|
||||||
|
fun progress(): Collection<EvolutionProgress<*>>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attaches a [EvolutionProgress] to this controller.
|
||||||
|
*
|
||||||
|
* @param P The type of [EvolutionProgress].
|
||||||
|
* @param progress The [EvolutionProgress] being attached for tracking.
|
||||||
|
* @return The instance being tracked.
|
||||||
|
*/
|
||||||
|
fun <P : EvolutionProgress<*>> trackProgress(progress: P): P
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempts to find an [EvolutionProgress] in [progress] or creates and tracks using [trackProgress].
|
||||||
|
*
|
||||||
|
* @param P The type of [EvolutionProgress].
|
||||||
|
* @param predicate The lambda attempting to find specific progress. This needs to ensure the [EvolutionProgress] is of type [P] or the cast will fail.
|
||||||
|
* @param progressFactory The lambda creating a new instance of type [P] if [predicate] can't find an element.
|
||||||
|
* @return The found match in [progress] or the created and now tracked with [trackProgress].
|
||||||
|
*/
|
||||||
|
fun <P : EvolutionProgress<*>> progressFirstOrCreate(predicate: (progress: EvolutionProgress<*>) -> Boolean, progressFactory: () -> P): P
|
||||||
|
|
||||||
|
fun asIntermediate(): I
|
||||||
|
|
||||||
|
}
|
||||||
Loaded 100 of 2654 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user