From fbb8ae3fd427405458f8a8160d53b8d02406e727 Mon Sep 17 00:00:00 2001 From: MysticKoko <132279944+MysticKoko@users.noreply.github.com> Date: Fri, 12 Apr 2024 06:45:17 +0200 Subject: [PATCH] Not all cephalopods squirt ink now --- .../hybridlabs/aquatic/entity/cephalopod/CuttlefishEntity.kt | 2 +- .../hybridlabs/aquatic/entity/cephalopod/FireflySquidEntity.kt | 2 +- .../aquatic/entity/cephalopod/GlowingSuckerOctopusEntity.kt | 2 +- .../aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt | 2 ++ .../dev/hybridlabs/aquatic/entity/cephalopod/NautilusEntity.kt | 2 +- .../aquatic/entity/cephalopod/UmbrellaOctopusEntity.kt | 2 +- .../hybridlabs/aquatic/entity/cephalopod/VampireSquidEntity.kt | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/CuttlefishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/CuttlefishEntity.kt index d4d13fa66..450c2d56e 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/CuttlefishEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/CuttlefishEntity.kt @@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity import net.minecraft.world.World class CuttlefishEntity(entityType: EntityType, world: World) : - HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.CUTTLEFISH_PREY, HybridAquaticEntityTags.CUTTLEFISH_PREDATOR) { + HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.CUTTLEFISH_PREY, HybridAquaticEntityTags.CUTTLEFISH_PREDATOR, true) { companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/FireflySquidEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/FireflySquidEntity.kt index 0f3146211..6a1e329b9 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/FireflySquidEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/FireflySquidEntity.kt @@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity import net.minecraft.world.World class FireflySquidEntity(entityType: EntityType, world: World) : - HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.FIREFLY_SQUID_PREY, HybridAquaticEntityTags.FIREFLY_SQUID_PREDATOR) { + HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.FIREFLY_SQUID_PREY, HybridAquaticEntityTags.FIREFLY_SQUID_PREDATOR, true) { companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/GlowingSuckerOctopusEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/GlowingSuckerOctopusEntity.kt index fd3bc2347..2e047fcf9 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/GlowingSuckerOctopusEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/GlowingSuckerOctopusEntity.kt @@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity import net.minecraft.world.World class GlowingSuckerOctopusEntity(entityType: EntityType, world: World) : - HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.OCTOPUS_PREY, HybridAquaticEntityTags.OCTOPUS_PREDATOR) { + HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.OCTOPUS_PREY, HybridAquaticEntityTags.OCTOPUS_PREDATOR, false) { companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { return WaterCreatureEntity.createMobAttributes() diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt index 7b309af12..72b945eed 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/HybridAquaticCephalopodEntity.kt @@ -48,6 +48,7 @@ open class HybridAquaticCephalopodEntity( private val variantCount: Int = 1, open val prey: TagKey>, open val predator: TagKey>, + open val hasInk: Boolean ) : WaterCreatureEntity(type, world), GeoEntity { private val factory = GeckoLibUtil.createInstanceCache(this) private var tiltAngle: Float = 0f @@ -268,6 +269,7 @@ open class HybridAquaticCephalopodEntity( } private fun squirt() { + if (hasInk) this.playSound(this.getSquirtSound(), this.soundVolume, this.soundPitch) val vec3d = applyBodyRotations(Vec3d(0.0, -1.0, 0.0)).add(this.x, this.y, this.z) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/NautilusEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/NautilusEntity.kt index 23dbc858c..a63685107 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/NautilusEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/NautilusEntity.kt @@ -10,7 +10,7 @@ import net.minecraft.sound.SoundEvents import net.minecraft.world.World class NautilusEntity(entityType: EntityType, world: World) : - HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.NAUTILUS_PREDATOR) { + HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.NAUTILUS_PREDATOR, false) { companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { return WaterCreatureEntity.createMobAttributes() diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/UmbrellaOctopusEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/UmbrellaOctopusEntity.kt index 26489caab..8f6bd9077 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/UmbrellaOctopusEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/UmbrellaOctopusEntity.kt @@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity import net.minecraft.world.World class UmbrellaOctopusEntity(entityType: EntityType, world: World) : - HybridAquaticCephalopodEntity(entityType, world, 6, HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.OCTOPUS_PREDATOR) { + HybridAquaticCephalopodEntity(entityType, world, 6, HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.OCTOPUS_PREDATOR, false) { companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { return WaterCreatureEntity.createMobAttributes() diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/VampireSquidEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/VampireSquidEntity.kt index c2a81d63a..d7a0cb76b 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/VampireSquidEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/VampireSquidEntity.kt @@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity import net.minecraft.world.World class VampireSquidEntity(entityType: EntityType, world: World) : - HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.FIREFLY_SQUID_PREDATOR) { + HybridAquaticCephalopodEntity(entityType, world, 1, HybridAquaticEntityTags.NONE, HybridAquaticEntityTags.FIREFLY_SQUID_PREDATOR, false) { companion object { fun createMobAttributes(): DefaultAttributeContainer.Builder { return WaterCreatureEntity.createMobAttributes()