Fix baby mobs not interacting properly with the new scale attribute (#8108)

Author: pupnewfster

src/additions/java/mekanism/additions/client/render/entity/RenderBabyEnderman.java

@@ -41,7 +41,8 @@ public void render(EntityBabyEnderman enderman, float entityYaw, float partialTi
     @Override
     public Vec3 getRenderOffset(EntityBabyEnderman enderman, float partialTicks) {
         if (enderman.isCreepy()) {
-            return new Vec3(this.random.nextGaussian() * 0.02, 0, this.random.nextGaussian() * 0.02);
+            double offset = 0.02 * enderman.getScale();
+            return new Vec3(this.random.nextGaussian() * offset, 0, this.random.nextGaussian() * offset);
         }
         return super.getRenderOffset(enderman, partialTicks);
     }

src/additions/java/mekanism/additions/common/entity/baby/EntityBabyBogged.java

@@ -1,9 +1,12 @@
 package mekanism.additions.common.entity.baby;
 
 import mekanism.additions.common.registries.AdditionsEntityTypes;
+import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.monster.Bogged;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.NotNull;
 
 public class EntityBabyBogged extends Bogged {
 
@@ -17,4 +20,11 @@ public EntityBabyBogged(EntityType<EntityBabyBogged> type, Level world) {
     public boolean isBaby() {
         return true;
     }
+
+    @NotNull
+    @Override
+    public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
+        //Note: We already have the age scale factored into the dimensions
+        return getType().getDimensions();
+    }
 }

src/additions/java/mekanism/additions/common/entity/baby/EntityBabyCreeper.java

@@ -1,9 +1,12 @@
 package mekanism.additions.common.entity.baby;
 
 import mekanism.additions.common.registries.AdditionsEntityTypes;
+import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.NotNull;
 
 public class EntityBabyCreeper extends Creeper {
 
@@ -18,6 +21,13 @@ public boolean isBaby() {
         return true;
     }
 
+    @NotNull
+    @Override
+    public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
+        //Note: We already have the age scale factored into the dimensions
+        return getType().getDimensions();
+    }
+
     /**
      * Modify vanilla's explode method to half the explosion strength of baby creepers, and charged baby creepers
      */

src/additions/java/mekanism/additions/common/entity/baby/EntityBabyEnderman.java

@@ -1,9 +1,12 @@
 package mekanism.additions.common.entity.baby;
 
 import mekanism.additions.common.registries.AdditionsEntityTypes;
+import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.NotNull;
 
 public class EntityBabyEnderman extends EnderMan {
 
@@ -17,4 +20,11 @@ public EntityBabyEnderman(EntityType<EntityBabyEnderman> type, Level world) {
     public boolean isBaby() {
         return true;
     }
+
+    @NotNull
+    @Override
+    public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
+        //Note: We already have the age scale factored into the dimensions
+        return getType().getDimensions();
+    }
 }

src/additions/java/mekanism/additions/common/entity/baby/EntityBabySkeleton.java

@@ -1,10 +1,13 @@
 package mekanism.additions.common.entity.baby;
 
 import mekanism.additions.common.registries.AdditionsEntityTypes;
+import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.monster.Skeleton;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.LevelEvent;
+import org.jetbrains.annotations.NotNull;
 
 public class EntityBabySkeleton extends Skeleton {
 
@@ -19,6 +22,13 @@ public boolean isBaby() {
         return true;
     }
 
+    @NotNull
+    @Override
+    public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
+        //Note: We already have the age scale factored into the dimensions
+        return getType().getDimensions();
+    }
+
     @Override
     protected void doFreezeConversion() {
         convertTo(AdditionsEntityTypes.BABY_STRAY.value(), true);

src/additions/java/mekanism/additions/common/entity/baby/EntityBabyStray.java

@@ -4,12 +4,15 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.monster.Stray;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ServerLevelAccessor;
 import net.minecraft.world.level.block.Blocks;
+import org.jetbrains.annotations.NotNull;
 
 public class EntityBabyStray extends Stray {
 
@@ -39,4 +42,11 @@ public EntityBabyStray(EntityType<EntityBabyStray> type, Level world) {
     public boolean isBaby() {
         return true;
     }
+
+    @NotNull
+    @Override
+    public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
+        //Note: We already have the age scale factored into the dimensions
+        return getType().getDimensions();
+    }
 }

src/additions/java/mekanism/additions/common/entity/baby/EntityBabyWitherSkeleton.java

@@ -1,9 +1,12 @@
 package mekanism.additions.common.entity.baby;
 
 import mekanism.additions.common.registries.AdditionsEntityTypes;
+import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.monster.WitherSkeleton;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.NotNull;
 
 public class EntityBabyWitherSkeleton extends WitherSkeleton {
 
@@ -17,4 +20,11 @@ public EntityBabyWitherSkeleton(EntityType<EntityBabyWitherSkeleton> type, Level
     public boolean isBaby() {
         return true;
     }
+
+    @NotNull
+    @Override
+    public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
+        //Note: We already have the age scale factored into the dimensions
+        return getType().getDimensions();
+    }
 }