Started implementing the new variant system to crustaceans

hybridlabs · Jul 15, 2024 · eb1a638 · eb1a638
1 parent b7ca172
commit eb1a638
Show file tree

Hide file tree

Showing 23 changed files with 198 additions and 80 deletions.
diff --git a/...nt/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/FiddlerCrabEntityModel.kt b/...nt/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/FiddlerCrabEntityModel.kt
@@ -1,15 +1,5 @@
 package dev.hybridlabs.aquatic.client.model.entity.crustacean
 
 import dev.hybridlabs.aquatic.entity.crustacean.HybridAquaticCrustaceanEntity
-import net.minecraft.util.Identifier
 
-class FiddlerCrabEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("fiddler_crab") {
-    override fun getTextureResource(animatable: HybridAquaticCrustaceanEntity?): Identifier {
-        if (animatable != null) return getVariantTexture(allVariants[animatable.variant])
-        return super.getTextureResource(animatable)
-    }
-
-    companion object {
-        val allVariants: Array<String> = arrayOf("blue", "red", "purple", "palestine")
-    }
-}
+class FiddlerCrabEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("fiddler_crab")
diff --git a/...ient/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/GhostCrabEntityModel.kt b/...ient/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/GhostCrabEntityModel.kt
@@ -1,15 +1,5 @@
 package dev.hybridlabs.aquatic.client.model.entity.crustacean
 
 import dev.hybridlabs.aquatic.entity.crustacean.HybridAquaticCrustaceanEntity
-import net.minecraft.util.Identifier
 
-class GhostCrabEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("ghost_crab") {
-    override fun getTextureResource(animatable: HybridAquaticCrustaceanEntity?): Identifier {
-        if (animatable != null) return getVariantTexture(allVariants[animatable.variant])
-        return super.getTextureResource(animatable)
-    }
-
-    companion object {
-        val allVariants: Array<String> = arrayOf("white", "yellow", "red", "brown", "palestine")
-    }
-}
+class GhostCrabEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("ghost_crab")
diff --git a/...v/hybridlabs/aquatic/client/model/entity/crustacean/HybridAquaticCrustaceanEntityModel.kt b/...v/hybridlabs/aquatic/client/model/entity/crustacean/HybridAquaticCrustaceanEntityModel.kt
@@ -7,18 +7,23 @@ import software.bernie.geckolib.model.GeoModel
 
 abstract class HybridAquaticCrustaceanEntityModel<T: HybridAquaticCrustaceanEntity> (private val id: String) : GeoModel<T>() {
     override fun getModelResource(animatable: T?): Identifier {
+        val variant = animatable?.variant
+        if (variant != null && !variant.ignore.contains(HybridAquaticCrustaceanEntity.CrustaceanVariant.Ignore.MODEL))
+            return Identifier(HybridAquatic.MOD_ID, "geo/${id}_${variant.getProvidedVariant(animatable)}.geo.json")
         return Identifier(HybridAquatic.MOD_ID, "geo/$id.geo.json")
     }
 
     override fun getTextureResource(animatable: T?): Identifier {
-        return Identifier(HybridAquatic.MOD_ID, "textures/entity/crustacean/$id/$id.png")
-    }
-
-    fun getVariantTexture(variant: String): Identifier {
-        return Identifier(HybridAquatic.MOD_ID, "textures/entity/crustacean/$id/${id}_$variant.png")
+        val variant = animatable?.variant
+        if (variant != null && !variant.ignore.contains(HybridAquaticCrustaceanEntity.CrustaceanVariant.Ignore.TEXTURE))
+            return Identifier(HybridAquatic.MOD_ID, "textures/entity/crustacean/${id}/${id}_${variant.getProvidedVariant(animatable)}.png")
+        return Identifier(HybridAquatic.MOD_ID, "textures/entity/crustacean/${id}/$id.png")
     }
 
     override fun getAnimationResource(animatable: T?): Identifier {
+        val variant = animatable?.variant
+        if (variant != null && !variant.ignore.contains(HybridAquaticCrustaceanEntity.CrustaceanVariant.Ignore.ANIMATION))
+            return Identifier(HybridAquatic.MOD_ID, "animations/${id}_${variant.getProvidedVariant(animatable)}.animation.json")
         return Identifier(HybridAquatic.MOD_ID, "animations/$id.animation.json")
     }
 }
