feat(*): gear bg change, info icon, scrolling implementation

implement_pokemon

See merge request cable-mc/cobblemon!2507

CHANGELOG.md

@@ -3,40 +3,13 @@
 
 ### Additions
 
-### New rideable Pokémon
-
-### Pokémon Added
-
-### Model updates for the following Pokémon
-- Froakie
-- Frogadier
-- Greninja
-(They have eyelids now.)
-
-### Animation updates for the following Pokémon
-- Froakie
-- Frogadier
-- Greninja
-(They can blink now.)
-
 ### Changes
-- Reworked spawn presets and added structure tags for spawns
 
 ### Fixes
-- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
-- Fixed Minior's "Shields Down" ability not working as intended
-- Fixed Dusclops using Squirtle's cry
-- Fixed size error with ceiling attached Orb hitbox
-
-### Developer
 
 ### Molang & Datapacks
-- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
 
 ### Particles
-- Updated Water shuriken to account for new `q.target_fainted` function
-
-#### New Move Animations
 
 ### Localization
 - Updated translations for:

changelogs/CHANGELOG-1.8.4.md

@@ -0,0 +1,25 @@
+# Changelog
+## [1.8.4 (October 27th, 2026)](#1-8-4)
+
+### Changes
+- The Froakie line now blinks. The world will never be the same.
+
+### Fixes
+- Fixed heaps of spawns not working. This was caused by us missing something before release. RIP.
+- Fixed a crash caused by Fearow blinking while you're riding one. Makes sense to me.
+- Fixed Minior's "Shields Down" ability being very broken.
+- Fixed Dusclops using Squirtle's cry sound (lol).
+- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
+- Fixed a hitbox issue with placeable Orb held items attached to a ceiling.
+- Fixed something sneaky. I'll tell you about it later.
+
+### Molang & Datapacks
+- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
+
+### Particles
+- Updated Water Shuriken effect to be timed better when the opponent faints.
+
+### Localization
+- Updated translations for:
+  - Korean
+  - Simplified Chinese

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

@@ -42,6 +42,10 @@ import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
 import com.cobblemon.mod.common.client.net.orientation.ClientboundUpdateOrientationHandler
 import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
 import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
