Move boat sprint check into handleSprinting and update changelog

teeny fixes to compat

See merge request cable-mc/cobblemon!2520

CHANGELOG.md

@@ -9,10 +9,37 @@
 
 ### Changes
 - Amethyst now grows from Typegem core blocks like typegems do
+- Updated the recipe category for the Create compatibility EXP Candy recipe
+- Added No Man's Lands' Honeyed Apple to the Leaves Leftovers tag
 
 ### Fixes
 - Fixed Ponigiri food values for AppleSkin integration
 - Fixed errors emitted by typos in Parched Peat bog structure files
+- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
+- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
+- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
+- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
+- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
+- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
+- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
+- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion
+- Fixed friendship booster items not being recognised as such
+- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot)
+- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event
+- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands
+- Fixed MoLang that's targeting players intermittedly failing when they have died, needing them to relog
+- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots
+- Fixed party overlay not hiding when the player opens the Pokédex scanner 
+- Added compat for AppleSkin
+- Fixed some display names having unintended font colours
+- Fixed `hate_entity` task focusing on its own entity
+  - Thus enabled deadly warfare between Zangoose and Seviper
+- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now generate
+- Fixed Frogadier floating in its battle_idle animation
+- Fixed absence or incorrect mergers in spawning conditions, making max height/depth of conditions to use the min value instead
+- Added stricter riding checks on server side to prevent possible packet forgery when player tries to ride pokemon
+- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures
+- Fixed boat style mounts sprinting on their own after landing in water from jet flight
 
 ### Developer
 

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/BoatBehaviour.kt

@@ -37,6 +37,7 @@ import com.cobblemon.mod.common.util.writeRidingStats
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
+import net.minecraft.client.Minecraft
 import net.minecraft.core.BlockPos
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.util.Mth
@@ -94,12 +95,8 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
             state.jumpBuffer.set(state.jumpBuffer.get() + 1)
         }
 
-        // Only start sprinting on vehicle if the state has changed and the pokemon has atleast 1/3 stamina
-        if (driver.isSprinting && !state.isVehicleSprinting.get()) {
-            state.isVehicleSprinting.set(state.stamina.get() > 0.33f)
-        }
-        else if (!driver.isSprinting) {
-            state.isVehicleSprinting.set(false)
+        if (vehicle.level().isClientSide) {
+            handleSprinting(state)
         }
 
         if (!state.isVehicleSprinting.get()) {
@@ -115,6 +112,20 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
         super.tick(settings, state, vehicle, driver, input)
     }
 
+    fun handleSprinting(
+        state: BoatState
+    ) {
+        // Check the keys instead of driver.isSprinting since that can still be true from a previous ride style
+        val tryingToSprint = Minecraft.getInstance().options.keySprint.isDown() && Minecraft.getInstance().options.keyUp.isDown()
+        // Only start sprinting on vehicle if the state has changed and the pokemon has atleast 1/3 stamina
+        if (tryingToSprint && !state.isVehicleSprinting.get()) {
+            state.isVehicleSprinting.set(state.stamina.get() > 0.33f)
+        }
+        else if (!tryingToSprint) {
+            state.isVehicleSprinting.set(false)
+        }
+    }
+
     override fun pose(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): PoseType {
         return poseProvider.select(settings, state, vehicle)
     }

common/src/main/resources/data/cobblemon/recipe/mod_compatibility/create/campfire_pot/exp_candy_xs_create.json

@@ -14,7 +14,7 @@
     }
   ],
     "type": "cobblemon:cooking_pot_shapeless",
-    "category": "medicines",
+    "category": "misc",
     "ingredients": [
         {
             "item": "create:experience_nugget"

common/src/main/resources/data/cobblemon/tags/item/held/leaves_leftovers.json

@@ -6,6 +6,7 @@
     "cobblemon:tart_apple",
 	"cobblemon:syrupy_apple",
 	"cobblemon:candied_apple",
-    { "id": "create:honeyed_apple","required": false }
+    { "id": "create:honeyed_apple","required": false },
+    { "id": "nomansland:honeyed_apple","required": false }
   ]
 }