Commit Graph
52 Commits
Author SHA1 Message Date
tyzillion 6004c153d3 Broke up with Validate Animations.
- ValidateAnimations.kt removed
Pipeline restored.
2023-06-09 23:58:13 -04:00
Paul 07ad7db139 Improved test error clarity and removed unsafe operation in ValidateAnimations 2023-05-29 18:29:56 +10:00
Nick 000d210b33 Adjust comment checker for even more fun formats that break the unit test :D 2023-04-24 21:14:55 -07:00
Paul a1df69c67a Merge remote-tracking branch 'origin/1.19.3'
# Conflicts:
#	common/build.gradle.kts
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketRegistrar.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/WildRestGoal.kt
#	common/src/main/resources/assets/cobblemon/lang/en_us.json
2023-04-24 21:43:41 +10:00
Nick 007bc4b212 Validate animations are registered via model AND configuration 2023-04-06 10:01:34 +00:00
Paul 348dd14fc5 Added icon_shiny and move_select that were deleted, fixed math util 2023-02-23 10:04:19 +10:00
Paul 5eba2230ea Many many corrections from merging main into bye-architectury 2023-02-22 19:35:43 +10:00
Paul 080a7f76bc Merge remote-tracking branch 'origin/main' into bye-architectury
# Conflicts:
#	common/src/main/java/com/cobblemon/mod/common/mixin/ArgumentTypesMixin.java
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonClientImplementation.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonConfiguredFeatures.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonEntities.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonFeatures.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonImplementation.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonPlacements.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/events/entity/EntityAttributeEvent.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/events/net/MessageBuiltEvent.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonItemTags.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/PCBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketRegistrar.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/pokemon/update/EvolutionUpdatePacketHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/pokemon/update/SingleUpdatePacketHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/SpeciesAssetResolver.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonInBattleMovementGoal.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/item/CobblemonItemGroups.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/PacketHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/SidedPacketRegistrar.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleHealthChangePacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleSwitchPokemonPacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/StringUpdatePacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/evolution/EvolutionUpdatePacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/EvolutionLikeUpdatePacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/SetPokemonPacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/pokemon/update/evolution/EvolutionDisplayUpdatePacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/ServerPacketHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/ServerPacketRegistrar.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/EvolutionDisplayUpdatePacketHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/registry/CompletableRegistry.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/util/EventExtensions.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/util/math/geometry/TransformationMatrix.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/world/feature/CobblemonOreConfiguredFeatures.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/world/feature/CobblemonOrePlacedFeatures.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/world/placement/BiomeTagModifier.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/world/placement/CobblemonPlacementTypes.kt
#	common/src/main/resources/assets/cobblemon/textures/gui/interact/move_select.png
#	common/src/main/resources/assets/cobblemon/textures/gui/summary/icon_shiny.png
#	common/src/main/resources/cobblemon-common.accesswidener
#	fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
#	fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
#	fabric/src/main/kotlin/com/cobblemon/mod/fabric/net/CobblemonNetworkFabric.kt
#	forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt
#	forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt
#	forge/src/main/kotlin/com/cobblemon/mod/forge/net/CobblemonNetworkForge.kt
#	gradle/libs.versions.yml
2023-02-22 11:37:37 +10:00
Paul 0ec23d65b3 Fixed blits being all black because of the wrong shader program being used 2023-02-05 22:08:03 +10:00
Paul ed55dd21af Final fixes to particles, updated copyright to 2023 2023-02-05 19:02:37 +10:00
Paul d2b9949b29 Merge remote-tracking branch 'origin/main' into snowstorm-particles
# Conflicts:
#	CHANGELOG.md
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
2023-02-01 08:31:08 +10:00
Paul 17c6608203 Pretty much completed Snowstorm particle implementation 2023-02-01 08:30:12 +10:00
Licious17 d00bdc3d21 Updated UseMoveRequirement. 2023-01-28 11:29:16 +00:00
Licious17 65dbb4baca Implement EvolutionProgress system, add RecoilRequirement. 2023-01-28 11:00:56 +00:00
Licious17 01fcc9271c Docs and movement of BattleMessage and Effect to the API package 2023-01-02 13:16:34 +00:00
Licious17 e6d3bbac3a Start of BattleMessage, lang for '-item' action interpretation 2022-12-31 14:14:41 +00:00
Nick dacb16044d License 2022-12-20 18:04:51 -08:00
Nick 68478f84d8 Fix Magmortar spawn definitions and add validator for future default configurations 2022-12-20 18:01:59 -08:00
Licious17 7edcf12ade Major refactor of Stats 2022-11-06 12:57:48 +00:00
Paul e2d3acfc7a Renamed to Cobblemon 2022-11-05 13:19:53 +10:00
Licious 9ab908d87b Species asset and properties update 2022-11-02 09:30:34 +00:00
Paul 507a94bb66 Added Yanma, Yanmega, Politoed, Wooper, Quagsire, Tsareena, Torracat, Litten, Incineroar, Torchic, Combusken, Blaziken, Mudkip, Marshtomp, Swampert, Swinub, Piloswine, Mamoswine, Steenee, Slowking, Sizzlipede, Centiskorch, Rowlet, Dartrix, Decidueye, Rayquaza, Piplup, Prinplup, Empoleon, Poipole, Plusle, Minun, Pachirisu, Naganedel, Mimikyu, Maractus, Dwebble, Crustle, Bunearly, Lopunny, Kleavor, Kingdra, Emolga, Bounsweet, Blissey, Bidoof, Bibarel, and Basculin 2022-10-21 13:14:12 +10:00
Paul 7aebca07d3 Renamed to PokeMod 2022-10-09 14:09:54 +10:00
Paul 8a1fa67726 Test fix 2022-09-25 21:31:05 +10:00
Oliver Whitehead 35784d532d license: add license headers 2022-09-16 02:34:58 +01:00
Hiroku 7180199a60 Merge branch 'species-data-pack-support' into 'main'
Species data pack support

