Skip to content

Commit

Permalink
Add whale shark and fix basking passiveness
Browse files Browse the repository at this point in the history
  • Loading branch information
@itsmeow
itsmeow committed Jan 17, 2023
1 parent 9a8918e commit c25cb3f
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 5 deletions.
3 changes: 3 additions & 0 deletions common/src/main/java/dev/itsmeow/betteranimalsplus/client/ClientLifecycleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public static void registerEntityRenders() {
.mEntry(ModelMakoShark::new, "mako_shark")
.mEntry(ModelGreatWhiteShark::new, "great_white_shark")
.mEntry(ModelBaskingShark::new, "basking_shark")
.mEntry(ModelWhaleShark::new, "whale_shark")
.preRender((e, s, p) -> {
switch(e.getVariantNameOrEmpty()) {
case "blue":
Expand Down Expand Up @@ -133,6 +134,7 @@ public static void registerEntityRenders() {
break;
case "basking":
case "mako":
case "whale":
default:
}
}));
Expand Down Expand Up @@ -261,6 +263,7 @@ public static void layerDefinitions(ImmutableMap.Builder<ModelLayerLocation, Lay
r.accept("hammerhead_shark", ModelHammerheadShark.createBodyLayer());
r.accept("mako_shark", ModelMakoShark.createBodyLayer());
r.accept("tiger_shark", ModelTigerShark.createBodyLayer());
r.accept("whale_shark", ModelWhaleShark.createBodyLayer());
r.accept("white_tip_shark", ModelWhiteTipShark.createBodyLayer());

r.accept("beluga_whale", ModelWhaleBeluga.createBodyLayer());
Expand Down
140 changes: 140 additions & 0 deletions ...rc/main/java/dev/itsmeow/betteranimalsplus/client/model/entity/shark/ModelWhaleShark.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
package dev.itsmeow.betteranimalsplus.client.model.entity.shark;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import dev.itsmeow.betteranimalsplus.client.model.abstracts.ModelBAP;
import dev.itsmeow.betteranimalsplus.common.entity.EntityShark;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.*;

public class ModelWhaleShark<T extends EntityShark> extends ModelBAP<T> {

public ModelPart body;
public ModelPart tail00;
public ModelPart tail01;
public ModelPart tail02;
public ModelPart tail03;
public ModelPart tail04;
public ModelPart tailFinUpper00;
public ModelPart tailFinUpper01;
public ModelPart tailFinUpper02;
public ModelPart tailFinLower00;
public ModelPart tailFinLower01;
public ModelPart tailFinLower2;
public ModelPart smallTopFin;
public ModelPart lowSmallFin;
public ModelPart dorsalFin00;
public ModelPart dorsalFin1;
public ModelPart dorsalFin2;
public ModelPart cube_r1;
public ModelPart smallLFin;
public ModelPart smallRFin;
public ModelPart neck;
public ModelPart throat;
public ModelPart head;
public ModelPart cube_r2;
public ModelPart topJaw;
public ModelPart cube_r3;
public ModelPart cube_r4;
public ModelPart lowJaw;
public ModelPart lFin1;
public ModelPart lFin2;
public ModelPart lFin3;
public ModelPart cube_r5;
public ModelPart rFin1;
public ModelPart rFin2;
public ModelPart rFin3;
public ModelPart cube_r6;

public ModelWhaleShark(ModelPart root) {
this.body = root.getChild("body");
this.tail00 = body.getChild("tail00");
this.tail01 = tail00.getChild("tail01");
this.tail02 = tail01.getChild("tail02");
this.tail03 = tail02.getChild("tail03");
this.tail04 = tail03.getChild("tail04");
this.tailFinUpper00 = tail04.getChild("tailFinUpper00");
this.tailFinUpper01 = tailFinUpper00.getChild("tailFinUpper01");
this.tailFinUpper02 = tailFinUpper01.getChild("tailFinUpper02");
this.tailFinLower00 = tailFinUpper00.getChild("tailFinLower00");
this.tailFinLower01 = tailFinLower00.getChild("tailFinLower01");
this.tailFinLower2 = tailFinLower01.getChild("tailFinLower2");
this.smallTopFin = tail02.getChild("smallTopFin");
this.lowSmallFin = tail02.getChild("lowSmallFin");
this.dorsalFin00 = tail00.getChild("dorsalFin00");
this.dorsalFin1 = dorsalFin00.getChild("dorsalFin1");
this.dorsalFin2 = dorsalFin00.getChild("dorsalFin2");
this.cube_r1 = dorsalFin2.getChild("cube_r1");
this.smallLFin = tail00.getChild("smallLFin");
this.smallRFin = tail00.getChild("smallRFin");
this.neck = body.getChild("neck");
this.throat = neck.getChild("throat");
this.head = neck.getChild("head");
this.cube_r2 = head.getChild("cube_r2");
this.topJaw = head.getChild("topJaw");
this.cube_r3 = topJaw.getChild("cube_r3");
this.cube_r4 = topJaw.getChild("cube_r4");
this.lowJaw = head.getChild("lowJaw");
this.lFin1 = body.getChild("lFin1");
this.lFin2 = lFin1.getChild("lFin2");
this.lFin3 = lFin2.getChild("lFin3");
this.cube_r5 = lFin3.getChild("cube_r5");
this.rFin1 = body.getChild("rFin1");
this.rFin2 = rFin1.getChild("rFin2");
this.rFin3 = rFin2.getChild("rFin3");
this.cube_r6 = rFin3.getChild("cube_r6");
}

public static LayerDefinition createBodyLayer() {
MeshDefinition meshdefinition = new MeshDefinition();
PartDefinition partdefinition = meshdefinition.getRoot();
PartDefinition body = partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(0, 0).addBox(-23.0F, -12.0F, -53.0F, 45.0F, 45.0F, 54.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.25F, -18.0F, -22.0F, 0.0175F, 0.0F, 0.0F));
PartDefinition tail00 = body.addOrReplaceChild("tail00", CubeListBuilder.create().texOffs(0, 111).addBox(-20.0F, -12.0F, -1.0F, 39.0F, 40.0F, 42.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, -0.0349F, 0.0F, 0.0F));
PartDefinition tail01 = tail00.addOrReplaceChild("tail01", CubeListBuilder.create().texOffs(0, 203).addBox(-17.0F, -12.0F, -1.0F, 33.0F, 32.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 1.0F, 41.0F, -0.0175F, 0.0F, 0.0F));
PartDefinition tail02 = tail01.addOrReplaceChild("tail02", CubeListBuilder.create().texOffs(0, 275).addBox(-14.0F, -11.0F, 0.0F, 27.0F, 28.0F, 25.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 25.0F));
PartDefinition tail03 = tail02.addOrReplaceChild("tail03", CubeListBuilder.create().texOffs(0, 339).addBox(-11.0F, -12.0F, -1.0F, 21.0F, 23.0F, 28.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 1.0F, 26.0F));
PartDefinition tail04 = tail03.addOrReplaceChild("tail04", CubeListBuilder.create().texOffs(0, 398).addBox(-7.0F, -12.0F, -1.0F, 14.0F, 17.0F, 25.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 1.0F, 27.0F));
PartDefinition tailFinUpper00 = tail04.addOrReplaceChild("tailFinUpper00", CubeListBuilder.create().texOffs(0, 451).addBox(-2.5F, -2.0F, -1.0F, 5.0F, 18.0F, 20.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.0F, 14.0F, 0.7854F, 0.0F, 0.0F));
PartDefinition tailFinUpper01 = tailFinUpper00.addOrReplaceChild("tailFinUpper01", CubeListBuilder.create().texOffs(64, 448).addBox(-2.0F, -2.0F, -1.0F, 4.0F, 14.0F, 20.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 19.0F, -0.1745F, 0.0F, 0.0F));
PartDefinition tailFinUpper02 = tailFinUpper01.addOrReplaceChild("tailFinUpper02", CubeListBuilder.create().texOffs(131, 445).addBox(-2.0F, 0.0F, -1.0F, 4.0F, 10.0F, 24.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -2.0F, 20.0F, -0.0436F, 0.0F, 0.0F));
PartDefinition tailFinLower00 = tailFinUpper00.addOrReplaceChild("tailFinLower00", CubeListBuilder.create().texOffs(106, 392).addBox(-2.0F, 2.0F, -7.0F, 4.0F, 22.0F, 16.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 7.0F, -2.0F, -0.3491F, 0.0F, 0.0F));
PartDefinition tailFinLower01 = tailFinLower00.addOrReplaceChild("tailFinLower01", CubeListBuilder.create().texOffs(164, 401).addBox(-2.0F, 0.0F, 0.0F, 3.0F, 16.0F, 11.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.5F, 24.0F, -7.0F, 0.1309F, 0.0F, 0.0F));
PartDefinition tailFinLower2 = tailFinLower01.addOrReplaceChild("tailFinLower2", CubeListBuilder.create().texOffs(195, 429).addBox(-1.0F, 0.0F, -1.0F, 2.0F, 11.0F, 8.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 16.0F, 1.0F, 0.1309F, 0.0F, 0.0F));
PartDefinition smallTopFin = tail02.addOrReplaceChild("smallTopFin", CubeListBuilder.create().texOffs(250, 378).addBox(-1.0F, -2.0F, -1.0F, 2.0F, 10.0F, 14.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -10.0F, 1.0F, 0.6981F, 0.0F, 0.0F));
PartDefinition lowSmallFin = tail02.addOrReplaceChild("lowSmallFin", CubeListBuilder.create().texOffs(292, 273).addBox(-1.0F, -3.0F, -1.0F, 2.0F, 7.0F, 15.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 15.0F, 2.0F, -0.6109F, 0.0F, 0.0F));
PartDefinition dorsalFin00 = tail00.addOrReplaceChild("dorsalFin00", CubeListBuilder.create().texOffs(136, 287).addBox(-2.5F, 0.0F, -1.0F, 5.0F, 13.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-0.25F, -12.0F, 0.0F, 0.8727F, 0.0F, 0.0F));
PartDefinition dorsalFin1 = dorsalFin00.addOrReplaceChild("dorsalFin1", CubeListBuilder.create().texOffs(189, 289).addBox(-1.5F, 0.0F, -1.0F, 3.0F, 11.0F, 15.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 12.0F, -0.0873F, 0.0F, 0.0F));
PartDefinition dorsalFin2 = dorsalFin00.addOrReplaceChild("dorsalFin2", CubeListBuilder.create().texOffs(239, 287).addBox(-1.0F, 0.2588F, 0.0341F, 2.0F, 11.0F, 11.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 1.0F, 26.0F, -0.48F, 0.0F, 0.0F));
PartDefinition cube_r1 = dorsalFin2.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(128, 323).addBox(-1.0F, 0.0F, -18.0F, 2.0F, 12.0F, 19.0F, new CubeDeformation(-0.01F)), PartPose.offsetAndRotation(0.0F, 11.0F, 10.0F, -0.1309F, 0.0F, 0.0F));
PartDefinition smallLFin = tail00.addOrReplaceChild("smallLFin", CubeListBuilder.create().texOffs(209, 334).mirror().addBox(-1.0F, -5.0F, -1.0F, 2.0F, 10.0F, 17.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-18.75F, 23.0F, 29.0F, -0.8027F, -0.1841F, 0.1872F));
PartDefinition smallRFin = tail00.addOrReplaceChild("smallRFin", CubeListBuilder.create().texOffs(209, 334).addBox(-1.0F, -5.0F, -1.0F, 2.0F, 10.0F, 17.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(18.25F, 23.0F, 29.0F, -0.8027F, 0.1841F, -0.1872F));
PartDefinition neck = body.addOrReplaceChild("neck", CubeListBuilder.create().texOffs(209, 0).addBox(-21.0F, 0.0F, -50.0F, 41.0F, 27.0F, 51.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -12.0F, -53.0F, 0.2618F, 0.0F, 0.0F));
PartDefinition throat = neck.addOrReplaceChild("throat", CubeListBuilder.create().texOffs(198, 95).addBox(-20.0F, -17.0F, 2.0F, 39.0F, 17.0F, 42.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 27.0F, -52.0F, -0.3927F, 0.0F, 0.0F));
PartDefinition head = neck.addOrReplaceChild("head", CubeListBuilder.create().texOffs(175, 173).addBox(-20.0F, -1.0F, -16.0F, 39.0F, 18.0F, 16.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 2.0F, -48.25F, 0.0873F, 0.0F, 0.0F));
PartDefinition cube_r2 = head.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(298, 170).addBox(-19.5F, -0.5F, -1.25F, 38.0F, 19.0F, 22.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, -15.0F, -0.4363F, 0.0F, 0.0F));
PartDefinition topJaw = head.addOrReplaceChild("topJaw", CubeListBuilder.create(), PartPose.offsetAndRotation(0.0F, 11.0F, -18.0F, -0.2182F, 0.0F, 0.0F));
PartDefinition cube_r3 = topJaw.addOrReplaceChild("cube_r3", CubeListBuilder.create().texOffs(250, 231).addBox(-18.0F, -0.25F, 2.0F, 34.0F, 4.0F, 13.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -8.75F, -14.0F, 0.2182F, 0.0F, 0.0F));
PartDefinition cube_r4 = topJaw.addOrReplaceChild("cube_r4", CubeListBuilder.create().texOffs(134, 225).addBox(-19.0F, -2.0F, -12.0F, 36.0F, 7.0F, 13.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -5.9743F, -0.3916F, -0.0873F, 0.0F, 0.0F));
PartDefinition lowJaw = head.addOrReplaceChild("lowJaw", CubeListBuilder.create().texOffs(150, 262).addBox(-18.0F, 0.0F, -10.0F, 34.0F, 7.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 9.0F, -20.0F, -0.5236F, 0.0F, 0.0F));
PartDefinition lFin1 = body.addOrReplaceChild("lFin1", CubeListBuilder.create().texOffs(378, 267).addBox(-2.1472F, -0.3617F, -14.0F, 4.0F, 15.0F, 32.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(20.0F, 23.0F, -38.75F, 0.0F, 0.0F, -0.6109F));
PartDefinition lFin2 = lFin1.addOrReplaceChild("lFin2", CubeListBuilder.create().texOffs(384, 337).addBox(-1.5F, 0.0F, 0.0F, 3.0F, 20.0F, 22.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-0.1472F, 14.6383F, -14.0F, 0.4363F, 0.0F, 0.0F));
PartDefinition lFin3 = lFin2.addOrReplaceChild("lFin3", CubeListBuilder.create(), PartPose.offset(0.0F, 20.0F, 0.0F));
PartDefinition cube_r5 = lFin3.addOrReplaceChild("cube_r5", CubeListBuilder.create().texOffs(398, 403).addBox(-1.0F, 0.0F, 0.0F, 2.0F, 21.0F, 14.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.2618F, 0.0F, 0.0F));
PartDefinition rFin1 = body.addOrReplaceChild("rFin1", CubeListBuilder.create().texOffs(378, 267).mirror().addBox(-1.8528F, -0.3617F, -14.0F, 4.0F, 15.0F, 32.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-20.5F, 23.0F, -38.75F, 0.0F, 0.0F, 0.6109F));
PartDefinition rFin2 = rFin1.addOrReplaceChild("rFin2", CubeListBuilder.create().texOffs(384, 337).mirror().addBox(-1.5F, 0.0F, 0.0F, 3.0F, 20.0F, 22.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.1472F, 14.6383F, -14.0F, 0.4363F, 0.0F, 0.0F));
PartDefinition rFin3 = rFin2.addOrReplaceChild("rFin3", CubeListBuilder.create(), PartPose.offset(0.0F, 20.0F, 0.0F));
PartDefinition cube_r6 = rFin3.addOrReplaceChild("cube_r6", CubeListBuilder.create().texOffs(398, 403).mirror().addBox(-1.0F, 0.0F, 0.0F, 2.0F, 21.0F, 14.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.2618F, 0.0F, 0.0F));
return LayerDefinition.create(meshdefinition, 512, 512);
}

@Override
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
this.body.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn);
}

