diff --git a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyBogged.java b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyBogged.java index 7f9a74e7fcd..de79db1da74 100644 --- a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyBogged.java +++ b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyBogged.java @@ -1,8 +1,11 @@ package mekanism.additions.common.entity.baby; import mekanism.additions.common.registries.AdditionsEntityTypes; +import net.minecraft.util.RandomSource; +import net.minecraft.world.DifficultyInstance; import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.monster.Bogged; import net.minecraft.world.entity.projectile.AbstractArrow; @@ -30,11 +33,21 @@ public EntityDimensions getDefaultDimensions(@NotNull Pose pose) { //Note: We already have the age scale factored into the dimensions return getType().getDimensions(); } - + @Override protected AbstractArrow getArrow(ItemStack arrow, float velocity, @Nullable ItemStack weapon) { AbstractArrow projectile = super.getArrow(arrow, velocity, weapon); projectile.setBaseDamage(projectile.getBaseDamage() * 0.25); return projectile; } + + @Override + protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) { + super.populateDefaultEquipmentSlots(random, difficulty); + for (EquipmentSlot slot : EquipmentSlot.values()) { + if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) { + this.setItemSlot(slot, ItemStack.EMPTY); + } + } + } } \ No newline at end of file diff --git a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabySkeleton.java b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabySkeleton.java index 23d7ce6be8e..7031a018f4a 100644 --- a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabySkeleton.java +++ b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabySkeleton.java @@ -1,8 +1,11 @@ package mekanism.additions.common.entity.baby; import mekanism.additions.common.registries.AdditionsEntityTypes; +import net.minecraft.util.RandomSource; +import net.minecraft.world.DifficultyInstance; import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.monster.Skeleton; import net.minecraft.world.entity.projectile.AbstractArrow; @@ -46,4 +49,14 @@ protected AbstractArrow getArrow(ItemStack arrow, float velocity, @Nullable Item projectile.setBaseDamage(projectile.getBaseDamage() * 0.25); return projectile; } + + @Override + protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) { + super.populateDefaultEquipmentSlots(random, difficulty); + for (EquipmentSlot slot : EquipmentSlot.values()) { + if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) { + this.setItemSlot(slot, ItemStack.EMPTY); + } + } + } } \ No newline at end of file diff --git a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyStray.java b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyStray.java index 7d41218467d..642f2a1df0f 100644 --- a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyStray.java +++ b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyStray.java @@ -4,11 +4,14 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; +import net.minecraft.world.DifficultyInstance; import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.monster.Stray; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.Blocks; @@ -49,4 +52,14 @@ public EntityDimensions getDefaultDimensions(@NotNull Pose pose) { //Note: We already have the age scale factored into the dimensions return getType().getDimensions(); } + + @Override + protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) { + super.populateDefaultEquipmentSlots(random, difficulty); + for (EquipmentSlot slot : EquipmentSlot.values()) { + if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) { + this.setItemSlot(slot, ItemStack.EMPTY); + } + } + } } \ No newline at end of file diff --git a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyWitherSkeleton.java b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyWitherSkeleton.java index f1b2e42c870..0de6dd5c335 100644 --- a/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyWitherSkeleton.java +++ b/src/additions/java/mekanism/additions/common/entity/baby/EntityBabyWitherSkeleton.java @@ -1,10 +1,14 @@ package mekanism.additions.common.entity.baby; import mekanism.additions.common.registries.AdditionsEntityTypes; +import net.minecraft.util.RandomSource; +import net.minecraft.world.DifficultyInstance; import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.monster.WitherSkeleton; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; @@ -27,4 +31,14 @@ public EntityDimensions getDefaultDimensions(@NotNull Pose pose) { //Note: We already have the age scale factored into the dimensions return getType().getDimensions(); } + + @Override + protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) { + super.populateDefaultEquipmentSlots(random, difficulty); + for (EquipmentSlot slot : EquipmentSlot.values()) { + if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) { + this.setItemSlot(slot, ItemStack.EMPTY); + } + } + } } \ No newline at end of file