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
|
f3f6a9744b
|
more smaller bugs fixed (neoforge users rejoice)
|
2024-10-10 16:57:59 +00: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 |
|
Hiroku
|
43050b4276
|
Many NPC improvements for foundation
|
2024-09-23 23:02:00 +00:00 |
|
Segfault Guy
|
f9def3acf5
|
Implement DeferredRenderer for rendering request icons after translucent layer in LevelRender.
|
2024-09-22 11:49:17 -04: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
|
e7efb94ee9
|
Merge remote-tracking branch 'origin/main' into poker-decks
|
2024-09-07 10:51:04 +10:00 |
|
Polymeta
|
c2b5eca4c7
|
bump neoforge to stable version and fix breaking changes (and add missing license headers)
|
2024-09-07 00:38:35 +00:00 |
|
apion
|
6126653a2c
|
Fix neoforge scanner rendering
|
2024-09-01 05:38:32 -04: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
|
3c3ef29965
|
Fixed mixin, removed unnecessary maven repo
|
2024-07-06 20:06:36 -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
|
f9d243dac7
|
Fix Neoforge runClient and runServer tasks not working
|
2024-07-01 22:28:34 +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
|
6c6261f055
|
part 16: insanity.
|
2024-06-30 04:27:24 +02:00 |
|
Dani Voort
|
c0731e3b93
|
part 13: neoforce module seems OK - client to go.
|
2024-06-29 23:06:12 +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 |
|
Paul
|
c83cfb2439
|
1.21 now boots on Fabric
|
2024-06-17 12:30:10 +10:00 |
|
Paul
|
995ffc165e
|
Mostly ported to 1.21
|
2024-06-17 11:19:09 +10:00 |
|
Paul
|
9996c06f69
|
Many more fixes for 1.20.6
|
2024-06-09 12:42:38 +10:00 |
|
Paul
|
e3ca678cd8
|
Merge remote-tracking branch 'origin/1.20.5' into sega_bass_pro_fishing_2
# Conflicts:
# 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/molang/MoLangFunctions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/net/serializers/StringSetDataSerializer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/dialogue/RenderableFace.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DisplayCaseRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/generic/GenericBedrockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/animation/PlayPosableAnimationPacket.kt
# common/src/main/resources/cobblemon-common.accesswidener
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
# gradle.properties
|
2024-06-09 09:43:40 +10:00 |
|
apion
|
3ba761df2b
|
Fixed criteria registration
|
2024-06-08 19:32:54 -04:00 |
|
Nick
|
ac5f9ac3c5
|
Sync with main, to the best of our abilities. Fixes some primary blurring on common menus
|
2024-06-08 15:50:32 -07:00 |
|
Nick
|
384724a906
|
Merge remote-tracking branch 'origin/1.20.5' into 1.20.5
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
# gradle/libs.versions.yml
# neoforge/build.gradle.kts
|
2024-06-07 23:24:06 -07:00 |
|
apion
|
245683832b
|
Added the idea of UnsplittablePackets
|
2024-06-08 02:02:27 -04:00 |
|
Nick
|
639417d6c8
|
Merge remote-tracking branch 'refs/remotes/origin/main' into 1.20.5
# Conflicts:
# common/build.gradle.kts
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/integration/adorn/AdornCompatibility.kt
# common/src/main/kotlin/com/cobblemon/mod/common/integration/jei/berry/BerryMutationProvider.kt
# common/src/main/kotlin/com/cobblemon/mod/common/integration/jei/berry/BerryMutationRecipe.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/ItemInteractionEvolution.kt
# fabric/build.gradle.kts
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# gradle.properties
# gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts
# gradle/libs.versions.yml
# gradle/wrapper/gradle-wrapper.properties
# neoforge/build.gradle.kts
# neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt
# settings.gradle.kts
|
2024-06-07 22:44:45 -07:00 |
|
apion
|
6f7e3cf594
|
Neoforge now boots to menu
|
2024-06-08 00:35:05 -04:00 |
|
apion
|
9570ce45ef
|
Fix a bunch of NeoForge issues, also moved ItemComponents and Advancement Critera to PlatformRegistries
|
2024-06-08 00:18:20 -04:00 |
|
Paul
|
c97ceef6f8
|
Migrated heaps of packets over to RegistryByteBuf, 1.20.5 vers now compiles
|
2024-06-08 11:00:07 +10:00 |
|
Paul
|
f59e3b53a1
|
Reworked packet rego for fabric and neo
|
2024-06-08 10:15:23 +10:00 |
|
apion
|
2acac11997
|
Split up network managing tasks into payload registry and handler registry. Needs cleanup, and need to figure out where some of these methods actually need to be called. Also I only really worked on Fabric ATM
|
2024-06-07 00:52:44 -04:00 |
|
Paul
|
56223cbd36
|
Fabric client packet stuff 2
|
2024-06-07 14:07:53 +10:00 |
|
Deltric
|
383f254652
|
possible component implementation for pokemon item
|
2024-06-06 20:50:18 -05:00 |
|
apion
|
335fbfd3e0
|
Fixed a lot of the codecs for advancements
|
2024-04-25 15:31:55 -04:00 |
|
apion
|
dfe30a91b6
|
Mitigated all errors in the neoforge module (god forgive me for some of the things I've done) and renamed most stuff from forge to neoforge
|
2024-04-25 15:00:50 -04:00 |
|
apion
|
e0f62b5eb9
|
Updated a bunch of dependencies. Swapped from Forge to NeoForge (Forge is not yet on 1.20.5, might get added back later) Got to a point where we can reload the project in IntelliJ
|
2024-04-25 12:32:49 -04:00 |
|