From 091c18b3288ea00a1e035b06bb2b4136871cc283 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 3 Dec 2021 10:32:08 +0000 Subject: [PATCH] API: Changed int to double --- .../com/willfp/ecoskills/api/modifier/ItemStatModifier.java | 6 +++--- .../willfp/ecoskills/api/modifier/PlayerStatModifier.java | 6 +++--- .../com/willfp/ecoskills/api/modifier/StatModifier.java | 2 +- .../src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlayer.kt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/ItemStatModifier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/ItemStatModifier.java index 2b269a3..1481686 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/ItemStatModifier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/ItemStatModifier.java @@ -19,7 +19,7 @@ public class ItemStatModifier implements StatModifier { /** * The amount. */ - private final int amount; + private final double amount; /** * The slots. @@ -59,7 +59,7 @@ public class ItemStatModifier implements StatModifier { */ public ItemStatModifier(@NotNull final NamespacedKey key, @NotNull final Stat stat, - final int amount, + final double amount, @NotNull final ModifierOperation operation, @NotNull final EquipmentSlot... slot) { this.key = key; @@ -80,7 +80,7 @@ public class ItemStatModifier implements StatModifier { } @Override - public int getAmount() { + public double getAmount() { return amount; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/PlayerStatModifier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/PlayerStatModifier.java index 65f4858..c2339b8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/PlayerStatModifier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/PlayerStatModifier.java @@ -18,7 +18,7 @@ public class PlayerStatModifier implements StatModifier { /** * The amount. */ - private final int amount; + private final double amount; /** * The operation. @@ -50,7 +50,7 @@ public class PlayerStatModifier implements StatModifier { */ public PlayerStatModifier(@NotNull final NamespacedKey key, @NotNull final Stat stat, - final int amount, + final double amount, @NotNull final ModifierOperation operation) { this.key = key; this.stat = stat; @@ -69,7 +69,7 @@ public class PlayerStatModifier implements StatModifier { } @Override - public int getAmount() { + public double getAmount() { return amount; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/StatModifier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/StatModifier.java index 65eea61..7a5afcb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/StatModifier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/api/modifier/StatModifier.java @@ -23,7 +23,7 @@ public interface StatModifier { * * @return The amount. */ - int getAmount(); + double getAmount(); /** * Get the operation. diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlayer.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlayer.kt index 075223e..4b2d0f1 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlayer.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlayer.kt @@ -142,7 +142,7 @@ fun OfflinePlayer.getStatLevel(stat: Stat): Int { } fun Player.getBonusStatLevel(stat: Stat): Int { - var i = 0 + var i = 0.0 for (modifier in this.getStatModifiers()) { if (modifier.stat == stat) { if (modifier.operation == ModifierOperation.ADD) { @@ -157,7 +157,7 @@ fun Player.getBonusStatLevel(stat: Stat): Int { } } } - return i + return i.toInt() } fun OfflinePlayer.getBaseStatLevel(stat: Stat): Int {