Commit Graph
271 Commits
Author SHA1 Message Date
Polymeta bfa58e9fb9 no more caffeine for shouldered pokemon 2024-11-16 04:14:48 +00:00
Segfault Guy e0fce5386e Merge branch 'main' into player_icons 2024-11-03 21:59:00 -05:00
Hiroku df1ff47e0e Merge branch 'feature/restore-mod-compat' into 'main'
restored modcompat with dynamic lights and adorn

Closes #775

See merge request cable-mc/cobblemon!1210
2024-10-21 01:18:56 +00:00
Sterrezo 38b0551a2d Audio bugfixes and volume adjustments 2024-10-15 00:03:57 +00:00
Polymeta 6c1b9d31f7 adorn compat restored (doesnt work in-dev but in proper jars)
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2024-10-14 21:39:56 +01:00
Polymeta bed47c7f04 dynamic light compat restored
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2024-10-14 21:36:46 +01:00
Test 47f8647d48 scan and dex fixes 2024-09-29 02:42:22 +00:00
Polymeta 99e47e4cb7 debug galore for pokemon 2024-09-24 23:05:41 +00:00
Nick eefff036b7 Merge branch 'more-npcs' into 'main'
Many NPC improvements for foundation

See merge request cable-mc/cobblemon!1171
2024-09-23 23:02:00 +00:00
Hiroku 43050b4276 Many NPC improvements for foundation 2024-09-23 23:02:00 +00:00
Paul 583a973e53 Fixed Jigsaw structure maximums 2024-09-23 15:51:58 +10:00
Segfault Guy f9def3acf5 Implement DeferredRenderer for rendering request icons after translucent layer in LevelRender. 2024-09-22 11:49:17 -04:00
Polymeta 95b15d50c3 JarInJar fabric kotlin instead of shadowing kotlin libs to avoid compatibility issues 2024-09-21 22:44:42 +00:00
Hiroku a2122c7b24 Merge branch 'feature/advanced-advancements!' into 'main'
fix interaction advancement json files and ensure resurrection advancement is triggered by machine

Closes #985 and #957

See merge request cable-mc/cobblemon!1147
2024-09-14 22:10:19 +00:00
Polymeta 940ed1450d fix interaction advancement json files and ensure resurrection advancement is triggered by machine 2024-09-14 22:10:18 +00:00
Segfault Guy 6ec81e6af2 Implement SoundTracker for active client sounds + fix rod casting sounds. 2024-09-14 22:00:43 +01:00
Test 70e55626a0 Decrease unemployment rate among villagers 2024-09-13 05:09:17 +00:00
Paul 0610a997e2 Merge remote-tracking branch 'origin/main' into log-async
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/factory/JsonPlayerDataStoreFactory.kt
2024-09-07 19:37:38 +10:00
apion c475e51a1c Re add JEI compat 2024-09-07 02:16:02 -04:00
Paul 0fd6328ae4 Fixed compile error from mappings switch 2024-09-07 10:43:43 +10:00
Paul 1c71e68323 Merge remote-tracking branch 'origin/main' into log-async 2024-09-01 19:29:56 +10:00
Test 33ff9e90b6 Table for poker decks 2024-09-01 04:50:21 +00:00
apion 590c3cfcd2 Added zooming back 2024-08-10 10:05:40 -04:00
apion 0b3d78e509 More cleanup 2024-08-10 06:30:47 -04:00
apion 301b210d5a Started some big boy cleanup for the dex 2024-08-04 16:31:04 -04:00
apion a65c82c2b4 Third pass at resolving mapping problems 2024-08-04 08:27:13 -04:00
apion c5124cf19d First pass at resolving mapping problems 2024-08-04 03:46:24 -04:00
apion 6ffa7b1be3 Merge branch 'refs/heads/sega_bass_pro_fishing_2' into poker-decks
# Conflicts:
#	common/src/main/java/com/cobblemon/mod/common/mixin/PartyScrollMixin.java
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/gui/GuiUtils.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/GeneralPlayerData.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerDataStoreManager.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/JsonPlayerData.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/MongoPlayerData.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/factory/JsonPlayerDataStoreFactory.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/factory/PlayerDataStoreFactory.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonBakingOverrides.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PokemonGuiUtils.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/BattleOverlay.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/keybind/CobblemonKeyBinds.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/SetClientPlayerDataHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/RenderHelper.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeScaleAndSize.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeWalkSpeed.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/command/OpenStarterScreenCommand.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleInitializePacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/starter/SetClientPlayerDataPacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/starter/RequestStarterScreenHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/starter/CobbledStarterHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/util/MiscUtils.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt
#	common/src/main/resources/cobblemon-common.accesswidener
#	fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
2024-08-04 02:53:12 -04:00
Test 36c4e4e553 overlay screen tests 2024-07-29 22:56:21 -04:00
Test 75faa7b798 overlay screen tests 2024-07-27 20:42:35 -04:00
Paul d282631662 Added logging for unsafe access to various APIs and moved JOIN and DISCONNECT platform events to always be sync 2024-07-21 13:16:13 +10:00
plastered_crab 76c3cba300 - tweaks to Dex Scanner mode so Scanner overlay doesn't get stuck on randomly 2024-07-11 23:31:09 -07: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
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 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 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
Dani Voort 83c679cc4b Fix DataComponents for pokemon and bait on NeoForge 2024-07-05 01:26:36 +02:00
plastered_crab a70c08f484 - hopefully this won't end badly 2024-07-04 00:11:01 -07:00
plastered_crab b19a5f637a - I broke everything.... put it back 2024-07-03 23:51:27 -07:00
plastered_crab 331551a614 - tweak to test feature 2024-07-03 23:33:56 -07:00
Plastered_Crab 4129f29da0 - lots of changes for a top-secret mysterious feature 2024-07-02 13:08:31 -07:00
Dani Voort 92c42c2772 Port Fabric mixins to mojmaps 2024-07-01 20:31:03 +02:00
Dani Voort 6c6261f055 part 16: insanity. 2024-06-30 04:27:24 +02:00
Dani Voort f8f619494a part 7: items and commands done 2024-06-29 20:51:19 +02:00
Paul 647f492fbc More more more more mappings swapping for Mojmaps 2024-06-29 20:53:42 +10:00
Paul c121028c22 More more more mappings swapping for Mojmaps 2024-06-29 11:15:37 +10:00
Paul 475a330071 More more mappings swapping for Mojmaps 2024-06-29 10:44:52 +10:00
Paul e9063cda2f More mappings swapping for Mojmaps 2024-06-29 10:28:46 +10:00
Dani Voort 514feb60f9 part 1: advancement & api packages 2024-06-29 00:34:12 +02:00
broccoli 5f380b824b begin moving to mojmap 2024-06-25 15:12:07 +01:00