@Override
public void setupAnim(EntityShark entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
ModelBullShark.animate(entity, ageInTicks, body, tail00, tail01, tail02, lowJaw);
}
}
8 changes: 6 additions & 2 deletions common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/EntityShark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import dev.itsmeow.betteranimalsplus.common.entity.util.abstracts.EntitySharkBase;
import dev.itsmeow.betteranimalsplus.common.entity.util.abstracts.EntityWaterMobPathing;
import dev.itsmeow.betteranimalsplus.init.ModEntities;
import dev.itsmeow.betteranimalsplus.common.entity.util.IPeacefulAware;
import dev.itsmeow.betteranimalsplus.util.OceanBiomeHelper;
import dev.itsmeow.imdlib.entity.EntityTypeContainer;
import dev.itsmeow.imdlib.entity.interfaces.IVariantTypes;
Expand Down Expand Up @@ -33,7 +34,7 @@
import java.util.Optional;
import java.util.Set;

public class EntityShark extends EntitySharkBase {
public class EntityShark extends EntitySharkBase implements IPeacefulAware {

private float lastAttack = 0;
private float lastGrab = 0;
Expand Down Expand Up @@ -110,7 +111,7 @@ private void updateAttributes(String name) {
this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(1.5D);
}
this.setHealth(this.getMaxHealth());
this.isPeaceful = "basking".equals(name);
this.isPeaceful = "basking".equals(name) || "whale".equals(name);
}

public boolean shouldAttackForHealth(float health) {
Expand All @@ -129,6 +130,7 @@ public boolean shouldAttackForHealth(float health) {
case "whitetip":
return health <= 16F;
case "basking":
case "whale":
default:
return false;
}
Expand Down Expand Up @@ -215,6 +217,7 @@ public void onSyncedDataUpdated(EntityDataAccessor<?> entityDataAccessor) {
public EntityDimensions getDimensions(Pose pose) {
String variantName = this.getVariantNameOrEmpty();
switch(variantName) {
case "whale":
case "basking":
return BASKING_DIMENSIONS.scale(this.getScale());
default:
Expand Down Expand Up @@ -259,6 +262,7 @@ public String[] getTypesFor(ResourceKey<Biome> biomeKey, Biome biome, Set<BiomeT
if(b.isWarm()) {
list.add("mako");
list.add("hammerhead");
list.add("whale");
}
return list.toArray(new String[0]);
}
Expand Down
3 changes: 2 additions & 1 deletion ...a/dev/itsmeow/betteranimalsplus/common/entity/ai/PeacefulNearestAttackableTargetGoal.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.itsmeow.betteranimalsplus.common.entity.ai;

import dev.itsmeow.betteranimalsplus.common.entity.util.IPeacefulAware;
import net.minecraft.world.Difficulty;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.Mob;
Expand All @@ -23,7 +24,7 @@ public PeacefulNearestAttackableTargetGoal(Mob goalOwnerIn, Class<T> targetClass

@Override
public boolean canUse() {
return this.mob.level.getDifficulty() != Difficulty.PEACEFUL && super.canUse();
return (this.mob instanceof IPeacefulAware) ? !((IPeacefulAware) this.mob).isPeaceful() : this.mob.level.getDifficulty() != Difficulty.PEACEFUL && super.canUse();
}

}
7 changes: 7 additions & 0 deletions common/src/main/java/dev/itsmeow/betteranimalsplus/common/entity/util/IPeacefulAware.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package dev.itsmeow.betteranimalsplus.common.entity.util;

public interface IPeacefulAware {

boolean isPeaceful();

}
3 changes: 2 additions & 1 deletion ...main/java/dev/itsmeow/betteranimalsplus/common/entity/util/abstracts/EntitySharkBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import dev.itsmeow.betteranimalsplus.common.entity.util.IHaveHunger;
import dev.itsmeow.betteranimalsplus.init.ModTriggers;
import dev.itsmeow.betteranimalsplus.common.entity.util.IPeacefulAware;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerPlayer;
Expand All @@ -12,7 +13,7 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.ServerLevelAccessor;

public abstract class EntitySharkBase extends EntityWaterMobPathingWithSelectiveTypes implements Enemy, IHaveHunger<EntityWaterMobPathing> {
public abstract class EntitySharkBase extends EntityWaterMobPathingWithSelectiveTypes implements Enemy, IHaveHunger<EntityWaterMobPathing>, IPeacefulAware {

private int hunger = 0;

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/itsmeow/betteranimalsplus/init/ModEntities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public class ModEntities {
.size(2.5F, 1.2F)
.despawn()
.biomesOverworld(BiomeTypes.OCEAN)
.variants("blue", "bull", "tiger", "whitetip", "greenland", "hammerhead", "goblin", "mako", "great_white", "basking"));
.variants("blue", "bull", "tiger", "whitetip", "greenland", "hammerhead", "goblin", "mako", "great_white", "basking", "whale"));
public static final EntityTypeContainer<EntityTurkey> TURKEY = H.add(EntityTurkey.class, EntityTurkey::new, "turkey", () -> Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, 6.5D)
.add(Attributes.MOVEMENT_SPEED, 0.25D)
Expand Down
Binary file added common/src/main/resources/assets/betteranimalsplus/textures/entity/shark_whale.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c25cb3f

Please sign in to comment.