diff --git a/.gradle/7.3.3/checksums/checksums.lock b/.gradle/7.3.3/checksums/checksums.lock index d20ec9f..ccab47b 100644 Binary files a/.gradle/7.3.3/checksums/checksums.lock and b/.gradle/7.3.3/checksums/checksums.lock differ diff --git a/.gradle/7.3.3/executionHistory/executionHistory.bin b/.gradle/7.3.3/executionHistory/executionHistory.bin index 5e007ee..d7b065c 100644 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.bin and b/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock index e199d1b..efec063 100644 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.lock and b/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin index 56f6852..b2fc35e 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.bin and b/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock index 0273a9c..f961203 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.lock and b/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index 979bc31..8247675 100644 Binary files a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 51a1807..1482185 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 002d577..cd4f77c 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index dcb3c8d..1371db3 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/io/github/simplex/api/LuckContainer.java b/src/main/java/io/github/simplex/api/LuckContainer.java index 62e847e..dee2cc1 100644 --- a/src/main/java/io/github/simplex/api/LuckContainer.java +++ b/src/main/java/io/github/simplex/api/LuckContainer.java @@ -18,5 +18,5 @@ public interface LuckContainer extends Serializable { Player associatedPlayer(); - double baseValue(); + double getValue(); } diff --git a/src/main/java/io/github/simplex/luck/FeelingLucky.java b/src/main/java/io/github/simplex/luck/FeelingLucky.java index db40b7e..70c188d 100644 --- a/src/main/java/io/github/simplex/luck/FeelingLucky.java +++ b/src/main/java/io/github/simplex/luck/FeelingLucky.java @@ -52,6 +52,6 @@ public final class FeelingLucky extends JavaPlugin { @Override public void onDisable() { Bukkit.getLogger().info("Saving all player configurations..."); - configMap.forEach((u, pc) -> pc.save()); + configMap.values().forEach(PlayerConfig::save); } } diff --git a/src/main/java/io/github/simplex/luck/LuckCMD.java b/src/main/java/io/github/simplex/luck/LuckCMD.java index 7e75854..9bafe1f 100644 --- a/src/main/java/io/github/simplex/luck/LuckCMD.java +++ b/src/main/java/io/github/simplex/luck/LuckCMD.java @@ -3,7 +3,6 @@ package io.github.simplex.luck; import io.github.simplex.lib.Messages; import io.github.simplex.luck.player.Luck; import io.github.simplex.luck.player.PlayerConfig; -import io.github.simplex.luck.player.PlayerHandler; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.TextColor; @@ -47,21 +46,21 @@ public class LuckCMD extends Command implements TabCompleter { case "set" -> { luck.setValue(amount); plugin.handler.updatePlayer(player, luck); - config.setLuck(luck.baseValue()); + config.setLuck(luck.getValue()); sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat.")); return true; } case "give" -> { luck.addTo(amount); plugin.handler.updatePlayer(player, luck); - config.setLuck(luck.baseValue()); + config.setLuck(luck.getValue()); sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat.")); return true; } case "take" -> { luck.takeFrom(amount); plugin.handler.updatePlayer(player, luck); - config.setLuck(luck.baseValue()); + config.setLuck(luck.getValue()); sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat.")); return true; } @@ -83,7 +82,7 @@ public class LuckCMD extends Command implements TabCompleter { } Luck luck = plugin.handler.getLuckContainer(player); - sender.sendMessage(Component.empty().content("Luck stat for " + args[1] + ": " + luck.baseValue())); + sender.sendMessage(Component.empty().content("Luck stat for " + args[1] + ": " + luck.getValue())); return true; } @@ -99,7 +98,7 @@ public class LuckCMD extends Command implements TabCompleter { PlayerConfig config = FeelingLucky.getConfigMap().get(player.getUniqueId()); luck.reset(); plugin.handler.updatePlayer(player, luck); - config.setLuck(luck.baseValue()); + config.setLuck(luck.getValue()); sender.sendMessage(Component.empty().content("Successfully reset " + args[1] + "'s Luck stat.")); return true; } diff --git a/src/main/java/io/github/simplex/luck/player/Luck.java b/src/main/java/io/github/simplex/luck/player/Luck.java index d344a9b..3efdb82 100644 --- a/src/main/java/io/github/simplex/luck/player/Luck.java +++ b/src/main/java/io/github/simplex/luck/player/Luck.java @@ -58,7 +58,7 @@ public class Luck implements LuckContainer { rng = RNG().nextDouble(0.0, 1024.0); } - double actual = (rng / 1024.0) * 100; + double actual = Math.round((rng / 1024.0) * 100); return (percentage >= actual); } @@ -101,7 +101,7 @@ public class Luck implements LuckContainer { rng = RNG().nextDouble(0.0, 1024.0); } - double actual = (rng / 1024) * 100; + double actual = Math.round((rng / 1024) * 100); if (multiplier() > 1.0) { return ((percentage * multiplier()) >= actual); @@ -111,15 +111,15 @@ public class Luck implements LuckContainer { } public void reset() { - setValue(defaultValue()); + setValue(getDefaultValue()); } @Override - public double baseValue() { + public double getValue() { return BASE_VALUE; } - public double defaultValue() { + public double getDefaultValue() { return player.getAttribute(Attribute.GENERIC_LUCK).getDefaultValue(); } @@ -130,39 +130,39 @@ public class Luck implements LuckContainer { } public void addTo(double value) { - if (value >= 1024.0 || (baseValue() + value) >= 1024.0) { + if (value >= 1024.0 || (getValue() + value) >= 1024.0) { setValue(1024.0); return; } - setValue(baseValue() + value); + setValue(getValue() + value); } public void takeFrom(double value) { - if (value <= -1024.0 || (baseValue() - value) <= -1024.0) { + if (value <= -1024.0 || (getValue() - value) <= -1024.0) { setValue(-1024.0); return; } - setValue(baseValue() + value); + setValue(getValue() + value); } public double getPercentage() { - return baseValue() - defaultValue(); + return getValue() - getDefaultValue(); } public boolean notDefault() { - return baseValue() != defaultValue(); + return getValue() != getDefaultValue(); } public boolean lessThan(double value) { - return baseValue() < value; + return getValue() < value; } public boolean greaterThan(double value) { - return baseValue() > value; + return getValue() > value; } @Override public String toString() { - return "" + baseValue(); + return "" + getValue(); } } diff --git a/src/main/java/io/github/simplex/luck/player/PlayerConfig.java b/src/main/java/io/github/simplex/luck/player/PlayerConfig.java index dece37a..63c9f69 100644 --- a/src/main/java/io/github/simplex/luck/player/PlayerConfig.java +++ b/src/main/java/io/github/simplex/luck/player/PlayerConfig.java @@ -47,7 +47,7 @@ public class PlayerConfig { if (tempUsername != null && !tempUsername.equalsIgnoreCase(player.getName())) { config.set("username", player.getName()); - config.set("luck", plugin.handler.getLuckContainer(player).defaultValue()); + config.set("luck", plugin.handler.getLuckContainer(player).getDefaultValue()); config.set("multiplier", "1.0"); save(); }