diff --git a/...client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/LobsterEntityModel.kt b/...client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/LobsterEntityModel.kt
@@ -1,15 +1,5 @@
 package dev.hybridlabs.aquatic.client.model.entity.crustacean
 
 import dev.hybridlabs.aquatic.entity.crustacean.HybridAquaticCrustaceanEntity
-import net.minecraft.util.Identifier
 
-class LobsterEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("lobster") {
-    override fun getTextureResource(animatable: HybridAquaticCrustaceanEntity?): Identifier {
-        if (animatable != null) return getVariantTexture(allVariants[animatable.variant])
-        return super.getTextureResource(animatable)
-    }
-
-    companion object {
-        val allVariants: Array<String> = arrayOf("ornate_spiny", "california_spiny", "american")
-    }
-}
+class LobsterEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("lobster")
diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/ShrimpEntityModel.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/model/entity/crustacean/ShrimpEntityModel.kt
@@ -1,15 +1,5 @@
 package dev.hybridlabs.aquatic.client.model.entity.crustacean
 
 import dev.hybridlabs.aquatic.entity.crustacean.HybridAquaticCrustaceanEntity
-import net.minecraft.util.Identifier
 
-class ShrimpEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("shrimp") {
-    override fun getTextureResource(animatable: HybridAquaticCrustaceanEntity?): Identifier {
-        if (animatable != null) return getVariantTexture(allVariants[animatable.variant])
-        return super.getTextureResource(animatable)
-    }
-
-    companion object {
-        val allVariants: Array<String> = arrayOf("blue", "blue_white", "black", "black_white", "red", "red_white", "green", "green_white", "brown", "brown_white", "lime", "lime_white", "yellow", "yellow_white", "pink", "pink_white", "white", "orange", "orange_white", "palestine")
-    }
-}
+class ShrimpEntityModel : HybridAquaticCrustaceanEntityModel<HybridAquaticCrustaceanEntity>("shrimp")
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt
@@ -12,9 +12,7 @@ import software.bernie.geckolib.core.`object`.PlayState
 
 class NudibranchEntity(entityType: EntityType<out NudibranchEntity>, world: World) :
     HybridAquaticCritterEntity(entityType, world, variants = hashMapOf(
-        "pyjama" to CritterVariant.biomeVariant(
-            "pyjama",
-            HybridAquaticBiomeTags.NUDIBRANCH_SPAWN_BIOMES,
+        "pyjama" to CritterVariant.biomeVariant("pyjama", HybridAquaticBiomeTags.NUDIBRANCH_SPAWN_BIOMES,
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),
         "bullock" to CritterVariant.biomeVariant("bullock", HybridAquaticBiomeTags.NUDIBRANCH_SPAWN_BIOMES,
             ignore = listOf(CritterVariant.Ignore.MODEL, CritterVariant.Ignore.ANIMATION)),

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/CoconutCrabEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/CoconutCrabEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class CoconutCrabEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 1, false, true) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/CrayfishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/CrayfishEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class CrayfishEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 1, false, false) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/DungenessCrabEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/DungenessCrabEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class DungenessCrabEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 1, false, true) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/FiddlerCrabEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/FiddlerCrabEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class FiddlerCrabEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 3, false, true) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/FlowerCrabEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/FlowerCrabEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class FlowerCrabEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 1, false, true) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/GhostCrabEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/GhostCrabEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class GhostCrabEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 4, false, true) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/GiantIsopodEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/GiantIsopodEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class GiantIsopodEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 1, false, false) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/HermitCrabEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/HermitCrabEntity.kt
@@ -11,7 +11,7 @@ import software.bernie.geckolib.core.animation.AnimationState
 import software.bernie.geckolib.core.`object`.PlayState
 
 class HermitCrabEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 1, true, false) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), true, false) {
 
     private var isHiding: Boolean = false
     private var hidingTimer: Int = 0

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/HorseshoeCrabEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/crustacean/HorseshoeCrabEntity.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class HorseshoeCrabEntity(entityType: EntityType<out HybridAquaticCrustaceanEntity>, world: World) :
-    HybridAquaticCrustaceanEntity(entityType, world, 1, false, false) {
+    HybridAquaticCrustaceanEntity(entityType, world, emptyMap(), false, false) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()