fix #76, 3+ coven, nether and depth sound

Author: mrsterner

src/main/java/dev/sterner/witchery/mixin/EntityAccessor.java

@@ -0,0 +1,15 @@
+package dev.sterner.witchery.mixin;
+
+import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Entity.class)
+public interface EntityAccessor {
+
+    @Accessor("eyeHeight")
+    float witchery$getEyeHeight();
+
+    @Accessor("eyeHeight")
+    void witchery$setEyeHeight(float value);
+}

src/main/kotlin/dev/sterner/witchery/client/layer/InsanityEndermanEyesLayer.kt

@@ -0,0 +1,45 @@
+package dev.sterner.witchery.client.layer
+
+import com.mojang.blaze3d.vertex.PoseStack
+import dev.sterner.witchery.content.entity.InsanityEntity
+import net.minecraft.client.model.EntityModel
+import net.minecraft.client.renderer.MultiBufferSource
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.client.renderer.entity.RenderLayerParent
+import net.minecraft.client.renderer.entity.layers.EyesLayer
+import net.minecraft.client.renderer.texture.OverlayTexture
+import net.minecraft.resources.ResourceLocation
+import net.neoforged.api.distmarker.Dist
+import net.neoforged.api.distmarker.OnlyIn
+
+@OnlyIn(Dist.CLIENT)
+class InsanityEndermanEyesLayer(p_116964_: RenderLayerParent<InsanityEntity, EntityModel<InsanityEntity>>) :
+    EyesLayer<InsanityEntity, EntityModel<InsanityEntity>>(p_116964_) {
+
+    override fun renderType(): RenderType {
+        return ENDERMAN_EYES
+    }
+
+    override fun render(
+        poseStack: PoseStack,
+        buffer: MultiBufferSource,
+        packedLight: Int,
+        livingEntity: InsanityEntity,
+        limbSwing: Float,
+        limbSwingAmount: Float,
+        partialTicks: Float,
+        ageInTicks: Float,
+        netHeadYaw: Float,
+        headPitch: Float
+    ) {
+        if (livingEntity.entityData.get(InsanityEntity.DATA_MIMIC) == "enderman") {
+            val vertexconsumer = buffer.getBuffer(this.renderType())
+            this.parentModel.renderToBuffer(poseStack, vertexconsumer, 15728640, OverlayTexture.NO_OVERLAY)
+        }
+    }
+
+    companion object {
+        private val ENDERMAN_EYES: RenderType =
+            RenderType.eyes(ResourceLocation.withDefaultNamespace("textures/entity/enderman/enderman_eyes.png"))
+    }
+}

src/main/kotlin/dev/sterner/witchery/client/renderer/entity/InsanityEntityRenderer.kt

@@ -2,6 +2,7 @@ package dev.sterner.witchery.client.renderer.entity
 
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
+import dev.sterner.witchery.client.layer.InsanityEndermanEyesLayer
 import dev.sterner.witchery.content.entity.InsanityEntity
 import net.minecraft.client.model.CreeperModel
 import net.minecraft.client.model.EntityModel
@@ -12,6 +13,8 @@ import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.renderer.entity.EntityRendererProvider
 import net.minecraft.client.renderer.entity.MobRenderer
+import net.minecraft.client.renderer.texture.OverlayTexture
+import net.minecraft.core.particles.ParticleTypes
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
 
@@ -28,6 +31,11 @@ class InsanityEntityRenderer(ctx: EntityRendererProvider.Context) :
     private val zombieTexture = ResourceLocation.withDefaultNamespace("textures/entity/zombie/zombie.png")
     private val skeletonTexture = ResourceLocation.withDefaultNamespace("textures/entity/skeleton/skeleton.png")
     private val endermanTexture = ResourceLocation.withDefaultNamespace("textures/entity/enderman/enderman.png")
