use singleton wrapper to allow comparing and identifying renderType of dogModel

DashieDev · DashieDev · commit 144dc1b7c898 · 2026-02-19T01:40:13.000+07:00
diff --git a/src/main/java/doggytalents/client/entity/model/dog/DogModel.java b/src/main/java/doggytalents/client/entity/model/dog/DogModel.java
@@ -24,6 +24,7 @@
 import doggytalents.client.entity.model.animation.DogKeyframeAnimations;
 import doggytalents.client.entity.model.animation.DTNAnimationLoader.DogAnimationHolder;
 import doggytalents.client.entity.model.animation.DogKeyframeAnimations.AnimationContext;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import doggytalents.common.util.Util;
 import net.minecraft.client.animation.AnimationDefinition;
@@ -42,6 +43,8 @@
 
 public class DogModel extends EntityModel<Dog> {
 
+    public final DogModelRenderType dogModelRendserType;
+    
     public static final float[] MANE_LYING_OFF = {0f, 6f, 1f};
     public static final float[] MANE_SITTING_OFF = {0f, 2f, 0f};
     public static final float[] TAIL_LYING_OFF = {0, 6f, 0};
@@ -73,11 +76,13 @@ public class DogModel extends EntityModel<Dog> {
     private final DogAnimationHolder WALK_GALLOP = DTNAnimationLoader.INSTANCE.getAnim("gallop");
 
     public DogModel(ModelPart box) {
-        initDogModel(box);
+        this(box, DogModelRenderType.CUTOUT);
     }
 
-    public DogModel(ModelPart box, Function<ResourceLocation, RenderType> renderType) {
-        super(renderType);
+    public DogModel(ModelPart box, DogModelRenderType renderType) {
+        super(renderType.renderType());
+        this.dogModelRendserType = renderType;
+
         initDogModel(box);
     }
 
diff --git a/src/main/java/doggytalents/client/entity/model/dog/GlowingEyeDogModel.java b/src/main/java/doggytalents/client/entity/model/dog/GlowingEyeDogModel.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
@@ -21,7 +22,7 @@ public GlowingEyeDogModel(ModelPart box) {
         setupGlowingEyes();
     }
 
-    public GlowingEyeDogModel(ModelPart box, Function<ResourceLocation, RenderType> renderType) {
+    public GlowingEyeDogModel(ModelPart box, DogModelRenderType renderType) {
         super(box, renderType);
         setupGlowingEyes();
     }
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmaterasuModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmaterasuModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.ListModel;
 import net.minecraft.client.model.geom.ModelPart;
@@ -18,7 +19,7 @@ public class AmaterasuModel extends DogModel {
 	
 
     public AmaterasuModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 
 	public static LayerDefinition createBodyLayer() {
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyChiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyChiModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -16,7 +17,7 @@ public class AmmyChiModel extends DogModel {
 	
 
     public AmmyChiModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 	public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyJinModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyJinModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -16,7 +17,7 @@ public class AmmyJinModel extends DogModel {
 	
 
     public AmmyJinModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 	public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyRebirthModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyRebirthModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -16,7 +17,7 @@ public class AmmyRebirthModel extends DogModel {
 	
 
     public AmmyRebirthModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 	public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyReiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyReiModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -16,7 +17,7 @@ public class AmmyReiModel extends DogModel {
 	
 
     public AmmyReiModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 	public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyShinModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyShinModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -16,7 +17,7 @@ public class AmmyShinModel extends DogModel {
 	
 
     public AmmyShinModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 	public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyShiranuiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyShiranuiModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -16,7 +17,7 @@ public class AmmyShiranuiModel extends DogModel {
 	
 
     public AmmyShiranuiModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 	public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyTeiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/AmmyTeiModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import doggytalents.common.entity.Dog;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
@@ -16,7 +17,7 @@ public class AmmyTeiModel extends DogModel {
 	
 
     public AmmyTeiModel(ModelPart box) {
-		super(box, RenderType::entityTranslucent);
+		super(box, DogModelRenderType.TRANSLUCENT);
 	}
 	public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/HoundstoneModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/HoundstoneModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.DogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeDeformation;
@@ -13,7 +14,7 @@
 public class HoundstoneModel extends DogModel{
 
     public HoundstoneModel(ModelPart box) {
-        super(box, RenderType::entityTranslucent);
+        super(box, DogModelRenderType.TRANSLUCENT);
     }
     public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/ScrapsModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/ScrapsModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.GlowingEyeDogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeDeformation;
@@ -13,7 +14,7 @@
 public class ScrapsModel extends GlowingEyeDogModel {
 
     public ScrapsModel(ModelPart box) {
-        super(box, RenderType::entityTranslucent);
+        super(box, DogModelRenderType.TRANSLUCENT);
     }
     public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/SparkyModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/SparkyModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.GlowingEyeDogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeDeformation;
@@ -13,7 +14,7 @@
 public class SparkyModel extends GlowingEyeDogModel {
 
     public SparkyModel(ModelPart box) {
-        super(box, RenderType::entityTranslucent);
+        super(box, DogModelRenderType.TRANSLUCENT);
     }
     public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/ZeroModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/ZeroModel.java
@@ -1,6 +1,7 @@
 package doggytalents.client.entity.model.dog.dogs;
 
 import doggytalents.client.entity.model.dog.GlowingEyeDogModel;
+import doggytalents.client.entity.model.util.DogModelRenderType;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeDeformation;
@@ -13,7 +14,7 @@
 public class ZeroModel extends GlowingEyeDogModel {
 
     public ZeroModel(ModelPart box) {
-        super(box, RenderType::entityTranslucent);
+        super(box, DogModelRenderType.TRANSLUCENT);
     }
     public static LayerDefinition createBodyLayer() {
 		MeshDefinition meshdefinition = new MeshDefinition();
diff --git a/src/main/java/doggytalents/client/entity/model/util/DogModelRenderType.java b/src/main/java/doggytalents/client/entity/model/util/DogModelRenderType.java
@@ -0,0 +1,50 @@
+package doggytalents.client.entity.model.util;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.mojang.serialization.Codec;
+
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.StringRepresentable;
+
+public class DogModelRenderType implements StringRepresentable {
+
+    public static final DogModelRenderType CUTOUT = 
+        new DogModelRenderType("cutout_no_cull", RenderType::entityCutoutNoCull);
+    public static final DogModelRenderType TRANSLUCENT = 
+        new DogModelRenderType("translucent", RenderType::entityTranslucent);
+    public static final List<DogModelRenderType> ALL = List.of(CUTOUT, TRANSLUCENT);
+    public static final Codec<DogModelRenderType> CODEC = StringRepresentable
+        .fromValues(() -> ALL.toArray(DogModelRenderType[]::new));
+    
+    private final String id;
+    private final Function<ResourceLocation, RenderType> renderType;
+
+    private DogModelRenderType(String id, Function<ResourceLocation, RenderType> renderType) {
+        this.id = id;
+        this.renderType = renderType;
+    }
+
+    public String id() {
+        return id;
+    }
+
+    public Function<ResourceLocation, RenderType> renderType() {
+        return renderType;
+    }
+
+    @Override
+    public String getSerializedName() {
+        return this.id();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this == obj;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import com.mojang.blaze3d.vertex.PoseStack;`
`4`	`4`	`import com.mojang.blaze3d.vertex.VertexConsumer;`
`5`	`5`
	`6`	`+import doggytalents.client.entity.model.util.DogModelRenderType;`
`6`	`7`	`import doggytalents.common.entity.Dog;`
`7`	`8`	`import net.minecraft.client.model.geom.ModelPart;`
`8`	`9`	`import net.minecraft.client.renderer.RenderType;`
`@@ -21,7 +22,7 @@ public GlowingEyeDogModel(ModelPart box) {`
`21`	`22`	`setupGlowingEyes();`
`22`	`23`	`}`
`23`	`24`
`24`		`- public GlowingEyeDogModel(ModelPart box, Function<ResourceLocation, RenderType> renderType) {`
	`25`	`+ public GlowingEyeDogModel(ModelPart box, DogModelRenderType renderType) {`
`25`	`26`	`super(box, renderType);`
`26`	`27`	`setupGlowingEyes();`
`27`	`28`	`}`