Update multipliers to double's

maximjsx · May 29, 2024 · c74d3a5 · c74d3a5
1 parent cf4dd34
commit c74d3a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/com/maximde/entitysize/EntitySize.java b/src/main/java/com/maximde/entitysize/EntitySize.java
@@ -62,7 +62,7 @@ public void setSize(LivingEntity livingEntity, double newScale) {
         if (this.configuration.isJumpMultiplier()) {
             if (livingEntity.getAttribute(Attribute.GENERIC_JUMP_STRENGTH) != null) {
                 livingEntity.getAttribute(Attribute.GENERIC_JUMP_STRENGTH).setBaseValue(getValidBase(0.41D, 32, newScale * configuration.getJumpMultiplier()));
-                livingEntity.getAttribute(Attribute.GENERIC_JUMP_STRENGTH).setBaseValue(Math.max(getValidBase(0.41D, 32, (newScale > 1 ? newScale / 2 : newScale) * configuration.getJumpMultiplier()), 0.2));
+                livingEntity.getAttribute(Attribute.GENERIC_JUMP_STRENGTH).setBaseValue(Math.max(getValidBase(0.41D, 32, newScale * configuration.getJumpMultiplier()), 0.2));
             }
         }
         if (this.configuration.isReachMultiplier()) {
@@ -75,7 +75,7 @@ public void setSize(LivingEntity livingEntity, double newScale) {
         }
         if (this.configuration.isSpeedMultiplier()) {
             if (livingEntity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED) != null) {
-                livingEntity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue(Math.max(getValidBase(0.1D, 1024, (newScale > 1 ? newScale / 2 : newScale) * configuration.getSpeedMultiplier()), 0.03));
+                livingEntity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue(Math.max(getValidBase(0.1D, 1024, newScale * configuration.getSpeedMultiplier()), 0.03));
             }
         }
         if (this.configuration.isStepHeightMultiplier()) {

diff --git a/src/main/java/com/maximde/entitysize/utils/Config.java b/src/main/java/com/maximde/entitysize/utils/Config.java
@@ -21,11 +21,11 @@ public class Config {
     private boolean isSaveFallDistanceMultiplier;
     private int transitionSteps;
 
-    private int reachMultiplier;
-    private int stepHeightMultiplier;
-    private int speedMultiplier;
-    private int jumpMultiplier;
-    private int saveFallDistanceMultiplier;
+    private double reachMultiplier;
+    private double stepHeightMultiplier;
+    private double speedMultiplier;
+    private double jumpMultiplier;
+    private double saveFallDistanceMultiplier;
 
     public Config() {
         setDefault("General.bStats", true);
@@ -55,11 +55,11 @@ private void initValues() {
         this.isJumpMultiplier = cfg.getBoolean("Size.IsJumpMultiplier");
         this.isSaveFallDistanceMultiplier = cfg.getBoolean("Size.IsSaveFallDistanceMultiplier");
 
-        this.reachMultiplier = cfg.getInt("Size.ReachMultiplier");
-        this.stepHeightMultiplier = cfg.getInt("Size.StepHeightMultiplier");
-        this.speedMultiplier = cfg.getInt("Size.SpeedMultiplier");
-        this.jumpMultiplier = cfg.getInt("Size.JumpMultiplier");
-        this.saveFallDistanceMultiplier = cfg.getInt("Size.SaveFallDistanceMultiplier");
+        this.reachMultiplier = cfg.getDouble("Size.ReachMultiplier");
+        this.stepHeightMultiplier = cfg.getDouble("Size.StepHeightMultiplier");
+        this.speedMultiplier = cfg.getDouble("Size.SpeedMultiplier");
+        this.jumpMultiplier = cfg.getDouble("Size.JumpMultiplier");
+        this.saveFallDistanceMultiplier = cfg.getDouble("Size.SaveFallDistanceMultiplier");
 
         this.transitionSteps = cfg.getInt("Size.TransitionSteps");
     }