+import com.cobblemon.mod.common.client.net.pasture.UpdatePastureRangeHandler
+import com.cobblemon.mod.common.net.messages.client.pasture.UpdatePastureRangePacket
+import com.cobblemon.mod.common.net.messages.server.pasture.AdjustPastureRangePacket
+import com.cobblemon.mod.common.net.serverhandling.pasture.AdjustPastureRangeHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.UpdatePastureConflictFlagHandler
@@ -473,6 +477,7 @@ object CobblemonNetwork {
 
         // Pasture
         list.add(PacketRegisterInfo(OpenPasturePacket.ID, OpenPasturePacket::decode, OpenPastureHandler))
+        list.add(PacketRegisterInfo(UpdatePastureRangePacket.ID, UpdatePastureRangePacket::decode, UpdatePastureRangeHandler))
         list.add(PacketRegisterInfo(ClosePasturePacket.ID, ClosePasturePacket::decode, ClosePastureHandler))
         list.add(PacketRegisterInfo(PokemonPasturedPacket.ID, PokemonPasturedPacket::decode, PokemonPasturedHandler))
         list.add(PacketRegisterInfo(PokemonUnpasturedPacket.ID, PokemonUnpasturedPacket::decode, PokemonUnpasturedHandler))
@@ -591,6 +596,7 @@ object CobblemonNetwork {
 
         // Pasture
         list.add(PacketRegisterInfo(PasturePokemonPacket.ID, PasturePokemonPacket::decode, PasturePokemonHandler))
+        list.add(PacketRegisterInfo(AdjustPastureRangePacket.ID, AdjustPastureRangePacket::decode, AdjustPastureRangeHandler))
         list.add(PacketRegisterInfo(UnpasturePokemonPacket.ID, UnpasturePokemonPacket::decode, UnpasturePokemonHandler))
         list.add(PacketRegisterInfo(UnpastureAllPokemonPacket.ID, UnpastureAllPokemonPacket::decode, UnpastureAllPokemonHandler))
         list.add(PacketRegisterInfo(SetPastureConflictPacket.ID, SetPastureConflictPacket::decode, SetPastureConflictHandler))

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/AirWanderTaskConfig.kt

@@ -15,11 +15,13 @@ import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
+import net.minecraft.core.BlockPos
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -69,7 +71,14 @@ class AirWanderTaskConfig : SingleTaskConfig {
 
                     val rotVec = entity.getViewVector(0F)
                     pathCooldown.setWithExpiry(true, 60L)
-                    val target = HoverRandomPos.getPos(entity, horizontalRange.resolveInt(runtime), verticalRange.resolveInt(runtime), rotVec.x, rotVec.y, 1.5707964f, minUpwardsMovement.resolveInt(runtime), minDownwardsMovement.resolveInt(runtime))
+                    val tethering = (entity as? PokemonEntity)?.tethering
+                    val horizontal = horizontalRange.resolveInt(runtime)
+                    val vertical = verticalRange.resolveInt(runtime)
+                    val minUpwards = minUpwardsMovement.resolveInt(runtime)
+                    val minDownwards = minDownwardsMovement.resolveInt(runtime)
+                    val target = (0 until 10).asSequence()
+                        .mapNotNull { HoverRandomPos.getPos(entity, horizontal, vertical, rotVec.x, rotVec.y, 1.5707964f, minUpwards, minDownwards) }
+                        .firstOrNull { tethering?.canRoamTo(BlockPos.containing(it)) != false }
                         ?: return@Trigger false
                     walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(runtime), 3))
                     lookTarget.set(BlockPosTracker(target))
@@ -78,4 +87,4 @@ class AirWanderTaskConfig : SingleTaskConfig {
             }
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WaterWanderTaskConfig.kt

@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WA
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.CobblemonWalkTarget
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveFloat
@@ -95,6 +96,7 @@ class WaterWanderTaskConfig : SingleTaskConfig {
                         attempts++
                         target = BehaviorUtils.getRandomSwimmablePos(entity, horizontalRange.resolveInt(mainThreadRuntime), verticalRange.resolveInt(mainThreadRuntime))
                             ?: continue
+                        if ((entity as? PokemonEntity)?.tethering?.canRoamTo(BlockPos.containing(target)) == false) continue
                         pos = BlockPos.containing(target).takeIf(wanderControl::isSuitable)
                     }
 
@@ -143,4 +145,4 @@ class WaterWanderTaskConfig : SingleTaskConfig {
             }
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/pasture/PastureLinkManager.kt

@@ -34,7 +34,7 @@ object PastureLinkManager {
     fun getLinkByPlayer(player: ServerPlayer): PastureLink? {
         val link = getLinkByPlayerId(player.uuid)
         if (link != null) {
-            if (!player.level().dimensionTypeRegistration().`is`(link.dimension) || !link.pos.closerToCenterThan(player.position(), 10.0)) {
+            if (player.level().dimension().location() != link.dimension || !link.pos.closerToCenterThan(player.position(), 10.0)) {
                 links.remove(player.uuid)
                 return null
             }
@@ -46,8 +46,8 @@ object PastureLinkManager {
     @JvmStatic
     fun removeAt(world: ServerLevel, pos: BlockPos) {
         links.removeIf { (uuid, pastureLink) ->
-            val shouldRemove = world.dimensionTypeRegistration().`is`(pastureLink.dimension) && pastureLink.pos == pos
-            uuid.getPlayer()?.sendPacket(ClosePasturePacket())
+            val shouldRemove = world.dimension().location() == pastureLink.dimension && pastureLink.pos == pos
+            if (shouldRemove) uuid.getPlayer()?.sendPacket(ClosePasturePacket())
             return@removeIf shouldRemove
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/pasture/PastureRange.kt

@@ -0,0 +1,82 @@
+/*
+ * 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.api.pasture
+
+import net.minecraft.core.BlockPos
+import net.minecraft.core.Direction
+import net.minecraft.network.RegistryFriendlyByteBuf
+import kotlin.math.abs
+import kotlin.math.ceil
+import kotlin.math.floor
+
+data class PastureRange(val north: Int, val east: Int, val south: Int, val west: Int) {
+    fun isValid(maximum: Int): Boolean =
+        listOf(north, east, south, west).all { it in 0..maximum } &&
+            north.toLong() + south >= 8 && east.toLong() + west >= 8
+
+    operator fun get(direction: Direction): Int = when (direction) {
+        Direction.NORTH -> north
+        Direction.EAST -> east
+        Direction.SOUTH -> south
+        Direction.WEST -> west
+        else -> error("Pasture range directions must be horizontal")
+    }
+
+    fun adjusted(direction: Direction, amount: Int): PastureRange = when (direction) {
+        Direction.NORTH -> copy(north = north + amount)
+        Direction.EAST -> copy(east = east + amount)
+        Direction.SOUTH -> copy(south = south + amount)
+        Direction.WEST -> copy(west = west + amount)
+        else -> this
+    }
+
+    fun minPos(origin: BlockPos) = origin.offset(-west, 0, -north)
+    fun maxPos(origin: BlockPos) = origin.offset(east, 0, south)
+
+    fun nearbyBlocks(origin: BlockPos, preferred: BlockPos, width: Double): Sequence<BlockPos> = sequence {
+        val halfWidth = width / 2.0
+        val minX = ceil(origin.x - west + halfWidth - 0.5).toInt()
+        val maxX = floor(origin.x + east - halfWidth - 0.5).toInt()
+        val minZ = ceil(origin.z - north + halfWidth - 0.5).toInt()
+        val maxZ = floor(origin.z + south - halfWidth - 0.5).toInt()
+        if (minX > maxX || minZ > maxZ) return@sequence
+
+        val centerX = preferred.x.coerceIn(minX, maxX)
+        val centerZ = preferred.z.coerceIn(minZ, maxZ)
+        for (distance in 0..16) {
+            for (dx in -distance..distance) {
+                val x = centerX + dx
+                if (x !in minX..maxX) continue
+                val dz = distance - abs(dx)
+                val z = centerZ + dz
+                if (z in minZ..maxZ) yield(BlockPos(x, origin.y, z))
+                if (dz != 0 && centerZ - dz in minZ..maxZ) yield(BlockPos(x, origin.y, centerZ - dz))
+            }
+        }
+    }
+
+    fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeVarInt(north)
+        buffer.writeVarInt(east)
+        buffer.writeVarInt(south)
+        buffer.writeVarInt(west)
+    }
+
+    companion object {
+        const val MAX_DISTANCE = 64
+
+        fun fromBounds(origin: BlockPos, min: BlockPos, max: BlockPos) = PastureRange(
+            origin.z - min.z, max.x - origin.x, max.z - origin.z, origin.x - min.x
+        )
+
+        fun decode(buffer: RegistryFriendlyByteBuf) = PastureRange(
+            buffer.readVarInt(), buffer.readVarInt(), buffer.readVarInt(), buffer.readVarInt()
+        )
+    }
+}

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

@@ -25,7 +25,6 @@ import com.cobblemon.mod.common.util.rotateShape
 import com.mojang.serialization.MapCodec
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.util.StringRepresentable
@@ -283,11 +282,13 @@ class PastureBlock(settings: Properties): BaseEntityBlock(settings), SimpleWater
                     pastureId = linkId,
                     permissions = perms,
                     limit = baseEntity.getMaxTethered(),
-                    tetheredPokemon = baseEntity.tetheredPokemon.mapNotNull { it.toDTO(player) }
+                    tetheredPokemon = baseEntity.tetheredPokemon.mapNotNull { it.toDTO(player) },
+                    range = baseEntity.getRange(),
+                    facing = state.getValue(HorizontalDirectionalBlock.FACING)
                 )
             )
 
-            PastureLinkManager.createLink(player.uuid, PastureLink(linkId, pcId, ResourceLocation.tryParse(world.dimensionTypeRegistration().registeredName)!!, getBasePosition(state, pos), perms))
+            PastureLinkManager.createLink(player.uuid, PastureLink(linkId, pcId, world.dimension().location(), getBasePosition(state, pos), perms))
 
             world.playSoundServer(
                 position = pos.bottomCenter,
@@ -366,4 +367,4 @@ class PastureBlock(settings: Properties): BaseEntityBlock(settings), SimpleWater
 
         return state
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.api.pasture.PastureLinkManager
+import com.cobblemon.mod.common.api.pasture.PastureRange
 import com.cobblemon.mod.common.api.scheduling.afterOnServer
 import com.cobblemon.mod.common.api.text.italicise
 import com.cobblemon.mod.common.api.text.red
@@ -39,7 +40,6 @@ import net.minecraft.core.Vec3i
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
 import net.minecraft.nbt.NbtUtils
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.tags.FluidTags
@@ -48,32 +48,49 @@ import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Blocks
+import net.minecraft.world.level.block.HorizontalDirectionalBlock
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.entity.EntityTypeTest
 import net.minecraft.world.phys.AABB
+import net.minecraft.world.phys.Vec3
 
 class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
     BlockEntity(CobblemonBlockEntities.PASTURE, pos, state) {
     open class Tethering(
-        val minRoamPos: BlockPos,
-        val maxRoamPos: BlockPos,
+        var minRoamPos: BlockPos,
+        var maxRoamPos: BlockPos,
         val playerId: UUID,
         val playerName: String,
         val tetheringId: UUID,
         val pokemonId: UUID,
         val pcId: UUID,
-        val entityId: Int,
-        val pasturePos: BlockPos
+        var entityId: Int,
+        val pasturePos: BlockPos,
+        var entityUuid: UUID? = null,
+        var lastEntityPos: BlockPos? = null,
+        var respawnAt: Long = 0L,
+        var healingAfterFaint: Boolean = false
     ) {
         fun getPokemon(): Pokemon? {
             val srv = server() ?: return null
             val pc = Cobblemon.storage.getPC(pcId, srv.registryAccess())
             return pc[pokemonId]
         }
-        val box = AABB(minRoamPos.toVec3d(), maxRoamPos.toVec3d())
-        open fun canRoamTo(pos: BlockPos) = box.contains(pos.center)
+        val box get() = AABB(minRoamPos.toVec3d(), maxRoamPos.toVec3d())
+        fun canRoamTo(x: Double, z: Double) = x >= minRoamPos.x && x < maxRoamPos.x && z >= minRoamPos.z && z < maxRoamPos.z
+        open fun canRoamTo(pos: BlockPos) = canRoamTo(pos.x + 0.5, pos.z + 0.5)
+
+        internal fun beginRecovery(now: Long, fainted: Boolean) {
+            if (fainted && !healingAfterFaint) {
+                healingAfterFaint = true
+                respawnAt = now + FAINT_COOLDOWN
+            } else if (respawnAt == 0L) {
+                respawnAt = now + MISSING_ENTITY_COOLDOWN
+            }
+        }
 
         fun toDTO(player: ServerPlayer): OpenPasturePacket.PasturePokemonDataDTO? {
             val pokemon = getPokemon() ?: return null
@@ -97,6 +114,8 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
     }
 
     companion object {
+        private const val FAINT_COOLDOWN = 24000L
+        private const val MISSING_ENTITY_COOLDOWN = 200L
         internal val TICKER = BlockEntityTicker<PokemonPastureBlockEntity> { world, _, _, blockEntity ->
             if (world.isClientSide) return@BlockEntityTicker
             blockEntity.ticksUntilCheck--
@@ -134,6 +153,26 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
 
     fun getMaxTethered() = Cobblemon.config.defaultPasturedPokemonLimit
 
+    fun getRange() = PastureRange.fromBounds(blockPos, minRoamPos, maxRoamPos)
+
+    fun setRange(range: PastureRange) {
+        minRoamPos = range.minPos(blockPos).atY(minRoamPos.y)
+        maxRoamPos = range.maxPos(blockPos).atY(maxRoamPos.y)
+        tetheredPokemon.forEach { tethering ->
+            tethering.minRoamPos = minRoamPos
+            tethering.maxRoamPos = maxRoamPos
+            tethering.getPokemon()?.entity?.let { entity ->
+                if (entity.tethering?.tetheringId == tethering.tetheringId) {
+                    entity.tethering = tethering
+                    entity.navigation.stop()
+                    entity.brain.eraseMemory(MemoryModuleType.WALK_TARGET)
+                    entity.checkPastureTether()
+                }
+            }
+        }
+        setChanged()
+    }
+
     fun canAddPokemon(player: ServerPlayer, pokemon: Pokemon, maxPerPlayer: Int): Boolean {
         val forThisPlayer = tetheredPokemon.count { it.playerId == player.uuid }
         // Shouldn't be possible, client should've prevented it
@@ -158,57 +197,61 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
 
 
     fun tether(player: ServerPlayer, pokemon: Pokemon, directionToBehind: Direction): Boolean {
+        val tethering = Tethering(
+            minRoamPos, maxRoamPos, player.uuid, player.gameProfile.name, UUID.randomUUID(),
+            pokemon.uuid, Cobblemon.storage.getPC(player).uuid, -1, blockPos
+        )
+        if (!spawnPokemon(pokemon, tethering, directionToBehind)) return false
+        pokemon.tetheringId = tethering.tetheringId
+        pokemon.onChange()
+        tetheredPokemon.add(tethering)
+        tethering.toDTO(player)?.let { player.sendPacket(PokemonPasturedPacket(it)) }
+        setChanged()
+        CobblemonCriteria.PASTURE_USE.trigger(player, pokemon)
+        return true
+    }
+
+    private fun spawnPokemon(pokemon: Pokemon, tethering: Tethering, directionToBehind: Direction): Boolean {
         val world = level ?: return false
         val entity = PokemonEntity(world, pokemon = pokemon)
         entity.refreshDimensions()
-        val width = entity.boundingBox.xsize
-
-        val idealPlace = blockPos.offset(directionToBehind.normal.multiply(ceil(width).toInt() + 1))
-        var box = entity.getDimensions(Pose.STANDING).makeBoundingBox(idealPlace.center.subtract(0.0, 0.5, 0.0))
-
-        for (i in 0..5) {
-            box = box.move(directionToBehind.normal.x.toDouble(), 0.0, directionToBehind.normal.z.toDouble())
-            val fixedPosition = makeSuitableY(world, idealPlace.offset(directionToBehind.normal.multiply(i + 1)), entity, box)
-            if (fixedPosition != null) {
-                entity.setPos(fixedPosition.center.subtract(0.0, 0.5, 0.0))
-                val pc = Cobblemon.storage.getPC(player)
-                entity.beamMode = 2
-                afterOnServer(seconds = 0.5F) {
-                    if(entity.pokemon.shiny) {
-                        SpawnSnowstormEntityParticlePacket(cobblemonResource("shiny_ring"), entity.id, listOf("shiny_particles", "middle"))
-                            .sendToPlayersAround(entity.x, entity.y, entity.z, 64.0, entity.level().dimension())
-                    }
-                    entity.after(seconds = SendOutPokemonHandler.SEND_OUT_DURATION) {
-                        entity.beamMode = 0
-                    }
-                }
-                if (world.addFreshEntity(entity)) {
-                    val tethering = Tethering(
-                        minRoamPos = minRoamPos,
-                        maxRoamPos = maxRoamPos,
-                        playerId = player.uuid,
-                        playerName = player.gameProfile.name,
-                        tetheringId = UUID.randomUUID(),
-                        pokemonId = pokemon.uuid,
-                        pcId = pc.uuid,
-                        entityId = entity.id,
-                        pasturePos = blockPos
-                    )
-                    pokemon.tetheringId = tethering.tetheringId
-                    tetheredPokemon.add(tethering)
-                    entity.tethering = tethering
-                    tethering.toDTO(player)?.let { player.sendPacket(PokemonPasturedPacket(it)) }
-                    setChanged()
-                    CobblemonCriteria.PASTURE_USE.trigger(player, pokemon)
-                    return true
-                } else {
-                    Cobblemon.LOGGER.warn("Couldn't spawn pastured Pokémon for some reason")
-                }
-                break
+        val position = findSpawnPosition(entity, tethering.lastEntityPos, directionToBehind) ?: return false
+        entity.setPos(position)
+        entity.beamMode = 2
+        entity.tethering = tethering
+        if (!world.addFreshEntity(entity)) return false
+        tethering.entityId = entity.id
+        tethering.entityUuid = entity.uuid
+        tethering.lastEntityPos = entity.blockPosition()
+        tethering.respawnAt = 0L
+        afterOnServer(seconds = 0.5F) {
+            if (!entity.isRemoved && entity.pokemon.shiny) {
+                SpawnSnowstormEntityParticlePacket(cobblemonResource("shiny_ring"), entity.id, listOf("shiny_particles", "middle"))
+                    .sendToPlayersAround(entity.x, entity.y, entity.z, 64.0, entity.level().dimension())
+            }
+            entity.after(seconds = SendOutPokemonHandler.SEND_OUT_DURATION) {
+                entity.beamMode = 0
             }
         }
+        return true
+    }
 
-        return false
+    fun findSpawnPosition(entity: PokemonEntity, preferred: BlockPos? = null, direction: Direction = blockState.getValue(HorizontalDirectionalBlock.FACING)): Vec3? {
+        val world = level ?: return null
+        val dimensions = entity.getDimensions(Pose.STANDING)
+        val idealPlace = preferred ?: blockPos.offset(direction.normal.multiply(ceil(dimensions.width / 2.0).toInt() + 1))
+        for (candidate in getRange().nearbyBlocks(blockPos, idealPlace, dimensions.width.toDouble())) {
+            if (!world.hasChunkAt(candidate)) continue
+            val box = dimensions.makeBoundingBox(candidate.center.subtract(0.0, 0.5, 0.0))
+            val fixedPosition = makeSuitableY(world, candidate, entity, box) ?: continue
+            val position = fixedPosition.center.subtract(0.0, 0.5, 0.0)
+            val spawnBox = dimensions.makeBoundingBox(position)
+            if (world.noCollision(entity, spawnBox) &&
+                world.getEntitiesOfClass(PokemonEntity::class.java, spawnBox) { it != entity }.isEmpty()) {
+                return position
+            }
+        }
+        return null
     }
 
     private fun togglePastureOn(on: Boolean) {
@@ -289,6 +332,7 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
     }
 
     fun checkPokemon() {
+        val world = level as? ServerLevel ?: return
         val deadLinks = mutableListOf<UUID>()
         tetheredPokemon.forEach {
             val pokemon = it.getPokemon()
@@ -296,6 +340,8 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
                 deadLinks.add(it.pokemonId)
             } else if (pokemon.tetheringId == null || pokemon.tetheringId != it.tetheringId) {
                 deadLinks.add(it.pokemonId)
+            } else {
+                checkDeployment(world, it, pokemon)
             }
         }
         deadLinks.forEach(::releasePokemon)
@@ -303,6 +349,51 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
         setChanged()
     }
 
+    private fun checkDeployment(world: ServerLevel, tethering: Tethering, pokemon: Pokemon) {
+        val now = world.gameTime
+        if (pokemon.isFainted() && !tethering.healingAfterFaint) {
+            tethering.beginRecovery(now, fainted = true)
+        }
+        val entity = (pokemon.entity ?: tethering.entityUuid?.let(world::getEntity) as? PokemonEntity)
+            ?.takeIf { !it.isRemoved && it.tethering?.tetheringId == tethering.tetheringId }
+        if (entity != null) {
+            tethering.entityUuid = entity.uuid
+            tethering.lastEntityPos = entity.blockPosition()
+            entity.tethering = tethering
+            if (!tethering.healingAfterFaint) tethering.respawnAt = 0L
+            return
+        }
+        // A Pokémon in an unloaded chunk is still deployed. Never create its replacement.
+        val lastPosition = tethering.lastEntityPos
+        if (lastPosition != null) {
+            if (!world.hasChunkAt(lastPosition)) return
+        }
+        // The last saved position may predate a chunk crossing. Require the entire range
+        // to be entity-ticking before deciding that its missing Pokémon has disappeared.
+        for (chunkX in (minRoamPos.x shr 4)..(maxRoamPos.x shr 4)) {
+            for (chunkZ in (minRoamPos.z shr 4)..(maxRoamPos.z shr 4)) {
+                if (!world.isPositionEntityTicking(BlockPos(chunkX shl 4, blockPos.y, chunkZ shl 4))) return
+            }
+        }
+        if (tethering.respawnAt == 0L) {
+            tethering.beginRecovery(now, fainted = false)
+            return
+        }
+        if (now < tethering.respawnAt) return
+        if (tethering.healingAfterFaint) {
+            pokemon.heal()
+            if (pokemon.isFainted()) return
+            tethering.healingAfterFaint = false
+        }
+        val radius = Cobblemon.config.pastureMaxWanderDistance.toDouble()
+        val nearby = world.getEntitiesOfClass(PokemonEntity::class.java, AABB.ofSize(blockPos.toVec3d(), radius * 2, world.height.toDouble(), radius * 2)).size
+        val chunkDiameter = (radius / 16) * 2
+        if (nearby >= Cobblemon.config.pastureMaxPerChunk * chunkDiameter * chunkDiameter ||
+            !spawnPokemon(pokemon, tethering, blockState.getValue(HorizontalDirectionalBlock.FACING))) {
+            tethering.respawnAt = now + MISSING_ENTITY_COOLDOWN
+        }
+    }
+
     fun onBroken() {
         if (level is ServerLevel) {
             tetheredPokemon.toList().forEach { releasePokemon(it.pokemonId) }
@@ -312,7 +403,10 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
 
     fun releasePokemon(pokemonId: UUID) {
         val tethering = tetheredPokemon.find { it.pokemonId == pokemonId } ?: return
-        tethering.getPokemon()?.tetheringId = null
+        tethering.getPokemon()?.let { pokemon ->
+            pokemon.tetheringId = null
+            pokemon.onChange()
+        }
         tetheredPokemon.remove(tethering)
         setChanged()
     }
@@ -320,7 +414,10 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
     fun releaseAllPokemon(playerId: UUID): List<UUID> {
         val unpastured = mutableListOf<UUID>()
         tetheredPokemon.filter { it.playerId == playerId }.forEach {
-            it.getPokemon()?.tetheringId = null
+            it.getPokemon()?.let { pokemon ->
+                pokemon.tetheringId = null
+                pokemon.onChange()
+            }
             tetheredPokemon.remove(it)
             unpastured.add(it.pokemonId)
         }
@@ -343,9 +440,7 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
 
     private fun isPlayerViewing(player: ServerPlayer): Boolean {
         val pastureLink = PastureLinkManager.getLinkByPlayer(player)
-        return pastureLink != null && pastureLink.pos == blockPos && pastureLink.dimension == ResourceLocation.tryParse(
-            player.level().dimensionTypeRegistration().registeredName // todo (techdaan): confirm this is good
-        )
+        return pastureLink != null && pastureLink.pos == blockPos && pastureLink.dimension == player.level().dimension().location()
     }
 
     override fun loadAdditional(nbt: CompoundTag, registryLookup: HolderLookup.Provider) {
@@ -353,6 +448,9 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
         val list = nbt.getList(DataKeys.TETHER_POKEMON, CompoundTag.TAG_COMPOUND.toInt())
         this.ownerId = if (nbt.hasUUID(DataKeys.TETHER_OWNER_ID)) nbt.getUUID(DataKeys.TETHER_OWNER_ID) else null
         this.ownerName = nbt.getString(DataKeys.TETHER_OWNER_NAME).takeIf { it.isNotEmpty() } ?: ""
+        this.minRoamPos = NbtUtils.readBlockPos(nbt, DataKeys.TETHER_MIN_ROAM_POS).orElse(minRoamPos)
+        this.maxRoamPos = NbtUtils.readBlockPos(nbt, DataKeys.TETHER_MAX_ROAM_POS).orElse(maxRoamPos)
+        tetheredPokemon.clear()
         for (tetheringNBT in list) {
             tetheringNBT as CompoundTag
             val tetheringId = tetheringNBT.getUUID(DataKeys.TETHERING_ID)
@@ -365,17 +463,19 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
                     minRoamPos = minRoamPos,
                     maxRoamPos = maxRoamPos,
                     playerId = playerId,
-                    playerName = ownerName,
+                    playerName = tetheringNBT.getString("PlayerName").ifEmpty { ownerName },
                     tetheringId = tetheringId,
                     pokemonId = pokemonId,
                     pcId = pcId,
                     entityId = entityId,
-                    pasturePos = blockPos
+                    pasturePos = blockPos,
+                    entityUuid = if (tetheringNBT.hasUUID("EntityUUID")) tetheringNBT.getUUID("EntityUUID") else null,
+                    lastEntityPos = NbtUtils.readBlockPos(tetheringNBT, "LastEntityPos").orElse(null),
+                    respawnAt = tetheringNBT.getLong("RespawnAt"),
+                    healingAfterFaint = tetheringNBT.getBoolean("HealingAfterFaint")
                 )
             )
         }
-        this.minRoamPos = NbtUtils.readBlockPos(nbt, DataKeys.TETHER_MIN_ROAM_POS).get()
-        this.maxRoamPos = NbtUtils.readBlockPos(nbt, DataKeys.TETHER_MAX_ROAM_POS).get()
     }
 
     override fun saveAdditional(nbt: CompoundTag, registryLookup: HolderLookup.Provider) {
@@ -388,6 +488,11 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
             tetheringNBT.putUUID(DataKeys.POKEMON_UUID, tethering.pokemonId)
             tetheringNBT.putUUID(DataKeys.PC_ID, tethering.pcId)
             tetheringNBT.putInt(DataKeys.TETHERING_ENTITY_ID, tethering.entityId)
+            tetheringNBT.putString("PlayerName", tethering.playerName)
+            tethering.entityUuid?.let { tetheringNBT.putUUID("EntityUUID", it) }
+            tethering.lastEntityPos?.let { tetheringNBT.put("LastEntityPos", NbtUtils.writeBlockPos(it)) }
+            tetheringNBT.putLong("RespawnAt", tethering.respawnAt)
+            tetheringNBT.putBoolean("HealingAfterFaint", tethering.healingAfterFaint)
             list.add(tetheringNBT)
         }
         nbt.put(DataKeys.TETHER_POKEMON, list)
@@ -396,4 +501,4 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
         ownerId?.let { nbt.putUUID(DataKeys.TETHER_OWNER_ID, it) }
         nbt.putString(DataKeys.TETHER_OWNER_NAME, this.ownerName)
     }
-}
+}

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

@@ -11,6 +11,8 @@ package com.cobblemon.mod.common.client.gui.pasture
 import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.pasture.PasturePermissions
+import com.cobblemon.mod.common.api.pasture.PastureRange
+import net.minecraft.core.Direction
 import com.cobblemon.mod.common.api.reactive.SettableObservable
 import com.cobblemon.mod.common.client.gui.pc.PCGUIConfiguration
 import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
@@ -21,7 +23,9 @@ class PasturePCGUIConfiguration(
     val pastureId: UUID,
     val limit: Int,
     val pasturedPokemon: SettableObservable<List<OpenPasturePacket.PasturePokemonDataDTO>>,
-    var permissions: PasturePermissions
+    var permissions: PasturePermissions,
+    var range: PastureRange,
+    val facing: Direction
 ) : PCGUIConfiguration(
     exitFunction = { it.closeNormally(unlink = true) },
     showParty = false,
@@ -32,4 +36,6 @@ class PasturePCGUIConfiguration(
         }
     },
     canSelect = { pokemon -> !pokemon.isFainted() && pokemon.tetheringId == null }
-)
+) {
+    var editingRange = false
+}

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

@@ -0,0 +1,181 @@
+/*
+ * 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.pasture
+
+import com.cobblemon.mod.common.CobblemonSounds
+import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.pc.StorageWidget
+import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
+import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.client.render.gui.PCBoxWallpaperRepository
+import com.cobblemon.mod.common.net.messages.server.pasture.AdjustPastureRangePacket
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.resources.sounds.SimpleSoundInstance
+import net.minecraft.core.Direction
+
+class PastureRangeWidget(x: Int, y: Int, private val configuration: PasturePCGUIConfiguration) :
+    SoundlessWidget(x, y, StorageWidget.SCREEN_WIDTH, StorageWidget.SCREEN_HEIGHT, lang("ui.pasture.range")) {
+
+    private val rangeResource = cobblemonResource("textures/gui/pasture/pasture_range.png")
+    private val glowResource = cobblemonResource("textures/gui/pc/wallpaper/basic/glow/wallpaper_basic_05.png")
+    private val overlayResource = cobblemonResource("textures/gui/pc/pc_screen_overlay.png")
+    private val infoResource = cobblemonResource("textures/gui/summary/summary_tab_icon_info.png")
+    private val directions = listOf(configuration.facing, configuration.facing.clockWise, configuration.facing.opposite, configuration.facing.counterClockWise)
+    private val arrowBounds = listOf(
+        intArrayOf(75, 17, 103, 46), intArrayOf(116, 64, 152, 96),
+        intArrayOf(75, 109, 103, 143), intArrayOf(26, 64, 62, 96)
+    )
+    // Centers of the numeral shadows in pasture_range.png, relative to its (85, 27) panel origin.
+    private val numberPositions = listOf(89 to 37, 125 to 77, 89 to 114, 53 to 77)
+    private var hoveredDirection: Direction? = null
+    private var showInfo = false
+
+    private val infoButtonX get() = x + 5
+    private val infoButtonY get() = y + 5
+
+    override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        blitk(
+            matrixStack = context.pose(), texture = PCBoxWallpaperRepository.defaultWallpaper,
+            x = x, y = y, width = width, height = height
+        )
+        blitk(
+            matrixStack = context.pose(), texture = rangeResource,
+            x = x + 3, y = y + 3, width = width - 6, height = height - 6,
+            uOffset = 88, vOffset = 30, textureWidth = 349, textureHeight = 205
+        )
+        blitk(
+            matrixStack = context.pose(), texture = glowResource,
+            x = x - 17, y = y - 17, width = 208, height = 189
+        )
+        blitk(matrixStack = context.pose(), texture = overlayResource, x = x, y = y, width = width, height = height)
+        hoveredDirection = directionAt(mouseX.toDouble(), mouseY.toDouble())
+        directions.indexOf(hoveredDirection).takeIf { it >= 0 }?.let { index ->
+            renderArrowHighlight(context, index)
+        }
+        context.pose().pushPose()
+        context.pose().translate(-0.5F, 0F, 0F)
+        directions.forEachIndexed { index, direction ->
+            val (numberX, numberY) = numberPositions[index]
+            drawScaledText(context, text = net.minecraft.network.chat.Component.literal(configuration.range[direction].toString()),
+                x = x + numberX + 1, y = y + numberY - 7, centered = true,
+                colour = 0xFFFFFFFF.toInt())
+        }
+        context.pose().popPose()
+        val infoHovered = mouseX in infoButtonX until infoButtonX + 12 && mouseY in infoButtonY until infoButtonY + 12
+        context.fill(infoButtonX, infoButtonY, infoButtonX + 12, infoButtonY + 12,
+            if (showInfo || infoHovered) 0xFFFFFFFF.toInt() else 0xFF91C5C9.toInt())
+        context.fill(infoButtonX + 1, infoButtonY + 1, infoButtonX + 11, infoButtonY + 11, 0xFF006775.toInt())
+        blitk(matrixStack = context.pose(), texture = infoResource,
+            x = infoButtonX + 2, y = infoButtonY + 2, width = 8, height = 8)
+        if (showInfo) {
+            val options = Minecraft.getInstance().options
+            val font = Minecraft.getInstance().font
+            val increaseLines = font.split(lang("ui.pasture.range.increase", options.keyAttack.translatedKeyMessage), 120)
+            val decreaseLines = font.split(lang("ui.pasture.range.decrease", options.keyUse.translatedKeyMessage), 120)
+            val boxX = infoButtonX
+            val boxY = y + 20
+            val boxHeight = (increaseLines.size + decreaseLines.size) * 5 + 8
+            context.fill(boxX, boxY, boxX + 66, boxY + boxHeight, 0xFF91C5C9.toInt())
+            context.fill(boxX + 1, boxY + 1, boxX + 65, boxY + boxHeight - 1, 0xE0004C59.toInt())
+            var lineY = boxY + 3
+            for (line in increaseLines) {
+                drawScaledText(context, text = line, x = boxX + 3, y = lineY, scaleX = 0.5F, scaleY = 0.5F,
+                    colour = 0xFFFFFFFF.toInt(), shadow = true)
+                lineY += 5
+            }
+            lineY += 2
+            for (line in decreaseLines) {
+                drawScaledText(context, text = line, x = boxX + 3, y = lineY, scaleX = 0.5F, scaleY = 0.5F,
+                    colour = 0xFFFFFFFF.toInt(), shadow = true)
+                lineY += 5
+            }
+        }
+    }
+
+    private fun renderArrowHighlight(context: GuiGraphics, index: Int) {
+        fun fill(left: Int, top: Int, right: Int, bottom: Int) {
+            context.fill(x + left, y + top, x + right, y + bottom, 0x66FFFFFF)
+        }
+        // Trace the arrow faces in pasture_range.png; horizontal arrows have longer stems.
+        // Keep their offset drop shadows visible instead of brightening the surrounding background.
+        when (index) {
+            0 -> {
+                for (row in 0..14) {
+                    val halfWidth = 3 + minOf(row, 11)
+                    fill(89 - halfWidth, 17 + row, 89 + halfWidth, 18 + row)
+                }
+                fill(81, 32, 97, 41)
+            }
+            1, 3 -> {
+                for (row in 0..26) {
+                    val tip = 141 + minOf(row, 11, 26 - row)
+                    if (index == 1) fill(137, 64 + row, tip, 65 + row)
+                    else fill(178 - tip, 64 + row, 41, 65 + row)
+                }
+                if (index == 1) fill(116, 72, 137, 83)
+                else fill(41, 72, 62, 83)
+            }
+            2 -> {
+                fill(81, 109, 97, 123)
+                for (row in 0..14) {
+                    val halfWidth = 14 - maxOf(0, row - 3)
+                    fill(89 - halfWidth, 123 + row, 89 + halfWidth, 124 + row)
+                }
+            }
+        }
+    }
+
+    private fun directionAt(mouseX: Double, mouseY: Double): Direction? {
+        val index = arrowBounds.indexOfFirst { (left, top, right, bottom) ->
+            mouseX >= x + left && mouseX < x + right &&
+                mouseY >= y + top && mouseY < y + bottom
+        }
+        return directions.getOrNull(index)
+    }
+
+    private fun adjust(direction: Direction, increase: Boolean): Boolean {
+        AdjustPastureRangePacket(configuration.pastureId, direction, increase).sendToServer()
+        return true
+    }
+
+    override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
+        if (pButton == 0 && pMouseX >= infoButtonX && pMouseX < infoButtonX + 12 &&
+            pMouseY >= infoButtonY && pMouseY < infoButtonY + 12) {
+            showInfo = !showInfo
+            Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.PC_CLICK, 1F))
+            return true
+        }
+        val direction = directionAt(pMouseX, pMouseY) ?: return false
+        val options = Minecraft.getInstance().options
+        return when {
+            options.keyAttack.matchesMouse(pButton) -> adjust(direction, true)
+            options.keyUse.matchesMouse(pButton) -> adjust(direction, false)
+            else -> false
+        }
+    }
+
+    override fun mouseScrolled(mouseX: Double, mouseY: Double, scrollX: Double, scrollY: Double): Boolean {
+        val direction = directionAt(mouseX, mouseY) ?: return false
+        if (scrollY == 0.0) return false
+        return adjust(direction, scrollY > 0)
+    }
+
+    override fun keyPressed(pKeyCode: Int, pScanCode: Int, pModifiers: Int): Boolean {
+        val direction = hoveredDirection ?: return false
+        val options = Minecraft.getInstance().options
+        return when {
+            options.keyAttack.matches(pKeyCode, pScanCode) -> adjust(direction, true)
+            options.keyUse.matches(pKeyCode, pScanCode) -> adjust(direction, false)
+            else -> false
+        }
+    }
+}

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

@@ -20,7 +20,9 @@ import com.cobblemon.mod.common.net.messages.server.pasture.UnpastureAllPokemonP
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.sounds.SoundManager
 import net.minecraft.network.chat.Component
+import net.minecraft.client.gui.components.Button
 
 class PastureWidget(
     val storageWidget: StorageWidget,
@@ -32,6 +34,8 @@ class PastureWidget(
 
     companion object {
         private val baseResource = cobblemonResource("textures/gui/pasture/pasture_panel.png")
+        private val buttonResource = cobblemonResource("textures/gui/pasture/pasture_button.png")
+        private val gearResource = cobblemonResource("textures/gui/pasture/pasture_range_gear.png")
     }
 
     private val recallButton = RecallButton(
@@ -42,6 +46,14 @@ class PastureWidget(
         UnpastureAllPokemonPacket(pasturePCGUIConfiguration.pastureId).sendToServer()
     }
 
+    private val rangeButton = object : Button(x + 6, y + 174, 27, 17, lang("ui.pasture.range"), {
+        storageWidget.pcGui.setPastureRangeEditing(!pasturePCGUIConfiguration.editingRange)
+    }, DEFAULT_NARRATION) {
+        override fun playDownSound(soundManager: SoundManager) {
+            storageWidget.pcGui.playSound(CobblemonSounds.PC_CLICK)
+        }
+    }
+
     val pastureScrollList = PasturePokemonScrollList(
         listX = x + 6,
         listY = y + 31,
@@ -70,11 +82,29 @@ class PastureWidget(
         pastureScrollList.render(context, mouseX, mouseY, delta)
 
         recallButton.render(context, mouseX, mouseY, delta)
+        rangeButton.message = lang(if (pasturePCGUIConfiguration.editingRange) "ui.pasture.storage" else "ui.pasture.range")
+        val buttonX = rangeButton.x
+        val buttonY = rangeButton.y
+        val highlighted = pasturePCGUIConfiguration.editingRange || rangeButton.isMouseOver(mouseX.toDouble(), mouseY.toDouble())
+        blitk(matrixStack = context.pose(), texture = buttonResource, x = buttonX, y = buttonY,
+            width = 23, height = 17, textureWidth = 70, textureHeight = 34)
+        blitk(matrixStack = context.pose(), texture = buttonResource, x = buttonX + 23, y = buttonY,
+            width = 4, height = 17, uOffset = 66, textureWidth = 70, textureHeight = 34)
+        if (highlighted) context.fill(buttonX + 2, buttonY + 2, buttonX + 26, buttonY + 15, 0x88FFFFFF.toInt())
+        val gearSize = 11
+        val gearX = buttonX + (rangeButton.width - gearSize) / 2
+        val gearY = buttonY + (rangeButton.height - gearSize) / 2
+        if (highlighted) blitk(matrixStack = context.pose(), texture = gearResource,
+            x = gearX + 1, y = gearY + 1, width = gearSize, height = gearSize,
+            red = 0.2F, green = 0.2F, blue = 0.2F)
+        blitk(matrixStack = context.pose(), texture = gearResource,
+            x = gearX, y = gearY, width = gearSize, height = gearSize)
     }
 
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
+        if (rangeButton.mouseClicked(pMouseX, pMouseY, pButton)) return true
         if (recallButton.isHovered(pMouseX, pMouseY)) recallButton.mouseClicked(pMouseX, pMouseY, pButton)
         if (pastureScrollList.isHovered(pMouseX, pMouseY)) pastureScrollList.mouseClicked(pMouseX, pMouseY, pButton)
         return super.mouseClicked(pMouseX, pMouseY, pButton)
     }
-}
+}

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

@@ -20,6 +20,7 @@ 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.pasture.PasturePCGUIConfiguration
 import com.cobblemon.mod.common.client.gui.TypeIcon
 import com.cobblemon.mod.common.client.gui.summary.Summary
 import com.cobblemon.mod.common.client.gui.summary.Summary.Companion.iconCosmeticItemResource
@@ -140,7 +141,10 @@ class PCGUI(
         // Add Exit Button
         this.addRenderableWidget(
             ExitButton(pX = x + 320, pY = y + 186) {
-                if (::wallpaperWidget.isInitialized && wallpaperWidget.visible) {
+                if (storageWidget.editingPastureRange) {
+                    setPastureRangeEditing(false)
+                    playSound(CobblemonSounds.PC_CLICK)
+                } else if (::wallpaperWidget.isInitialized && wallpaperWidget.visible) {
                     wallpaperWidget.visible = false
                     configuration.showParty = true
                     for (button in optionButtons) button.highlighted = false
@@ -158,7 +162,7 @@ class PCGUI(
                 pX = x + 220,
                 pY = y + 16,
                 forward = true
-            ) { storageWidget.box += 1 }
+            ) { if (!storageWidget.editingPastureRange) storageWidget.box += 1 }
         )
 
         // Add Backwards Button
@@ -167,7 +171,7 @@ class PCGUI(
                 pX = x + 117,
                 pY = y + 16,
                 forward = false
-            ) { storageWidget.box -= 1 }
+            ) { if (!storageWidget.editingPastureRange) storageWidget.box -= 1 }
         )
 
         // Add Filter Widget
@@ -197,6 +201,8 @@ class PCGUI(
             storageWidget = storageWidget
         )
         this.addRenderableWidget(boxNameWidget)
+        filterWidget.active = !storageWidget.editingPastureRange
+        boxNameWidget.active = !storageWidget.editingPastureRange
 
         // Initialise box options if not pasture
         if (storageWidget.pastureWidget == null) {
@@ -711,17 +717,28 @@ class PCGUI(
         }
     }
 
+    fun setPastureRangeEditing(editing: Boolean) {
+        val pasture = configuration as? PasturePCGUIConfiguration ?: return
+        pasture.editingRange = editing
+        filterWidget.active = !editing
+        boxNameWidget.active = !editing
+        focused = null
+        storageWidget.resetSelected()
+    }
+
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
         // Trigger child component function as they will need to check the entire screen click area
-        if (::boxNameWidget.isInitialized) boxNameWidget.mouseClicked(mouseX, mouseY, button)
+        if (::boxNameWidget.isInitialized && !storageWidget.editingPastureRange) boxNameWidget.mouseClicked(mouseX, mouseY, button)
         return super.mouseClicked(mouseX, mouseY, button)
     }
 
     override fun mouseScrolled(mouseX: Double, mouseY: Double, amount: Double, verticalAmount: Double): Boolean {
+        if (storageWidget.editingPastureRange &&
+            storageWidget.pastureRangeWidget?.mouseScrolled(mouseX, mouseY, amount, verticalAmount) == true) return true
         storageWidget.pastureWidget?.let { pasture ->
             if (pasture.pastureScrollList.isHovered) pasture.pastureScrollList.mouseScrolled(mouseX, mouseY, amount, verticalAmount)
         }
-        if (storageWidget.isHovered && mouseX < (storageWidget.x + StorageWidget.SCREEN_WIDTH)) this.storageWidget.box -= verticalAmount.toInt()
+        if (!storageWidget.editingPastureRange && storageWidget.isHovered && mouseX < (storageWidget.x + StorageWidget.SCREEN_WIDTH)) this.storageWidget.box -= verticalAmount.toInt()
         if (::wallpaperWidget.isInitialized && wallpaperWidget.isHovered) wallpaperWidget.mouseScrolled(mouseX, mouseY, amount, verticalAmount)
 
         val infoBoxX = ((width - BASE_WIDTH) / 2) + 9
@@ -744,6 +761,11 @@ class PCGUI(
     }
 
     override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
+        if (storageWidget.editingPastureRange) {
+            if (keyCode != InputConstants.KEY_ESCAPE &&
+                storageWidget.pastureRangeWidget?.keyPressed(keyCode, scanCode, modifiers) == true) return true
+            if (keyCode == InputConstants.KEY_RIGHT || keyCode == InputConstants.KEY_LEFT) return true
+        }
         val boxNameFocused = this::boxNameWidget.isInitialized && boxNameWidget.isFocused
         val filterFocused = this::filterWidget.isInitialized && filterWidget.isFocused
 

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

@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.pasture.PasturePCGUIConfiguration
 import com.cobblemon.mod.common.client.gui.pasture.PastureWidget
+import com.cobblemon.mod.common.client.gui.pasture.PastureRangeWidget
 import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.gui.PCBoxWallpaperRepository
@@ -74,6 +75,9 @@ class StorageWidget(
     private val releaseNoButton: ReleaseConfirmButton
 
     var pastureWidget: PastureWidget? = null
+    val pastureRangeWidget = (pcGui.configuration as? PasturePCGUIConfiguration)?.let { PastureRangeWidget(x, y, it) }
+    val editingPastureRange: Boolean
+        get() = (pcGui.configuration as? PasturePCGUIConfiguration)?.editingRange == true
 
     var displayConfirmRelease = false
     var screenLoaded = false
@@ -218,6 +222,11 @@ class StorageWidget(
     }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        if (editingPastureRange) {
+            pastureRangeWidget?.render(context, mouseX, mouseY, delta)
+            pastureWidget?.render(context, mouseX, mouseY, delta)
+            return
+        }
         val matrices = context.pose()
         // Party  Label
         if (pcGui.configuration.showParty) {
@@ -340,6 +349,10 @@ class StorageWidget(
     }
 
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
+        if (editingPastureRange) {
+            return pastureRangeWidget?.mouseClicked(pMouseX, pMouseY, pButton) == true ||
+                pastureWidget?.mouseClicked(pMouseX, pMouseY, pButton) == true
+        }
         if (displayConfirmRelease) {
             if (releaseYesButton.isHovered(pMouseX, pMouseY)) releaseYesButton.mouseClicked(pMouseX, pMouseY, pButton)
             if (releaseNoButton.isHovered(pMouseX, pMouseY)) releaseNoButton.mouseClicked(pMouseX, pMouseY, pButton)

common/src/main/kotlin/com/cobblemon/mod/common/client/net/pasture/OpenPastureHandler.kt

@@ -23,6 +23,8 @@ object OpenPastureHandler : ClientNetworkPacketHandler<OpenPasturePacket> {
             pastureId = packet.pastureId,
             limit = packet.limit,
             permissions = packet.permissions,
+            range = packet.range,
+            facing = packet.facing,
             pasturedPokemon = SettableObservable(packet.tetheredPokemon)
         )
 

common/src/main/kotlin/com/cobblemon/mod/common/client/net/pasture/UpdatePastureRangeHandler.kt

@@ -0,0 +1,26 @@
+/*
+ * 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.pasture
+
+import com.cobblemon.mod.common.CobblemonSounds
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.client.gui.pasture.PasturePCGUIConfiguration
+import com.cobblemon.mod.common.client.gui.pc.PCGUI
+import com.cobblemon.mod.common.net.messages.client.pasture.UpdatePastureRangePacket
+import net.minecraft.client.Minecraft
+import net.minecraft.client.resources.sounds.SimpleSoundInstance
+
+object UpdatePastureRangeHandler : ClientNetworkPacketHandler<UpdatePastureRangePacket> {
+    override fun handle(packet: UpdatePastureRangePacket, client: Minecraft) {
+        val configuration = (client.screen as? PCGUI)?.configuration as? PasturePCGUIConfiguration ?: return
+        if (configuration.pastureId != packet.pastureId) return
+        configuration.range = packet.range
+        client.soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.PC_CLICK, 1F))
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt

@@ -166,7 +166,6 @@ import net.minecraft.world.item.Items
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.LightLayer
 import net.minecraft.world.level.block.Blocks
-import net.minecraft.world.level.block.HorizontalDirectionalBlock
 import net.minecraft.world.level.block.SuspiciousEffectHolder
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.gameevent.GameEvent
@@ -304,6 +303,7 @@ open class PokemonEntity(
     var drops: DropTable? = null
 
     var tethering: PokemonPastureBlockEntity.Tethering? = null
+    private var nextPastureReturnAttempt = 0
 
     // TODO review if we still want this
     var queuedToDespawn = false
@@ -738,34 +738,29 @@ open class PokemonEntity(
 
     // Check to see if the entity needs recalled or repositioned if pastured.
     fun checkPastureTether() {
-        // Teleport a pastured mon back to the pasture block if they are out of range
-        if (this.tethering != null && !this.tethering!!.box.contains(this.x, this.y, this.z)) {
-
-            // Gather the ideal position (behind the pastureBlock)
-            val pastureBlockPos = this.tethering!!.pasturePos
-            val state = this.level().getBlockState(pastureBlockPos)
-
-            // Check to ensure we are working with a pastureblock here and it hasn't been broken
-            if (state.block == CobblemonBlocks.PASTURE) {
-                val direction = state.getValue(HorizontalDirectionalBlock.FACING)
-                val width = this.boundingBox.xsize
-                val tpPos = pastureBlockPos.offset(direction.normal.multiply(ceil(width).toInt() + 1)).center
-                val heightAllowance = 4.0 // Allow spawning up to x blocks above the pastureBlock y level
-
-                // Attempt tp and recall if it fails
-                if (!this.randomTeleport(tpPos.x, tpPos.y + heightAllowance, tpPos.z, false)) {
-                    // If the teleport was not successful then recall the mon
-                    this.tethering = null
-                    this.pokemon.recall()
-                } else {
-                    // Stop any now invalid navigation post teleport
-                    this.navigation.stop()
-                }
-            } else {
-                // If the block is destroyed or something else went wrong.
-                this.tethering = null
-                this.pokemon.recall()
-            }
+        val currentTethering = tethering ?: return
+        val world = level() as? ServerLevel ?: return
+        if (ticksLived == 1 && world.hasChunkAt(currentTethering.pasturePos)) {
+            val pasture = world.getBlockEntity(currentTethering.pasturePos) as? PokemonPastureBlockEntity
+            pasture?.tetheredPokemon?.find { it.tetheringId == currentTethering.tetheringId }?.let { tethering = it }
+        }
+        if (tethering!!.canRoamTo(x, z) || !world.hasChunkAt(currentTethering.pasturePos)) return
+        navigation.stop()
+        (moveControl as? PokemonMoveControl)?.apply { stop(); stopBanking() }
+        brain.eraseMemory(MemoryModuleType.WALK_TARGET)
+        deltaMovement = Vec3.ZERO
+        if (ticksLived < nextPastureReturnAttempt) return
+        val pasture = world.getBlockEntity(currentTethering.pasturePos) as? PokemonPastureBlockEntity
+        val position = pasture?.findSpawnPosition(this, blockPosition())
+        if (position != null) {
+            teleportTo(position.x, position.y, position.z)
+            nextPastureReturnAttempt = 0
+        } else if (pasture == null) {
+            tethering = null
+            pokemon.recall()
+            return
+        } else {
+            nextPastureReturnAttempt = ticksLived + 20
         }
     }
 
@@ -1800,7 +1795,7 @@ open class PokemonEntity(
         removalObservable.emit(reason)
         this.brain.clearMemories()
 
-        if (reason.shouldDestroy() && pokemon.tetheringId != null) {
+        if (reason.shouldDestroy() && pokemon.tetheringId != null && tethering == null) {
             pokemon.tetheringId = null
         }
         if (evolutionEntity != null) {

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonMoveControl.kt

@@ -29,6 +29,7 @@ import net.minecraft.tags.FluidTags
 import net.minecraft.util.Mth
 import net.minecraft.world.entity.ai.attributes.Attributes
 import net.minecraft.world.entity.ai.control.MoveControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.level.material.FluidState
 import net.minecraft.world.level.pathfinder.PathType
 import net.minecraft.world.phys.AABB
@@ -106,7 +107,14 @@ class PokemonMoveControl(val pokemonEntity: PokemonEntity) : MoveControl(pokemon
 
         if (banking) {
             pokemonEntity.yRot += bankRightDegreesPerTick
-            pokemonEntity.travel(Vec3(0.0, bankUpwardsBlocksPerTick.toDouble(), bankForwardBlocksPerTick.toDouble()).scale(mediumSpeed.toDouble()))
+            val forward = bankForwardBlocksPerTick * mediumSpeed
+            val tethering = pokemonEntity.tethering
+            if (tethering?.canRoamTo(
+                    pokemonEntity.x - Mth.sin(pokemonEntity.yRot.toRadians()) * forward,
+                    pokemonEntity.z + Mth.cos(pokemonEntity.yRot.toRadians()) * forward
+                ) != false) {
+                pokemonEntity.travel(Vec3(0.0, bankUpwardsBlocksPerTick.toDouble(), bankForwardBlocksPerTick.toDouble()).scale(mediumSpeed.toDouble()))
+            }
             if (bankDurationTicks > 0) {
                 bankDurationTicks--
             }
@@ -280,6 +288,16 @@ class PokemonMoveControl(val pokemonEntity: PokemonEntity) : MoveControl(pokemon
                 }
             }
         }
+        val tethering = pokemonEntity.tethering
+        val motion = mob.deltaMovement
+        if (tethering?.canRoamTo(mob.x, mob.z) == true &&
+            !tethering.canRoamTo(mob.x + motion.x, mob.z + motion.z)) {
+            mob.navigation.stop()
+            pokemonEntity.brain.eraseMemory(MemoryModuleType.WALK_TARGET)
+            stop()
+            stopBanking()
+            mob.deltaMovement = Vec3(0.0, motion.y, 0.0)
+        }
     }
 
     /*
@@ -369,4 +387,4 @@ class PokemonMoveControl(val pokemonEntity: PokemonEntity) : MoveControl(pokemon
         strafeForwards = 0.0f
         strafeRight = 0.0f
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pasture/OpenPasturePacket.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.net.messages.client.pasture
 
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.pasture.PasturePermissions
+import com.cobblemon.mod.common.api.pasture.PastureRange
 import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
 import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
 import com.cobblemon.mod.common.net.IntSize
@@ -19,6 +20,7 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.core.Direction
 
 /**
  * Opens a pasture GUI using the provided data.
@@ -28,7 +30,7 @@ import net.minecraft.resources.ResourceLocation
  * @author Hiroku
  * @since April 9th, 2023
  */
-class OpenPasturePacket(val pcId: UUID, val pastureId: UUID, val limit: Int, val tetheredPokemon: List<PasturePokemonDataDTO>, val permissions: PasturePermissions) : NetworkPacket<OpenPasturePacket> {
+class OpenPasturePacket(val pcId: UUID, val pastureId: UUID, val limit: Int, val tetheredPokemon: List<PasturePokemonDataDTO>, val permissions: PasturePermissions, val range: PastureRange, val facing: Direction) : NetworkPacket<OpenPasturePacket> {
     class PasturePokemonDataDTO(
         val pokemonId: UUID,
         val playerId: UUID,
@@ -95,7 +97,7 @@ class OpenPasturePacket(val pcId: UUID, val pastureId: UUID, val limit: Int, val
                 dtos.add(PasturePokemonDataDTO.decode(buffer))
             }
             val permissions = PasturePermissions.decode(buffer)
-            return OpenPasturePacket(pcId, pastureId, limit, dtos, permissions)
+            return OpenPasturePacket(pcId, pastureId, limit, dtos, permissions, PastureRange.decode(buffer), buffer.readEnum(Direction::class.java))
         }
     }
 
@@ -110,5 +112,7 @@ class OpenPasturePacket(val pcId: UUID, val pastureId: UUID, val limit: Int, val
             tethered.encode(buffer)
         }
         permissions.encode(buffer)
+        range.encode(buffer)
+        buffer.writeEnum(facing)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pasture/UpdatePastureRangePacket.kt

@@ -0,0 +1,31 @@
+/*
+ * 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.pasture
+
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.api.pasture.PastureRange
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.network.RegistryFriendlyByteBuf
+import java.util.UUID
+
+class UpdatePastureRangePacket(val pastureId: UUID, val range: PastureRange) : NetworkPacket<UpdatePastureRangePacket> {
+    override val id = ID
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeUUID(pastureId)
+        range.encode(buffer)
+    }
+
+    companion object {
+        val ID = cobblemonResource("update_pasture_range")
+        fun decode(buffer: RegistryFriendlyByteBuf) = UpdatePastureRangePacket(
+            buffer.readUUID(), PastureRange.decode(buffer)
+        )
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/pasture/AdjustPastureRangePacket.kt

@@ -0,0 +1,32 @@
+/*
+ * 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.server.pasture
+
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.core.Direction
+import net.minecraft.network.RegistryFriendlyByteBuf
+import java.util.UUID
+
+class AdjustPastureRangePacket(val pastureId: UUID, val direction: Direction, val increase: Boolean) : NetworkPacket<AdjustPastureRangePacket> {
+    override val id = ID
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeUUID(pastureId)
+        buffer.writeEnum(direction)
+        buffer.writeBoolean(increase)
+    }
+
+    companion object {
+        val ID = cobblemonResource("adjust_pasture_range")
+        fun decode(buffer: RegistryFriendlyByteBuf) = AdjustPastureRangePacket(
+            buffer.readUUID(), buffer.readEnum(Direction::class.java), buffer.readBoolean()
+        )
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/pasture/AdjustPastureRangeHandler.kt

@@ -0,0 +1,39 @@
+/*
+ * 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.serverhandling.pasture
+
+import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
+import com.cobblemon.mod.common.api.pasture.PastureLinkManager
+import com.cobblemon.mod.common.api.pasture.PastureRange
+import com.cobblemon.mod.common.block.entity.PokemonPastureBlockEntity
+import com.cobblemon.mod.common.net.messages.client.pasture.UpdatePastureRangePacket
+import com.cobblemon.mod.common.net.messages.server.pasture.AdjustPastureRangePacket
+import net.minecraft.core.Direction
+import net.minecraft.server.MinecraftServer
+import net.minecraft.server.level.ServerPlayer
+
+object AdjustPastureRangeHandler : ServerNetworkPacketHandler<AdjustPastureRangePacket> {
+    override fun handle(packet: AdjustPastureRangePacket, server: MinecraftServer, player: ServerPlayer) {
+        val link = PastureLinkManager.getLinkByPlayer(player) ?: return
+        if (link.linkId != packet.pastureId || packet.direction.axis == Direction.Axis.Y) return
+        val pasture = player.serverLevel().getBlockEntity(link.pos) as? PokemonPastureBlockEntity ?: return
+        val range = pasture.getRange().adjusted(packet.direction, if (packet.increase) 1 else -1)
+        if (!range.isValid(PastureRange.MAX_DISTANCE)) {
+            UpdatePastureRangePacket(link.linkId, pasture.getRange()).sendToPlayer(player)
+            return
+        }
+        pasture.setRange(range)
+        for (viewer in player.serverLevel().players()) {
+            val viewerLink = PastureLinkManager.getLinkByPlayer(viewer) ?: continue
+            if (viewerLink.pos == link.pos && viewerLink.dimension == link.dimension) {
+                UpdatePastureRangePacket(viewerLink.linkId, range).sendToPlayer(viewer)
+            }
+        }
+    }
+}

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

@@ -1307,6 +1307,10 @@
   "cobblemon.ui.sort.discovered": "Sort by discovered status",
   "cobblemon.ui.pasture": "Pasture",
   "cobblemon.ui.pasture.recall_all": "Recall All",
+  "cobblemon.ui.pasture.range": "Range",
+  "cobblemon.ui.pasture.storage": "PC",
+  "cobblemon.ui.pasture.range.increase": "%s / scroll up to increase",
+  "cobblemon.ui.pasture.range.decrease": "%s / scroll down to decrease",
   "cobblemon.pasture.too_many_nearby": "There are too many Pokémon nearby.",
   "cobblemon.ui.interact.give.item": "Change held item",
   "cobblemon.ui.interact.give.cosmetic_item": "Change cosmetic item",

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

@@ -6526,7 +6526,7 @@
     "cobblemon.move.10000000voltthunderbolt": "1000만볼트",
     "cobblemon.species.unown-x.desc": "고대 문자를 닮은 모습의 포켓몬이다. 먼저 생겨난 것은 문자인가 안농인가. 연구 중이지만 아직도 수수께끼다.",
     "cobblemon.ui.pokedex.info.form.qwilfish-hisui": "히스이의 모습",
-    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시그란돈",
+    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시회귀",
     "cobblemon.ui.pokedex.info.form.burmy-sandy": "모래땅도롱",
     "cobblemon.ui.pokedex.info.form.abomasnow-mega": "메가눈설왕",
     "cobblemon.species.rotom-frost.desc": "특수한 모터로 움직이는 냉장고에 들어갔다. 냉기를 뿜으며 싸운다.",
@@ -6758,7 +6758,7 @@
     "cobblemon.species.salamence-mega.desc": "앞다리를 껍질 틈에 얹어서 비행 태세를 갖춘다. 복잡한 지형도 고속으로 날아다닌다.",
     "cobblemon.species.metagross-mega.desc": "이길 수 없다고 판단하면 발톱으로 상대를 붙잡고 대폭발의 카운트를 시작한다.",
     "cobblemon.species.latios-mega.desc": "본 것이나 생각한 이미지를 상대방에게 영상으로 보여주는 능력을 지녔다. 인간의 말을 이해할 수 있다.",
-    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시가이오가",
+    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시회귀",
     "cobblemon.species.deoxys-attack.desc": "공격적인 형상으로 변화한 테오키스. 다른 모습을 보여 적을 혼란시키는 힘을 가졌다.",
     "cobblemon.ui.pokedex.info.form.deoxys-speed": "스피드폼",
     "cobblemon.ui.pokedex.info.form.burmy-trash": "슈레도롱",
@@ -9549,5 +9549,125 @@
     "cobblemon.config.ui.world_spawning_blocklist": "월드별 스폰 차단 목록",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "포켓몬 생성 로직을 비활성화하는 월드입니다.",
     "advancements.cobblemon.obtain_tm": "기술을 보여줘!",
-    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요"
+    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요",
+    "itemGroup.cobblemon.tm_item": "코블몬: 기술머신",
+    "block.cobblemon.pomohana": "이글이글꽃",
+    "block.cobblemon.pauvillea": "파칙파칙꽃",
+    "block.cobblemon.lobaila": "훌라훌라꽃",
+    "block.cobblemon.wistensu": "하늘하늘꽃",
+    "block.cobblemon.voltaconia": "찌릿꽃",
+    "block.cobblemon.verdroot": "풀빛뿌리",
+    "block.cobblemon.lucibell": "빛방울꽃",
+    "block.cobblemon.mistleaf": "안개잎",
+    "cobblemon.ui.pokedex.info.evolution_tree": "진화 계통",
+    "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "진화하려면 %1$s 필요",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "%1$s와(과) 교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.shedder.tooltip": "남는 몬스터볼과 파티 빈칸도 필요",
+    "cobblemon.ui.pokedex.evolution.or": "또는",
+    "cobblemon.ui.pokedex.evolution.one_of": "다음 중 하나:",
+    "cobblemon.ui.pokedex.requirement.advancement.tooltip": "발전 과제 %1$s 달성 필요",
+    "cobblemon.ui.pokedex.requirement.battle_critical_hits.tooltip": "배틀에서 급소 %1$s회 맞히기",
+    "cobblemon.ui.pokedex.requirement.biome.anticondition.tooltip": "%1$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.both.tooltip": "%1$s 바이옴 안, %2$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.tooltip": "%1$s 바이옴에 있기",
+    "cobblemon.ui.pokedex.requirement.blocks_traveled.tooltip": "%1$s블록 이동하기",
+    "cobblemon.ui.pokedex.requirement.damage_taken.tooltip": "배틀에서 기절하지 않고 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.defeat.tooltip": "배틀에서 %1$s을(를) 쓰러뜨리기",
+    "cobblemon.ui.pokedex.requirement.friendship.tooltip": "친밀도 %1$s 이상 필요",
+    "cobblemon.ui.pokedex.requirement.has_move.tooltip": "기술 %1$s 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.has_move_type.tooltip": "%1$s 타입 기술 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.held_item.tooltip": "%1$s 지니고 있기",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.min": "레벨 %1$s부터 진화",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.between": "레벨 %1$s~%2$s 사이에 진화",
+    "cobblemon.ui.pokedex.requirement.moon_phase.tooltip": "달 모양이 %1$s일 때 진화",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_amped": "§a노력§r, §a용감§r, §a고집§r, §a개구쟁이§r, §a온순§r, §a장난꾸러기§r, §a촐랑§r, §a성급§r, §a명랑§r, §a천진난만§r, §a덜렁§r, §a건방§r, §a변덕§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_low_key": "§a외로움§r, §a대담§r, §a무사태평§r, §a겁쟁이§r, §a성실§r, §a조심§r, §a의젓§r, §a냉정§r, §a수줍음§r, §a차분§r, §a얌전§r, §a신중§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.negate.tooltip": "아님: %1$s",
+    "cobblemon.ui.pokedex.requirement.nickname.malamar": "이름이 §aDinnerbone§r 또는 §aGrumm§r이어야 함",
+    "cobblemon.ui.pokedex.requirement.party_member.anticondition.tooltip": "파티에 %1$s 포켓몬이 없기",
+    "cobblemon.ui.pokedex.requirement.party_member.tooltip": "파티에 %1$s 포켓몬이 있기",
+    "cobblemon.ui.pokedex.requirement.pokemon_properties.tooltip": "조건: %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.and": "%1$s, %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.custom.cocoon_species": "%1$s 고치",
+    "cobblemon.ui.pokedex.requirement.properties.held_item": "%1$s 지닌",
+    "cobblemon.ui.pokedex.requirement.properties.int_feature": "%1$s %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.nature": "%1$s 성격",
+    "cobblemon.ui.pokedex.requirement.properties.nickname": "이름이 %1$s인",
+    "cobblemon.ui.pokedex.requirement.properties.type": "%1$s 타입",
+    "cobblemon.ui.pokedex.requirement.property_range.tooltip": "%1$s이(가) %2$s~%3$s 사이여야 함",
+    "cobblemon.ui.pokedex.requirement.recoil.tooltip": "배틀에서 반동 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.stat_compare.tooltip": "%1$s이(가) %2$s보다 높아야 함",
+    "cobblemon.ui.pokedex.requirement.stat_equal.tooltip": "%1$s와(과) %2$s이(가) 같아야 함",
+    "cobblemon.ui.pokedex.requirement.structure.anticondition.tooltip": "%1$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.both.tooltip": "%1$s 구조물 안, %2$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.tooltip": "%1$s 구조물에 있기",
+    "cobblemon.ui.pokedex.requirement.time_range.tooltip": "%1$s에 진화",
+    "cobblemon.ui.pokedex.requirement.use_move.tooltip": "배틀에서 기술 %1$s 사용하기",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.raining": "비가 올 때 진화",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.thundering": "뇌우가 칠 때 진화",
+    "cobblemon.ui.moon_phase.full_moon": "보름달",
+    "cobblemon.ui.moon_phase.waning_gibbous": "기우는 볼록달",
+    "cobblemon.ui.moon_phase.third_quarter": "하현달",
+    "cobblemon.ui.moon_phase.waning_crescent": "그믐달",
+    "cobblemon.ui.moon_phase.new_moon": "삭",
+    "cobblemon.ui.moon_phase.waxing_crescent": "초승달",
+    "cobblemon.ui.moon_phase.first_quarter": "상현달",
+    "cobblemon.ui.moon_phase.waxing_gibbous": "차오르는 볼록달",
+    "cobblemon.ui.time_range.any": "언제든",
+    "cobblemon.ui.time_range.day": "낮",
+    "cobblemon.ui.time_range.night": "밤",
+    "cobblemon.ui.time_range.noon": "정오",
+    "cobblemon.ui.time_range.midnight": "자정",
+    "cobblemon.ui.time_range.dawn": "새벽",
+    "cobblemon.ui.time_range.dusk": "해 질 녘",
+    "cobblemon.ui.time_range.twilight": "황혼",
+    "cobblemon.ui.time_range.morning": "아침",
+    "cobblemon.ui.time_range.afternoon": "오후",
+    "cobblemon.ui.time_range.predawn": "동트기 전",
+    "cobblemon.ui.time_range.evening": "저녁",
+    "cobblemon.subtitle.item.bright_powder.use": "반짝가루가 빛남",
+    "cobblemon.config.ui.type_gem_max_connected": "연결된 타입주얼 블록 최대 수",
+    "cobblemon.config.ui.type_gem_min_growth": "타입주얼 최소 성장",
+    "cobblemon.config.ui.type_gem_growth_chance": "타입주얼 성장 확률",
+    "cobblemon.config.ui.type_gem_initial_expansion_cycles": "타입주얼 초기 확장 횟수",
+    "cobblemon.battle.activate.ficklebeam": "%1$s은(는) 전력을 다해 공격한다!",
+    "tag.item.cobblemon.oricorio_flowers": "꽃꿀 꽃",
+    "tag.item.cobblemon.terrain_plants": "필드 식물",
+    "tag.item.cobblemon.tall_flowers": "큰 꽃",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_sinnohbiome": "신오",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_johtobiome": "성도",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_unovabiome": "하나",
+    "cobblemon.ui.pokedex.info.form.vivillon-icy snow": "빙설의 모양",
+    "cobblemon.species.vivillon-icy-snow.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 얼어붙은 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-high plains": "황야의 모양",
+    "cobblemon.species.vivillon-high-plains.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 비가 적게 내리는 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-inferno": "지옥의 모양",
+    "cobblemon.species.vivillon-inferno.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-void": "공허의 모양",
+    "cobblemon.species.vivillon-void.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-forsaken": "망각의 모양",
+    "cobblemon.species.vivillon-forsaken.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.species.minior-red.desc": "겉껍질이 벗겨진 모습. 코어의 색이 다른 이유는 먹은 먹이의 성분이 다르기 때문이다."
 }

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

@@ -9677,5 +9677,6 @@
     "cobblemon.config.ui.world_spawning_blocklist": "维度生成黑名单",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "禁用宝可梦生成逻辑的维度。",
     "advancements.cobblemon.obtain_tm": "让我看看你的招式",
-    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器"
+    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器",
+    "itemGroup.cobblemon.tm_item": "招式学习器"
 }

common/src/test/kotlin/com/cobblemon/mod/common/api/pasture/PastureRangeTest.kt

@@ -0,0 +1,120 @@
+/*
+ * 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.api.pasture
+
+import com.cobblemon.mod.common.block.entity.PokemonPastureBlockEntity.Tethering
+import net.minecraft.core.BlockPos
+import net.minecraft.core.Direction
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+import java.util.UUID
+
+class PastureRangeTest {
+    @Test
+    fun `spec examples allow zero sides while requiring eight blocks on both axes`() {
+        listOf(
+            PastureRange(0, 8, 8, 0), PastureRange(4, 4, 4, 4), PastureRange(2, 8, 6, 0)
+        ).forEach { assertTrue(it.isValid(64), it.toString()) }
+        listOf(
+            PastureRange(8, 7, 8, 0), PastureRange(64, 4, 64, 3)
+        ).forEach { assertFalse(it.isValid(64), it.toString()) }
+    }
+
+    @Test
+    fun `every side obeys the configured maximum and rejects negative or overflowing input`() {
+        assertTrue(PastureRange(32, 32, 32, 32).isValid(32))
+        assertTrue(PastureRange(64, 64, 64, 64).isValid(PastureRange.MAX_DISTANCE))
+        assertFalse(PastureRange(65, 64, 64, 64).isValid(PastureRange.MAX_DISTANCE))
+        listOf(
+            PastureRange(33, 32, 32, 32), PastureRange(32, 33, 32, 32),
+            PastureRange(32, 32, 33, 32), PastureRange(32, 32, 32, 33),
+            PastureRange(-1, 8, 9, 0), PastureRange(Int.MAX_VALUE, 8, Int.MAX_VALUE, 0)
+        ).forEach { assertFalse(it.isValid(32), it.toString()) }
+    }
+
+    @Test
+    fun `an adjustment changes only the requested cardinal side`() {
+        val range = PastureRange(4, 4, 4, 4)
+        Direction.Plane.HORIZONTAL.forEach { direction ->
+            val changed = range.adjusted(direction, 1)
+            assertEquals(5, changed[direction])
+            assertEquals(4, changed[direction.opposite])
+            assertTrue(changed.isValid(32))
+            assertFalse(range.adjusted(direction, -1).isValid(32))
+        }
+    }
+
+    @Test
+    fun `saved bounds round trip at negative world coordinates`() {
+        val origin = BlockPos(-100, 70, -200)
+        val range = PastureRange(2, 8, 6, 0)
+        assertEquals(range, PastureRange.fromBounds(origin, range.minPos(origin), range.maxPos(origin)))
+    }
+
+    @Test
+    fun `a zero length facing side still offers spawn blocks elsewhere in the minimum range`() {
+        val range = PastureRange(0, 8, 8, 0)
+        val candidates = range.nearbyBlocks(BlockPos.ZERO, BlockPos(0, 0, -4), 1.0).toList()
+        assertEquals(BlockPos.ZERO, candidates.first())
+        assertTrue(BlockPos(7, 0, 7) in candidates)
+        assertTrue(candidates.all { it.x in 0..7 && it.z in 0..7 })
+    }
+
+    @Test
+    fun `return search starts at the nearest block that fits the pokemon inside the edge`() {
+        val range = PastureRange(4, 4, 4, 4)
+        val candidates = range.nearbyBlocks(BlockPos.ZERO, BlockPos(99, 0, 1), 2.0).toList()
+        assertEquals(BlockPos(2, 0, 1), candidates.first())
+        assertTrue(candidates.all { it.x in -3..2 && it.z in -3..2 })
+    }
+
+    @Test
+    fun `a pokemon wider than the entire range has no safe center`() {
+        assertTrue(PastureRange(0, 8, 8, 0).nearbyBlocks(BlockPos.ZERO, BlockPos.ZERO, 9.0).none())
+    }
+
+    @Test
+    fun `pasture bounds constrain horizontal movement without a ceiling`() {
+        val tether = tether()
+        assertTrue(tether.canRoamTo(BlockPos(0, -10000, 0)))
+        assertTrue(tether.canRoamTo(BlockPos(0, 10000, 0)))
+        assertFalse(tether.canRoamTo(-4.01, 0.0))
+        assertFalse(tether.canRoamTo(4.0, 0.0))
+        tether.maxRoamPos = BlockPos(8, 4, 4)
+        assertTrue(tether.canRoamTo(7.5, 0.0))
+    }
+
+    @Test
+    fun `fainting starts one day of recovery without restarting it each check`() {
+        val tether = tether()
+        tether.beginRecovery(100L, fainted = true)
+        assertEquals(24100L, tether.respawnAt)
+        assertTrue(tether.healingAfterFaint)
+        tether.beginRecovery(140L, fainted = true)
+        assertEquals(24100L, tether.respawnAt)
+    }
+
+    @Test
+    fun `accidental disappearance has a shorter cooldown and fainting takes precedence`() {
+        val tether = tether()
+        tether.beginRecovery(100L, fainted = false)
+        assertEquals(300L, tether.respawnAt)
+        assertFalse(tether.healingAfterFaint)
+        tether.beginRecovery(140L, fainted = true)
+        assertEquals(24140L, tether.respawnAt)
+        tether.beginRecovery(180L, fainted = false)
+        assertEquals(24140L, tether.respawnAt)
+        assertTrue(tether.healingAfterFaint)
+    }
+
+    private fun tether() = Tethering(
+        BlockPos(-4, -4, -4), BlockPos(4, 4, 4), UUID.randomUUID(), "Owner",
+        UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), 1, BlockPos.ZERO
+    )
+}

gradle.properties

@@ -14,7 +14,7 @@ parchment_version = 2024.07.28@zip
 java_version = 21
 
 mod_id=cobblemon
-mod_version=1.8.4
+mod_version=1.8.5
 snapshot=true
 
 fabric.loom.multiProjectOptimisation=false