Merge branch 'multiplayer_mount_sync' into 'main'

Multiplayer mount sync

Closes #2023

See merge request cable-mc/cobblemon!2315

CHANGELOG.md

@@ -42,9 +42,8 @@
 - All ruin structures gilded chest loot tables have been updated to include a guaranteed TM not learned naturally by any Pokémon through their level-up moveset. Each ruin gets its own specific TM, so you can now go hunting ruins to complete your move dex!
 - All fossil structures have been transferred over to biome features, allowing for better placement in generation.
 - The prehistoric_underwater_fissure & prehistoric_submerged_impact fossil structures now use the biome tag `#cobblemon:is_temperate_ocean`.
-- A new Biome tag called `#cobblemon:is_stony_beach` has been added.
 - Gimmighoul towers now generate at ground level rather than sinking one block into the ground.
-- 1 New shipwreck cove structure called the "magma_shipwreck_cove" has been added.
+- A new shipwreck cove structure called the "magma_shipwreck_cove" has been added.
 - Shipwreck coves now generate slightly more frequently.
 - Added equipment loot tables for shipwreck cove enemies.
 - Maps from abandoned fishing boats leading to shipwreck coves now will skip explored chunks, allowing the player to find more shipwreck coves easier.
@@ -57,6 +56,7 @@
 - Pokémon cries now play when clicking Pokémon in the summary screen.
 - Pressing the Summary key while either the starter selection or summary screen are open now closes those screens
 - Ice type Pokémon are now immune to Packed Snow
+- Held item visibility can now be controlled by the held_item_visible command argument.
 
 ### New rideable Pokémon
 - Drampa
@@ -302,6 +302,11 @@
 - Restored Ninjask's ability to do barrel rolls
 - Fixed a crash caused by adding enchanted items to the Resurrection Machine
 - Fixed a crash that could occur when starting a PvN battle with only fainted Pokémon.
+- Fixed the Remember Riding Camera config not being respected when dismounting and resolved the incompatibility with the Auto Third Person mod
+- Fixed Full Heal block not dropping Full Heals
+- Fixed status cure items not returning an empty bottle when used
+- Fixed Panpour consuming its held item when evolving with a Water Stone
+- Fixed Smoked Tail Curry returning a Wooden Bowl when consumed despite it not being included in the recipe
 
 ### Fixes
 - Fixed Croagunk's walkspeed
@@ -352,6 +357,8 @@
 - Fixed Guilded chests being more accessible than intended
 - Fixed fished up Pokémon not being added as "seen" to the Pokedex
 - Fixed surprised Gimmighoul encounters not being added as "seen" to the Pokedex
+- Fixed a crash involving berry trees that have been world edited.
+- Fixed visual desync in multiplayer for players mounting Pokémon outside other players' loaded chunks 
 
 ### Developer
 - Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
@@ -362,7 +369,8 @@
 - Separated all the functions of MoLangFunctions.kt into their own files.
 - Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
 - Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
-- Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files
+- Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files.
+- Added support for `profilePokedexScale`, `profilePokedexTranslation`, `profileSummaryScale`, and `profileSummaryTranslation` in poser files for finer control over profile displays.
 
 ### Molang & Datapacks
 - Added `moveset_builders` datapack folder for different styles of movesets.

common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -108,6 +108,7 @@ import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.pokemon.properties.AspectPropertyType
 import com.cobblemon.mod.common.pokemon.properties.BattleCloneProperty
 import com.cobblemon.mod.common.pokemon.properties.FreezeFrameProperty
+import com.cobblemon.mod.common.pokemon.properties.HeldItemVisibleProperty
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
 import com.cobblemon.mod.common.pokemon.properties.LabelProperty
 import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
@@ -350,6 +351,7 @@ object Cobblemon {
         CustomPokemonProperty.register(UnaspectPropertyType)
         CustomPokemonProperty.register(FreezeFrameProperty)
         CustomPokemonProperty.register(NoAIProperty)
+        CustomPokemonProperty.register(HeldItemVisibleProperty)
 
         CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)
 

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt

@@ -405,7 +405,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val BIG_MALASADA = regionalFoodItem("big_malasada", 64, 7, 0.3f, false)
     @JvmField
-    val SMOKED_TAIL_CURRY = regionalFoodItem("smoked_tail_curry", 64, 10, 0.6f, false, ItemStack(Items.BOWL, 1))
+    val SMOKED_TAIL_CURRY = regionalFoodItem("smoked_tail_curry", 64, 10, 0.6f, false)
     @JvmField
     val JUBILIFE_MUFFIN = regionalFoodItem("jubilife_muffin", 64, 7, 0.3f, false)
     @JvmField

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt

@@ -35,6 +35,7 @@ import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SetActiveTMPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SetTMMachineContainerDataPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
+import com.cobblemon.mod.common.client.net.gui.SynchronizeActiveTMHandler
 import com.cobblemon.mod.common.client.net.habitat.OpenHabitatBlockEditorHandler
 import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
 import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
@@ -147,6 +148,7 @@ import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SetActiveTMPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SetTMMachineContainerDataPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
+import com.cobblemon.mod.common.net.messages.client.ui.SynchronizeActiveTMPacket
 import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
 import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
 import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
@@ -375,6 +377,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(PlayerInteractOptionsPacket.ID, PlayerInteractOptionsPacket::decode, PlayerInteractOptionsHandler))
         list.add(PacketRegisterInfo(PokedexUIPacket.ID, PokedexUIPacket::decode, PokedexUIPacketHandler))
         list.add(PacketRegisterInfo(ExpGainedDataPacket.ID, ExpGainedDataPacket::decode, ExpGainedDataPacketHandler))
+        list.add(PacketRegisterInfo(SynchronizeActiveTMPacket.ID, SynchronizeActiveTMPacket::decode, SynchronizeActiveTMHandler))
 
         // Starter packets
         list.add(PacketRegisterInfo(OpenStarterUIPacket.ID, OpenStarterUIPacket::decode, StarterUIPacketHandler))

common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.block
 
 //import dev.lambdaurora.lambdynlights.util.SodiumDynamicLightHandler.pos
-import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.berry.Berries
 import com.cobblemon.mod.common.api.berry.Berry
@@ -40,7 +39,11 @@ import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.LevelAccessor
 import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.*
+import net.minecraft.world.level.block.BaseEntityBlock
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.Blocks
+import net.minecraft.world.level.block.BonemealableBlock
+import net.minecraft.world.level.block.RenderShape
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
@@ -128,7 +131,10 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
         val newAge = curAge + 1
         if (newAge > FRUIT_AGE) return
         val newState = state.setValue(AGE, newAge)
