Licious
853fea4ce9
ResistanceMap finish.
2024-07-11 16:26:04 +01:00
Licious
59c617b856
Datagen support, datagen elemental type and tags, start of registry tera type.
2024-07-11 16:21:34 +01:00
Licious
c5234dd8a6
Progress towards custom elemental type.
2024-07-10 22:33:15 +01:00
Licious
51aebdaa7f
Merge branch 'coin_pouch_fixes' into 'sega_bass_pro_fishing_2'
...
Coin pouch fixes
See merge request cable-mc/cobblemon!1088
2024-07-10 20:59:34 +00:00
Licious
03304a5d00
Coin pouch fixes
2024-07-10 20:59:33 +00:00
Licious
7240f76fb2
Merge branch 'properties_tera_and_elemental_type' into 'sega_bass_pro_fishing_2'
...
PokemonProperties Tera Type fixes and support for Elemental type.
See merge request cable-mc/cobblemon!1085
2024-07-10 20:52:14 +00:00
Licious
0f1efd2ef8
PokemonProperties Tera Type fixes and support for Elemental type.
2024-07-10 20:52:14 +00:00
Licious
d9d2c660ce
Add support for FishingBobberPredicate and CobblemonEntitySubPredicates, update pokerod loot table for the intended predicate usage.
2024-07-09 14:04:37 +01:00
Licious
22ad2d9126
Move PokemonBattle.onEndHandlers invoke to fire from BattleRegistry.closeBattle.
2024-07-08 12:28:03 +01:00
Licious
3afefe3a59
Fix to recipe loading after cherry-pick, fix to pokerod loot table, fix PokeRodFishingBobberEntity invoking the vanilla fishing loot table instead of ours.
2024-07-08 12:19:24 +01:00
Licious
88ed6a055f
Disable 'FISHING_JUNK' LootInjector entry as we don't have the table.
2024-07-08 09:27:21 +01:00
dhi_holo
380c88ee4c
Recipes and Items
...
(cherry picked from commit 38d90da48c
2024-07-08 09:23:11 +01:00
Licious
4ad419fe11
Removed logging of all s2c/c2s comm.
2024-07-07 09:55:53 +01:00
dhi_holo
bcb0e18d42
Link Cable Recipe Change
...
Closes #916
Also fixed one issue with the changelog because I haven't touched the file since we shifted how we handled it slightly and my previous change was lumped in the wrong category during it.
(cherry picked from commit 99b7a119e0
2024-07-07 09:54:12 +01:00
Paul
2bbfc1a7a7
Merge branch 'refs/heads/sega_bass_pro_fishing_2_mojmap_kinda' into sega_bass_pro_fishing_2
2024-07-07 13:15:55 +10:00
Paul
83f1d844f1
Expanded on NPC interact configurations
2024-07-07 13:15:25 +10:00
Apion
237e4901d1
Change forge paths to neo in CI
2024-07-07 00:27:54 +00:00
apion
915967facf
Delete unused file
2024-07-06 20:14:56 -04:00
apion
3c3ef29965
Fixed mixin, removed unnecessary maven repo
2024-07-06 20:06:36 -04:00
apion
9a95992156
Merge branch 'refs/heads/sega_bass_pro_fishing_2_mojmap_kinda' into sega_bass_pro_fishing_2
2024-07-06 19:38:37 -04:00
apion
da1dea9380
Merge remote-tracking branch 'origin/sega_bass_pro_fishing_2_mojmap_kinda' into sega_bass_pro_fishing_2_mojmap_kinda
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt
2024-07-06 19:37:06 -04:00
apion
a601199910
Merge conflicts
2024-07-06 19:35:31 -04:00
apion
9e00551b33
Merge branch 'refs/heads/sega_bass_pro_fishing_2' into sega_bass_pro_fishing_2_mojmap_kinda
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/Ability.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/AbilityTemplate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/moves/BenchedMove.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Move.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveSet.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/EvolutionController.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/EvolutionProxy.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/progress/EvolutionProgress.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stat.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Status.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/BottomlessStore.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PartyStore.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCBox.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/types/ElementalType.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/types/tera/TeraType.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/battle/BattleSetTeamPokemonHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/party/SetPartyPokemonHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/pc/SetPCPokemonHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/layer/PokemonOnShoulderRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
# common/src/main/kotlin/com/cobblemon/mod/common/loot/LootInjector.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/PokemonDTO.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleSetTeamPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleUpdateTeamPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/DataRegistrySyncPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/party/SetPartyPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/SetPCPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/trade/TradeUpdatedPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/ui/SummaryUIPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Nature.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/activestate/PokemonState.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/CobbledEvolutionProxy.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/controller/ClientEvolutionController.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/controller/ServerEvolutionController.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/progress/DamageTakenEvolutionProgress.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/progress/DefeatEvolutionProgress.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/progress/LastBattleCriticalHitsEvolutionProgress.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/progress/RecoilEvolutionProgress.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/progress/UseMoveEvolutionProgress.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/PersistentStatusContainer.kt
# common/src/main/resources/cobblemon-common.accesswidener
2024-07-06 18:45:42 -04:00
Licious
48801e3b80
Fix cobblemon:healing_machine advancement and cobblemon:is_held_item tag.
2024-07-06 23:33:02 +01:00
Licious
7fe107296a
Rename multiple data paths to modern standards, fixes a bunch of errors or lack of data powered vanilla features Cobblemon integration.
2024-07-06 23:17:08 +01:00
Apion
ff553e1610
Merge branch 'pokemon-to-codec' into 'sega_bass_pro_fishing_2'
...
Pokemon Codec for both sides & s2c comm
See merge request cable-mc/cobblemon!1077
2024-07-06 19:34:42 +00:00
Licious
a162efba11
Pokemon Codec for both sides & s2c comm
2024-07-06 19:34:42 +00:00
Paul
b855f3689b
Fixed pose conditions not resolving properly, fixed generic bedrock entity spawn packet, NPC posable function corrections
2024-07-05 12:22:48 +10:00
Dani Voort
83c679cc4b
Fix DataComponents for pokemon and bait on NeoForge
2024-07-05 01:26:36 +02:00
Dani Voort
6253471a6c
Allow 'action' to be set on DialogueTextInput
2024-07-05 01:22:48 +02:00
Dani Voort
4b36631029
Fix entity dimensions transmitting in FormData
2024-07-05 01:22:39 +02:00
Licious
f60f92f16f
Merge branch 'remove_unused_loot_injection' into 'sega_bass_pro_fishing_2'
...
Remove the fishing junk loot injection.
See merge request cable-mc/cobblemon!1084
2024-07-04 00:07:21 +00:00
Licious
6cc90ccac8
Remove the fishing junk loot injection.
2024-07-03 21:03:17 +01:00
Licious
c5a913d0f2
Missing lang entry for Terrain Seed tag.
2024-07-03 20:56:59 +01:00
Licious
0231010e0c
Merge branch 'new_items_and_tag_fixes' into 'sega_bass_pro_fishing_2'
...
Add new items, update tag folder names for 1.21 convention
See merge request cable-mc/cobblemon!1082
2024-07-03 19:43:23 +00:00
Dani Voort
23c055751f
Fix Pokéball rendering
2024-07-01 23:55:33 +02:00
Licious
11b7505fac
Merge branch 'trade_friendship_fix' into 'sega_bass_pro_fishing_2'
...
Fix trading Pokemon setting friendship to 0 instead of base value
See merge request cable-mc/cobblemon!1083
2024-07-01 20:46:27 +00:00
Dani Voort
f9d243dac7
Fix Neoforge runClient and runServer tasks not working
2024-07-01 22:28:34 +02:00
Licious
d3b4a9b00b
Fix trading Pokemon friendship values.
2024-07-01 21:22:21 +01:00
Dani Voort
92c42c2772
Port Fabric mixins to mojmaps
2024-07-01 20:31:03 +02:00
Dani Voort
0436d7549d
Update PokemonDTO to remove usage of Netty buffers to store data.
2024-06-30 19:50:03 +02:00
Dani Voort
da5c3b7615
Various other (experimental) fixes
2024-06-30 19:05:40 +02:00
Dani Voort
857192e0e1
Execute registry sync packets on Neoforged on the network thread to block other packets & prevent data races
2024-06-30 19:04:15 +02:00
Dani Voort
8e0887c14f
Fix a few things I broke during mapping
2024-06-30 19:02:53 +02:00
Dani Voort
c409b143e9
Throw a more descriptive error if a species was not found in SpawnPokemonPacket
2024-06-30 19:01:26 +02:00
Dani Voort
19a94e565f
Fix reading EntityDimensions
2024-06-30 19:00:46 +02:00
Dani Voort
ed6534a561
Use proper TagKey codec in BiomePredicate
2024-06-30 19:00:36 +02:00
Dani Voort
6c6261f055
part 16: insanity.
2024-06-30 04:27:24 +02:00
Dani Voort
bb97dbc1da
part 15: the end is near
2024-06-30 01:38:23 +02:00
Dani Voort
27bcd18444
part 14: everything but client rendering & fabric
2024-06-30 00:37:34 +02:00
Licious
Licious
dhi_holo
dhi_holo
Paul
Apion
apion
Dani Voort