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
Polymeta
4c024ac947
various bug fixes
2024-10-10 10:09:19 +00:00
Polymeta
99e47e4cb7
debug galore for pokemon
2024-09-24 23:05:41 +00:00
apion
fa73fb8e46
Added parchment mappings for param names
2024-09-22 22:00:49 -04:00
Polymeta
95b15d50c3
JarInJar fabric kotlin instead of shadowing kotlin libs to avoid compatibility issues
2024-09-21 22:44:42 +00:00
Paul
88d6c17c90
Fixed NBT on pokemon held items not serializing, updated to 1.21.1
2024-09-15 13:26:33 +10:00
apion
c475e51a1c
Re add JEI compat
2024-09-07 02:16:02 -04: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
dbc108602a
Bump kotlin versions (fr)
2024-07-31 21:43:08 -04:00
apion
7c15504828
Bump kotlin versions
2024-07-31 20:39:56 -04:00
apion
3c3ef29965
Fixed mixin, removed unnecessary maven repo
2024-07-06 20:06:36 -04:00
broccoli
5f380b824b
begin moving to mojmap
2024-06-25 15:12:07 +01:00
Paul
9ddd11205e
Merge branch 'refs/heads/1.21' into sega_bass_pro_fishing_2
2024-06-22 17:17:18 +10:00
Paul
9ebd655909
Merge remote-tracking branch 'origin/main' into sega_bass_pro_fishing_2
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagmarModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagbyModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagmortarModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DreepyModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
2024-06-22 17:07:03 +10:00
CanadianBacon
970aaee6c6
Relocate groups exported by GraalJS
...
org.graalvm -> com.cobblemon.mod.relocations.graalvm
com.oracle -> com.cobblemon.mod.relocations.oracle
2024-06-17 08:22:20 +02: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
2f0dd36214
Merge branch 'refs/heads/1.20.5' into sega_bass_pro_fishing_2
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
2024-06-14 14:25:17 +10:00
apion
88808e8548
Changed gradle run configs to use a username matched to UUID
2024-06-13 22:26:53 -04: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
Nick
bb4c3d8a48
Fix libs.versions.toml
2024-06-08 15:56:17 -07:00
Nick
fc06b04e47
Merge remote-tracking branch 'origin/1.20.5' into 1.20.5
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/BindingSoilBlock.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/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
# fabric/src/main/java/com/cobblemon/mod/fabric/mixin/GuiMixin.java
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts
# gradle/wrapper/gradle-wrapper.properties
# neoforge/build.gradle.kts
# neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt
2024-06-08 15:52:31 -07: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
apion
31323eb53e
Fix some issues from the main merge and a StackOverflow in PasturePokemonScrollList
2024-06-08 18:28:46 -04:00
apion
8fa4f7b5c2
Fixed build
2024-06-08 17:16:42 -04:00
Paul
81498888bd
Some corrections
2024-06-08 20:00:16 +10:00
Paul
c1c9f8e235
Fix some project config stuff
2024-06-08 18:38:09 +10:00
Paul
d631e89645
Merge remote-tracking branch '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-08 16:41:34 +10: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
Hiroku
58e82f1bf6
Major refactor of animation system
2024-06-06 11:22:06 +00:00
Hiroku
f81e8ba766
Merge branch 'npcs' into 'sega_bass_pro_fishing_2'
...
NPC foundationwork that's not implemented but I need the tech for reasons
See merge request cable-mc/cobblemon!1024
2024-05-19 00:31:46 +00:00
apion
90c5180712
Revert "update Forge to current RB, update Fabric deps to latest"
...
This reverts commit 7139d4708b .
2024-05-15 18:17:29 -04:00
Nick
158aa05f24
Merge branch 'fix/downgrade-loom' into 'main'
...
fix: resolve mapping issues by downgrading loom
See merge request cable-mc/cobblemon!1015
2024-05-15 15:38:09 +00:00
MoeBoy76
7139d4708b
update Forge to current RB, update Fabric deps to latest
2024-05-15 11:11:02 +10:00
broccoli
5b5e7109f5
fix: resolve mapping issues by downgrading loom
...
fixes regression in fd7b82dbe3
2024-05-14 23:17:16 +01:00
Paul
78d34e0ae6
Mergo conflicto
2024-05-13 21:16:25 +10:00
broccolai
7ef48402fb
gradle and build improvements
2024-05-11 23:40:09 +00:00
apion
9648a91f4a
Fixed fabric server run config, split client and server run folders
2024-04-26 20:35:50 -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
apion
63edd09f3f
Update to Gradle 8.6 and Loom 1.6
2024-04-25 11:01:50 -04:00
apion
a2d574300c
Merge branch 'main' into 1.20.4
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/block/TumblestoneBlock.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/client/gui/summary/Summary.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
# forge/src/main/java/com/cobblemon/mod/forge/mixin/LootManagerMixin.java
# gradle/libs.versions.yml
2024-04-25 08:31:40 -04:00
Nick
724c674992
Fix packet/mixin issues related to forge, bump KFF version, and build details
2024-04-24 22:07:31 -07:00
broccoli
7875006c8e
tooling: improve tests by properly bootstrapping minecraft
...
- uses the fabric-loader-junit build
- rewrites the SpawnValidator to use #getResource instead of code file paths
- create a junit extension to bootstrap easier
2024-03-17 21:13:45 +00:00
Deltric
20a866a0e3
draft: rough port with some bugs to fix and code to clean up.
2024-03-16 23:39:29 -05:00
Deltric
ad49106132
initial gradle changes
2024-03-16 23:27:09 -05:00
Nick
7ed6075410
Change Version Publication for Better Maven Support
2024-03-07 18:23:06 +00:00
Hiroku
4c5f88db06
Simplistic move animations
2024-02-10 22:51:29 +00:00
Licious
943d6e0c55
Dynamic lighting compat
2024-02-03 21:49:27 +00:00