Configurable dance distance

common/src/main/java/com/cobblemon/mod/common/mixin/MinecraftDedicatedServerMixin.java

@@ -1,30 +0,0 @@
-/*
- * 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.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.server.ServerInterface;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(ServerLevel.class)
-public abstract class MinecraftDedicatedServerMixin implements ServerInterface {
-
-    @Inject(method = "shouldDiscardEntity", at = @At(value = "HEAD"), cancellable = true)
-    public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
-        if (entity instanceof PokemonEntity) {
-            callback.setReturnValue(false);
-        }
-    }
-
-}

common/src/main/java/com/cobblemon/mod/common/mixin/ServerLevelMixin.java

@@ -0,0 +1,53 @@
+/*
+ * 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.mixin;
+
+import com.cobblemon.mod.common.Cobblemon;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.entity.pokemon.PokemonServerDelegate;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.block.LevelEvent;
+import net.minecraft.world.phys.AABB;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ServerLevel.class)
+public abstract class ServerLevelMixin {
+
+    @Inject(method = "shouldDiscardEntity", at = @At(value = "HEAD"), cancellable = true)
+    public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
+        if (entity instanceof PokemonEntity) {
+            callback.setReturnValue(false);
+        }
+    }
+
+    @Inject(method = "levelEvent(Lnet/minecraft/world/entity/player/Player;ILnet/minecraft/core/BlockPos;I)V", at = @At(value = "HEAD"))
+    public void cobblemon$setPokemonDancing(Player player, int type, BlockPos pos, int data, CallbackInfo ci) {
+        if (type == LevelEvent.SOUND_PLAY_JUKEBOX_SONG || type == LevelEvent.SOUND_STOP_JUKEBOX_SONG) {
+            cobblemon$notifyNearbyEntities((ServerLevel) ((Object) this), pos, type == LevelEvent.SOUND_PLAY_JUKEBOX_SONG);
+        }
+    }
+
+    @Unique
+    private void cobblemon$notifyNearbyEntities(ServerLevel level, BlockPos pos, boolean playing) {
+        for (PokemonEntity pokemonEntity : level.getEntitiesOfClass(PokemonEntity.class, new AABB(pos).inflate(Cobblemon.config.getPokemonDanceDistance()))) {
+            PokemonServerDelegate delegate = (PokemonServerDelegate) pokemonEntity.getDelegate();
+            delegate.setDancing(playing);
+            delegate.setJukeboxPos(pos);
+            pokemonEntity.setRecordPlayingNearby(pos, playing);
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -17,7 +17,11 @@ import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.*
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonActivities
+import com.cobblemon.mod.common.CobblemonBlockEntities
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
@@ -27,7 +31,13 @@ import com.cobblemon.mod.common.api.mark.Marks
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.animations.NPCProvider
-import com.cobblemon.mod.common.api.pokedex.*
+import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
+import com.cobblemon.mod.common.api.pokedex.CaughtCount
+import com.cobblemon.mod.common.api.pokedex.CaughtPercent
+import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
+import com.cobblemon.mod.common.api.pokedex.PokedexManager
+import com.cobblemon.mod.common.api.pokedex.SeenCount
+import com.cobblemon.mod.common.api.pokedex.SeenPercent
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
@@ -60,7 +70,35 @@ import com.cobblemon.mod.common.pokemon.Species
 import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
-import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.asArrayValue
+import com.cobblemon.mod.common.util.asBlockPos
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.asResource
+import com.cobblemon.mod.common.util.asUUID
+import com.cobblemon.mod.common.util.blockRegistry
+import com.cobblemon.mod.common.util.cloneFrom
+import com.cobblemon.mod.common.util.effectiveName
+import com.cobblemon.mod.common.util.getBattleState
+import com.cobblemon.mod.common.util.getBlockStatesWithPos
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getIntOrNull
+import com.cobblemon.mod.common.util.getIsSubmerged
+import com.cobblemon.mod.common.util.getOrNull
+import com.cobblemon.mod.common.util.getPlayer
+import com.cobblemon.mod.common.util.getStringOrNull
+import com.cobblemon.mod.common.util.isInBattle
+import com.cobblemon.mod.common.util.isInt
+import com.cobblemon.mod.common.util.isStandingOn
+import com.cobblemon.mod.common.util.party
+import com.cobblemon.mod.common.util.pc
+import com.cobblemon.mod.common.util.pokedex
+import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.toProperties
+import com.cobblemon.mod.common.util.withNPCValue
+import com.cobblemon.mod.common.util.worldRegistry
 import com.mojang.datafixers.util.Either
 import net.minecraft.commands.arguments.EntityAnchorArgument
 import net.minecraft.core.BlockPos
@@ -69,7 +107,11 @@ import net.minecraft.core.Registry
 import net.minecraft.core.RegistryAccess
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.nbt.*
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.DoubleTag
+import net.minecraft.nbt.ListTag
+import net.minecraft.nbt.StringTag
+import net.minecraft.nbt.Tag
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.MinecraftServer
@@ -78,7 +120,11 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.tags.TagKey
 import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.damagesource.DamageTypes
-import net.minecraft.world.entity.*
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.EntityType
+import net.minecraft.world.entity.LightningBolt
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.ai.memory.MemoryStatus
@@ -93,7 +139,45 @@ import net.minecraft.world.level.dimension.DimensionType
 import net.minecraft.world.level.levelgen.Heightmap
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
-import java.util.*
+import java.util.UUID
+import kotlin.collections.HashMap
+import kotlin.collections.Map
+import kotlin.collections.MutableList
+import kotlin.collections.MutableSet
+import kotlin.collections.any
+import kotlin.collections.associate
+import kotlin.collections.component1
+import kotlin.collections.component2
+import kotlin.collections.contains
+import kotlin.collections.count
+import kotlin.collections.emptyList
+import kotlin.collections.filter
+import kotlin.collections.filterIsInstance
+import kotlin.collections.find
+import kotlin.collections.flatMap
+import kotlin.collections.forEach
+import kotlin.collections.forEachIndexed
+import kotlin.collections.getOrPut
+import kotlin.collections.hashMapOf
+import kotlin.collections.isNotEmpty
+import kotlin.collections.iterator
+import kotlin.collections.listOf
+import kotlin.collections.map
+import kotlin.collections.mapIndexed
+import kotlin.collections.mapNotNull
+import kotlin.collections.mapOf
+import kotlin.collections.maxOfOrNull
+import kotlin.collections.minByOrNull
+import kotlin.collections.minOfOrNull
+import kotlin.collections.mutableListOf
+import kotlin.collections.mutableSetOf
+import kotlin.collections.none
+import kotlin.collections.random
+import kotlin.collections.set
+import kotlin.collections.setOf
+import kotlin.collections.toList
+import kotlin.collections.toMap
+import kotlin.collections.toTypedArray
 import kotlin.math.sqrt
 import kotlin.random.Random
 

common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt

@@ -34,7 +34,11 @@ import com.cobblemon.mod.common.client.render.pokemon.PokemonRenderer.Companion.
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.MovingSoundInstance
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.resolve
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.Minecraft
 import net.minecraft.network.syncher.EntityDataAccessor

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt

@@ -8,11 +8,11 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
 
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
 import net.minecraft.client.model.geom.ModelPart
@@ -38,6 +38,7 @@ class LudicoloModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     lateinit var floating: Pose
     lateinit var swim: Pose
     lateinit var sleep: Pose
+    lateinit var dance: Pose
 
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("ludicolo", "blink") }
@@ -87,6 +88,17 @@ class LudicoloModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
             )
         )
 
+        dance = registerPose(
+            poseName = "dance",
+            poseType = PoseType.DANCE,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("ludicolo", "dance"),
+            )
+        )
+
     }
     override fun getFaintAnimation(state: PosableState) = if (state.isNotPosedIn(sleep)) bedrockStateful("ludicolo", "faint") else null
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt

@@ -38,6 +38,7 @@ class AmbipomModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B
     lateinit var walking: Pose
     lateinit var sleep: Pose
     lateinit var battleidle: Pose
+    lateinit var dancing: Pose
 
     override val cryAnimation = CryProvider { bedrockStateful("ambipom", "cry") }
 
@@ -50,8 +51,7 @@ class AmbipomModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B
 
         standing = registerPose(
             poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            condition = { !it.isBattling },
+            poseTypes = PoseType.UI_POSES + PoseType.STAND,
             quirks = arrayOf(blink),
             animations = arrayOf(
                 singleBoneLook(),
@@ -80,10 +80,20 @@ class AmbipomModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B
                 bedrock("ambipom", "ground_idle")
             )
         )
+
+        dancing = registerPose(
+            poseName = "dancing",
+            poseType = PoseType.DANCE,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("ambipom", "dance")
+            )
+        )
     }
 
 //    override fun getFaintAnimation(
 //        pokemonEntity: PokemonEntity,
 //        state: PosableState<PokemonEntity>
 //    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("ambipom", "faint") else null
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt

@@ -280,6 +280,9 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Debug, lang = "enable_debug_keys")
     var enableDebugKeys = false
 
+    @CobblemonConfigField(Category.Pokemon, lang="pokemon_dance_distance")
+    var pokemonDanceDistance = 3.0
+
     fun clone(): CobblemonConfig {
         val newConfig = CobblemonConfig()
         CobblemonConfig::class.memberProperties.forEach { property ->

common/src/main/kotlin/com/cobblemon/mod/common/entity/PoseType.kt

@@ -9,8 +9,9 @@
 package com.cobblemon.mod.common.entity
 
 import com.cobblemon.mod.common.util.cobblemonResource
-import java.util.*
 import net.minecraft.resources.ResourceLocation
+import java.util.EnumSet
+import java.util.Locale
 
 /**
  * The type of a pose. Used for normalizing pose swapping for all models.
@@ -27,6 +28,7 @@ enum class PoseType {
     FLOAT,
     SWIM,
     GLIDE,
+    DANCE,
     /** A pose for rendering on the left shoulder. Pose animations are given the player head yaw, pitch, and ageInTicks. */
     SHOULDER_LEFT,
     /** A pose for rendering on the right shoulder. Pose animations are given the player head yaw, pitch, and ageInTicks. */

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