See merge request cable-mc/pokemon-cobbled!123
2022-08-10 10:52:29 +00:00
Nick DeGruccio 5caafa9ccf Simplify calculation, 3x maximum difficulty increase, unit test 2022-08-09 01:09:15 -07:00
Paul 99288211e5 Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into species-data-pack-support
 Conflicts:
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/Pokemon.kt
2022-08-08 20:02:32 +10:00
Paul 93c3e00bbc Fix compile error in EvolutionTest 2022-08-05 21:17:51 +10:00
Paul f19d0e87f5 Added pvp battles 2022-08-05 12:42:07 +10:00
Paul a825a2ee5d Upgraded Abilities 2022-07-28 23:25:43 +10:00
Licious a7f1a24208 Implemented passive evolution trigger, reduced visibility on species and form evolution property, cleaned up package structure of evolution stuff. 2022-05-05 13:25:29 +01:00
Licious 3a798e1b1f Merge remote-tracking branch 'origin/main' into #56-evolution-base
# Conflicts:
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/CobbledCommands.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/CobbledItems.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/CobbledNetwork.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/gui/pokenav/PokeNav.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/gui/pokenav/PokeNavImageButton.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/render/block/HealingMachineRenderer.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokeball/EmptyPokeBallEntity.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/item/CobbledCreativeTabs.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/Pokemon.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/SpeciesLoader.kt
2022-04-30 10:13:04 +01:00
Paul 7f7a9fb795 Finished the mappings conversion and added geckolib 2022-04-30 07:19:21 +10:00
Paul 94b426cb7f Completed most of the work converting mappings from mojmaps to Yarn since needed for GeckoLib 2022-04-30 01:08:25 +10:00
Licious 898f3fa16a Merge branch 'main' into #56-evolution-base
# Conflicts:
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/CobbledCommands.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/CobbledItems.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/moves/Moves.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/net/ClientPacketRegistrar.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/config/CobbledConfig.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokeball/EmptyPokeBallEntity.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/item/CobbledCreativeTabs.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/FormData.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/Pokemon.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/Species.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/SpeciesLoader.kt
#	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/util/DataKeys.kt
#	common/src/main/resources/assets/pokemoncobbled/lang/en_us.json
#	gradle.properties
2022-04-28 14:54:33 +01:00
Paul 045fc1724a Reworking various bits of Pokemon, fix issue where all forms are Eevee D: 2022-04-04 23:30:09 +10:00
Paul d89d523518 Bunch of work around benched moves 2022-04-04 12:27:10 +10:00
Licious 24dec43472 Allowed mutability of Evolution requirements and learnable moves. 2022-03-23 13:56:33 +00:00
Licious 374255cb09 Implemented PreEvolution & EvolutionSet
Workaround in PokemonSpecies for case-insensitive lookup, refactor still pending
LazySet implemented, used in evolutions.
2022-03-23 13:48:14 +00:00
Licious 82895b53b0 Implemented PartyMember evolution requirement. 2022-03-21 17:45:29 +00:00
Licious b487e33a05 Implemented lazy MoveTemplate adapter 2022-03-21 17:10:50 +00:00
Licious 17bb448431 Implemented Area, Biome, Friendship & Level/World evolution requirements.
Documented evolution implementations.
Made ContextEvolution support different types for the serialized target context and the runtime context.
2022-03-21 15:17:18 +00:00
Licious b7abcea14d Implemented Evolution & ItemStack adapters.
Cleaned up Evolution impl
2022-03-20 20:20:45 +00:00
Hiroku 3123687259 Merge branch '#64-forge-issues' into 'main'
Fixed forge issues

Closes #64

See merge request cable-mc/pokemon-cobbled!61
2022-03-19 05:46:19 +00:00
Paul 6bb47c14cf Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into #64-forge-issues
 Conflicts:
	build.gradle
	common/build.gradle
	forge/build.gradle
	forge/src/main/kotlin/com/cablemc/pokemoncobbled/forge/mod/PokemonCobbledForge.kt
2022-03-19 12:58:23 +10:00
Paul 1c5b0ce0a5 Fixed test locations and update gitlab-ci for fabric and forge artifacts 2022-03-14 18:57:18 +10:00
Paul 1833bce429 Some cleanup for abilities, moves, Stat 2022-02-26 14:05:15 +10:00
Paul 18741b3339 Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into #63-3-fabric-forge
 Conflicts:
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/CobbledNetwork.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/storage/PokemonStoreManager.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/net/ClientPacketRegistrar.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/render/party/PokemonPartyOverlay.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokeball/EmptyPokeBallEntity.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/storage/RequestMoveSwapHandler.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/storage/SendOutPokemonHandler.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/Pokemon.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/util/MiscUtils.kt
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/util/PlayerExtensions.kt
	src/main/kotlin/com/cablemc/pokemoncobbled/common/CommandRegistrar.kt
	src/main/kotlin/com/cablemc/pokemoncobbled/common/PokemonCobbled.kt
	src/main/kotlin/com/cablemc/pokemoncobbled/mod/PokemonCobbledMod.kt
	src/main/kotlin/com/cablemc/pokemoncobbled/mod/config/CobbledConfig.kt
2022-02-25 09:52:59 +10:00
Qumoo b10ccdbe69 Moved packages to common module that were able to survive the move, proposal for shadowing kotlin 2022-02-16 23:40:28 +01:00