Paul
|
5ab7efcbc6
|
Converted Pokemon models to be JSON-loadable and totally replaceable via resource packs
|
2022-08-08 19:03:32 +10:00 |
|
Paul
|
db81f48fb0
|
Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into #70-battle-gui
|
2022-05-10 22:57:01 +10:00 |
|
Paul
|
3542d58c5a
|
Pose Ekans, loads more work setting up battle GUI data
|
2022-05-10 20:03:16 +10:00 |
|
chrisfusco06
|
61e73289f9
|
Fixed javet dep for mac, model json reading for charizard incomplete as of now
|
2022-05-10 16:18:25 +09:30 |
|
Paul
|
1c2778e3d6
|
Fixed C2S packet handlers not working on Forge specifically
|
2022-05-06 23:15:50 +10:00 |
|
Paul
|
3d2e47cd6d
|
Update javet
|
2022-05-05 19:43:24 +10:00 |
|
Paul
|
818c1d3e48
|
Added support for MoLang-based bedrock animations
|
2022-05-01 00:06:17 +10:00 |
|
Paul
|
7c3424174b
|
Remove geckolib traces, not worth using
|
2022-04-30 18:41:15 +10: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 |
|
Deltric
|
82a8794917
|
Move configured feature and placements to respective platforms
|
2022-04-02 03:01:47 -05:00 |
|
Deltric
|
8b68a9f2af
|
Merge branch 'main' into #57-apricorns-galore
|
2022-04-01 21:41:01 -05:00 |
|
Paul
|
4744bfe5d2
|
Fixed move loading from Fabric assets by implementing a manifest system
|
2022-04-01 21:20:35 +10:00 |
|
Deltric
|
b86f5f25b1
|
fix stuff?
|
2022-03-31 07:24:05 -05:00 |
|
Deltric
|
2a74aab5c3
|
changes
|
2022-03-31 05:31:14 -05:00 |
|
Deltric
|
8641c931fb
|
Merge branch 'main' into #57-apricorns-galore
|
2022-03-31 04:42:58 -05:00 |
|
Paul
|
11a6b8fd66
|
Fixed most issues in the environment in prod, Pokemon still not rendering outside dev
|
2022-03-20 22:54:13 +10:00 |
|
Paul
|
73bf8fe8ed
|
Fixed despawn issues in general and in the tracking from spawning
|
2022-03-19 21:09:43 +10:00 |
|
Deltric
|
1c2dc5301f
|
Merge branch 'main' into #57-apricorns-galore
|
2022-03-19 02:33:29 -05:00 |
|
Paul
|
9665ab9c8d
|
Merge branch 'updated-party-assets' of https://gitlab.com/cable-mc/pokemon-cobbled into #43-Portraits
Conflicts:
common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/gui/PartyOverlay.kt
common/src/main/resources/assets/pokemoncobbled/lang/en_us.json
|
2022-03-16 23:13:13 +10:00 |
|
Deltric
|
208322d66a
|
Merge branch '#64-forge-issues' of https://gitlab.com/cable-mc/pokemon-cobbled into #64-forge-issues
|
2022-03-16 05:20:41 -05:00 |
|
Deltric
|
c05ff7a1aa
|
test work
|
2022-03-16 05:20:30 -05:00 |
|
Paul
|
1c5b0ce0a5
|
Fixed test locations and update gitlab-ci for fabric and forge artifacts
|
2022-03-14 18:57:18 +10:00 |
|
Deltric
|
cd62413e2c
|
Merge branch 'main' into #57-apricorns-galore
|
2022-03-14 03:49:16 -05:00 |
|
Paul
|
a8deb69a4a
|
Fixed the mod.toml processResources issue
|
2022-03-14 18:16:31 +10:00 |
|
Paul
|
d06fcf8b6a
|
A heap more changes for gradle shit trying to copy Adorn
|
2022-03-14 17:49:57 +10:00 |
|
Paul
|
11d2db1903
|
Redoing a bunch of the gradles and converting to kotlin dsl
|
2022-03-14 12:11:28 +10:00 |
|
Paul
|
f963a1f060
|
Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into #43-Portraits
Conflicts:
common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/render/models/blockbench/pokemon/BlastoiseModel.kt
|
2022-03-13 15:23:19 +10:00 |
|
Deltric
|
4e402865e6
|
I made progress
|
2022-03-12 00:03:56 -06:00 |
|
Paul
|
cd3f3fae69
|
Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into more-battle-work
|
2022-03-12 12:37:18 +10:00 |
|
Paul
|
909d54b354
|
Removed apparently defunct minecraft block in forge gradle
|
2022-03-12 11:47:39 +10:00 |
|
Paul
|
e1b4f9f53f
|
1.18.2
|
2022-03-12 11:29:48 +10:00 |
|
Paul
|
343a61e381
|
More work inside battles a lot of which cleanup, updated showdown code with some custom changes, we need to check out disordered showdown messages
|
2022-03-06 16:23:16 +10:00 |
|
Paul
|
5b64a9ecdd
|
Fixed shoulder mount observable issue, properly reimplemented spawning, made Eevee shoulder-mountable again
|
2022-02-25 19:46:37 +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 |
|
Deltric
|
1c36f4e85f
|
Merge branch '#63-3-fabric-forge' of https://gitlab.com/cable-mc/pokemon-cobbled into #63-3-fabric-forge
|
2022-02-24 03:40:42 -06:00 |
|
Deltric
|
9ee507cc25
|
Gave config some freedom 🇺🇸
Config is now platform independent built around Gson.
|
2022-02-24 03:32:28 -06:00 |
|
Qumoo
|
c69ca9fbaf
|
Re-add shading of Kotlin and Showdown to fabric and forge gradle
|
2022-02-23 10:40:32 +01:00 |
|
Qumoo
|
229e69d619
|
Adjust refmap path
|
2022-02-23 10:38:20 +01:00 |
|
Qumoo
|
1c51ee35f9
|
Separate Client and Common setups
|
2022-02-23 00:49:46 +01:00 |
|
Paul
|
a93659e087
|
Cleanup
|
2022-02-22 22:22:20 +10:00 |
|
Paul
|
54fec9a3c4
|
Entity rendering working on Forge and Fabric (with clean implementation yay)
|
2022-02-22 22:03:56 +10:00 |
|
Paul
|
be3c8706ab
|
Migrated command registration, added Text library from Cable Libs, fixed sounds
|
2022-02-21 21:44:39 +10:00 |
|
Paul
|
d2e3ccbffe
|
Fixed network packet handling for Fabric and cleaned up common process
|
2022-02-21 11:15:19 +10:00 |
|
Qumoo
|
fc18dbd728
|
Move Keybinds to Common
|
2022-02-21 00:06:09 +01:00 |
|
Paul
|
1fe5a41035
|
Fixed entity renderer registration
|
2022-02-20 23:52:03 +10:00 |
|
Paul
|
ce85c7b100
|
Crappy attribute fix
|
2022-02-20 22:10:40 +10:00 |
|
Paul
|
03ac02cc2a
|
Fixed packet registration issue and double-initialization from Forge fork
|
2022-02-20 12:04:56 +10:00 |
|
Qumoo
|
7f72cef24a
|
fix imports again
|
2022-02-20 01:30:52 +01:00 |
|
Qumoo
|
df7b616dae
|
Remove Method from addListener, register mod event bus
|
2022-02-20 01:29:55 +01:00 |
|