Fix not nerfing the baby stray's projectile shots, and move the modifier to a config option

Author: pupnewfster

src/additions/java/mekanism/additions/common/config/AdditionsConfig.java

@@ -30,6 +30,7 @@ public class AdditionsConfig extends BaseMekanismConfig {
 
     public final CachedIntValue obsidianTNTDelay;
     public final CachedFloatValue obsidianTNTBlastRadius;
+    public final CachedDoubleValue babyArrowDamageMultiplier;
     public final CachedBooleanValue voiceServerEnabled;
     public final CachedIntValue voicePort;
     private final Map<BabyType, SpawnConfig> spawnConfigs = new EnumMap<>(BabyType.class);
@@ -43,6 +44,9 @@ public class AdditionsConfig extends BaseMekanismConfig {
         obsidianTNTBlastRadius = CachedFloatValue.wrap(this, builder.comment("Radius of the explosion of Obsidian TNT.")
               .defineInRange("obsidianTNTBlastRadius", 12, 0.1, 1_000));
 
+        babyArrowDamageMultiplier = CachedDoubleValue.wrap(this, builder.comment("Damage multiplier of arrows shot by baby mobs.")
+              .defineInRange("babyArrowDamageMultiplier", 0.25, 0.1, 10));
+
         voiceServerEnabled = CachedBooleanValue.wrap(this, builder.comment("Enables the voice server for Walkie Talkies.").worldRestart()
               .define("voiceServerEnabled", false));
         voicePort = CachedIntValue.wrap(this, builder.comment("TCP port for the Voice server to listen on.")

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

@@ -1,5 +1,6 @@
 package mekanism.additions.common.entity.baby;
 
+import mekanism.additions.common.config.MekanismAdditionsConfig;
 import mekanism.additions.common.registries.AdditionsEntityTypes;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.DifficultyInstance;
@@ -34,15 +35,16 @@ public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
         return getType().getDimensions();
     }
 
+    @NotNull
     @Override
-    protected AbstractArrow getArrow(ItemStack arrow, float velocity, @Nullable ItemStack weapon) {
+    protected AbstractArrow getArrow(@NotNull ItemStack arrow, float velocity, @Nullable ItemStack weapon) {
         AbstractArrow projectile = super.getArrow(arrow, velocity, weapon);
-        projectile.setBaseDamage(projectile.getBaseDamage() * 0.25);
+        projectile.setBaseDamage(projectile.getBaseDamage() * MekanismAdditionsConfig.additions.babyArrowDamageMultiplier.get());
         return projectile;
     }
 
     @Override
-    protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) {
+    protected void populateDefaultEquipmentSlots(@NotNull RandomSource random, @NotNull DifficultyInstance difficulty) {
         super.populateDefaultEquipmentSlots(random, difficulty);
         for (EquipmentSlot slot : EquipmentSlot.values()) {
             if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) {

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

@@ -1,5 +1,6 @@
 package mekanism.additions.common.entity.baby;
 
+import mekanism.additions.common.config.MekanismAdditionsConfig;
 import mekanism.additions.common.registries.AdditionsEntityTypes;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.DifficultyInstance;
@@ -43,15 +44,16 @@ protected void doFreezeConversion() {
         }
     }
 
+    @NotNull
     @Override
-    protected AbstractArrow getArrow(ItemStack arrow, float velocity, @Nullable ItemStack weapon) {
+    protected AbstractArrow getArrow(@NotNull ItemStack arrow, float velocity, @Nullable ItemStack weapon) {
         AbstractArrow projectile = super.getArrow(arrow, velocity, weapon);
-        projectile.setBaseDamage(projectile.getBaseDamage() * 0.25);
+        projectile.setBaseDamage(projectile.getBaseDamage() * MekanismAdditionsConfig.additions.babyArrowDamageMultiplier.get());
         return projectile;
     }
 
     @Override
-    protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) {
+    protected void populateDefaultEquipmentSlots(@NotNull RandomSource random, @NotNull DifficultyInstance difficulty) {
         super.populateDefaultEquipmentSlots(random, difficulty);
         for (EquipmentSlot slot : EquipmentSlot.values()) {
             if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) {

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

@@ -1,5 +1,6 @@
 package mekanism.additions.common.entity.baby;
 
+import mekanism.additions.common.config.MekanismAdditionsConfig;
 import mekanism.additions.common.registries.AdditionsEntityTypes;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -11,11 +12,13 @@
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.monster.Stray;
+import net.minecraft.world.entity.projectile.AbstractArrow;
 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;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class EntityBabyStray extends Stray {
 
@@ -53,8 +56,16 @@ public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
         return getType().getDimensions();
     }
 
+    @NotNull
+    @Override
+    protected AbstractArrow getArrow(@NotNull ItemStack arrow, float velocity, @Nullable ItemStack weapon) {
+        AbstractArrow projectile = super.getArrow(arrow, velocity, weapon);
+        projectile.setBaseDamage(projectile.getBaseDamage() * MekanismAdditionsConfig.additions.babyArrowDamageMultiplier.get());
+        return projectile;
+    }
+
     @Override
-    protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) {
+    protected void populateDefaultEquipmentSlots(@NotNull RandomSource random, @NotNull DifficultyInstance difficulty) {
         super.populateDefaultEquipmentSlots(random, difficulty);
         for (EquipmentSlot slot : EquipmentSlot.values()) {
             if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) {

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

@@ -33,7 +33,7 @@ public EntityDimensions getDefaultDimensions(@NotNull Pose pose) {
     }
 
     @Override
-    protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInstance difficulty) {
+    protected void populateDefaultEquipmentSlots(@NotNull RandomSource random, @NotNull DifficultyInstance difficulty) {
         super.populateDefaultEquipmentSlots(random, difficulty);
         for (EquipmentSlot slot : EquipmentSlot.values()) {
             if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) {