From d7481278937a1d9a923d542f0a4f9d7cdfcb28b5 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 29 Nov 2020 12:32:55 +0000 Subject: [PATCH] Refactored utils --- .../com/willfp/ecoenchants/mmo/MMOMain.java | 2 +- .../willfp/ecoenchants/EcoEnchantsPlugin.java | 2 +- .../command/commands/CommandEcodebug.java | 2 +- .../command/commands/CommandEcoreload.java | 2 +- .../TabCompleterEnchantinfo.java | 10 +-- .../config/UpdatingYamlConfig.java | 2 +- .../willfp/ecoenchants/config/YamlConfig.java | 2 +- .../config/configs/EnchantmentConfig.java | 2 +- .../ecoenchants/display/EnchantDisplay.java | 2 +- .../ecoenchants/display/EnchantmentCache.java | 2 +- .../ecoenchants/normal/Beheading.java | 2 +- .../ecoenchants/normal/Extraction.java | 2 +- .../ecoenchants/normal/Farmhand.java | 6 +- .../ecoenchants/normal/Fetching.java | 2 +- .../ecoenchants/normal/InfernalTouch.java | 2 +- .../ecoenchants/normal/MagmaWalker.java | 4 +- .../ecoenchants/normal/Necrotic.java | 2 +- .../ecoenchants/normal/Spearfishing.java | 2 +- .../ecoenchants/normal/StoneSwitcher.java | 2 +- .../ecoenchants/normal/Telekinesis.java | 2 +- .../ecoenchants/normal/Transfuse.java | 2 +- .../listeners/PlayerJoinListener.java | 2 +- .../willfp/ecoenchants/util/StringUtils.java | 7 ++ .../willfp/ecoenchants/util/VectorShapes.java | 87 ------------------- .../willfp/ecoenchants/util/VectorUtils.java | 81 +++++++++++++++++ .../util/{ => internal}/DropQueue.java | 3 +- .../util/{ => internal}/Loader.java | 2 +- .../util/{ => internal}/Logger.java | 3 +- .../util/{ => internal}/UpdateChecker.java | 2 +- 29 files changed, 120 insertions(+), 123 deletions(-) delete mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/util/VectorShapes.java rename Plugin/src/main/java/com/willfp/ecoenchants/util/{ => internal}/DropQueue.java (97%) rename Plugin/src/main/java/com/willfp/ecoenchants/util/{ => internal}/Loader.java (99%) rename Plugin/src/main/java/com/willfp/ecoenchants/util/{ => internal}/Logger.java (84%) rename Plugin/src/main/java/com/willfp/ecoenchants/util/{ => internal}/UpdateChecker.java (97%) diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java index 4e1d17cc..d121c3d9 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java +++ b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java @@ -16,7 +16,7 @@ import com.willfp.ecoenchants.mmo.enchants.stamina.Endurance; import com.willfp.ecoenchants.mmo.enchants.stamina.Fortitude; import com.willfp.ecoenchants.mmo.enchants.stamina.Motivate; import com.willfp.ecoenchants.mmo.structure.MMOEnchant; -import com.willfp.ecoenchants.util.Logger; +import com.willfp.ecoenchants.util.internal.Logger; import org.bukkit.Bukkit; public class MMOMain extends Extension { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java index 93e05d46..bac9b8c3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants; import com.comphenix.protocol.ProtocolManager; import com.willfp.ecoenchants.extensions.loader.EcoExtensionLoader; import com.willfp.ecoenchants.extensions.loader.ExtensionLoader; -import com.willfp.ecoenchants.util.Loader; +import com.willfp.ecoenchants.util.internal.Loader; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java index e7b90a8e..2b81a810 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java @@ -5,7 +5,7 @@ import com.willfp.ecoenchants.command.AbstractCommand; import com.willfp.ecoenchants.display.EnchantmentCache; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.util.Logger; +import com.willfp.ecoenchants.util.internal.Logger; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.enchantments.Enchantment; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java index 96abf7e6..7d68fe95 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.command.commands; import com.willfp.ecoenchants.command.AbstractCommand; import com.willfp.ecoenchants.config.ConfigManager; -import com.willfp.ecoenchants.util.Loader; +import com.willfp.ecoenchants.util.internal.Loader; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java index ae2503b3..2b4e1770 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java @@ -4,6 +4,7 @@ import com.willfp.ecoenchants.command.AbstractCommand; import com.willfp.ecoenchants.command.AbstractTabCompleter; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.util.StringUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.util.StringUtil; @@ -25,13 +26,6 @@ public class TabCompleterEnchantinfo extends AbstractTabCompleter { enchantsNames.addAll(EcoEnchants.getAll().stream().filter(EcoEnchant::isEnabled).map(EcoEnchant::getName).collect(Collectors.toList())); } - private static String removePrefix(String s, String prefix) { - if (s != null && prefix != null && s.startsWith(prefix)) { - return s.substring(prefix.length()); - } - return s; - } - @Override public List onTab(CommandSender sender, List args) { List completions = new ArrayList<>(); @@ -48,7 +42,7 @@ public class TabCompleterEnchantinfo extends AbstractTabCompleter { finishedArgs.remove(args.size() - 1); String prefix = String.join(" ", finishedArgs); - completions = completions.stream().map(enchantName -> removePrefix(enchantName, prefix).trim()).collect(Collectors.toList()); + completions = completions.stream().map(enchantName -> StringUtils.removePrefix(enchantName, prefix).trim()).collect(Collectors.toList()); } Collections.sort(completions); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/UpdatingYamlConfig.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/UpdatingYamlConfig.java index 0141ec90..9de960cf 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/UpdatingYamlConfig.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/UpdatingYamlConfig.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.config; import com.willfp.ecoenchants.EcoEnchantsPlugin; -import com.willfp.ecoenchants.util.Logger; +import com.willfp.ecoenchants.util.internal.Logger; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/YamlConfig.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/YamlConfig.java index ebc6322c..ea021af4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/YamlConfig.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/YamlConfig.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.config; import com.willfp.ecoenchants.EcoEnchantsPlugin; -import com.willfp.ecoenchants.util.Logger; +import com.willfp.ecoenchants.util.internal.Logger; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java index d33e80e8..9a9f302e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java @@ -6,7 +6,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget; -import com.willfp.ecoenchants.util.Logger; +import com.willfp.ecoenchants.util.internal.Logger; import org.bukkit.NamespacedKey; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index f7209aea..dbd81cfe 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -84,7 +84,7 @@ public class EnchantDisplay { * @param item The item to revert * @return The item, updated */ - public static ItemStack revertDisplay(ItemStack item) { + public static ItemStack revertDisplay(final ItemStack item) { if(item == null || !EnchantmentTarget.ALL.getMaterials().contains(item.getType()) || item.getItemMeta() == null) return item; ItemMeta meta = item.getItemMeta(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java index 9aebef33..831c7d02 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java @@ -4,7 +4,7 @@ import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; -import com.willfp.ecoenchants.util.Logger; +import com.willfp.ecoenchants.util.internal.Logger; import org.apache.commons.lang.WordUtils; import org.bukkit.enchantments.Enchantment; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java index 201efa8c..1d7e2135 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java index 120b315f..088e10c7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extraction.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java index 39576e91..490e37ce 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java @@ -5,7 +5,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.util.DurabilityUtils; -import com.willfp.ecoenchants.util.VectorShapes; +import com.willfp.ecoenchants.util.VectorUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -53,9 +53,9 @@ public class Farmhand extends EcoEnchant { Vector[] vecs; if (this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "use-cube")) { - vecs = VectorShapes.getCube(radius); + vecs = VectorUtils.getCube(radius); } else { - vecs = VectorShapes.getSquare(radius); + vecs = VectorUtils.getSquare(radius); } if (!this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "per-block-damage")) { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java index 86e8ca8f..8ac93d0e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java @@ -4,7 +4,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.entitydeathbyentity.EntityDeathByEntityEvent; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.Wolf; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java index 1bc7f5a5..ba3c727a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import com.willfp.ecoenchants.util.tuplets.Pair; import org.bukkit.Bukkit; import org.bukkit.GameMode; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java index 860a420c..7260919d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java @@ -6,7 +6,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; -import com.willfp.ecoenchants.util.VectorShapes; +import com.willfp.ecoenchants.util.VectorUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -36,7 +36,7 @@ public class MagmaWalker extends EcoEnchant { if (!EnchantChecks.boots(player, this)) return; - Vector[] circle = VectorShapes.getCircle(this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "initial-radius") + Vector[] circle = VectorUtils.getCircle(this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "initial-radius") + (this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "per-level-radius") * EnchantChecks.getBootsLevel(player, this) - 1)); AnticheatManager.exemptPlayer(player); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java index a0694bb4..b92cccd5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.entity.WitherSkeleton; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java index cb8d1686..f07324cd 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java @@ -5,7 +5,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.TridentStack; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import com.willfp.ecoenchants.util.NumberUtils; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java index 31436d85..951599c2 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import com.willfp.ecoenchants.util.NumberUtils; import org.bukkit.GameMode; import org.bukkit.Material; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java index e37a201a..eb919012 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java @@ -7,7 +7,7 @@ import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.entitydeathbyentity.EntityDeathByEntityEvent; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.nms.TridentStack; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java index 5f54a668..8d6d9848 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.util.DropQueue; +import com.willfp.ecoenchants.util.internal.DropQueue; import com.willfp.ecoenchants.util.NumberUtils; import org.bukkit.GameMode; import org.bukkit.Material; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/listeners/PlayerJoinListener.java b/Plugin/src/main/java/com/willfp/ecoenchants/listeners/PlayerJoinListener.java index 14ba09fd..a315b085 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/listeners/PlayerJoinListener.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/listeners/PlayerJoinListener.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.listeners; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.config.ConfigManager; -import com.willfp.ecoenchants.util.UpdateChecker; +import com.willfp.ecoenchants.util.internal.UpdateChecker; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java index fce8a2f8..61f9847c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/StringUtils.java @@ -55,4 +55,11 @@ public class StringUtils { return c.stream().map(String::valueOf).collect(Collectors.joining(", ")); } else return String.valueOf(object); } + + public static String removePrefix(String s, String prefix) { + if (s != null && prefix != null && s.startsWith(prefix)) { + return s.substring(prefix.length()); + } + return s; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/VectorShapes.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/VectorShapes.java deleted file mode 100644 index 287262ff..00000000 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/VectorShapes.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.willfp.ecoenchants.util; - -import org.bukkit.util.Vector; - -import java.util.ArrayList; - -public class VectorShapes { - - /** - * Get circle as relative vectors - * @param radius The radius - * @return An array of {@link Vector}s - */ - public static Vector[] getCircle(int radius) { - ArrayList circleVecs = new ArrayList<>(); - - int xoffset = -radius; - int zoffset = -radius; - - while (zoffset <= radius) { - while (xoffset <= radius) { - if (Math.round(Math.sqrt((xoffset * xoffset) + (zoffset * zoffset))) <= radius) { - circleVecs.add(new Vector(xoffset, 0, zoffset)); - } else { - xoffset++; - continue; - } - xoffset++; - } - xoffset = -radius; - zoffset++; - } - - return circleVecs.toArray(new Vector[0]); - } - - /** - * Get square as relative vectors - * @param radius The radius of the square - * @return An array of {@link Vector}s - */ - public static Vector[] getSquare(int radius) { - ArrayList circleVecs = new ArrayList<>(); - - int xoffset = -radius; - int zoffset = -radius; - - while (zoffset <= radius) { - while (xoffset <= radius) { - circleVecs.add(new Vector(xoffset, 0, zoffset)); - xoffset++; - } - xoffset = -radius; - zoffset++; - } - - return circleVecs.toArray(new Vector[0]); - } - - /** - * Get cube as relative vectors - * @param radius The radius of the cube - * @return An array of {@link Vector}s - */ - public static Vector[] getCube(int radius) { - ArrayList cubeVecs = new ArrayList<>(); - - int xoffset = -radius; - int zoffset = -radius; - int yoffset = -radius; - - while (yoffset <= radius) { - while (zoffset <= radius) { - while (xoffset <= radius) { - cubeVecs.add(new Vector(xoffset, yoffset, zoffset)); - xoffset++; - } - xoffset = -radius; - zoffset++; - } - zoffset = -radius; - yoffset++; - } - - return cubeVecs.toArray(new Vector[0]); - } -} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/VectorUtils.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/VectorUtils.java index 4d15e126..847dfa3d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/VectorUtils.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/VectorUtils.java @@ -3,6 +3,8 @@ package com.willfp.ecoenchants.util; import org.bukkit.util.NumberConversions; import org.bukkit.util.Vector; +import java.util.ArrayList; + public class VectorUtils { public static boolean isFinite(Vector vector) { try { @@ -48,4 +50,83 @@ public class VectorUtils { return new Vector(0, 0, 1); } } + + /** + * Get circle as relative vectors + * @param radius The radius + * @return An array of {@link Vector}s + */ + public static Vector[] getCircle(int radius) { + ArrayList circleVecs = new ArrayList<>(); + + int xoffset = -radius; + int zoffset = -radius; + + while (zoffset <= radius) { + while (xoffset <= radius) { + if (Math.round(Math.sqrt((xoffset * xoffset) + (zoffset * zoffset))) <= radius) { + circleVecs.add(new Vector(xoffset, 0, zoffset)); + } else { + xoffset++; + continue; + } + xoffset++; + } + xoffset = -radius; + zoffset++; + } + + return circleVecs.toArray(new Vector[0]); + } + + /** + * Get square as relative vectors + * @param radius The radius of the square + * @return An array of {@link Vector}s + */ + public static Vector[] getSquare(int radius) { + ArrayList circleVecs = new ArrayList<>(); + + int xoffset = -radius; + int zoffset = -radius; + + while (zoffset <= radius) { + while (xoffset <= radius) { + circleVecs.add(new Vector(xoffset, 0, zoffset)); + xoffset++; + } + xoffset = -radius; + zoffset++; + } + + return circleVecs.toArray(new Vector[0]); + } + + /** + * Get cube as relative vectors + * @param radius The radius of the cube + * @return An array of {@link Vector}s + */ + public static Vector[] getCube(int radius) { + ArrayList cubeVecs = new ArrayList<>(); + + int xoffset = -radius; + int zoffset = -radius; + int yoffset = -radius; + + while (yoffset <= radius) { + while (zoffset <= radius) { + while (xoffset <= radius) { + cubeVecs.add(new Vector(xoffset, yoffset, zoffset)); + xoffset++; + } + xoffset = -radius; + zoffset++; + } + zoffset = -radius; + yoffset++; + } + + return cubeVecs.toArray(new Vector[0]); + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/DropQueue.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/DropQueue.java similarity index 97% rename from Plugin/src/main/java/com/willfp/ecoenchants/util/DropQueue.java rename to Plugin/src/main/java/com/willfp/ecoenchants/util/internal/DropQueue.java index 36c4c870..bcc35b07 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/DropQueue.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/DropQueue.java @@ -1,7 +1,8 @@ -package com.willfp.ecoenchants.util; +package com.willfp.ecoenchants.util.internal; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; +import com.willfp.ecoenchants.util.NumberUtils; import org.bukkit.*; import org.bukkit.entity.EntityType; import org.bukkit.entity.ExperienceOrb; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java similarity index 99% rename from Plugin/src/main/java/com/willfp/ecoenchants/util/Loader.java rename to Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java index 07c98efc..dbef4729 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/Loader.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.util; +package com.willfp.ecoenchants.util.internal; import com.comphenix.protocol.ProtocolLibrary; import com.willfp.ecoenchants.EcoEnchantsPlugin; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/Logger.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Logger.java similarity index 84% rename from Plugin/src/main/java/com/willfp/ecoenchants/util/Logger.java rename to Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Logger.java index 77548826..18b8c6b4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/Logger.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Logger.java @@ -1,6 +1,7 @@ -package com.willfp.ecoenchants.util; +package com.willfp.ecoenchants.util.internal; import com.willfp.ecoenchants.EcoEnchantsPlugin; +import com.willfp.ecoenchants.util.StringUtils; public class Logger { private static final EcoEnchantsPlugin INSTANCE = EcoEnchantsPlugin.getInstance(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/UpdateChecker.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/UpdateChecker.java similarity index 97% rename from Plugin/src/main/java/com/willfp/ecoenchants/util/UpdateChecker.java rename to Plugin/src/main/java/com/willfp/ecoenchants/util/internal/UpdateChecker.java index 3d1d8b75..c0ce1385 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/UpdateChecker.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/UpdateChecker.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.util; +package com.willfp.ecoenchants.util.internal; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin;