Commit Graph
3283 Commits
Author SHA1 Message Date
Waldleufer 4e9d45d38c MutableText.onHover() now is actually drawn if text is being hovered
#480
2023-10-22 21:08:15 +02:00
Waldleufer 4e2f7d3bc5 InfoWidget refactored into multiple smaller widgets.
#480
2023-10-22 21:08:15 +02:00
Waldleufer 8975b099ad InfoWidget reworked.
#480
2023-10-22 21:08:09 +02:00
Waldleufer 308380706a Implemented Hovertext and italicized Nature for Minted Natures in Info and Trade Screen.
I am sure there is a better way to do that though.

#480
2023-10-22 21:01:31 +02:00
Jordan fe219e52e6 Simplified composting as well as made mint, apricorn, and berries more consistent. 2023-10-22 01:13:45 +00:00
Plastered_Crab f5418a8088 Update PotionItem.kt to fix Potions, Super Potions, and Hyper Potions not working during Battle 2023-10-21 02:07:00 +00:00
Plastered_Crab 81b00d7f85 Fixed Berry Juice so that when it is used in and outside of Battle when in Survival Mode a wooden bowl is given back to the player 2023-10-21 01:47:43 +00:00
Paul 948ceeaa8d Merge remote-tracking branch 'origin/main' 2023-10-21 10:14:25 +10:00
Paul 1eda446897 Fixed bad PC loading from JSON and NBT store adapters due to 392b6993 2023-10-21 10:14:15 +10:00
Charzard4261 d3e10cb570 Merge remote-tracking branch 'origin/Berries-On-Modded-Farmland' into Berries-On-Modded-Farmland 2023-10-20 19:12:34 +01:00
Charzard4261 51d7d2cb04 Added Forge and Fabric (unofficial but according to their standards) farmlands tag to facilitate better compatibility, as advised by Licious. 2023-10-20 19:12:19 +01:00
Charzard4261 ac53d2da95 Merge branch 'main' into 'Berries-On-Modded-Farmland'
# Conflicts:
#   CHANGELOG.md
2023-10-20 16:43:45 +00:00
Charzard4261 4bd70698ce Added a "below.block is FarmlandBlock" check for Berry blocks to allow them to be placed on other blocks that extend from it. 2023-10-20 17:25:57 +01:00
Hiroku c391d1a5e0 Merge branch 'main' into 'Dispenser-Shear-Apricorn-Fix'
# Conflicts:
#   CHANGELOG.md
2023-10-20 07:42:04 +00:00
Nick 0af39118eb Merge branch 'multi-party-fix' into 'main'
Allows PlayerPartyStore's to have their own unique storage id, separate from the player uuid.

See merge request cable-mc/cobblemon!704
2023-10-20 07:21:03 +00:00
Deltric 392b69937f Allows PlayerPartyStore's to have their own unique storage id, separate from the player uuid. 2023-10-20 01:53:32 -05:00
Hiroku e32af733f1 Merge branch 'more-mod-compat' into 'main'
Fix compatibility with the Forge version of Carry On, add compatibility for Adorn.

See merge request cable-mc/cobblemon!697
2023-10-20 06:41:13 +00:00
Charzard4261 9ca472ccaf Fixed Dispensers being unable to shear grown Apricorns. 2023-10-19 11:48:27 +01:00
Licious b3255045fa Fix compatibility with the Forge version of Carry On, add compatibility for Adorn. 2023-10-18 22:17:35 +01:00
Hiroku 90f3acebac Merge branch 'main' into 'main'
Check chunks are loaded before running AreaSpawner

See merge request cable-mc/cobblemon!692
2023-10-18 20:00:56 +00:00
Charzard4261 ba3b26ac74 Fix desync that was causing milk buckets occasionally reverting to regular buckets by removing the ServerClientPlayer check in PokemonEntity.interactMob for Shearing and Milking, and modifying it slightly to be the same calls as CowEntity (minus the SFX). 2023-10-18 17:49:47 +01:00
Xander Forrest 966761776d Merge branch cobblemon:main into main 2023-10-18 10:20:29 +00:00
Nick 24f07c58a0 Merge branch 'fabric-roots-spreading-fix' into 'main'
Fix Fabric big root spreading.

See merge request cable-mc/cobblemon!695
2023-10-17 23:06:24 +00:00
Xander Forrest a8b5f649a8 Merge branch cobblemon:main into main 2023-10-17 21:49:58 +00:00
Xander Forrest 295c73ae69 Don't create chunk in SpawningProspector 2023-10-17 22:47:38 +01:00
Xander Forrest 899bdb38ac Removes ServerChunkManagerMixin.java
Update chunk logic in AreaSpawner.constrainArea to reflect this
Updated Prospector to not use SCCM when getting chunks
2023-10-17 21:40:47 +01:00
Nick f30e5bda1e Merge branch 'improve-mongo-db-store-override' into 'main'
Improve the ability to reuse and override the MongoDBStoreAdapter.

See merge request cable-mc/cobblemon!694
2023-10-17 19:50:18 +00:00
Licious 76c870b472 Fix Fabric big root spreading. 2023-10-17 20:40:43 +01:00
Licious 48d2fc6e2e Improve the ability to reuse and override the MongoDBStoreAdapter. 2023-10-17 20:08:49 +01:00
Licious 5868d39431 Rework Composter item registration to be platform implementation specific. 2023-10-17 19:53:48 +01:00
Xander Forrest c47b3a21db Move isBoxLoaded to WorldExtensions.kt 2023-10-17 10:41:47 +01:00
Xander Forrest 0d12fb1f1c When running AreaSpawner, check area box's chunks are all loaded before attempting to get all entities in the area 2023-10-17 10:18:05 +01:00
Hiroku 6a737999a9 Merge branch 'sendingOutShoulderedCobblemon' into 'main'
Dismounting Shouldered Cobblemon

Closes #473

See merge request cable-mc/cobblemon!680
2023-10-14 07:04:34 +00:00
Waldleufer 89d37e583b Dismounting Shouldered Cobblemon 2023-10-14 07:04:33 +00:00
tyzillion 61f2150f2e Fixed Exeggcute looping faint. Fixed Baltoy texture zfighting. Fixed Wishiwashi framing. 2023-10-13 19:36:00 -04:00
tyzillion 5d63c8fe06 Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon 2023-10-13 19:35:16 -04:00
Hiroku 0d109a64fd Merge branch 'scriptedDropsCSVtoJson' into 'main'
Automating the manual Drop Json editing

See merge request cable-mc/cobblemon!686
2023-10-13 23:34:54 +00:00
Segfault Guy 0d4f63ba01 Remove gmax factor from natural spawns. 2023-10-13 19:12:22 -04:00
Paul 946cff21fb Merge remote-tracking branch 'origin/main' into implement_pokemon 2023-10-14 08:43:40 +10:00
Paul 8a2291cd6e Fixed form order for exeggcute and pikachu 2023-10-14 08:43:33 +10:00
tyzillion 3cac1138fb 😂😂😂 ˙sǝxᴉɟ uoᴉʇnloʌǝ ǝʇnuᴉɯ ʇsɐl 2023-10-13 18:05:33 -04:00
Paul b19a11f8ab Merge remote-tracking branch 'origin/main' into 1.4-fixes 2023-10-14 07:41:25 +10:00
Paul 9036909968 Fixed underscores not really working as species names, fixed recalls not working (that was close) 2023-10-14 07:40:08 +10:00
MoeBoy76 53b98e8008 order of operations 2023-10-14 08:31:34 +11:00
MoeBoy76 574fd92827 added trigger to Shedinja evolution code and made Creative not care about Pokeballs 2023-10-14 08:06:31 +11:00
Waldleufer e6d7513c20 Merge branch 'main' into 'scriptedDropsCSVtoJson'
# Conflicts:
#   common/src/main/resources/data/cobblemon/species/generation1/golem.json
#   common/src/main/resources/data/cobblemon/species/generation1/graveler.json
#   common/src/main/resources/data/cobblemon/species/generation5/boldore.json
#   common/src/main/resources/data/cobblemon/species/generation5/gigalith.json
2023-10-13 20:47:11 +00:00
Waldleufer e36252318a Removed dangling Import. 2023-10-13 22:37:58 +02:00
Waldleufer 5d5dbb9e79 Fruits of the labor. 100% Datasheet and code consistency. 2023-10-13 22:28:04 +02:00
Paul fa1f485cd2 Merge remote-tracking branch 'origin/main' into go-to-sleep-flywheel
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryEntityInstance.kt
2023-10-14 06:18:35 +10:00
Waldleufer b5aeb0e5f7 Removed debug logs. 2023-10-13 22:18:13 +02:00