classic-mods-revived/Jurassic-Revived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds debug mode and simplifies size setting in code, updates male indom texture, and model size adjustments

Browse Source
This commit is contained in:
Eli Gibbs
2026-06-11 00:54:10 -04:00
parent 1a499cf057
commit 5c885183e9
164 changed files with 827 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/net/cmr/jurassicrevived/Constants.java
+2
View File
@@ -11,6 +11,8 @@ public class Constants
public static final String MOD_NAME = "JurassicRevived";
public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME);
public static final boolean DEBUG_SIZES = false;
public static ResourceLocation rl(String path) {
//? if >1.20.1 {
/*return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
common/src/main/java/net/cmr/jurassicrevived/entity/ai/DinoEntityBase.java
+81 -1
View File
@@ -1,6 +1,6 @@
package net.cmr.jurassicrevived.entity.ai;
import net.cmr.jurassicrevived.config.JRConfigManager;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.entity.ai.navigation.CustomDinoNavigation;
import net.cmr.jurassicrevived.util.ModTags;
import net.minecraft.nbt.CompoundTag;
@@ -14,8 +14,10 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EntityDimensions;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.Pose;
import net.minecraft.world.entity.ai.navigation.PathNavigation;
import net.minecraft.world.entity.animal.Animal;
import net.minecraft.world.entity.player.Player;
@@ -23,6 +25,7 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.List;
@@ -30,6 +33,42 @@ import java.util.Map;
public abstract class DinoEntityBase extends Animal {
public float liveDebugWidth = -1.0F;
public float liveDebugHeight = -1.0F;
public float getDinoScale() {
return 1.0F;
}
@Override
//? if >1.20.1 {
/*protected @NotNull EntityDimensions getDefaultDimensions(Pose pose) {
*///?} else {
public EntityDimensions getDimensions(Pose pose) {
//?}
EntityDimensions base;
// 1. Use Live Debug Sizes if enabled and modified
if (Constants.DEBUG_SIZES && liveDebugWidth > 0 && liveDebugHeight > 0) {
base = EntityDimensions.scalable(liveDebugWidth, liveDebugHeight);
} else {
// 2. Otherwise, use the ModEntities registry default
/*? if >1.20.1 {*/
/*base = super.getDefaultDimensions(pose);
*//*?} else {*/
base = super.getDimensions(pose);
/*?}*/
}
// 3. Prevent vanilla from double-shrinking your babies
if (this.isBaby()) {
base = base.scale(2.0F);
}
// 4. Apply the dynamic multiplier from the subclass
return base.scale(this.getDinoScale());
}
protected IDinoData dinoData;
protected final DinoAIController aiController;
@@ -139,6 +178,47 @@ public abstract class DinoEntityBase extends Animal {
}
ItemStack stack = player.getItemInHand(hand);
// --- LIVE HITBOX TUNER ---
if (Constants.DEBUG_SIZES && stack.is(Items.BLAZE_ROD)) {
// Grab default registry sizes on the very first click
if (liveDebugWidth < 0) {
//? if >1.20.1 {
/*liveDebugWidth = this.getType().getDimensions().width();
liveDebugHeight = this.getType().getDimensions().height();
*///?} else {
liveDebugWidth = this.getType().getDimensions().width;
liveDebugHeight = this.getType().getDimensions().height;
//?}
}
// Shift = Shrink, Normal = Grow
float adjustment = player.isShiftKeyDown() ? -0.1f : 0.1f;
if (hand == InteractionHand.MAIN_HAND) {
liveDebugWidth += adjustment; // Main hand edits WIDTH
} else if (hand == InteractionHand.OFF_HAND) {
liveDebugHeight += adjustment; // Off hand edits HEIGHT
}
// INSTANT VISUAL UPDATE (Works because mobInteract is client+server)
this.refreshDimensions();
if (!this.level().isClientSide) {
String action = player.isShiftKeyDown() ? "§c[-] SHRUNK" : "§a[+] GREW";
String dimension = hand == InteractionHand.MAIN_HAND ? "WIDTH" : "HEIGHT";
String dinoName = net.minecraft.world.entity.EntityType.getKey(this.getType()).getPath();
player.sendSystemMessage(Component.literal(action + " " + dimension + "§f: " + dinoName +
" -> §e.sized(" + String.format("%.1f", liveDebugWidth) + "F, " +
String.format("%.1f", liveDebugHeight) + "F)"));
}
return InteractionResult.SUCCESS;
}
// --- END LIVE HITBOX TUNER ---
if (this.isFood(stack)) {
if (!this.level().isClientSide) {
feedDino(player, stack);
common/src/main/java/net/cmr/jurassicrevived/entity/client/AchillobatorRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class AchillobatorRenderer extends GeoEntityRenderer<AchillobatorEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, AchillobatorEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/AlbertosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class AlbertosaurusRenderer extends GeoEntityRenderer<AlbertosaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, AlbertosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/AllosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class AllosaurusRenderer extends GeoEntityRenderer<AllosaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, AllosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/AlvarezsaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class AlvarezsaurusRenderer extends GeoEntityRenderer<AlvarezsaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, AlvarezsaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/AnkylosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class AnkylosaurusRenderer extends GeoEntityRenderer<AnkylosaurusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, AnkylosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ApatosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ApatosaurusRenderer extends GeoEntityRenderer<ApatosaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ApatosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ArambourgianiaRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ArambourgianiaRenderer extends GeoEntityRenderer<ArambourgianiaEnti
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ArambourgianiaEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/BaryonyxRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class BaryonyxRenderer extends GeoEntityRenderer<BaryonyxEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, BaryonyxEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/BrachiosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class BrachiosaurusRenderer extends GeoEntityRenderer<BrachiosaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, BrachiosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CarcharodontosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CarcharodontosaurusRenderer extends GeoEntityRenderer<Carcharodonto
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CarcharodontosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CarnotaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CarnotaurusRenderer extends GeoEntityRenderer<CarnotaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CarnotaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CearadactylusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CearadactylusRenderer extends GeoEntityRenderer<CearadactylusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CearadactylusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CeratosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CeratosaurusRenderer extends GeoEntityRenderer<CeratosaurusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CeratosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ChasmosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ChasmosaurusRenderer extends GeoEntityRenderer<ChasmosaurusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ChasmosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ChickenosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ChickenosaurusRenderer extends GeoEntityRenderer<ChickenosaurusEnti
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ChickenosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ChilesaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ChilesaurusRenderer extends GeoEntityRenderer<ChilesaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ChilesaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CoelophysisRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CoelophysisRenderer extends GeoEntityRenderer<CoelophysisEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CoelophysisEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CoelurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CoelurusRenderer extends GeoEntityRenderer<CoelurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CoelurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CompsognathusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CompsognathusRenderer extends GeoEntityRenderer<CompsognathusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CompsognathusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ConcavenatorRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ConcavenatorRenderer extends GeoEntityRenderer<ConcavenatorEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ConcavenatorEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/CorythosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class CorythosaurusRenderer extends GeoEntityRenderer<CorythosaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, CorythosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/DeinonychusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class DeinonychusRenderer extends GeoEntityRenderer<DeinonychusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, DeinonychusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/DilophosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class DilophosaurusRenderer extends GeoEntityRenderer<DilophosaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, DilophosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/DimorphodonRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class DimorphodonRenderer extends GeoEntityRenderer<DimorphodonEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, DimorphodonEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/DiplodocusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class DiplodocusRenderer extends GeoEntityRenderer<DiplodocusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, DiplodocusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/DistortusRexRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class DistortusRexRenderer extends GeoEntityRenderer<DistortusRexEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, DistortusRexEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/DryosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class DryosaurusRenderer extends GeoEntityRenderer<DryosaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, DryosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/EdmontosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class EdmontosaurusRenderer extends GeoEntityRenderer<EdmontosaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, EdmontosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/FDuckRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class FDuckRenderer extends GeoEntityRenderer<FDuckEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, FDuckEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/GallimimusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class GallimimusRenderer extends GeoEntityRenderer<GallimimusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, GallimimusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/GeosternbergiaRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class GeosternbergiaRenderer extends GeoEntityRenderer<GeosternbergiaEnti
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, GeosternbergiaEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/GiganotosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class GiganotosaurusRenderer extends GeoEntityRenderer<GiganotosaurusEnti
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, GiganotosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/GuanlongRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class GuanlongRenderer extends GeoEntityRenderer<GuanlongEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, GuanlongEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/GuidracoRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class GuidracoRenderer extends GeoEntityRenderer<GuidracoEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, GuidracoEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/HadrosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class HadrosaurusRenderer extends GeoEntityRenderer<HadrosaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, HadrosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/HerrerasaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class HerrerasaurusRenderer extends GeoEntityRenderer<HerrerasaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, HerrerasaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/HypsilophodonRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class HypsilophodonRenderer extends GeoEntityRenderer<HypsilophodonEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, HypsilophodonEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/IndominusRexRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class IndominusRexRenderer extends GeoEntityRenderer<IndominusRexEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, IndominusRexEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/IndoraptorRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class IndoraptorRenderer extends GeoEntityRenderer<IndoraptorEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, IndoraptorEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/InostranceviaRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class InostranceviaRenderer extends GeoEntityRenderer<InostranceviaEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, InostranceviaEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/LambeosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class LambeosaurusRenderer extends GeoEntityRenderer<LambeosaurusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, LambeosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/LudodactylusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class LudodactylusRenderer extends GeoEntityRenderer<LudodactylusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, LudodactylusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/MajungasaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class MajungasaurusRenderer extends GeoEntityRenderer<MajungasaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, MajungasaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/MamenchisaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class MamenchisaurusRenderer extends GeoEntityRenderer<MamenchisaurusEnti
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, MamenchisaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/MetriacanthosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class MetriacanthosaurusRenderer extends GeoEntityRenderer<Metriacanthosa
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, MetriacanthosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/MoganopterusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class MoganopterusRenderer extends GeoEntityRenderer<MoganopterusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, MoganopterusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/MussasaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class MussasaurusRenderer extends GeoEntityRenderer<MussasaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, MussasaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/NyctosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class NyctosaurusRenderer extends GeoEntityRenderer<NyctosaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, NyctosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/OrnitholestesRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class OrnitholestesRenderer extends GeoEntityRenderer<OrnitholestesEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, OrnitholestesEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/OrnithomimusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class OrnithomimusRenderer extends GeoEntityRenderer<OrnithomimusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, OrnithomimusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/OuranosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class OuranosaurusRenderer extends GeoEntityRenderer<OuranosaurusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, OuranosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/OviraptorRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class OviraptorRenderer extends GeoEntityRenderer<OviraptorEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, OviraptorEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/PachycephalosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class PachycephalosaurusRenderer extends GeoEntityRenderer<Pachycephalosa
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, PachycephalosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ParasaurolophusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ParasaurolophusRenderer extends GeoEntityRenderer<ParasaurolophusEn
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ParasaurolophusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ProceratosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ProceratosaurusRenderer extends GeoEntityRenderer<ProceratosaurusEn
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ProceratosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ProcompsognathusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ProcompsognathusRenderer extends GeoEntityRenderer<Procompsognathus
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ProcompsognathusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ProtoceratopsRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ProtoceratopsRenderer extends GeoEntityRenderer<ProtoceratopsEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ProtoceratopsEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/PteranodonRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class PteranodonRenderer extends GeoEntityRenderer<PteranodonEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, PteranodonEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/PterodaustroRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class PterodaustroRenderer extends GeoEntityRenderer<PterodaustroEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, PterodaustroEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/QuetzalcoatlusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class QuetzalcoatlusRenderer extends GeoEntityRenderer<QuetzalcoatlusEnti
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, QuetzalcoatlusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/RajasaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class RajasaurusRenderer extends GeoEntityRenderer<RajasaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, RajasaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/RugopsRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class RugopsRenderer extends GeoEntityRenderer<RugopsEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, RugopsEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/SegisaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class SegisaurusRenderer extends GeoEntityRenderer<SegisaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, SegisaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ShantungosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ShantungosaurusRenderer extends GeoEntityRenderer<ShantungosaurusEn
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ShantungosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/SpinosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class SpinosaurusRenderer extends GeoEntityRenderer<SpinosaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, SpinosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/StegosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class StegosaurusRenderer extends GeoEntityRenderer<StegosaurusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, StegosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/StyracosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class StyracosaurusRenderer extends GeoEntityRenderer<StyracosaurusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, StyracosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/SuchomimusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class SuchomimusRenderer extends GeoEntityRenderer<SuchomimusEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, SuchomimusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TapejaraRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TapejaraRenderer extends GeoEntityRenderer<TapejaraEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TapejaraEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TherizinosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TherizinosaurusRenderer extends GeoEntityRenderer<TherizinosaurusEn
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TherizinosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ThescelosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ThescelosaurusRenderer extends GeoEntityRenderer<ThescelosaurusEnti
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ThescelosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TitanosaurusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TitanosaurusRenderer extends GeoEntityRenderer<TitanosaurusEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TitanosaurusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TriceratopsRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TriceratopsRenderer extends GeoEntityRenderer<TriceratopsEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TriceratopsEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TroodonRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TroodonRenderer extends GeoEntityRenderer<TroodonEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TroodonEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TropeognathusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TropeognathusRenderer extends GeoEntityRenderer<TropeognathusEntity
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TropeognathusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TupuxuaraRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TupuxuaraRenderer extends GeoEntityRenderer<TupuxuaraEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TupuxuaraEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/TyrannosaurusRexRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class TyrannosaurusRexRenderer extends GeoEntityRenderer<TyrannosaurusRex
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, TyrannosaurusRexEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/UtahraptorRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class UtahraptorRenderer extends GeoEntityRenderer<UtahraptorEntity> {
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, UtahraptorEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/VelociraptorRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class VelociraptorRenderer extends GeoEntityRenderer<VelociraptorEntity>
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, VelociraptorEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/client/ZhenyuanopterusRenderer.java
+1
View File
@@ -15,6 +15,7 @@ public class ZhenyuanopterusRenderer extends GeoEntityRenderer<ZhenyuanopterusEn
@Override
public void scaleModelForRender(float widthScale, float heightScale, PoseStack poseStack, ZhenyuanopterusEntity animatable, BakedGeoModel model, boolean isReRender, float partialTick, int packedLight, int packedOverlay) {
super.scaleModelForRender(widthScale, heightScale, poseStack, animatable, model, isReRender, partialTick, packedLight, packedOverlay);
float scale = animatable.getTotalModelScale();
poseStack.scale(scale, scale, scale);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/AchillobatorEntity.java
+7 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -47,8 +48,9 @@ public class AchillobatorEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 28800;
private static final float MIN_ANIMAL_SCALE = 0.8F;
private static final float MAX_ANIMAL_SCALE = 1.2F;
private static final float ANIMAL_SCALE = 1.0F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -135,6 +137,7 @@ public class AchillobatorEntity extends DinoEntityBase implements GeoEntity {
AchillobatorVariant randomVariant = Util.getRandom(AchillobatorVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -293,7 +296,6 @@ public class AchillobatorEntity extends DinoEntityBase implements GeoEntity {
float growthProgress = Mth.clamp((BABY_TO_ADULT_AGE_TICKS + age) / (float) BABY_TO_ADULT_AGE_TICKS, 0.0F, 1.0F);
return Mth.lerp(growthProgress, 0.2F, 1.0F);
}
public float getTotalModelScale() {
return this.getAnimalScale() * this.getGrowthScale();
}
@@ -306,17 +308,10 @@ public class AchillobatorEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
public float getDinoScale() {
return this.getTotalModelScale();
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public int getTypeVariant() {
return this.entityData.get(VARIANT);
common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlbertosaurusEntity.java
+7 -11
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -48,8 +49,9 @@ public class AlbertosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 67200;
private static final float MIN_ANIMAL_SCALE = 1.5F;
private static final float MAX_ANIMAL_SCALE = 1.9F;
private static final float ANIMAL_SCALE = 1.7F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -134,6 +136,7 @@ public class AlbertosaurusEntity extends DinoEntityBase implements GeoEntity {
AlbertosaurusVariant randomVariant = Util.getRandom(AlbertosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -305,17 +308,10 @@ public class AlbertosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
public float getDinoScale() {
return this.getTotalModelScale();
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public int getTypeVariant() {
return this.entityData.get(VARIANT);
common/src/main/java/net/cmr/jurassicrevived/entity/custom/AllosaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.*;
@@ -51,8 +52,9 @@ public class AllosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 52800;
private static final float MIN_ANIMAL_SCALE = 1.7F;
private static final float MAX_ANIMAL_SCALE = 2.1F;
private static final float ANIMAL_SCALE = 1.9F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -137,6 +139,7 @@ public class AllosaurusEntity extends DinoEntityBase implements GeoEntity {
AllosaurusVariant randomVariant = Util.getRandom(AllosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -308,17 +311,10 @@ public class AllosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlvarezsaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -55,8 +56,9 @@ public class AlvarezsaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 19200;
private static final float MIN_ANIMAL_SCALE = 0.6F;
private static final float MAX_ANIMAL_SCALE = 1.0F;
private static final float ANIMAL_SCALE = 0.8F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -143,6 +145,7 @@ public class AlvarezsaurusEntity extends DinoEntityBase implements GeoEntity {
AlvarezsaurusVariant randomVariant = Util.getRandom(AlvarezsaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -312,17 +315,10 @@ public class AlvarezsaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/AnkylosaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -54,8 +55,9 @@ public class AnkylosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 86400;
private static final float MIN_ANIMAL_SCALE = 2.2F;
private static final float MAX_ANIMAL_SCALE = 2.6F;
private static final float ANIMAL_SCALE = 2.4F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -142,6 +144,7 @@ public class AnkylosaurusEntity extends DinoEntityBase implements GeoEntity {
AnkylosaurusVariant randomVariant = Util.getRandom(AnkylosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -311,17 +314,10 @@ public class AnkylosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/ApatosaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -56,8 +57,9 @@ public class ApatosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 110400;
private static final float MIN_ANIMAL_SCALE = 1.7F;
private static final float MAX_ANIMAL_SCALE = 2.1F;
private static final float ANIMAL_SCALE = 1.9F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -144,6 +146,7 @@ public class ApatosaurusEntity extends DinoEntityBase implements GeoEntity {
ApatosaurusVariant randomVariant = Util.getRandom(ApatosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -315,17 +318,10 @@ public class ApatosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/ArambourgianiaEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -64,8 +65,9 @@ public class ArambourgianiaEntity extends DinoEntityBase implements GeoEntity, F
private final AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 43200;
private static final float MIN_ANIMAL_SCALE = 1.7F;
private static final float MAX_ANIMAL_SCALE = 2.1F;
private static final float ANIMAL_SCALE = 1.9F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -177,6 +179,7 @@ public class ArambourgianiaEntity extends DinoEntityBase implements GeoEntity, F
ArambourgianiaVariant randomVariant = Util.getRandom(ArambourgianiaVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -351,17 +354,10 @@ public class ArambourgianiaEntity extends DinoEntityBase implements GeoEntity, F
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public ArambourgianiaVariant getVariant() {
return ArambourgianiaVariant.byId(this.getTypeVariant() & 255);
common/src/main/java/net/cmr/jurassicrevived/entity/custom/BaryonyxEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -55,8 +56,9 @@ public class BaryonyxEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 52800;
private static final float MIN_ANIMAL_SCALE = 1.1F;
private static final float MAX_ANIMAL_SCALE = 1.5F;
private static final float ANIMAL_SCALE = 1.3F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -143,6 +145,7 @@ public class BaryonyxEntity extends DinoEntityBase implements GeoEntity {
BaryonyxVariant randomVariant = Util.getRandom(BaryonyxVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -314,17 +317,10 @@ public class BaryonyxEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/BrachiosaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -56,8 +57,9 @@ public class BrachiosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 134400;
private static final float MIN_ANIMAL_SCALE = 1.8F;
private static final float MAX_ANIMAL_SCALE = 2.2F;
private static final float ANIMAL_SCALE = 2.0F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -144,6 +146,7 @@ public class BrachiosaurusEntity extends DinoEntityBase implements GeoEntity {
BrachiosaurusVariant randomVariant = Util.getRandom(BrachiosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -315,17 +318,10 @@ public class BrachiosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarcharodontosaurusEntity.java
+8 -10
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -58,8 +59,9 @@ public class CarcharodontosaurusEntity extends DinoEntityBase implements GeoEnti
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 72000;
private static final float MIN_ANIMAL_SCALE = 1.8F;
private static final float MAX_ANIMAL_SCALE = 2.2F;
private static final float ANIMAL_SCALE = 2.0F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -146,6 +148,7 @@ public class CarcharodontosaurusEntity extends DinoEntityBase implements GeoEnti
CarcharodontosaurusVariant randomVariant = Util.getRandom(CarcharodontosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -312,16 +315,11 @@ public class CarcharodontosaurusEntity extends DinoEntityBase implements GeoEnti
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
public float getDinoScale() {
return this.getTotalModelScale();
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());}
*//*?}*/
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarnotaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.*;
@@ -52,8 +53,9 @@ public class CarnotaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 43200;
private static final float MIN_ANIMAL_SCALE = 1.3F;
private static final float MAX_ANIMAL_SCALE = 1.7F;
private static final float ANIMAL_SCALE = 1.5F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -139,6 +141,7 @@ public class CarnotaurusEntity extends DinoEntityBase implements GeoEntity {
CarnotaurusVariant randomVariant = Util.getRandom(CarnotaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -309,17 +312,10 @@ public class CarnotaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/CearadactylusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -64,8 +65,9 @@ public class CearadactylusEntity extends DinoEntityBase implements GeoEntity, Fl
private final AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 28800;
private static final float MIN_ANIMAL_SCALE = 0.7F;
private static final float MAX_ANIMAL_SCALE = 1.1F;
private static final float ANIMAL_SCALE = 0.9F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -177,6 +179,7 @@ public class CearadactylusEntity extends DinoEntityBase implements GeoEntity, Fl
CearadactylusVariant randomVariant = Util.getRandom(CearadactylusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -351,17 +354,10 @@ public class CearadactylusEntity extends DinoEntityBase implements GeoEntity, Fl
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public CearadactylusVariant getVariant() {
return CearadactylusVariant.byId(this.getTypeVariant() & 255);
common/src/main/java/net/cmr/jurassicrevived/entity/custom/CeratosaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.*;
@@ -51,8 +52,9 @@ public class CeratosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 38400;
private static final float MIN_ANIMAL_SCALE = 1.9F;
private static final float MAX_ANIMAL_SCALE = 2.3F;
private static final float ANIMAL_SCALE = 2.1F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -138,6 +140,7 @@ public class CeratosaurusEntity extends DinoEntityBase implements GeoEntity {
CeratosaurusVariant randomVariant = Util.getRandom(CeratosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -308,17 +311,10 @@ public class CeratosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChasmosaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -54,8 +55,9 @@ public class ChasmosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 67200;
private static final float MIN_ANIMAL_SCALE = 1.1F;
private static final float MAX_ANIMAL_SCALE = 1.5F;
private static final float ANIMAL_SCALE = 1.3F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -142,6 +144,7 @@ public class ChasmosaurusEntity extends DinoEntityBase implements GeoEntity {
ChasmosaurusVariant randomVariant = Util.getRandom(ChasmosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -311,17 +314,10 @@ public class ChasmosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChickenosaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -55,8 +56,9 @@ public class ChickenosaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 28800;
private static final float MIN_ANIMAL_SCALE = 0.7F;
private static final float MAX_ANIMAL_SCALE = 1.1F;
private static final float ANIMAL_SCALE = 0.9F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -143,6 +145,7 @@ public class ChickenosaurusEntity extends DinoEntityBase implements GeoEntity {
ChickenosaurusVariant randomVariant = Util.getRandom(ChickenosaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -312,17 +315,10 @@ public class ChickenosaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChilesaurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -47,8 +48,9 @@ public class ChilesaurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 38400;
private static final float MIN_ANIMAL_SCALE = 0.4F;
private static final float MAX_ANIMAL_SCALE = 0.8F;
private static final float ANIMAL_SCALE = 0.6F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -135,6 +137,7 @@ public class ChilesaurusEntity extends DinoEntityBase implements GeoEntity {
ChilesaurusVariant randomVariant = Util.getRandom(ChilesaurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -300,17 +303,10 @@ public class ChilesaurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelophysisEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -55,8 +56,9 @@ public class CoelophysisEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 19200;
private static final float MIN_ANIMAL_SCALE = 0.5F;
private static final float MAX_ANIMAL_SCALE = 0.9F;
private static final float ANIMAL_SCALE = 0.7F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -143,6 +145,7 @@ public class CoelophysisEntity extends DinoEntityBase implements GeoEntity {
CoelophysisVariant randomVariant = Util.getRandom(CoelophysisVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -312,17 +315,10 @@ public class CoelophysisEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}
common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelurusEntity.java
+8 -12
View File
@@ -1,5 +1,6 @@
package net.cmr.jurassicrevived.entity.custom;
import net.cmr.jurassicrevived.Constants;
import net.cmr.jurassicrevived.block.ModBlocks;
import net.cmr.jurassicrevived.entity.ModEntities;
import net.cmr.jurassicrevived.entity.ai.DinoData;
@@ -55,8 +56,9 @@ public class CoelurusEntity extends DinoEntityBase implements GeoEntity {
private AnimatableInstanceCache cache = new SingletonAnimatableInstanceCache(this);
public static final int BABY_TO_ADULT_AGE_TICKS = 24000;
private static final float MIN_ANIMAL_SCALE = 0.3F;
private static final float MAX_ANIMAL_SCALE = 0.7F;
private static final float ANIMAL_SCALE = 0.5F;
private static final float MIN_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE - 0.2F) : ANIMAL_SCALE;
private static final float MAX_ANIMAL_SCALE = !Constants.DEBUG_SIZES ? (ANIMAL_SCALE + 0.2F) : ANIMAL_SCALE;
private float lastDimensionsScale = 1.0F;
@@ -143,6 +145,7 @@ public class CoelurusEntity extends DinoEntityBase implements GeoEntity {
CoelurusVariant randomVariant = Util.getRandom(CoelurusVariant.values(), this.random);
baby.setVariant(randomVariant);
baby.setBaby(true);
baby.setAnimalScale(Mth.nextFloat(this.random, MIN_ANIMAL_SCALE, MAX_ANIMAL_SCALE));
}
return child;
}
@@ -312,17 +315,10 @@ public class CoelurusEntity extends DinoEntityBase implements GeoEntity {
}
}
/*? if <=1.20.1 {*/
@Override
public EntityDimensions getDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
/*?} else {*/
/*@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
return this.getType().getDimensions().scale(this.getTotalModelScale());
}
*//*?}*/
public float getDinoScale() {
return this.getTotalModelScale();
}
public int getTypeVariant() {
return this.entityData.get(VARIANT);
}

Some files were not shown because too many files have changed in this diff Show More