@@ -50,7 +50,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
 import com.cobblemon.mod.common.api.riding.events.SelectDriverEvent
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.riding.util.RidingAnimationData
-import com.cobblemon.mod.common.api.riding.util.Vec3Spring
 import com.cobblemon.mod.common.api.scheduling.Schedulable
 import com.cobblemon.mod.common.api.scheduling.SchedulingTracker
 import com.cobblemon.mod.common.api.scheduling.afterOnServer

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

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.entity.pokemon
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.entity.PokemonSender
@@ -29,8 +30,10 @@ import com.cobblemon.mod.common.util.asUUID
 import com.cobblemon.mod.common.util.getIsSubmerged
 import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.util.playSoundServer
+import com.cobblemon.mod.common.util.toVec3d
 import com.cobblemon.mod.common.util.update
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
+import net.minecraft.core.BlockPos
 import net.minecraft.network.chat.Component
 import net.minecraft.network.syncher.EntityDataAccessor
 import net.minecraft.server.level.ServerLevel
@@ -39,16 +42,20 @@ import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.ai.attributes.Attributes
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.level.block.entity.JukeboxBlockEntity
 import net.minecraft.world.level.pathfinder.PathType
 import org.joml.Matrix3f
 import org.joml.Vector3f
-import java.util.*
+import java.util.Optional
 
 /** Handles purely server logic for a Pokémon */
 class PokemonServerDelegate : PokemonSideDelegate {
     lateinit var entity: PokemonEntity
     var acknowledgedHPStat = -1
 
+    var dancing: Boolean = false
+    var jukeboxPos: BlockPos? = null
+
     /** Mocked properties exposed to the client [PokemonEntity]. */
     private val mock: PokemonProperties?
         get() = entity.effects.mockEffect?.mock
@@ -265,6 +272,15 @@ class PokemonServerDelegate : PokemonSideDelegate {
         val isPassenger = entity.isPassenger
         val isUnderwater = entity.getIsSubmerged()
         val isFlying = entity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)
+        var isDancing = false
+
+        if (jukeboxPos != null) {
+            val level = entity.level()
+            val jukeboxBlockEntity =  if (level.isLoaded(jukeboxPos!!)) level.getBlockEntity(jukeboxPos) as? JukeboxBlockEntity
+                                      else null
+            val distanceToJukebox = jukeboxPos?.toVec3d()?.distanceTo(entity.position())
+            isDancing = jukeboxBlockEntity?.songPlayer?.isPlaying == true && (distanceToJukebox ?: 100.0) < Cobblemon.config.pokemonDanceDistance
+        }
 
         val poseType = when {
             isPassenger -> PoseType.STAND
@@ -274,6 +290,7 @@ class PokemonServerDelegate : PokemonSideDelegate {
             isMoving && isFlying -> PoseType.FLY
             isFlying -> PoseType.HOVER
             isMoving -> PoseType.WALK
+            isDancing -> PoseType.DANCE
             else -> PoseType.STAND
         }
 

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0395_empoleon/empoleon.json

@@ -33,6 +33,7 @@
       "poseName": "standing",
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
       "isBattle": false,
+      "condition": "!q.is_dancing",
       "animations": [
         "q.look('head')",
         "q.bedrock('empoleon', 'ground_idle_old')"
@@ -120,6 +121,13 @@
           "rotation": [0, 12.5, -52.5]
         }
       ]
+    },
+    "dancing": {
+      "poseName": "dancing",
+      "isBattle": false,
+      "poseTypes": ["DANCE"],
+      "animations": ["q.bedrock('empoleon', 'dance')"],
+      "quirks": ["q.bedrock_quirk('empoleon', 'blink')"]
     }
   }
 }

common/src/main/resources/mixins.cobblemon-common.json

@@ -40,7 +40,7 @@
     "LecternBlockMixin",
     "LivingEntityMixin",
     "LocalPlayerMixin",
-    "MinecraftDedicatedServerMixin",
+    "ServerLevelMixin",
     "NbtUtilsMixin",
     "PiglinBarterMixin",
     "PiglinEntityMixin",