+    private val endermanEyesTexture = ResourceLocation.withDefaultNamespace("textures/entity/enderman/enderman_eyes.png")
+
+    init {
+        addLayer(InsanityEndermanEyesLayer(this))
+    }
 
     private class DummyModel : EntityModel<InsanityEntity>() {
         override fun setupAnim(
@@ -99,6 +107,62 @@ class InsanityEntityRenderer(ctx: EntityRendererProvider.Context) :
                 leftArm.xRot = Mth.cos(limbSwing * 0.6662f) * 2.0f * limbSwingAmount * 0.5f
                 rightLeg.xRot = Mth.cos(limbSwing * 0.6662f) * 1.4f * limbSwingAmount
                 leftLeg.xRot = Mth.cos(limbSwing * 0.6662f + Math.PI.toFloat()) * 1.4f * limbSwingAmount
+
+
+                this.head.visible = true
+                this.body.xRot = 0.0F
+                this.body.y = -14.0F
+                this.body.z = -0.0F
+                this.rightLeg.xRot -= 0.0F
+                this.leftLeg.xRot -= 0.0F
+                this.rightArm.xRot *= 0.5F
+                this.leftArm.xRot *= 0.5F
+                this.rightLeg.xRot *= 0.5F
+                this.leftLeg.xRot *= 0.5F
+
+                if (this.rightArm.xRot > 0.4F) {
+                    this.rightArm.xRot = 0.4F
+                }
+
+                if (this.leftArm.xRot > 0.4F) {
+                    this.leftArm.xRot = 0.4F
+                }
+
+                if (this.rightArm.xRot < -0.4F) {
+                    this.rightArm.xRot = -0.4F
+                }
+
+                if (this.leftArm.xRot < -0.4F) {
+                    this.leftArm.xRot = -0.4F
+                }
+
+                if (this.rightLeg.xRot > 0.4F) {
+                    this.rightLeg.xRot = 0.4F
+                }
+
+                if (this.leftLeg.xRot > 0.4F) {
+                    this.leftLeg.xRot = 0.4F
+                }
+
+                if (this.rightLeg.xRot < -0.4F) {
+                    this.rightLeg.xRot = -0.4F
+                }
+
+                if (this.leftLeg.xRot < -0.4F) {
+                    this.leftLeg.xRot = -0.4F
+                }
+
+                this.rightLeg.z = 0.0F
+                this.leftLeg.z = 0.0F
+                this.rightLeg.y = -5.0F
+                this.leftLeg.y = -5.0F
+                this.head.z = -0.0F
+                this.head.y = -13.0F
+
+                this.head.y -= 5.0F
+
+                this.rightArm.setPos(-5.0F, -12.0F, 0.0F)
+                this.leftArm.setPos(5.0F, -12.0F, 0.0F)
             }
 
             override fun renderToBuffer(
@@ -137,6 +201,25 @@ class InsanityEntityRenderer(ctx: EntityRendererProvider.Context) :
         insanityModel.let { currentModel ->
             model = currentModel
             super.render(entity, entityYaw, partialTicks, poseStack, buffer, packedLight)
+
+            if (entity.entityData.get(InsanityEntity.DATA_MIMIC) == "enderman") {
+                val vertexConsumer = buffer.getBuffer(RenderType.eyes(endermanEyesTexture))
+                currentModel.renderToBuffer(poseStack, vertexConsumer, 15728640, OverlayTexture.NO_OVERLAY)
+
+                if (entity.isAggressive && entity.level().isClientSide) {
+                    if (entity.level().random.nextFloat() < 0.3f) {
+                        entity.level().addParticle(
+                            ParticleTypes.PORTAL,
+                            entity.x + (entity.level().random.nextDouble() - 0.5) * entity.bbWidth,
+                            entity.y + entity.level().random.nextDouble() * entity.bbHeight,
+                            entity.z + (entity.level().random.nextDouble() - 0.5) * entity.bbWidth,
+                            (entity.level().random.nextDouble() - 0.5) * 2.0,
+                            -entity.level().random.nextDouble(),
+                            (entity.level().random.nextDouble() - 0.5) * 2.0
+                        )
+                    }
+                }
+            }
         }
     }
 

src/main/kotlin/dev/sterner/witchery/content/entity/InsanityEntity.kt

@@ -1,6 +1,7 @@
 package dev.sterner.witchery.content.entity
 
 import dev.sterner.witchery.core.registry.WitcheryEntityTypes
+import dev.sterner.witchery.mixin.EntityAccessor
 import net.minecraft.core.particles.ParticleTypes
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.syncher.EntityDataAccessor
@@ -28,11 +29,12 @@ class InsanityEntity(level: Level) : PathfinderMob(WitcheryEntityTypes.INSANITY.
     private var oldSwell = 0
     private var swell = 0
     private var maxSwell = 30
+    private var hasPlayedAggroSound = false
 
     override fun registerGoals() {
         this.goalSelector.addGoal(1, MeleeAttackGoal(this, 1.0, false))
         this.goalSelector.addGoal(2, WaterAvoidingRandomStrollGoal(this, 1.0))
-        this.goalSelector.addGoal(3, LookAtPlayerGoal(this, Player::class.java, 8.0f))
+        this.goalSelector.addGoal(3, LookAtPlayerGoal(this, Player::class.java, 16.0f))
         this.goalSelector.addGoal(4, RandomLookAroundGoal(this))
         this.goalSelector.addGoal(2, SwellGoal(this))
 
@@ -43,6 +45,7 @@ class InsanityEntity(level: Level) : PathfinderMob(WitcheryEntityTypes.INSANITY.
         super.defineSynchedData(builder)
         builder.define(DATA_SWELL_DIR, -1)
         builder.define(DATA_MIMIC, "")
+        builder.define(DATA_IS_AGGRESSIVE, false)
     }
 
     fun getSwelling(partialTicks: Float): Float {
@@ -57,14 +60,19 @@ class InsanityEntity(level: Level) : PathfinderMob(WitcheryEntityTypes.INSANITY.
     ): SpawnGroupData? {
         val mimicType: InsanityMobType = InsanityMobType.entries[Random.nextInt(InsanityMobType.entries.size)]
         entityData.set(DATA_MIMIC, mimicType.name.lowercase())
+        if (mimicType.name.lowercase() == "enderman") {
+            val accessor: EntityAccessor = this as EntityAccessor
+            accessor.`witchery$setEyeHeight`(2.55f)
+
+        }
         return super.finalizeSpawn(level, difficulty, spawnType, spawnGroupData)
     }
 
     companion object {
         fun createAttributes(): AttributeSupplier.Builder {
             return createMobAttributes()
                 .add(Attributes.MAX_HEALTH, 1.0)
-                .add(Attributes.MOVEMENT_SPEED, 0.25)
+                .add(Attributes.MOVEMENT_SPEED, 0.32)
                 .add(Attributes.ATTACK_DAMAGE, 0.0)
         }
 
@@ -74,9 +82,28 @@ class InsanityEntity(level: Level) : PathfinderMob(WitcheryEntityTypes.INSANITY.
         val DATA_MIMIC: EntityDataAccessor<String> = SynchedEntityData.defineId(
             InsanityEntity::class.java, EntityDataSerializers.STRING
         )
+        val DATA_IS_AGGRESSIVE: EntityDataAccessor<Boolean> = SynchedEntityData.defineId(
+            InsanityEntity::class.java, EntityDataSerializers.BOOLEAN
+        )
     }
 
     override fun tick() {
+
+
+        if (entityData.get(DATA_MIMIC) == InsanityMobType.ENDERMAN.name.lowercase()) {
+            val hasTarget = target != null
+            if (hasTarget && !entityData.get(DATA_IS_AGGRESSIVE)) {
+                entityData.set(DATA_IS_AGGRESSIVE, true)
+                if (!hasPlayedAggroSound) {
+                    playSound(SoundEvents.ENDERMAN_SCREAM, 0.7f, 1.0f)
+                    hasPlayedAggroSound = true
+                }
+            } else if (!hasTarget && entityData.get(DATA_IS_AGGRESSIVE)) {
+                entityData.set(DATA_IS_AGGRESSIVE, false)
+                hasPlayedAggroSound = false
+            }
+        }
+
         if (entityData.get(DATA_MIMIC) == InsanityMobType.CREEPER.name.lowercase()) {
             if (this.isAlive) {
                 this.oldSwell = this.swell
@@ -103,34 +130,33 @@ class InsanityEntity(level: Level) : PathfinderMob(WitcheryEntityTypes.INSANITY.
         if (Random.nextInt(200) == 0) {
             playMobSound()
         }
+        this.target?.let {
+            if (this.distanceToSqr(this.target!!) < 2f) {
+                hurt(level().damageSources().generic(), 1f)
+            }
+        }
 
         super.tick()
     }
 
     private fun playMobSound() {
         if (entityData.get(DATA_MIMIC) == "zombie") {
-            this.playSound(SoundEvents.ZOMBIE_AMBIENT, 1.0f, 1.0f)
+            this.makeSound(SoundEvents.ZOMBIE_AMBIENT)
         }
         if (entityData.get(DATA_MIMIC) == "skeleton") {
-            this.playSound(SoundEvents.SKELETON_AMBIENT, 1.0f, 1.0f)
+            this.makeSound(SoundEvents.SKELETON_AMBIENT)
         }
         if (entityData.get(DATA_MIMIC) == "enderman") {
-            this.playSound(SoundEvents.ENDERMAN_AMBIENT, 1.0f, 1.0f)
+            this.makeSound(SoundEvents.ENDERMAN_AMBIENT)
         }
     }
 
     private fun playerDeathSound() {
-        if (entityData.get(DATA_MIMIC) == "zombie") {
-            this.playSound(SoundEvents.ZOMBIE_HURT, 1.0f, 1.0f)
-        }
-        if (entityData.get(DATA_MIMIC) == "skeleton") {
-            this.playSound(SoundEvents.SKELETON_HURT, 1.0f, 1.0f)
-        }
-        if (entityData.get(DATA_MIMIC) == "enderman") {
-            this.playSound(SoundEvents.ENDERMAN_HURT, 1.0f, 1.0f)
-        }
-        if (entityData.get(DATA_MIMIC) == "creeper") {
-            this.playSound(SoundEvents.CREEPER_HURT, 1.0f, 1.0f)
+        when (entityData.get(DATA_MIMIC)) {
+            "zombie" -> makeSound(SoundEvents.ZOMBIE_DEATH)
+            "skeleton" -> makeSound(SoundEvents.SKELETON_DEATH)
+            "enderman" -> makeSound(SoundEvents.ENDERMAN_DEATH)
+            "creeper" -> makeSound(SoundEvents.CREEPER_DEATH)
         }
     }
 
@@ -142,6 +168,7 @@ class InsanityEntity(level: Level) : PathfinderMob(WitcheryEntityTypes.INSANITY.
         super.addAdditionalSaveData(compound)
         compound.putShort("Fuse", maxSwell.toShort())
         compound.putString("Mimic", entityData.get(DATA_MIMIC))
+        compound.putBoolean("IsAggressive", entityData.get(DATA_IS_AGGRESSIVE))
     }
 
     override fun readAdditionalSaveData(compound: CompoundTag) {
@@ -152,32 +179,35 @@ class InsanityEntity(level: Level) : PathfinderMob(WitcheryEntityTypes.INSANITY.
         if (compound.contains("Mimic", 99)) {
             entityData.set(DATA_MIMIC, compound.getString("Mimic"))
         }
+        if (compound.contains("IsAggressive")) {
+            entityData.set(DATA_IS_AGGRESSIVE, compound.getBoolean("IsAggressive"))
+        }
     }
 
     override fun hurt(source: DamageSource, amount: Float): Boolean {
-        if (source.entity is Player) {
-            (0 until 20).forEach { i ->
-                this.level().addParticle(
-                    ParticleTypes.POOF,
-                    this.x + (Random.nextDouble() - 0.5) * this.bbWidth,
-                    this.y + Random.nextDouble() * this.bbHeight,
-                    this.z + (Random.nextDouble() - 0.5) * this.bbWidth,
-                    0.0, 0.0, 0.0
-                )
-                playerDeathSound()
-            }
-
-            this.remove(RemovalReason.KILLED)
-            return true
+        (0 until 20).forEach { i ->
+            this.level().addParticle(
+                ParticleTypes.POOF,
+                this.x + (Random.nextDouble() - 0.5) * this.bbWidth,
+                this.y + Random.nextDouble() * this.bbHeight,
+                this.z + (Random.nextDouble() - 0.5) * this.bbWidth,
+                0.0, 0.0, 0.0
+            )
         }
+        playerDeathSound()
 
-        return false
+        this.remove(RemovalReason.KILLED)
+        return true
     }
 
     override fun isInvulnerableTo(source: DamageSource): Boolean {
         return source.entity !is Player || super.isInvulnerableTo(source)
     }
 
+    override fun isAggressive(): Boolean {
+        return entityData.get(DATA_IS_AGGRESSIVE)
+    }
+
     enum class InsanityMobType {
         CREEPER,
         ZOMBIE,

src/main/kotlin/dev/sterner/witchery/core/registry/WitcheryEntityTypes.kt

@@ -50,7 +50,7 @@ object WitcheryEntityTypes {
             { _: EntityType<InsanityEntity>, level: Level ->
                 InsanityEntity(level)
             }, MobCategory.MONSTER
-        ).sized(0.6f, 1.8f).build(Witchery.id("insanity").toString())
+        ).sized(0.75f, 2.0f).build(Witchery.id("insanity").toString())
     })
 
     val AREA_EFFECT_CLOUD =