-        val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
+        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: run {
+            world.setBlock(pos, Blocks.AIR.defaultBlockState(), UPDATE_CLIENTS)
+            return
+        }
         if (curAge == MATURE_AGE) {
             treeEntity.generateGrowthPoints(world, newState, pos, null)
             determineMutation(world, random, pos, newState)

common/src/main/kotlin/com/cobblemon/mod/common/block/tmmachine/TMMachineMenu.kt

@@ -10,11 +10,13 @@ package com.cobblemon.mod.common.block.tmmachine
 
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.CobblemonMenuType
+import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.moves.Moves
+import com.cobblemon.mod.common.api.tms.TechnicalMachine
 import com.cobblemon.mod.common.api.tms.TechnicalMachines
 import com.cobblemon.mod.common.block.entity.TMMachineBlockEntity
-import com.cobblemon.mod.common.util.itemRegistry
-import net.minecraft.server.level.ServerLevel
+import com.cobblemon.mod.common.net.messages.client.ui.SynchronizeActiveTMPacket
+import net.minecraft.server.level.ServerPlayer
 import net.minecraft.util.Mth
 import net.minecraft.world.Container
 import net.minecraft.world.SimpleContainer
@@ -35,38 +37,20 @@ class TMMachineMenu(menuType: MenuType<*>, syncId: Int) : AbstractContainerMenu(
     var inventory: Container? = null
     var containerData: ContainerData? = null
 
+    var currentlySelectedTM: TechnicalMachine? = null
+    private var lastSelectedTM: TechnicalMachine? = null
+
+    var onSelectedTMUpdate: (TechnicalMachine?) -> Unit = {}
+
     constructor(syncId: Int, playerInventory: Inventory) : this(CobblemonMenuType.TM_MACHINE, syncId) {
         this.playerInventory = playerInventory
         this.inventory = SimpleContainer(5)
         this.containerData = SimpleContainerData(6)
-        this.tmMachineEntity = (inventory as? TMMachineBlockEntity.TMMachineBlockInventory)?.blockEntity
 
         this.addDataSlots(containerData!!)
         inventory?.startOpen(playerInventory.player)
 
-        val startX = 15
-        val startY = 144
-        val slotWidth = 18
-        val slotHeight = 18
-
-        for (row in 0..2) {
-            for (col in 0..8) {
-                this.addSlot(Slot(playerInventory, 9 + (row * 9) + col, startX + (slotWidth * col), startY + (slotHeight * row)))
-            }
-        }
-        for (col in 0..8) {
-            this.addSlot(Slot(playerInventory, col, startX + (slotWidth * col), startY + 58))
-        }
-
-        val container = inventory
-        container?.let {
-            this.addSlot(TMResultSlot(container, RESULT_SLOT, startX + 37, startY - 28)) // Output slot
-            this.addSlot(BlankTMSlot(container, BLANK_TM_SLOT, startX + 90, startY - 28))  // Blank TM
-            for (index in INGREDIENT_SLOTS) {
-                this.addSlot(Slot(container, index, startX + 114 + (18 * (index - INGREDIENT_SLOTS.first)), startY - 28))
-            }
-        }
-        this.addSlotListener(this)
+        initiateSlots()
     }
 
     constructor(syncId: Int, playerInventory: Inventory, inventory: Container, containerData: ContainerData) : this(CobblemonMenuType.TM_MACHINE, syncId) {
@@ -78,6 +62,20 @@ class TMMachineMenu(menuType: MenuType<*>, syncId: Int) : AbstractContainerMenu(
         this.addDataSlots(containerData)
         inventory.startOpen(playerInventory.player)
 
+        initiateSlots()
+
+        tmMachineEntity?.let {
+            val move = Moves.getByName(it.activeMove)
+            move.let {
+                currentlySelectedTM = TechnicalMachines.moveToTM[it]
+                synchronizeSelectedTM()
+            }
+        }
+
+        this.addSlotListener(this)
+    }
+
+    private fun initiateSlots() {
         val startX = 15
         val startY = 144
         val slotWidth = 18
@@ -92,7 +90,7 @@ class TMMachineMenu(menuType: MenuType<*>, syncId: Int) : AbstractContainerMenu(
             this.addSlot(Slot(playerInventory, col, startX + (slotWidth * col), startY + 58))
         }
 
-        val container = inventory
+        val container = inventory!!
         container.let {
             this.addSlot(TMResultSlot(container, RESULT_SLOT, startX + 37, startY - 28)) // Output slot
             this.addSlot(BlankTMSlot(container, BLANK_TM_SLOT, startX + 90, startY - 28))  // Blank TM
@@ -100,7 +98,6 @@ class TMMachineMenu(menuType: MenuType<*>, syncId: Int) : AbstractContainerMenu(
                 this.addSlot(Slot(container, index, startX + 114 + (18 * (index - INGREDIENT_SLOTS.first)), startY - 28))
             }
         }
-        this.addSlotListener(this)
     }
 
     override fun quickMoveStack(player: Player, index: Int): ItemStack {
@@ -207,4 +204,25 @@ class TMMachineMenu(menuType: MenuType<*>, syncId: Int) : AbstractContainerMenu(
     override fun dataChanged(containerMenu: AbstractContainerMenu, dataSlotIndex: Int, value: Int) {
         broadcastChanges()
     }
+
+    fun synchronizeSelectedTM() {
+        val serverPlayer = playerInventory?.player as? ServerPlayer ?: return
+        serverPlayer.sendPacket(SynchronizeActiveTMPacket(currentlySelectedTM))
+        lastSelectedTM = currentlySelectedTM
+    }
+
+    override fun sendAllDataToRemote() {
+        super.sendAllDataToRemote()
+        synchronizeSelectedTM()
+    }
+
+    override fun broadcastChanges() {
+        super.broadcastChanges()
+        if (lastSelectedTM != currentlySelectedTM) synchronizeSelectedTM()
+    }
+
+    fun clientSetSelectedTM(tm: TechnicalMachine?) {
+        currentlySelectedTM = tm
+        onSelectedTMUpdate(tm)
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/MountedCameraTypeHandler.kt

@@ -49,7 +49,7 @@ object MountedCameraTypeHandler {
             return
         }
         val currentCameraType = mc.options.cameraType
-        if (currentCameraType != unmountedCameraType) {
+        if (Cobblemon.config.rememberRidingCamera && currentCameraType != unmountedCameraType) {
             mc.options.cameraType = unmountedCameraType
         }
         val data = ClientPersistedData.ridingPerspectives

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PokemonGuiUtils.kt

@@ -27,10 +27,18 @@ import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
+import net.minecraft.world.phys.Vec3
 import org.joml.Quaternionf
 import org.joml.Vector3f
 import kotlin.math.atan
 
+enum class ProfileTransformType {
+    PROFILE,
+    NONE,
+    POKEDEX,
+    SUMMARY,
+}
+
 fun drawProfilePokemon(
     renderablePokemon: RenderablePokemon,
     matrixStack: PoseStack,
@@ -39,7 +47,7 @@ fun drawProfilePokemon(
     state: PosableState,
     partialTicks: Float,
     scale: Float = 20F,
-    applyProfileTransform: Boolean = true,
+    profileTransformType: ProfileTransformType = ProfileTransformType.PROFILE,
     applyBaseScale: Boolean = false,
     r: Float = 1F,
     g: Float = 1F,
@@ -56,7 +64,7 @@ fun drawProfilePokemon(
     state = state.also { it.currentAspects = renderablePokemon.aspects },
     partialTicks = partialTicks,
     scale = scale,
-    applyProfileTransform = applyProfileTransform,
+    profileTransformType = profileTransformType,
     applyBaseScale = applyBaseScale,
     r = r,
     g = g,
@@ -75,7 +83,7 @@ fun drawProfilePokemon(
     state: PosableState,
     partialTicks: Float,
     scale: Float = 20F,
-    applyProfileTransform: Boolean = true,
+    profileTransformType: ProfileTransformType = ProfileTransformType.PROFILE,
     applyBaseScale: Boolean = false,
     doQuirks: Boolean = false,
     r: Float = 1F,
@@ -114,18 +122,38 @@ fun drawProfilePokemon(
         state.setPoseToFirstSuitable(poseType)
         state.updatePartialTicks(partialTicks)
 
-        if (applyProfileTransform) {
-            matrixStack.translate(
-                model.profileTranslation.x,
-                model.profileTranslation.y + 1.5 * model.profileScale,
-                model.profileTranslation.z - 4.0
-            )
-            matrixStack.scale(model.profileScale, model.profileScale, 1 / model.profileScale)} else {
+        if (profileTransformType == ProfileTransformType.NONE) {
             matrixStack.translate(0F, 0F, -4.0F)
             if (applyBaseScale) {
                 matrixStack.scale(baseScale, baseScale, 1 / baseScale)
             }
+        } else {
+            var profileScale: Float
+            var profileTranslation: Vec3
+
+            when (profileTransformType) {
+                ProfileTransformType.POKEDEX -> {
+                    profileScale = model.profilePokedexScale ?: model.profileScale
+                    profileTranslation = model.profilePokedexTranslation ?: model.profileTranslation
+                }
+                ProfileTransformType.SUMMARY -> {
+                    profileScale = model.profileSummaryScale ?: model.profileScale
+                    profileTranslation = model.profileSummaryTranslation ?: model.profileTranslation
+                }
+                else -> {
+                    profileScale = model.profileScale
+                    profileTranslation = model.profileTranslation
+                }
+            }
+
+            matrixStack.translate(
+                profileTranslation.x,
+                profileTranslation.y + 1.5 * profileScale,
+                profileTranslation.z - 4.0
+            )
+            matrixStack.scale(profileScale, profileScale, 1 / profileScale)
         }
+
         matrixStack.mulPose(rotation)
 
         model.applyAnimations(null, state, 0F, 0F, 0F, headYaw, headPitch)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PokemonProfileDebugKeys.kt

@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
+import com.mojang.blaze3d.platform.InputConstants
+import net.minecraft.client.Minecraft
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.phys.Vec3
+
+fun handleProfileDebugKeys(keyCode: Int, poserResourceLocation: ResourceLocation, state: FloatingState) {
+    if (!Cobblemon.config.enableDebugKeys) {
+        return
+    }
+    val model = VaryingModelRepository.getPoser(poserResourceLocation, state)
+
+    val delta = when (keyCode) {
+        InputConstants.KEY_UP -> Vec3(0.0, -0.01, 0.0)
+        InputConstants.KEY_DOWN -> Vec3(0.0, 0.01, 0.0)
+        InputConstants.KEY_LEFT -> Vec3(-0.01, 0.0, 0.0)
+        InputConstants.KEY_RIGHT -> Vec3(0.01, 0.0, 0.0)
+        else -> null
+    }
+
+    if (delta != null) {
+        model.profileTranslation = model.profileTranslation.add(delta)
+        model.profileSummaryTranslation = model.profileSummaryTranslation?.add(delta)
+        model.profilePokedexTranslation = model.profilePokedexTranslation?.add(delta)
+    }
+
+    val scaleDelta = when (keyCode) {
+        InputConstants.KEY_EQUALS -> 0.01F
+        InputConstants.KEY_MINUS -> -0.01F
+        else -> null
+    }
+
+    if (scaleDelta != null) {
+        model.profileScale += scaleDelta
+        model.profileSummaryScale = model.profileSummaryScale?.plus(scaleDelta)
+        model.profilePokedexScale = model.profilePokedexScale?.plus(scaleDelta)
+    }
+}
+
+fun logProfileTranslations(poserResourceLocation: ResourceLocation, state: FloatingState) {
+    if (!Cobblemon.config.enableDebugKeys) {
+        return
+    }
+
+    val model = VaryingModelRepository.getPoser(poserResourceLocation, state)
+    val player = Minecraft.getInstance().player
+
+    fun Double.f2() = "%.2f".format(this)
+    fun Float.f2() = "%.2f".format(this)
+
+    fun sendTranslation(name: String, translation: Vec3) {
+        player?.sendSystemMessage(Component.literal("$name Translation: (${translation.x.f2()}, ${translation.y.f2()}, ${translation.z.f2()})"))
+    }
+
+    fun sendScale(name: String, scale: Float) {
+        player?.sendSystemMessage(Component.literal("$name Scale: ${scale.f2()}"))
+    }
+
+    fun logTranslation(name: String, translation: Vec3) {
+        Cobblemon.LOGGER.info("override var ${name.replaceFirstChar(Char::lowercase)}Translation = Vec3(${translation.x.f2()}, ${translation.y.f2()}, ${translation.z.f2()})")
+    }
+
+    fun logScale(name: String, scale: Float) {
+        Cobblemon.LOGGER.info("override var ${name.replaceFirstChar(Char::lowercase)}Scale = ${scale.f2()}F")
+    }
+
+    sendTranslation("Profile", model.profileTranslation)
+    sendScale("Profile", model.profileScale)
+
+    model.profileSummaryTranslation?.let { sendTranslation("Summary Profile", it) }
+    model.profileSummaryScale?.let { sendScale("Summary Profile", it) }
+
+    model.profilePokedexTranslation?.let { sendTranslation("Pokedex Profile", it) }
+    model.profilePokedexScale?.let { sendScale("Pokedex Profile", it) }
+
+    logTranslation("Profile", model.profileTranslation)
+    logScale("Profile", model.profileScale)
+
+    model.profileSummaryTranslation?.let { logTranslation("ProfileSummary", it) }
+    model.profileSummaryScale?.let { logScale("ProfileSummary", it) }
+
+    model.profilePokedexTranslation?.let { logTranslation("ProfilePokedex", it) }
+    model.profilePokedexScale?.let { logScale("ProfilePokedex", it) }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/PokedexGUI.kt

@@ -32,6 +32,8 @@ import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
+import com.cobblemon.mod.common.client.gui.handleProfileDebugKeys
+import com.cobblemon.mod.common.client.gui.logProfileTranslations
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
@@ -427,6 +429,11 @@ class PokedexGUI private constructor(
     override fun onClose() {
         if (blockPos != null) AdjustBlockEntityViewerCountPacket(blockPos, false).sendToServer()
         playSound(CobblemonSounds.POKEDEX_CLOSE)
+
+        selectedEntry?.speciesId?.let { speciesId ->
+            logProfileTranslations(speciesId, pokemonInfoWidget.state)
+        }
+
         super.onClose()
     }
 
@@ -757,6 +764,12 @@ class PokedexGUI private constructor(
             return true
         }
 
+        if (!searchWidget.isFocused) {
+            selectedEntry?.speciesId?.let { speciesId ->
+                handleProfileDebugKeys(keyCode, speciesId, pokemonInfoWidget.state)
+            }
+        }
+
         return super.keyPressed(keyCode, scanCode, modifiers)
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/PokemonInfoWidget.kt

@@ -22,6 +22,7 @@ import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.ProfileTransformType
 import com.cobblemon.mod.common.client.gui.TypeIcon
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_HEIGHT
@@ -386,7 +387,8 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
                     partialTicks = delta,
                     rotation = Quaternionf().fromEulerXYZDegrees(rotationVector),
                     state = state,
-                    blockLight = 15
+                    blockLight = 15,
+                    profileTransformType = ProfileTransformType.POKEDEX,
                 )
 
                 matrices.popPose()

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/SizeWidget.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.gui.pokedex.widgets
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.ProfileTransformType
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_DESCRIPTION_HEIGHT
@@ -90,7 +91,7 @@ class SizeWidget(val pX: Int, val pY: Int) : SoundlessWidget(
             rotation = Quaternionf().fromEulerXYZDegrees(Vector3f(0F, 0F, 0F)),
             state = FloatingState(),
             scale = modelScale,
-            applyProfileTransform = false,
+            profileTransformType = ProfileTransformType.NONE,
             applyBaseScale = true,
             r = 0F,
             g = 0F,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.client.gui.summary
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.CobblemonNetwork.sendToServer
 import com.cobblemon.mod.common.CobblemonSounds
@@ -21,14 +20,8 @@ import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
-import com.cobblemon.mod.common.client.gui.CobblemonRenderable
-import com.cobblemon.mod.common.client.gui.ExitButton
-import com.cobblemon.mod.common.client.gui.TypeIcon
-import com.cobblemon.mod.common.client.gui.summary.widgets.EvolutionSelectScreen
-import com.cobblemon.mod.common.client.gui.summary.widgets.MarkingsWidget
-import com.cobblemon.mod.common.client.gui.summary.widgets.ModelWidget
-import com.cobblemon.mod.common.client.gui.summary.widgets.NicknameEntryWidget
-import com.cobblemon.mod.common.client.gui.summary.widgets.PartyWidget
+import com.cobblemon.mod.common.client.gui.*
+import com.cobblemon.mod.common.client.gui.summary.widgets.*
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.SummaryTab
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.info.InfoWidget
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.marks.MarksWidget
@@ -37,7 +30,6 @@ import com.cobblemon.mod.common.client.gui.summary.widgets.screens.moves.MovesWi
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.StatWidget
 import com.cobblemon.mod.common.client.keybind.keybinds.SummaryBinding
 import com.cobblemon.mod.common.client.render.drawScaledText
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetItemHiddenPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
@@ -715,27 +707,9 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         ) {
             this.focused = null
         }
-        if (Cobblemon.config.enableDebugKeys) {
-            val model = VaryingModelRepository.getPoser(selectedPokemon.species.resourceIdentifier, modelWidget.state)
-            if (keyCode == InputConstants.KEY_UP) {
-                model.profileTranslation = model.profileTranslation.add(0.0, -0.01, 0.0)
-            }
-            if (keyCode == InputConstants.KEY_DOWN) {
-                model.profileTranslation = model.profileTranslation.add(0.0, 0.01, 0.0)
-            }
-            if (keyCode == InputConstants.KEY_LEFT) {
-                model.profileTranslation = model.profileTranslation.add(-0.01, 0.0, 0.0)
-            }
-            if (keyCode == InputConstants.KEY_RIGHT) {
-                model.profileTranslation = model.profileTranslation.add(0.01, 0.0, 0.0)
-            }
-            if (keyCode == InputConstants.KEY_EQUALS) {
-                model.profileScale += 0.01F
-            }
-            if (keyCode == InputConstants.KEY_MINUS) {
-                model.profileScale -= 0.01F
-            }
-        }
+
+        handleProfileDebugKeys(keyCode, selectedPokemon.species.resourceIdentifier, modelWidget.state)
+
         return super.keyPressed(keyCode, scanCode, modifiers)
     }
 
@@ -744,13 +718,8 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
     }
 
     override fun onClose() {
-        if (Cobblemon.config.enableDebugKeys) {
-            val model = VaryingModelRepository.getPoser(selectedPokemon.species.resourceIdentifier, modelWidget.state)
-            Minecraft.getInstance().player?.sendSystemMessage(Component.literal("Profile Translation: ${model.profileTranslation}"))
-            Minecraft.getInstance().player?.sendSystemMessage(Component.literal("Profile Scale: ${model.profileScale}"))
-            Cobblemon.LOGGER.info("override var profileTranslation = Vec3d(${model.profileTranslation.x}, ${model.profileTranslation.y}, ${model.profileTranslation.z})")
-            Cobblemon.LOGGER.info("override var profileScale = ${model.profileScale}F")
-        }
+        logProfileTranslations(selectedPokemon.species.resourceIdentifier, modelWidget.state)
+
         super.onClose()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/ModelWidget.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.gui.summary.widgets
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
+import com.cobblemon.mod.common.client.gui.ProfileTransformType
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.calculateHeadYawAndPitch
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
@@ -116,7 +117,8 @@ class ModelWidget(
             partialTicks = partialTicks,
             headYaw = currentYawAndPitch.first,
             headPitch = currentYawAndPitch.second,
-            blockLight = blockLight
+            blockLight = blockLight,
+            profileTransformType = ProfileTransformType.SUMMARY,
         )
 
         heldItemRenderer.renderOnModel(

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/tmmachine/TMMachineScreen.kt

@@ -120,7 +120,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
         fun getLogoResource(langCode: String?): ResourceLocation =
             logoResourceMap.entries.find { it.value.contains(langCode?.substringBefore("_")) }?.key ?: logo
     }
-    var selectedTM: TechnicalMachine? = null
+
     var heldStackMove: MoveTemplate? = null
     var tmList: SettableObservable<MutableList<TechnicalMachine>> = SettableObservable(mutableListOf())
     var output: ItemStack? = null
@@ -159,6 +159,8 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
     var oldIngredientItems: Array<Item> = arrayOf(Items.AIR, Items.AIR, Items.AIR)
     var oldResultTmSlotItem: Item = Items.AIR
 
+    var moveInfoTM: TechnicalMachine? = null
+
     override fun init() {
         imageWidth = WIDTH
         imageHeight = HEIGHT
@@ -171,6 +173,8 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
         logoPosY = topPos + 1
         scanPosY = topPos + 1
 
+        menu.onSelectedTMUpdate = { updateSelectedTM(it) }
+
         partySlotList.clear()
         CobblemonClient.storage.party.forEachIndexed { index, pokemon ->
             partySlotList.add(TMPartySlotWidget(
@@ -226,7 +230,14 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
             pX = leftPos + 4,
             pY = topPos + 29,
             tmList,
-            setTM = { tm, clicked -> setSelectedTM(tm, clicked) }
+            setTM = { tm, clicked ->
+                if (clicked) {
+                    if (tm != menu.currentlySelectedTM) SetActiveTMPacket(tm).sendToServer()
+                    setScreenFromMode(TM_BURN_MODE)
+                } else {
+                    updateMoveInformation(tm)
+                }
+            }
         )
         if (!children().contains(movesScrollingList)) addRenderableWidget(movesScrollingList)
 
@@ -252,24 +263,21 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
         selectedMoveButton = MoveSlotButton(
             leftPos + 6,
             topPos + 6,
-            move = selectedTM?.moveName,
-            pp = selectedTM?.moveName?.pp ?: 0,
+            move = menu.currentlySelectedTM?.moveName,
+            pp = menu.currentlySelectedTM?.moveName?.pp ?: 0,
             ppAsFraction = false
         ) {
             if ((it as MoveSlotButton).enabled) {
                 if (::movesScrollingList.isInitialized && movesScrollingList.children().isEmpty()) setMoveList()
                 playSound(CobblemonSounds.GUI_CLICK)
                 setScreenFromMode(MOVE_SELECT_MODE)
-
-                // Clear active TM
-                CobblemonNetwork.sendToServer(SetActiveTMPacket(null))
             }
         }
         if (!children().contains(selectedMoveButton)) addRenderableWidget(selectedMoveButton)
 
         startButton = StartButton(leftPos + 5F, topPos + 35F) {
             if (!(it as StartButton).disabled) {
-                selectedTM?.let {
+                menu.currentlySelectedTM?.let {
                     val burnActive = menu.containerData?.get(TMMachineBlockEntity.BURN_ACTIVE_INDEX) ?: 0
                     CobblemonNetwork.sendToServer(SetTMMachineContainerDataPacket(
                         TMMachineBlockEntity.BURN_ACTIVE_INDEX,
@@ -284,17 +292,14 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
                         ))
                     }*/
 
-                    CobblemonNetwork.sendToServer(SetActiveTMPacket(it))
+                    //CobblemonNetwork.sendToServer(SetActiveTMPacket(it))
                     if (burnActive != 1) playSound(CobblemonSounds.TM_MACHINE_START)
-                    inventory.setChanged()
-                    menu.broadcastChanges()
                 }
             }
         }
         if (!children().contains(startButton)) addRenderableWidget(startButton)
 
         setScreenFromMode(mode)
-        initScreen = false
 
         updateSlotItemMemory()
     }
@@ -306,7 +311,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
         if (scanPosY + 1 >= (topPos + SCREEN_SAVER_HEIGHT) * 2) scanPosY = 0
 
         if (mode == TM_BURN_MODE) {
-            selectedTM?.let { tm ->
+            menu.currentlySelectedTM?.let { tm ->
                 val resultStack = menu.inventory!!.getItem(TMMachineMenu.RESULT_SLOT)
                 val craftedTmStack = ItemStack(CobblemonItems.TECHNICAL_MACHINE)
                     .also { TMMoveComponent.setTMMove(it, tm.moveName) }
@@ -339,7 +344,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
                 }
 
                 if (::selectedMoveButton.isInitialized) {
-                    selectedMoveButton.enabled = !isBurnActive() && (heldStackMove == null || heldStackMove == selectedTM?.moveName)
+                    selectedMoveButton.enabled = (heldStackMove == null || heldStackMove == menu.currentlySelectedTM?.moveName)
                 }
 
                 if (isBurnActive()) {
@@ -350,9 +355,6 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
                     }
                 }
             }
-        } else {
-            // Check if screen should be switched upon opening UI
-            if (!initScreen) loadBurnScreenData()
         }
 
         if (heldMoveItemChanged) {
@@ -400,32 +402,6 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
         return wasScreenSaverActive
     }
 
-    private fun loadBurnScreenData() {
-        var tm: TechnicalMachine? = null
-
-        val blockPos = menu.containerData?.let {
-            val x = it.get(TMMachineBlockEntity.POSITION_X_INDEX)
-            val y = it.get(TMMachineBlockEntity.POSITION_Y_INDEX)
-            val z = it.get(TMMachineBlockEntity.POSITION_Z_INDEX)
-            BlockPos(x, y, z)
-        }
-
-        inventory.player.level().getBlockEntity(blockPos)?.let { blockEntity ->
-            if (blockEntity is TMMachineBlockEntity) {
-                Moves.getByName(blockEntity.activeMove)?.let {
-                    tm = TechnicalMachines.moveToTM[it]
-                }
-            }
-        }
-
-        // If burn currently in progress or if active TM set, set to burn screen
-        if (isBurnActive() || tm != null) {
-            setSelectedTM(tm, true)
-        }
-
-        initScreen = true
-    }
-
     private fun isBurnActive(): Boolean = (menu.containerData?.get(TMMachineBlockEntity.BURN_ACTIVE_INDEX) ?: 0) == 1
 
     private fun setScreenFromMode(screen: Int) {
@@ -467,7 +443,6 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
 
     private fun toggleTypeSelect(isVisible: Boolean) {
         if (isVisible) {
-            setSelectedTM(null, false)
             if (::moveSearchWidget.isInitialized) moveSearchWidget.value = ""
             if (selectedPokemon != null) selectedPokemon = null
             sortType = null
@@ -505,7 +480,6 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
     }
 
     private fun toggleTMBurn(isVisible: Boolean) {
-        if (!isVisible) setSelectedTM(null, false)
         if (::selectedMoveButton.isInitialized) selectedMoveButton.visible = isVisible
         if (::startButton.isInitialized) startButton.visible = isVisible
     }
@@ -516,35 +490,40 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
         return if (learnableMoves.contains(move)) TMPartySlotWidget.CAN_LEARN else TMPartySlotWidget.CANNOT_LEARN
     }
 
-    fun setSelectedTM(tm: TechnicalMachine?, clicked: Boolean) {
-        if (selectedTM != tm) {
-            selectedTM = tm
-            updatePartySlotStatus(tm?.moveName)
+    fun updateSelectedTM(tm: TechnicalMachine?) {
+        if (!initScreen) {
+            initScreen = true
+            setScreenFromMode(TM_BURN_MODE)
+            tm?.let {
+                sortType = ElementalTypes.get(tm.type)
+                setMoveList()
+            }
         }
 
-        if (::movesScrollingList.isInitialized) {
-            movesScrollingList.setSlotHighlighted(if (clicked) null else selectedTM?.id)
+        if (mode == TM_BURN_MODE) updateMoveInformation(tm)
+
+        tm?.let {
+            if (::selectedMoveButton.isInitialized) {
+                selectedMoveButton.apply {
+                    move = it.moveName
+                    pp = it.moveName.pp
+                }
+            }
         }
+    }
+
+    fun updateMoveInformation(tm: TechnicalMachine?) {
+        moveInfoTM = tm
 
         if (::moveDescriptionWidget.isInitialized) {
-            val selectedDescription = selectedTM?.moveName?.description?.string
+            val selectedDescription = tm?.moveName?.description?.string
             moveDescriptionWidget.setText(
                 if (selectedDescription != null) listOf(selectedDescription) else emptyList()
             )
         }
 
-        if (clicked) {
-            CobblemonNetwork.sendToServer(SetActiveTMPacket(tm))
-
-            selectedTM?.let {
-                if (::selectedMoveButton.isInitialized) {
-                    selectedMoveButton.apply {
-                        move = it.moveName
-                        pp = it.moveName.pp
-                    }
-                    setScreenFromMode(TM_BURN_MODE)
-                }
-            }
+        if (::movesScrollingList.isInitialized) {
+            movesScrollingList.setSlotHighlighted(tm?.id)
         }
     }
 
@@ -557,7 +536,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
     }
 
     fun renderDiscTypeOverlay(poseStack: PoseStack, isDiscRotating: Boolean, alpha: Float = 1F) {
-        selectedTM?.let {
+        menu.currentlySelectedTM?.let {
             val primaryRgb = it.moveName.elementalType.primaryColor.toRGB()
             val secondaryRgb = it.moveName.elementalType.secondaryColor.toRGB()
             blitk(
@@ -706,7 +685,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
     }
 
     fun renderMoveInfo(context: GuiGraphics, mouseX: Int, mouseY: Int) {
-        val moveTemplate = selectedTM?.moveName
+        val moveTemplate = moveInfoTM?.moveName
 
         blitk(
             matrixStack = context.pose(),
@@ -1057,7 +1036,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
                 movesScrollingList.setDisabled(true, TechnicalMachines.moveToTM[heldStackMove])
                 if (mode == MOVE_SELECT_MODE) {
                     val heldStackTm = TechnicalMachines.moveToTM[heldStackMove]
-                    setSelectedTM(if (tmList.get().contains(heldStackTm)) heldStackTm else null, false)
+                    updateMoveInformation(if (tmList.get().contains(heldStackTm)) heldStackTm else null)
 
                     // Scroll to move if moves list contains held TM move
                     if (tmList.get().contains(heldStackTm)) {
@@ -1077,8 +1056,8 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
             heldStackMove = null
 
             // Reset selected move on move select screen
-            if (mode == MOVE_SELECT_MODE) setSelectedTM(null, false)
-            updatePartySlotStatus(selectedTM?.moveName)
+            if (mode == MOVE_SELECT_MODE) updateMoveInformation(null)
+            updatePartySlotStatus(menu.currentlySelectedTM?.moveName)
 
             if (::movesScrollingList.isInitialized) {
                 movesScrollingList.setDisabled(false)
@@ -1155,7 +1134,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
         if (isInventoryKeyPressed(minecraft, keyCode, scanCode)) {
             if (searchFocused) { return true }
             else {
-                Minecraft.getInstance().setScreen(null)
+                onClose()
                 return true
             }
         }
@@ -1166,7 +1145,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
                 this.focused = null
                 return true
             } else {
-                Minecraft.getInstance().setScreen(null)
+                onClose()
                 return true
             }
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/gui/SetActiveTMPacketHandler.kt

@@ -19,7 +19,6 @@ import net.minecraft.world.level.block.Block
 object SetActiveTMPacketHandler : ServerNetworkPacketHandler<SetActiveTMPacket> {
     override fun handle(packet: SetActiveTMPacket, server: MinecraftServer, player: ServerPlayer) {
         val menu = player.containerMenu as? TMMachineMenu ?: return
-        val inventory = menu.inventory ?: return
         val tmData = Cobblemon.playerDataManager.getTMData(player)
 
         if (packet.tm != null && (!packet.tm.isPassivelyObtained() && packet.tm.id !in tmData.learnedTMs)) {
@@ -30,9 +29,17 @@ object SetActiveTMPacketHandler : ServerNetworkPacketHandler<SetActiveTMPacket>
             blockEntity.activeMove = packet.tm?.moveName?.name ?: ""
             blockEntity.setChanged()
             player.level().sendBlockUpdated(blockEntity.blockPos, blockEntity.blockState, blockEntity.blockState, Block.UPDATE_CLIENTS)
-        }
 
-        inventory.setChanged()
-        menu.broadcastChanges()
+            blockEntity.burnActive = false
+            blockEntity.burnProgress = 0
+
+            player.level().players().forEach { thePlayer -> //Update all players with matching menu/blockentity
+                val tmmMenu = thePlayer.containerMenu as? TMMachineMenu ?: return@forEach
+                if (tmmMenu.tmMachineEntity == blockEntity) {
+                    tmmMenu.currentlySelectedTM = packet.tm
+                    tmmMenu.broadcastChanges()
+                }
+            }
+        }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/gui/SynchronizeActiveTMHandler.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.net.gui
+
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.block.tmmachine.TMMachineMenu
+import com.cobblemon.mod.common.net.messages.client.ui.SynchronizeActiveTMPacket
+import net.minecraft.client.Minecraft
+
+object SynchronizeActiveTMHandler: ClientNetworkPacketHandler<SynchronizeActiveTMPacket> {
+    override fun handle(packet: SynchronizeActiveTMPacket, client: Minecraft) {
+        val tmmMenu = client.player?.containerMenu as? TMMachineMenu ?: return
+        tmmMenu.clientSetSelectedTM(packet.tm)
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt

@@ -134,6 +134,11 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
      */
     open var profileTranslation = Vec3(0.0, 0.0, 0.0)
 
+    open var profilePokedexScale: Float? = null
+    open var profilePokedexTranslation: Vec3? = null
+    open var profileSummaryScale: Float? = null
+    open var profileSummaryTranslation: Vec3? = null
+
     var red = 1F
     var green = 1F
     var blue = 1F

common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/StatusCureItem.kt

@@ -36,7 +36,7 @@ import net.minecraft.world.level.block.Block
 class StatusCureItem(val itemName: String, vararg val status: Status, block: Block) : ItemNameBlockItem(block, Properties()), PokemonSelectingItem {
     override val bagItem = object : BagItem {
         override val itemName = this@StatusCureItem.itemName
-        override val returnItem = Items.AIR
+        override val returnItem = Items.GLASS_BOTTLE
         override fun canUse(stack: ItemStack, battle: PokemonBattle, target: BattlePokemon) = canUseOnPokemon(stack, target.effectedPokemon)
         override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "cure_status${status.takeIf { it.isNotEmpty() }?.let { " ${it.joinToString(separator = " ") { it.showdownName } }" } ?: "" }"
     }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt

@@ -64,6 +64,7 @@ class SpawnPokemonPacket(
     var rideStamina: Float,
     var isAlpha: Boolean,
     var silent: Boolean,
+    var riders: List<Int>,
     vanillaSpawnPacket: ClientboundAddEntityPacket,
 ) : SpawnExtraDataEntityPacket<SpawnPokemonPacket, PokemonEntity>(vanillaSpawnPacket) {
 
@@ -98,6 +99,7 @@ class SpawnPokemonPacket(
         entity.entityData.get(PokemonEntity.RIDE_STAMINA),
         entity.entityData.get(PokemonEntity.IS_ALPHA),
         entity.isSilent,
+        entity.occupiedSeats.map { entry -> entry.value.id }.toList(),
         vanillaSpawnPacket
     )
 
@@ -134,6 +136,7 @@ class SpawnPokemonPacket(
         buffer.writeFloat(rideStamina)
         buffer.writeBoolean(isAlpha)
         buffer.writeBoolean(silent)
+        buffer.writeCollection(this.riders) { pb, value -> pb.writeInt(value) }
     }
 
     override fun applyData(entity: PokemonEntity, level: ClientLevel) {
@@ -184,6 +187,10 @@ class SpawnPokemonPacket(
 
         entity.tickSpawned = this.tickSpawned
         entity.delegate.updateAge(this.tickSpawned)
+
+        if (this.riders.isNotEmpty()) {
+            this.riders.forEach { level.getEntity(it)?.startRiding(entity) }
+        }
     }
 
     override fun checkType(entity: Entity): Boolean = entity is PokemonEntity
@@ -222,6 +229,7 @@ class SpawnPokemonPacket(
             val rideStamina = buffer.readFloat()
             val isAlpha = buffer.readBoolean()
             val silent = buffer.readBoolean()
+            val riders = buffer.readList { it.readInt() }.toList()
             val vanillaPacket = decodeVanillaPacket(buffer)
 
             return SpawnPokemonPacket(
@@ -253,6 +261,7 @@ class SpawnPokemonPacket(
                 rideStamina,
                 isAlpha,
                 silent,
+                riders,
                 vanillaPacket
             )
         }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/ui/SynchronizeActiveTMPacket.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.net.messages.client.ui
+
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.api.tms.TechnicalMachine
+import com.cobblemon.mod.common.api.tms.TechnicalMachines
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class SynchronizeActiveTMPacket(val tm: TechnicalMachine?): NetworkPacket<SynchronizeActiveTMPacket> {
+    override val id = ID
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeNullable(tm?.id) { pb, value -> pb.writeResourceLocation(value) }
+    }
+
+    companion object {
+        val ID = cobblemonResource("synchronize_active_tm")
+        fun decode(buffer: RegistryFriendlyByteBuf): SynchronizeActiveTMPacket {
+            val resourceLocation = buffer.readNullable { it.readResourceLocation() }
+            if (resourceLocation == null) return SynchronizeActiveTMPacket(null)
+            val tm = TechnicalMachines.tmMap[resourceLocation]
+            return SynchronizeActiveTMPacket(tm)
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/HeldItemVisibleProperty.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.pokemon.properties
+
+import com.cobblemon.mod.common.api.properties.CustomPokemonPropertyType
+
+object HeldItemVisibleProperty : CustomPokemonPropertyType<BooleanProperty> {
+    override val keys = setOf("held_item_visible")
+    override val needsKey = true
+
+    override fun fromString(value: String?) =
+        when {
+            value == null || value.lowercase() in listOf("true", "yes") -> heldItemVisible(true)
+            value.lowercase() in listOf("false", "no") -> heldItemVisible(false)
+            else -> null
+        }
+
+    fun heldItemVisible(value: Boolean) = BooleanProperty(
+        key = keys.first(),
+        value = value,
+        pokemonApplicator = { pokemon, _ -> pokemon.heldItemVisible = value },
+        entityApplicator = { pokemonEntity, _ -> pokemonEntity.pokemon.heldItemVisible = value },
+        pokemonMatcher = { pokemon, _ -> pokemon.heldItemVisible == value },
+        entityMatcher = { pokemonEntity, _ -> pokemonEntity.pokemon.heldItemVisible == value }
+    )
+
+    override fun examples() = setOf("yes", "no")
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0003_venusaur/venusaur.json

@@ -2,7 +2,8 @@
   "portraitScale": 1.03,
   "portraitTranslation": [-0.31, 0.12, 0],
   "profileScale": 0.47,
-  "profileTranslation": [0, 0.98, 0.0],
+  "profileTranslation": [0.07, 0.98, 0.0],
+  "profilePokedexTranslation": [0, 0.98, 0],
   "rootBone": "venusaur",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.25, 0]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0005_charmeleon/charmeleon.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.89,
   "portraitTranslation": [-0.13, 0.91, 0],
-  "profileScale": 0.63,
-  "profileTranslation": [0, 0.81, 0],
+  "profileScale": 0.77,
+  "profileTranslation": [0, 0.65, 0],
   "rootBone": "charmeleon",
   "animations": {
     "cry": "q.bedrock_stateful('charmeleon', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0006_charizard/charizard.json

@@ -2,7 +2,7 @@
   "portraitScale": 2.1,
   "portraitTranslation": [-1.11, 2.43, 0],
   "profileScale": 0.54,
-  "profileTranslation": [0, 0.96, -10],
+  "profileTranslation": [0, 0.92, -10],
   "rootBone": "charizard",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0034_nidoking/nidoking.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.89,
   "portraitTranslation": [-0.8, 1.36, 0.0],
-  "profileScale": 0.59,
-  "profileTranslation": [0, 0.84, 0.0],
+  "profileScale": 0.57,
+  "profileTranslation": [0, 0.81, 0.0],
   "rootBone": "nidoking",
   "animations": {
     "cry": "q.bedrock_stateful('nidoking', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0047_parasect/parasect.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.8,
   "portraitTranslation": [-0.35, -0.8, 0],
   "profileScale": 0.8,
-  "profileTranslation": [0, 0.45, 0.0],
+  "profileTranslation": [0, 0.52, 0.0],
   "rootBone": "parasect",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0122_mrmime/mrmime_galarian.json

@@ -1,6 +1,6 @@
 {
   "portraitScale": 1.96,
-  "portraitTranslation": [ -0.48, 1.61, 0],
+  "portraitTranslation": [ -0.3, 1.86, 0],
   "profileScale": 0.53,
   "profileTranslation": [0, 0.92, 0],
   "rootBone": "mr_rime",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0206_dunsparce/dunsparce.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.73,
   "portraitTranslation": [-0.45, -1.17, 0],
   "profileScale": 0.7,
-  "profileTranslation": [-0.06, 0.59, 0],
+  "profileTranslation": [0, 0.59, 0],
   "rootBone": "dunsparce",
   "animations": {
       "cry": "q.bedrock_stateful('dunsparce', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0267_beautifly/beautifly.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.73,
   "portraitTranslation": [-0.09, 0.26, 0],
   "profileScale": 0.60,
-  "profileTranslation": [0.16, 0.90, 0],
+  "profileTranslation": [0, 0.90, 0],
   "rootBone": "beautifly",
   "poses": {
 	"battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0269_dustox/dustox.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.65,
   "portraitTranslation": [-0.10, 0.16, 0],
   "profileScale": 0.63,
-  "profileTranslation": [0.13, 0.64, 0],
+  "profileTranslation": [0, 0.64, 0],
   "rootBone": "dustox",
   "poses": {
 	"battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0452_drapion/drapion.json

@@ -2,7 +2,9 @@
   "portraitScale": 1.63,
   "portraitTranslation": [-1.76, 1.25, 0],
   "profileScale": 0.53,
-  "profileTranslation": [-0.09, 0.92, 0],
+  "profileTranslation": [0.49, 0.96, 0],
+  "profilePokedexTranslation": [0, 0.96, 0],
+  "profileSummaryTranslation": [-0.30, 0.87, 0],
   "rootBone": "drapion",
   "animations": {
     "cry": "q.bedrock_stateful('drapion', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0668_pyroar/pyroar_female.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.98,
   "portraitTranslation": [-0.96, 1.39, 0],
   "profileScale": 0.59,
-  "profileTranslation": [0.13, 0.82, 0],
+  "profileTranslation": [0, 0.84, 0],
   "rootBone": "pyroar_female",
   "animations": {
     "cry": "q.bedrock_stateful('pyroar_female', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0668_pyroar/pyroar_male.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.89,
   "portraitTranslation": [-1.12, 1.78, 0],
   "profileScale": 0.51,
-  "profileTranslation": [0.12, 0.94, 0],
+  "profileTranslation": [0, 0.97, 0],
   "rootBone": "pyroar_male",
   "animations": {
     "cry": "q.bedrock_stateful('pyroar_male', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0982_dudunsparce/dudunsparce_three_segment.json

@@ -2,7 +2,8 @@
   "portraitScale": 1.1,
   "portraitTranslation": [-1.2, -0.009, 0],
   "profileScale": 0.5,
-  "profileTranslation": [-0.18, 0.96, 0],
+  "profileTranslation": [0, 0.96, 0],
+  "profileSummaryTranslation": [-0.20, 0.87, 0],
   "rootBone": "dudunsparce",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0982_dudunsparce/dudunsparce_two_segment.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.1,
   "portraitTranslation": [-0.8, -0.009, 0],
   "profileScale": 0.5,
-  "profileTranslation": [-0.18, 0.96, 0],
+  "profileTranslation": [0, 0.96, 0],
   "rootBone": "dudunsparce",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0],

common/src/main/resources/assets/cobblemon/lang/ja_jp.json

@@ -819,7 +819,7 @@
     "advancements.cobblemon.first_catch.description": "モンスターボールを投げて、ポケモンを捕まえる",
     "advancements.cobblemon.full_party": "フルハウス",
     "advancements.cobblemon.full_party.description": "ポケモンをもっとゲットし、手持ちを6匹にする",
-    "advancements.cobblemon.first_evolution": "新たなる姿",
+    "advancements.cobblemon.first_evolution": "てれ てれん",
     "advancements.cobblemon.first_evolution.description": "進化条件を満たし、ポケモンを進化させる",
     "advancements.cobblemon.first_battle_victory": "勝利は目の前？",
     "advancements.cobblemon.first_battle_victory.description": "他のトレーナーに勝利する",
@@ -831,7 +831,7 @@
     "advancements.cobblemon.obtain_leek.description": "淡水で育つ野草、クスリソウを手に入れる",
     "advancements.cobblemon.medicinal_brew": "町のジョーイさん",
     "advancements.cobblemon.medicinal_brew.description": "クスリソウを醸造して溶媒のクスリチャを作る",
-    "advancements.cobblemon.brew_potion": "お砂糖ひとさじ",
+    "advancements.cobblemon.brew_potion": "そんな装備で大丈夫か?",
     "advancements.cobblemon.brew_potion.description": "クスリチャを溶媒にオレンのみを醸造してキズぐすりを作る",
     "advancements.cobblemon.brew_full_restore": "チャンピオン御用達",
     "advancements.cobblemon.brew_full_restore.description": "まんたんのくすりを溶媒にラムのみを醸造してかいふくのくすりを作る",
@@ -9237,7 +9237,7 @@
     "cobblemon.ui.edit.habitat.validation.species": "種族名は有効なポケモン名でなければなりません。",
     "cobblemon.ui.edit.habitat.validation.weight": "重量は0より大きくなければなりません。",
     "cobblemon.ui.edit.habitat.validation.modifiers": "修飾子の形式が無効です。",
-    "cobblemon.ui.edit.habitat.validation.phases_list": "フェーズでは、整数の範囲を表す際に有効な形式を使用する必要があります。例：1-3、または1、3-5、6。",
+    "cobblemon.ui.edit.habitat.validation.phases_list": "フェーズには有効な月の満ち欠け（0-7）を指定する必要があります。例：1-3、または1、3-5、6。",
     "cobblemon.ui.edit.habitat.validation.min_light": "最小明るさ度の値は0から15の間でなければなりません。",
     "cobblemon.ui.edit.habitat.validation.max_light": "最大明るさ度の値は0から15の間でなければなりません。",
     "cobblemon.ui.moves.learnset.tm.discovered": "発見済み",
@@ -9358,25 +9358,5 @@
     "cobblemon.config.ui.alpha_pokemon_size_extra_large_multiplier.tooltip": "当たり判定が10ブロック以上のポケモンに対するオヤブンサイズ倍率。",
     "cobblemon.config.ui.alpha_pokemon_size_extra_large_multiplier": "とても大きいオヤブンサイズ倍率",
     "cobblemon.config.ui.baby_pokemon_level_duration": "ベイビィポケモン期間レベル",
-    "cobblemon.config.ui.baby_pokemon_level_duration.tooltip": "ポケモンが通常よりも小さく見える「ベイビィポケモン」とみなされるレベル数。",
-    "cobblemon.config.ui.baby_pokemon_size_multiplier": "ベイビィポケモンの最小サイズ",
-    "cobblemon.config.ui.baby_pokemon_size_multiplier.tooltip": "レベル1のポケモンに適用されるサイズ倍率。",
-    "cobblemon.config.ui.minimum_riding_scale": "ライドするための最低限のポケモンスケール値",
-    "cobblemon.config.ui.minimum_riding_scale.tooltip": "ポケモンに乗れなくなる限界のスケール。",
-    "cobblemon.config.ui.unlock_all_move_dex_moves_by_default.tooltip": "この機能を有効にすると、わざマシンやレベルアップで覚える技が解放され、わざマシンマシンやポケモン図鑑の技一覧で確認できるようになります。",
-    "cobblemon.config.ui.unlock_all_move_dex_moves_by_default": "全ての技をアンロック",
-    "cobblemon.config.ui.infinite_tm_uses": "わざマシン無限化",
-    "cobblemon.config.ui.infinite_tm_uses.tooltip": "わざマシンで技を教える際、わざマシンが消費されなくなります。",
-    "advancements.cobblemon.use_healing_machine.description": "かいふく装置のチャージを待ち、使用して手持ちのポケモンを回復させる",
-    "advancements.cobblemon.use_healing_machine": "てん てん てれれん",
-    "advancements.cobblemon.plant_all_apricorn_sprouts.description": "あらゆる色のぼんぐりの新芽を植える",
-    "advancements.cobblemon.plant_all_apricorn_sprouts": "ぼんぐりころころぼんぐりこ",
-    "advancements.cobblemon.use_mint.description": "ミントを使ってポケモンのステータスの得意不得意を変える",
-    "advancements.cobblemon.use_mint": "結果にコミント！",
-    "advancements.cobblemon.brew_medicinal_brew.description": "クスリソウを煎じて、薬の基礎となるものを作る",
-    "advancements.cobblemon.brew_medicinal_brew": "ネギらうおくすり",
-    "advancements.cobblemon.brew_all_potions.description": "クスリソウを使って、ありとあらゆるアイテムを作成する",
-    "advancements.cobblemon.brew_all_potions": "一番良いのを頼む",
-    "advancements.cobblemon.use_exp_candy.description": "ポケモンにけいけんアメを使う",
-    "advancements.cobblemon.use_exp_candy": "甘美な経験"
+    "cobblemon.config.ui.baby_pokemon_level_duration.tooltip": "ポケモンが通常よりも小さく見える「ベイビィポケモン」とみなされるレベル数。"
 }

common/src/main/resources/assets/cobblemon/lang/zh_cn.json

@@ -9258,7 +9258,7 @@
     "cobblemon.item_class.technical_machine": "招式学习器",
     "block.cobblemon.damaged_monitor": "损坏的数据显示器",
     "block.cobblemon.tm_machine": "招式学习器机",
-    "block.cobblemon.disc_shelf": "光盘架",
+    "block.cobblemon.disc_shelf": "唱片架",
     "cobblemon.fishing_bait_effects.mark_chance.tooltip": "%1$s%% - 证章出现率+%3$s%%",
     "cobblemon.fishing_bait_effects.alpha_chance.tooltip": "%1$s%% - 头目宝可梦出现率",
     "cobblemon.fishing_bait_effects.size.tooltip": "%1$s%% - 体型%3$s%%",
@@ -9333,11 +9333,5 @@
     "cobblemon.tms.cannot_learn": "%1$s 不能学习 %2$s！",
     "cobblemon.tms.unlock_tm": "你解锁了 %1$s 招式学习器！",
     "cobblemon.tms.new_tms_learned": "学会了新的招式学习器！",
-    "cobblemon.tms.check_tmm": "查看招式学习器机",
-    "cobblemon.ui.party.party_select_title": "更改同行队伍选中",
-    "cobblemon.ui.party.party_select_description": "按下 %1$s/%2$s 或长按 %3$s 滑动鼠标滚轮。",
-    "cobblemon.ui.category": "分类",
-    "cobblemon.ui.pp": "PP",
-    "cobblemon.ui.pokemon.alpha": "头目",
-    "cobblemon.ui.edit.habitat.validation.phases_list": "阶段的格式必须使用有效的整数范围，例如：1-3或者1，3-5，6。"
+    "cobblemon.tms.check_tmm": "查看招式学习器机"
 }

common/src/main/resources/data/cobblemon/species/generation5/panpour.json

@@ -190,7 +190,7 @@
       "id": "panpour_simipour",
       "variant": "item_interact",
       "result": "simipour",
-      "consumeHeldItem": true,
+      "consumeHeldItem": false,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:water_stone"