Not all cephalopods squirt ink now

hybridlabs · Apr 12, 2024 · fbb8ae3 · fbb8ae3
1 parent 91b4261
commit fbb8ae3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 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
@@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class CuttlefishEntity(entityType: EntityType<out CuttlefishEntity>, 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
@@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class FireflySquidEntity(entityType: EntityType<out FireflySquidEntity>, 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
@@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class GlowingSuckerOctopusEntity(entityType: EntityType<out GlowingSuckerOctopusEntity>, 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
@@ -48,6 +48,7 @@ open class HybridAquaticCephalopodEntity(
     private val variantCount: Int = 1,
     open val prey: TagKey<EntityType<*>>,
     open val predator: TagKey<EntityType<*>>,
+    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
@@ -10,7 +10,7 @@ import net.minecraft.sound.SoundEvents
 import net.minecraft.world.World
 
 class NautilusEntity(entityType: EntityType<out NautilusEntity>, 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
@@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class UmbrellaOctopusEntity(entityType: EntityType<out UmbrellaOctopusEntity>, 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
@@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class VampireSquidEntity(entityType: EntityType<out VampireSquidEntity>, 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()