From 2130776df94a64397e5a4ff021335932793bf776 Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Tue, 5 Feb 2019 23:57:30 -0500 Subject: [PATCH] Cleanup. --- EpicBuckets-Legacy-Hooks/pom.xml | 9 +- .../hooks/legacy/HookPlotSquared.java | 2 +- .../hooks/legacy/HookWorldGuard.java | 2 +- .../hooks/ClaimableProtectionPluginHook.java | 12 +- .../utils}/hooks/ProtectionPluginHook.java | 19 +- EpicBuckets-Plugin/pom.xml | 2 +- .../com/songoda/epicbuckets/EpicBuckets.java | 34 +- .../java/com/songoda/epicbuckets/Locale.java | 235 +++++++------- .../epicbuckets/command/AbstractCommand.java | 9 +- .../epicbuckets/command/CommandManager.java | 12 +- .../command/commands/CommandAdminPanel.java | 2 +- .../command/commands/CommandAdminToggle.java | 2 +- .../command/commands/CommandEpicBuckets.java | 2 +- .../command/commands/CommandGive.java | 4 +- .../command/commands/CommandHelp.java | 2 +- .../command/commands/CommandReload.java | 2 +- .../event/GenbucketPlaceEvent.java | 17 +- .../epicbuckets/file/ConfigManager.java | 130 ++++---- .../epicbuckets/genbucket/Genbucket.java | 5 +- .../genbucket/GenbucketManager.java | 5 +- .../com/songoda/epicbuckets/gui/GUIBulk.java | 14 +- .../com/songoda/epicbuckets/gui/GUIMain.java | 2 +- .../com/songoda/epicbuckets/gui/GUIPanel.java | 10 +- .../com/songoda/epicbuckets/gui/GUIShop.java | 7 +- .../epicbuckets/hooks/HookASkyBlock.java | 2 +- .../epicbuckets/hooks/HookFactions.java | 2 +- .../hooks/HookGriefPrevention.java | 2 +- .../epicbuckets/hooks/HookKingdoms.java | 2 +- .../epicbuckets/hooks/HookPlotSquared.java | 2 +- .../epicbuckets/hooks/HookRedProtect.java | 2 +- .../epicbuckets/hooks/HookSkyBlockEarth.java | 2 +- .../songoda/epicbuckets/hooks/HookTowny.java | 3 +- .../epicbuckets/hooks/HookUSkyBlock.java | 2 +- .../epicbuckets/hooks/HookWorldGuard.java | 2 +- .../listeners/GenbucketPlaceListener.java | 8 +- .../listeners/PlayerJoinListeners.java | 28 +- .../com/songoda/epicbuckets/shop/Shop.java | 16 +- .../songoda/epicbuckets/shop/ShopManager.java | 26 +- .../com/songoda/epicbuckets/shop/SubShop.java | 14 +- .../epicbuckets/{util => utils}/ChatUtil.java | 2 +- .../{util => utils}/ConfigWrapper.java | 2 +- .../epicbuckets/{util => utils}/Debugger.java | 2 +- .../{util => utils}/InventoryHelper.java | 5 +- .../{util => utils}/NBTHelper.java | 4 +- .../{util => utils}/ServerVersion.java | 2 +- .../{util => utils}/Validator.java | 4 +- .../{util => utils}/XMaterial.java | 125 ++++---- .../{util => utils}/gui/AbstractAnvilGUI.java | 0 .../{util => utils}/gui/AbstractGUI.java | 0 .../{util => utils}/gui/Clickable.java | 0 .../{util => utils}/gui/OnClose.java | 0 .../{util => utils}/gui/Range.java | 0 .../itemnbtapi/ClassWrapper.java | 0 .../itemnbtapi/NBTCompound.java | 0 .../itemnbtapi/NBTContainer.java | 0 .../{util => utils}/itemnbtapi/NBTEntity.java | 0 .../{util => utils}/itemnbtapi/NBTFile.java | 0 .../{util => utils}/itemnbtapi/NBTItem.java | 0 .../{util => utils}/itemnbtapi/NBTList.java | 0 .../itemnbtapi/NBTListCompound.java | 0 .../itemnbtapi/NBTReflectionUtil.java | 0 .../itemnbtapi/NBTTileEntity.java | 0 .../{util => utils}/itemnbtapi/NBTType.java | 0 .../itemnbtapi/ObjectCreator.java | 0 .../itemnbtapi/ReflectionMethod.java | 0 .../itemnbtapi/utils/GsonWrapper.java | 0 .../itemnbtapi/utils/MinecraftVersion.java | 0 .../{util => utils}/version/NMSUtil.java | 0 dependency-reduced-pom.xml | 297 +++++++++--------- pom.xml | 2 +- 70 files changed, 545 insertions(+), 553 deletions(-) rename {EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util => EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils}/hooks/ClaimableProtectionPluginHook.java (91%) rename {EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util => EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils}/hooks/ProtectionPluginHook.java (78%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/ChatUtil.java (98%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/ConfigWrapper.java (97%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/Debugger.java (95%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/InventoryHelper.java (92%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/NBTHelper.java (88%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/ServerVersion.java (95%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/Validator.java (94%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/XMaterial.java (95%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/gui/AbstractAnvilGUI.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/gui/AbstractGUI.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/gui/Clickable.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/gui/OnClose.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/gui/Range.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/ClassWrapper.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTCompound.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTContainer.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTEntity.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTFile.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTItem.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTList.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTListCompound.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTReflectionUtil.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTTileEntity.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/NBTType.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/ObjectCreator.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/ReflectionMethod.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/utils/GsonWrapper.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/itemnbtapi/utils/MinecraftVersion.java (100%) rename EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/{util => utils}/version/NMSUtil.java (100%) diff --git a/EpicBuckets-Legacy-Hooks/pom.xml b/EpicBuckets-Legacy-Hooks/pom.xml index dae9ff0..0000a46 100644 --- a/EpicBuckets-Legacy-Hooks/pom.xml +++ b/EpicBuckets-Legacy-Hooks/pom.xml @@ -1,4 +1,4 @@ - 4.0.0 @@ -7,7 +7,6 @@ EpicBuckets-Parent maven-version-number - com.songoda EpicBuckets-Legacy-Hooks clean install @@ -20,12 +19,6 @@ - - com.songoda - EpicBuckets-Plugin - ${project.version} - provided - com.sk89q worldguard diff --git a/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookPlotSquared.java b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookPlotSquared.java index 78afa93..cac4bf1 100644 --- a/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookPlotSquared.java +++ b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookPlotSquared.java @@ -2,7 +2,7 @@ package com.songoda.epicbuckets.hooks.legacy; import com.intellectualcrafters.plot.api.PlotAPI; import com.plotsquared.bukkit.BukkitMain; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookWorldGuard.java b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookWorldGuard.java index fa75ffd..96d1f82 100644 --- a/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookWorldGuard.java +++ b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/hooks/legacy/HookWorldGuard.java @@ -1,7 +1,7 @@ package com.songoda.epicbuckets.hooks.legacy; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/hooks/ClaimableProtectionPluginHook.java b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils/hooks/ClaimableProtectionPluginHook.java similarity index 91% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/hooks/ClaimableProtectionPluginHook.java rename to EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils/hooks/ClaimableProtectionPluginHook.java index bbe03b6..2c8e214 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/hooks/ClaimableProtectionPluginHook.java +++ b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils/hooks/ClaimableProtectionPluginHook.java @@ -1,4 +1,4 @@ -package com.songoda.epicbuckets.util.hooks; +package com.songoda.epicbuckets.utils.hooks; import org.bukkit.Location; @@ -8,17 +8,16 @@ import org.bukkit.Location; * interface is not recommended over the ProtectionPluginHook interface as its methods * will not often be used by implementation, though they are available if more information * is desired. It is, however, recommended to use the former - * + * * @author Parker Hawke - 2008Choco */ public interface ClaimableProtectionPluginHook extends ProtectionPluginHook { /** * Check whether the provided location is in the claim with the given String ID - * + * * @param location the location to check - * @param id the ID of the claim to check - * + * @param id the ID of the claim to check * @return true if the location is within the claim, false otherwise or if the * claim ID does not exist */ @@ -29,9 +28,8 @@ public interface ClaimableProtectionPluginHook extends ProtectionPluginHook { * as unique IDs are not provided by a claim implementation, though for plugins * such as factions, the passed parameter is the name of the faction and the * returned String is its unique ID - * + * * @param name the name of the claim to check - * * @return the unique String ID. null if no claim exists */ public String getClaimID(String name); diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/hooks/ProtectionPluginHook.java b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils/hooks/ProtectionPluginHook.java similarity index 78% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/hooks/ProtectionPluginHook.java rename to EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils/hooks/ProtectionPluginHook.java index c38b642..3e00b51 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/hooks/ProtectionPluginHook.java +++ b/EpicBuckets-Legacy-Hooks/src/main/java/com/songoda/epicbuckets/utils/hooks/ProtectionPluginHook.java @@ -1,6 +1,5 @@ -package com.songoda.epicbuckets.util.hooks; +package com.songoda.epicbuckets.utils.hooks; -import com.songoda.epicbuckets.EpicBuckets; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -10,35 +9,31 @@ import org.bukkit.plugin.java.JavaPlugin; * Represents a hook for a protection plugin. This is used by EpicBuckets to determine * whether a block break should be successful or not according to the current state of * another plugin. For plugins providing claims with unique String IDs, see the - * {@link ClaimableProtectionPluginHook} for a more detailed implementation. To register - * a protection hook implementation, see - * {@link EpicBuckets#registerProtectionHook(ProtectionPluginHook)} + * {@link ClaimableProtectionPluginHook} for a more detailed implementation. */ public interface ProtectionPluginHook { /** * The plugin to which this plugin hook belongs. Must not be null - * + * * @return the hooking plugin */ public JavaPlugin getPlugin(); /** * Check whether the provided player may build at the specified location - * - * @param player the player to check + * + * @param player the player to check * @param location the location to check - * * @return true if player is permitted to build, false otherwise */ public boolean canBuild(Player player, Location location); /** * Check whether the provided player may build at the specified block - * + * * @param player the player to check - * @param block the block to check - * + * @param block the block to check * @return true if player is permitted to build, false otherwise */ public default boolean canBuild(Player player, Block block) { diff --git a/EpicBuckets-Plugin/pom.xml b/EpicBuckets-Plugin/pom.xml index 28f2296..3d6fbfd 100644 --- a/EpicBuckets-Plugin/pom.xml +++ b/EpicBuckets-Plugin/pom.xml @@ -1,4 +1,4 @@ - 4.0.0 diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/EpicBuckets.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/EpicBuckets.java index 7d4be4d..bcc508c 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/EpicBuckets.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/EpicBuckets.java @@ -9,12 +9,12 @@ import com.songoda.epicbuckets.listeners.GenbucketPlaceListener; import com.songoda.epicbuckets.listeners.PlayerJoinListeners; import com.songoda.epicbuckets.listeners.SourceBlockBreakListener; import com.songoda.epicbuckets.shop.ShopManager; -import com.songoda.epicbuckets.util.ChatUtil; -import com.songoda.epicbuckets.util.ConfigWrapper; -import com.songoda.epicbuckets.util.Debugger; -import com.songoda.epicbuckets.util.ServerVersion; -import com.songoda.epicbuckets.util.hooks.ClaimableProtectionPluginHook; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.ChatUtil; +import com.songoda.epicbuckets.utils.ConfigWrapper; +import com.songoda.epicbuckets.utils.Debugger; +import com.songoda.epicbuckets.utils.ServerVersion; +import com.songoda.epicbuckets.utils.hooks.ClaimableProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import net.milkbowl.vault.economy.Economy; import org.apache.commons.lang.ArrayUtils; import org.bukkit.Bukkit; @@ -51,6 +51,10 @@ public class EpicBuckets extends JavaPlugin { private List protectionHooks = new ArrayList<>(); private ClaimableProtectionPluginHook factionsHook, townyHook, aSkyblockHook, uSkyblockHook, skyBlockEarhHook; + public static EpicBuckets getInstance() { + return INSTANCE; + } + @Override public void onEnable() { INSTANCE = this; @@ -81,14 +85,19 @@ public class EpicBuckets extends JavaPlugin { pluginManager.registerEvents(new PlayerJoinListeners(this), this); // Register default hooks - if (pluginManager.isPluginEnabled("ASkyBlock")) aSkyblockHook = (ClaimableProtectionPluginHook) this.register(HookASkyBlock::new); - if (pluginManager.isPluginEnabled("FactionsFramework")) factionsHook = (ClaimableProtectionPluginHook) this.register(HookFactions::new); + if (pluginManager.isPluginEnabled("ASkyBlock")) + aSkyblockHook = (ClaimableProtectionPluginHook) this.register(HookASkyBlock::new); + if (pluginManager.isPluginEnabled("FactionsFramework")) + factionsHook = (ClaimableProtectionPluginHook) this.register(HookFactions::new); if (pluginManager.isPluginEnabled("GriefPrevention")) this.register(HookGriefPrevention::new); if (pluginManager.isPluginEnabled("Kingdoms")) this.register(HookKingdoms::new); if (pluginManager.isPluginEnabled("RedProtect")) this.register(HookRedProtect::new); - if (pluginManager.isPluginEnabled("Towny")) townyHook = (ClaimableProtectionPluginHook) this.register(HookTowny::new); - if (pluginManager.isPluginEnabled("USkyBlock")) uSkyblockHook = (ClaimableProtectionPluginHook) this.register(HookUSkyBlock::new); - if (pluginManager.isPluginEnabled("SkyBlock")) skyBlockEarhHook = (ClaimableProtectionPluginHook) this.register(HookSkyBlockEarth::new); + if (pluginManager.isPluginEnabled("Towny")) + townyHook = (ClaimableProtectionPluginHook) this.register(HookTowny::new); + if (pluginManager.isPluginEnabled("USkyBlock")) + uSkyblockHook = (ClaimableProtectionPluginHook) this.register(HookUSkyBlock::new); + if (pluginManager.isPluginEnabled("SkyBlock")) + skyBlockEarhHook = (ClaimableProtectionPluginHook) this.register(HookSkyBlockEarth::new); if (isServerVersionAtLeast(ServerVersion.V1_13)) { if (pluginManager.isPluginEnabled("WorldGuard")) this.register(HookWorldGuard::new); @@ -123,7 +132,6 @@ public class EpicBuckets extends JavaPlugin { return this.registerProtectionHook(hookSupplier.get()); } - public ProtectionPluginHook registerProtectionHook(ProtectionPluginHook hook) { Preconditions.checkNotNull(hook, "Cannot register null hook"); Preconditions.checkNotNull(hook.getPlugin(), "Protection plugin hook returns null plugin instance (#getPlugin())"); @@ -219,6 +227,4 @@ public class EpicBuckets extends JavaPlugin { public References getReferences() { return references; } - - public static EpicBuckets getInstance() { return INSTANCE; } } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/Locale.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/Locale.java index 866f1d3..23425a1 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/Locale.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/Locale.java @@ -23,11 +23,10 @@ import java.util.stream.Collectors; */ public class Locale { - private static JavaPlugin plugin; private static final List LOCALES = Lists.newArrayList(); - private static final Pattern NODE_PATTERN = Pattern.compile("(\\w+(?:\\.{1}\\w+)*)\\s*=\\s*\"(.*)\""); private static final String FILE_EXTENSION = ".lang"; + private static JavaPlugin plugin; private static File localeFolder; private static String defaultLocale; @@ -52,122 +51,6 @@ public class Locale { plugin.getLogger().info("Loaded locale " + fileName); } - /** - * Get the name of the language that this locale is based on. - * (i.e. "en" for English, or "fr" for French) - * - * @return the name of the language - */ - public String getName() { - return name; - } - - /** - * Get the name of the region that this locale is from. - * (i.e. "US" for United States or "CA" for Canada) - * - * @return the name of the region - */ - public String getRegion() { - return region; - } - - /** - * Return the entire locale tag (i.e. "en_US") - * - * @return the language tag - */ - public String getLanguageTag() { - return name + "_" + region; - } - - /** - * Get the file that represents this locale - * - * @return the locale file (.lang) - */ - public File getFile() { - return file; - } - - /** - * Get a message set for a specific node - * - * @param node the node to get - * @return the message for the specified node - */ - public String getMessage(String node) { - return ChatColor.translateAlternateColorCodes('&', this.getMessageOrDefault(node, node)); - } - - /** - * Get a message set for a specific node and replace its params with a supplied arguments. - * - * @param node the node to get - * @param args the replacement arguments - * @return the message for the specified node - */ - public String getMessage(String node, Object... args) { - String message = getMessage(node); - for (Object arg : args) { - message = message.replaceFirst("\\%.*?\\%", arg.toString()); - } - return message; - } - - /** - * Get a message set for a specific node - * - * @param node the node to get - * @param defaultValue the default value given that a value for the node was not found - * @return the message for the specified node. Default if none found - */ - public String getMessageOrDefault(String node, String defaultValue) { - return this.nodes.getOrDefault(node, defaultValue); - } - - /** - * Get the key-value map of nodes to messages - * - * @return node-message map - */ - public Map getMessageNodeMap() { - return ImmutableMap.copyOf(nodes); - } - - /** - * Clear the previous message cache and load new messages directly from file - * - * @return reload messages from file - */ - public boolean reloadMessages() { - if (!this.file.exists()) { - plugin.getLogger().warning("Could not find file for locale " + this.name); - return false; - } - - this.nodes.clear(); // Clear previous data (if any) - - try (BufferedReader reader = new BufferedReader(new FileReader(file))) { - String line; - for (int lineNumber = 0; (line = reader.readLine()) != null; lineNumber++) { - if (line.isEmpty() || line.startsWith("#") /* Comment */) continue; - - Matcher matcher = NODE_PATTERN.matcher(line); - if (!matcher.find()) { - System.err.println("Invalid locale syntax at (line=" + lineNumber + ")"); - continue; - } - - nodes.put(matcher.group(1), matcher.group(2)); - } - } catch (IOException e) { - e.printStackTrace(); - return false; - } - return true; - } - /** * Initialize the locale class to generate information and search for localizations. * This must be called before any other methods in the Locale class can be invoked. @@ -361,4 +244,120 @@ public class Locale { return changed; } + /** + * Get the name of the language that this locale is based on. + * (i.e. "en" for English, or "fr" for French) + * + * @return the name of the language + */ + public String getName() { + return name; + } + + /** + * Get the name of the region that this locale is from. + * (i.e. "US" for United States or "CA" for Canada) + * + * @return the name of the region + */ + public String getRegion() { + return region; + } + + /** + * Return the entire locale tag (i.e. "en_US") + * + * @return the language tag + */ + public String getLanguageTag() { + return name + "_" + region; + } + + /** + * Get the file that represents this locale + * + * @return the locale file (.lang) + */ + public File getFile() { + return file; + } + + /** + * Get a message set for a specific node + * + * @param node the node to get + * @return the message for the specified node + */ + public String getMessage(String node) { + return ChatColor.translateAlternateColorCodes('&', this.getMessageOrDefault(node, node)); + } + + /** + * Get a message set for a specific node and replace its params with a supplied arguments. + * + * @param node the node to get + * @param args the replacement arguments + * @return the message for the specified node + */ + public String getMessage(String node, Object... args) { + String message = getMessage(node); + for (Object arg : args) { + message = message.replaceFirst("\\%.*?\\%", arg.toString()); + } + return message; + } + + /** + * Get a message set for a specific node + * + * @param node the node to get + * @param defaultValue the default value given that a value for the node was not found + * @return the message for the specified node. Default if none found + */ + public String getMessageOrDefault(String node, String defaultValue) { + return this.nodes.getOrDefault(node, defaultValue); + } + + /** + * Get the key-value map of nodes to messages + * + * @return node-message map + */ + public Map getMessageNodeMap() { + return ImmutableMap.copyOf(nodes); + } + + /** + * Clear the previous message cache and load new messages directly from file + * + * @return reload messages from file + */ + public boolean reloadMessages() { + if (!this.file.exists()) { + plugin.getLogger().warning("Could not find file for locale " + this.name); + return false; + } + + this.nodes.clear(); // Clear previous data (if any) + + try (BufferedReader reader = new BufferedReader(new FileReader(file))) { + String line; + for (int lineNumber = 0; (line = reader.readLine()) != null; lineNumber++) { + if (line.isEmpty() || line.startsWith("#") /* Comment */) continue; + + Matcher matcher = NODE_PATTERN.matcher(line); + if (!matcher.find()) { + System.err.println("Invalid locale syntax at (line=" + lineNumber + ")"); + continue; + } + + nodes.put(matcher.group(1), matcher.group(2)); + } + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + } \ No newline at end of file diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/AbstractCommand.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/AbstractCommand.java index cd1e1b6..b05d1bb 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/AbstractCommand.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/AbstractCommand.java @@ -9,16 +9,12 @@ import java.util.List; public abstract class AbstractCommand { - public enum ReturnType { SUCCESS, FAILURE, SYNTAX_ERROR } - private final AbstractCommand parent; - + private final boolean noConsole; private List command; private List subCommand = new ArrayList<>(); - private final boolean noConsole; - protected AbstractCommand(AbstractCommand parent, boolean noConsole, String... command) { if (parent != null) { this.subCommand = Arrays.asList(command); @@ -34,7 +30,6 @@ public abstract class AbstractCommand { } public List getCommand() { - System.out.println(command + " " + (command != null && command.contains("epicbuckets"))); return command; } @@ -57,4 +52,6 @@ public abstract class AbstractCommand { public boolean isNoConsole() { return noConsole; } + + public enum ReturnType {SUCCESS, FAILURE, SYNTAX_ERROR} } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/CommandManager.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/CommandManager.java index c0710e2..1373bd1 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/CommandManager.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/CommandManager.java @@ -3,7 +3,7 @@ package com.songoda.epicbuckets.command; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.References; import com.songoda.epicbuckets.command.commands.*; -import com.songoda.epicbuckets.util.ChatUtil; +import com.songoda.epicbuckets.utils.ChatUtil; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -67,11 +67,11 @@ public class CommandManager implements CommandExecutor { return; } if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) { - AbstractCommand.ReturnType returnType = command.runCommand(instance, sender, strings); - if (returnType == AbstractCommand.ReturnType.SYNTAX_ERROR) { - sender.sendMessage(References.getPrefix() + ChatUtil.colorString("&cInvalid Syntax!")); - sender.sendMessage(References.getPrefix() + ChatUtil.colorString("&7The valid syntax is: &6" + command.getSyntax() + "&7.")); - } + AbstractCommand.ReturnType returnType = command.runCommand(instance, sender, strings); + if (returnType == AbstractCommand.ReturnType.SYNTAX_ERROR) { + sender.sendMessage(References.getPrefix() + ChatUtil.colorString("&cInvalid Syntax!")); + sender.sendMessage(References.getPrefix() + ChatUtil.colorString("&7The valid syntax is: &6" + command.getSyntax() + "&7.")); + } return; } sender.sendMessage(References.getPrefix() + instance.getLocale().getMessage("event.general.nopermission")); diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminPanel.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminPanel.java index 898bae8..641924f 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminPanel.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminPanel.java @@ -14,7 +14,7 @@ public class CommandAdminPanel extends AbstractCommand { @Override protected ReturnType runCommand(EpicBuckets instance, CommandSender sender, String... args) { - new GUIPanel((Player)sender); + new GUIPanel((Player) sender); return ReturnType.SUCCESS; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminToggle.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminToggle.java index af9115e..6d11ffe 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminToggle.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandAdminToggle.java @@ -13,7 +13,7 @@ public class CommandAdminToggle extends AbstractCommand { @Override protected ReturnType runCommand(EpicBuckets instance, CommandSender sender, String... args) { - instance.getGenbucketManager().toggleAdmin((Player)sender); + instance.getGenbucketManager().toggleAdmin((Player) sender); return ReturnType.SUCCESS; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandEpicBuckets.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandEpicBuckets.java index da51af8..0efb4a1 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandEpicBuckets.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandEpicBuckets.java @@ -15,7 +15,7 @@ public class CommandEpicBuckets extends AbstractCommand { @Override protected AbstractCommand.ReturnType runCommand(EpicBuckets instance, CommandSender sender, String... args) { - new GUIMain((Player)sender); + new GUIMain((Player) sender); return ReturnType.SUCCESS; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandGive.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandGive.java index 023f9da..a7f3110 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandGive.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandGive.java @@ -5,8 +5,8 @@ import com.songoda.epicbuckets.References; import com.songoda.epicbuckets.command.AbstractCommand; import com.songoda.epicbuckets.shop.Shop; import com.songoda.epicbuckets.shop.SubShop; -import com.songoda.epicbuckets.util.ChatUtil; -import com.songoda.epicbuckets.util.Validator; +import com.songoda.epicbuckets.utils.ChatUtil; +import com.songoda.epicbuckets.utils.Validator; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandHelp.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandHelp.java index e8f4089..b12c3c1 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandHelp.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandHelp.java @@ -3,7 +3,7 @@ package com.songoda.epicbuckets.command.commands; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.References; import com.songoda.epicbuckets.command.AbstractCommand; -import com.songoda.epicbuckets.util.ChatUtil; +import com.songoda.epicbuckets.utils.ChatUtil; import org.bukkit.command.CommandSender; public class CommandHelp extends AbstractCommand { diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandReload.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandReload.java index 8aca8ee..adfb232 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandReload.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/command/commands/CommandReload.java @@ -2,7 +2,7 @@ package com.songoda.epicbuckets.command.commands; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.command.AbstractCommand; -import com.songoda.epicbuckets.util.ChatUtil; +import com.songoda.epicbuckets.utils.ChatUtil; import org.bukkit.command.CommandSender; public class CommandReload extends AbstractCommand { diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/event/GenbucketPlaceEvent.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/event/GenbucketPlaceEvent.java index 89d8f55..276f7e0 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/event/GenbucketPlaceEvent.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/event/GenbucketPlaceEvent.java @@ -8,6 +8,10 @@ import org.bukkit.event.HandlerList; public class GenbucketPlaceEvent extends Event implements Cancellable { + /* + Needed for the event + */ + private static final HandlerList HANDLERS = new HandlerList(); private final Player player; private final Genbucket genbucket; private boolean isCancelled; @@ -18,6 +22,10 @@ public class GenbucketPlaceEvent extends Event implements Cancellable { this.isCancelled = false; } + public static HandlerList getHandlerList() { + return HANDLERS; + } + public Player getPlayer() { return this.player; } @@ -26,19 +34,10 @@ public class GenbucketPlaceEvent extends Event implements Cancellable { return this.genbucket; } - /* - Needed for the event - */ - private static final HandlerList HANDLERS = new HandlerList(); - public HandlerList getHandlers() { return HANDLERS; } - public static HandlerList getHandlerList() { - return HANDLERS; - } - @Override public boolean isCancelled() { return this.isCancelled; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java index a48d726..643eeea 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java @@ -2,9 +2,9 @@ package com.songoda.epicbuckets.file; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.genbucket.GenbucketType; -import com.songoda.epicbuckets.util.InventoryHelper; -import com.songoda.epicbuckets.util.Validator; -import com.songoda.epicbuckets.util.XMaterial; +import com.songoda.epicbuckets.utils.InventoryHelper; +import com.songoda.epicbuckets.utils.Validator; +import com.songoda.epicbuckets.utils.XMaterial; import org.bukkit.block.BlockFace; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; @@ -253,6 +253,10 @@ public class ConfigManager { return backButtonPath; } + public void setBackButtonPath(String backButtonPath) { + this.backButtonPath = backButtonPath; + } + public String getFillItemPath() { return fillItemPath; } @@ -281,18 +285,34 @@ public class ConfigManager { return supportFactions; } + public void setSupportFactions(boolean supportFactions) { + this.supportFactions = supportFactions; + } + public boolean isSupportWorldGuard() { return supportWorldGuard; } + public void setSupportWorldGuard(boolean supportWorldGuard) { + this.supportWorldGuard = supportWorldGuard; + } + public boolean isSupportGriefPrevention() { return supportGriefPrevention; } + public void setSupportGriefPrevention(boolean supportGriefPrevention) { + this.supportGriefPrevention = supportGriefPrevention; + } + public boolean isGensInWilderness() { return gensInWilderness; } + public void setGensInWilderness(boolean gensInWilderness) { + this.gensInWilderness = gensInWilderness; + } + public boolean isEnchantGenbuckets() { return enchantGenbuckets; } @@ -301,38 +321,66 @@ public class ConfigManager { return spongeCheck; } + public void setSpongeCheck(boolean spongeCheck) { + this.spongeCheck = spongeCheck; + } + public int getSpongeRadius() { return spongeRadius; } + public void setSpongeRadius(int spongeRadius) { + this.spongeRadius = spongeRadius; + } + public int getMaxGenbucketsPerPlayer() { return maxGenbucketsPerPlayer; } + public void setMaxGenbucketsPerPlayer(int maxGenbucketsPerPlayer) { + this.maxGenbucketsPerPlayer = maxGenbucketsPerPlayer; + } + public boolean isUnlimitedGenbuckets() { return unlimitedGenbuckets; } + public void setUnlimitedGenbuckets(boolean unlimitedGenbuckets) { + this.unlimitedGenbuckets = unlimitedGenbuckets; + } + public int getMaxVerticalHeight() { return maxVerticalHeight; } + public void setMaxVerticalHeight(int maxVerticalHeight) { + this.maxVerticalHeight = maxVerticalHeight; + } + public int getMaxHorizontalLength() { return maxHorizontalLength; } + public void setMaxHorizontalLength(int maxHorizontalLength) { + this.maxHorizontalLength = maxHorizontalLength; + } + public int getDelay() { return delay; } - public void setGenbucketsDisabled(boolean enabled) { - this.genbucketsDisabled = enabled; + public void setDelay(int delay) { + this.delay = delay; } public boolean isGenbucketsDisabled() { return genbucketsDisabled; } + public void setGenbucketsDisabled(boolean enabled) { + this.genbucketsDisabled = enabled; + } + public ItemStack getBackButton() { return backButton; } @@ -353,6 +401,10 @@ public class ConfigManager { return fillInventory; } + public void setFillInventory(boolean fillInventory) { + this.fillInventory = fillInventory; + } + public ItemStack getFillItem() { return fillItem; } @@ -377,10 +429,18 @@ public class ConfigManager { return infiniteUse; } + public void setInfiniteUse(boolean infiniteUse) { + this.infiniteUse = infiniteUse; + } + public boolean isChargeInfiniteUse() { return chargeInfiniteUse; } + public void setChargeInfiniteUse(boolean chargeInfiniteUse) { + this.chargeInfiniteUse = chargeInfiniteUse; + } + public double getInfiniteUseCostForGenbucketType(GenbucketType genbucketType, ItemStack item) { for (ItemStack itemStack : infiniteUseCost.get(genbucketType).keySet()) { if (itemStack.getType() == item.getType() && itemStack.getData() == item.getData()) { @@ -394,70 +454,10 @@ public class ConfigManager { return genbucketDelay; } - public void setBackButtonPath(String backButtonPath) { - this.backButtonPath = backButtonPath; - } - - public void setSupportFactions(boolean supportFactions) { - this.supportFactions = supportFactions; - } - - public void setSupportWorldGuard(boolean supportWorldGuard) { - this.supportWorldGuard = supportWorldGuard; - } - - public void setSupportGriefPrevention(boolean supportGriefPrevention) { - this.supportGriefPrevention = supportGriefPrevention; - } - - public void setGensInWilderness(boolean gensInWilderness) { - this.gensInWilderness = gensInWilderness; - } - - public void setSpongeCheck(boolean spongeCheck) { - this.spongeCheck = spongeCheck; - } - - public void setSpongeRadius(int spongeRadius) { - this.spongeRadius = spongeRadius; - } - - public void setMaxGenbucketsPerPlayer(int maxGenbucketsPerPlayer) { - this.maxGenbucketsPerPlayer = maxGenbucketsPerPlayer; - } - - public void setUnlimitedGenbuckets(boolean unlimitedGenbuckets) { - this.unlimitedGenbuckets = unlimitedGenbuckets; - } - - public void setInfiniteUse(boolean infiniteUse) { - this.infiniteUse = infiniteUse; - } - - public void setChargeInfiniteUse(boolean chargeInfiniteUse) { - this.chargeInfiniteUse = chargeInfiniteUse; - } - public void setGenbucketDelay(int genbucketDelay) { this.genbucketDelay = genbucketDelay; } - public void setMaxVerticalHeight(int maxVerticalHeight) { - this.maxVerticalHeight = maxVerticalHeight; - } - - public void setMaxHorizontalLength(int maxHorizontalLength) { - this.maxHorizontalLength = maxHorizontalLength; - } - - public void setDelay(int delay) { - this.delay = delay; - } - - public void setFillInventory(boolean fillInventory) { - this.fillInventory = fillInventory; - } - public HashMap> getSettingsGenbucketBooleans() { return settingsGenbucketBooleans; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/Genbucket.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/Genbucket.java index 1d5853e..b205186 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/Genbucket.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/Genbucket.java @@ -2,7 +2,7 @@ package com.songoda.epicbuckets.genbucket; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.shop.SubShop; -import com.songoda.epicbuckets.util.XMaterial; +import com.songoda.epicbuckets.utils.XMaterial; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -148,7 +148,8 @@ public abstract class Genbucket { } protected boolean placeGen(Block block) { - if (!epicBuckets.getConfigManager().getIgnoredMaterials().contains(XMaterial.requestXMaterial(block.getType().name(), block.getData()))) return false; + if (!epicBuckets.getConfigManager().getIgnoredMaterials().contains(XMaterial.requestXMaterial(block.getType().name(), block.getData()))) + return false; if (spongeInRange(block)) return false; block.setType(getGenItem().getType()); return true; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/GenbucketManager.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/GenbucketManager.java index f7b9512..5967079 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/GenbucketManager.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/genbucket/GenbucketManager.java @@ -1,7 +1,7 @@ package com.songoda.epicbuckets.genbucket; import com.songoda.epicbuckets.EpicBuckets; -import com.songoda.epicbuckets.util.ChatUtil; +import com.songoda.epicbuckets.utils.ChatUtil; import org.apache.commons.lang.StringUtils; import org.bukkit.entity.Player; @@ -63,7 +63,8 @@ public class GenbucketManager { } public void registerGenbucketForPlayer(Player owner, Genbucket genbucket) { - if (!activeGens.containsKey(owner.getUniqueId())) activeGens.put(owner.getUniqueId(), new ArrayList<>(Arrays.asList(genbucket))); + if (!activeGens.containsKey(owner.getUniqueId())) + activeGens.put(owner.getUniqueId(), new ArrayList<>(Arrays.asList(genbucket))); List genbucketItems = activeGens.get(owner.getUniqueId()); genbucketItems.add(genbucket); activeGens.put(owner.getUniqueId(), genbucketItems); diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIBulk.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIBulk.java index 300f877..2598447 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIBulk.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIBulk.java @@ -5,7 +5,7 @@ import com.songoda.epicbuckets.file.ConfigManager; import com.songoda.epicbuckets.shop.Shop; import com.songoda.epicbuckets.shop.ShopManager; import com.songoda.epicbuckets.shop.SubShop; -import com.songoda.epicbuckets.util.gui.AbstractGUI; +import com.songoda.epicbuckets.utils.gui.AbstractGUI; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -70,16 +70,16 @@ public class GUIBulk extends AbstractGUI { shopManager.getDecreaseSlots().forEach(i -> registerClickable(i, ((player1, inventory1, cursor, slot, type) -> { - ItemStack genbucket = inventory.getItem(shopManager.getBulkMainItemSlot()); - int amount = shopManager.getBulkAmounts().get(shopManager.getDecreaseSlots().indexOf(i)); - genbucket.setAmount(genbucket.getAmount() - amount < 1 ? 1 : genbucket.getAmount() - amount); + ItemStack genbucket = inventory.getItem(shopManager.getBulkMainItemSlot()); + int amount = shopManager.getBulkAmounts().get(shopManager.getDecreaseSlots().indexOf(i)); + genbucket.setAmount(genbucket.getAmount() - amount < 1 ? 1 : genbucket.getAmount() - amount); }))); shopManager.getIncreaseSlots().forEach(i -> registerClickable(i, ((player1, inventory1, cursor, slot, type) -> { - ItemStack genbucket = inventory.getItem(shopManager.getBulkMainItemSlot()); - int amount = shopManager.getBulkAmounts().get(shopManager.getIncreaseSlots().indexOf(i)); - genbucket.setAmount(genbucket.getAmount() + amount > 64 ? 64 : genbucket.getAmount() + amount); + ItemStack genbucket = inventory.getItem(shopManager.getBulkMainItemSlot()); + int amount = shopManager.getBulkAmounts().get(shopManager.getIncreaseSlots().indexOf(i)); + genbucket.setAmount(genbucket.getAmount() + amount > 64 ? 64 : genbucket.getAmount() + amount); }))); registerClickable(shopManager.getPurchaseSlot(), ((player1, inventory1, cursor, slot, type) -> { diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIMain.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIMain.java index 0bda487..4ecb926 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIMain.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIMain.java @@ -4,7 +4,7 @@ import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.file.ConfigManager; import com.songoda.epicbuckets.shop.Shop; import com.songoda.epicbuckets.shop.ShopManager; -import com.songoda.epicbuckets.util.gui.AbstractGUI; +import com.songoda.epicbuckets.utils.gui.AbstractGUI; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIPanel.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIPanel.java index 334594a..a15e452 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIPanel.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIPanel.java @@ -2,9 +2,9 @@ package com.songoda.epicbuckets.gui; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.genbucket.Genbucket; -import com.songoda.epicbuckets.util.ChatUtil; -import com.songoda.epicbuckets.util.XMaterial; -import com.songoda.epicbuckets.util.gui.AbstractGUI; +import com.songoda.epicbuckets.utils.ChatUtil; +import com.songoda.epicbuckets.utils.XMaterial; +import com.songoda.epicbuckets.utils.gui.AbstractGUI; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -42,8 +42,8 @@ public class GUIPanel extends AbstractGUI { inventory.setItem(place, skull); registerClickable(place, ((player1, inventory1, cursor, slot, type) -> player.teleport(genbucket.getPlayerLocation() - ))); - place ++; + ))); + place++; } } } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIShop.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIShop.java index 4a58497..d9042a7 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIShop.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/gui/GUIShop.java @@ -5,7 +5,7 @@ import com.songoda.epicbuckets.file.ConfigManager; import com.songoda.epicbuckets.shop.Shop; import com.songoda.epicbuckets.shop.ShopManager; import com.songoda.epicbuckets.shop.SubShop; -import com.songoda.epicbuckets.util.gui.AbstractGUI; +import com.songoda.epicbuckets.utils.gui.AbstractGUI; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; @@ -56,9 +56,10 @@ public class GUIShop extends AbstractGUI { registerClickable(shop.getBackButtonSlot(), ((player, inventory, cursor, slot, type) -> new GUIMain(player))); } - shop.getSubShops().stream().filter(SubShop::isEnabled).forEach(subShop -> { + shop.getSubShops().stream().filter(SubShop::isEnabled).forEach(subShop -> { registerClickable(subShop.getSlot(), ClickType.LEFT, ((player1, inventory1, cursor, slot, type) -> { - if (shopManager.hasEnoughFunds(player1, subShop, 1) && !shopManager.inventoryFull(player)) shopManager.buyFromShop(player, subShop, 1); + if (shopManager.hasEnoughFunds(player1, subShop, 1) && !shopManager.inventoryFull(player)) + shopManager.buyFromShop(player, subShop, 1); if (shopManager.isCloseAfterPurchase()) new GUIMain(player); })); registerClickable(subShop.getSlot(), ClickType.RIGHT, ((player1, inventory1, cursor, slot, type) -> new GUIBulk(player, shop, subShop))); diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookASkyBlock.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookASkyBlock.java index 41e26aa..16161c4 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookASkyBlock.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookASkyBlock.java @@ -1,6 +1,6 @@ package com.songoda.epicbuckets.hooks; -import com.songoda.epicbuckets.util.hooks.ClaimableProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ClaimableProtectionPluginHook; import com.wasteofplastic.askyblock.ASkyBlock; import com.wasteofplastic.askyblock.ASkyBlockAPI; import com.wasteofplastic.askyblock.Island; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookFactions.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookFactions.java index 10210fd..7ba9125 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookFactions.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookFactions.java @@ -1,6 +1,6 @@ package com.songoda.epicbuckets.hooks; -import com.songoda.epicbuckets.util.hooks.ClaimableProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ClaimableProtectionPluginHook; import me.markeh.factionsframework.FactionsFramework; import me.markeh.factionsframework.entities.FPlayer; import me.markeh.factionsframework.entities.FPlayers; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookGriefPrevention.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookGriefPrevention.java index dac1bfc..929cdfb 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookGriefPrevention.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookGriefPrevention.java @@ -1,6 +1,6 @@ package com.songoda.epicbuckets.hooks; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import me.ryanhamshire.GriefPrevention.Claim; import me.ryanhamshire.GriefPrevention.GriefPrevention; import org.bukkit.Location; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookKingdoms.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookKingdoms.java index 5652e5d..e9074a8 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookKingdoms.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookKingdoms.java @@ -1,6 +1,6 @@ package com.songoda.epicbuckets.hooks; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookPlotSquared.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookPlotSquared.java index 5641695..c0b7fc1 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookPlotSquared.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookPlotSquared.java @@ -2,7 +2,7 @@ package com.songoda.epicbuckets.hooks; import com.intellectualcrafters.plot.api.PlotAPI; import com.plotsquared.bukkit.BukkitMain; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookRedProtect.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookRedProtect.java index 180c0b9..fef7d5f 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookRedProtect.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookRedProtect.java @@ -3,7 +3,7 @@ package com.songoda.epicbuckets.hooks; import br.net.fabiozumbi12.RedProtect.Bukkit.API.RedProtectAPI; import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect; import br.net.fabiozumbi12.RedProtect.Bukkit.Region; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookSkyBlockEarth.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookSkyBlockEarth.java index ad396cd..2eda19f 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookSkyBlockEarth.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookSkyBlockEarth.java @@ -1,6 +1,6 @@ package com.songoda.epicbuckets.hooks; -import com.songoda.epicbuckets.util.hooks.ClaimableProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ClaimableProtectionPluginHook; import me.goodandevil.skyblock.SkyBlock; import me.goodandevil.skyblock.island.Island; import org.bukkit.Location; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookTowny.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookTowny.java index 37f805e..084bc78 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookTowny.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookTowny.java @@ -4,8 +4,7 @@ import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.TownyUniverse; -import com.songoda.epicbuckets.util.hooks.ClaimableProtectionPluginHook; - +import com.songoda.epicbuckets.utils.hooks.ClaimableProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookUSkyBlock.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookUSkyBlock.java index 269ce79..275326a 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookUSkyBlock.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookUSkyBlock.java @@ -1,6 +1,6 @@ package com.songoda.epicbuckets.hooks; -import com.songoda.epicbuckets.util.hooks.ClaimableProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ClaimableProtectionPluginHook; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java index 8c4fa16..cf31fbf 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java @@ -1,7 +1,7 @@ package com.songoda.epicbuckets.hooks; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.songoda.epicbuckets.util.hooks.ProtectionPluginHook; +import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/GenbucketPlaceListener.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/GenbucketPlaceListener.java index 9c6a794..a538441 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/GenbucketPlaceListener.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/GenbucketPlaceListener.java @@ -9,8 +9,8 @@ import com.songoda.epicbuckets.genbucket.types.Horizontal; import com.songoda.epicbuckets.genbucket.types.Infused; import com.songoda.epicbuckets.genbucket.types.PsuedoVertical; import com.songoda.epicbuckets.genbucket.types.Vertical; -import com.songoda.epicbuckets.util.XMaterial; -import com.songoda.epicbuckets.util.itemnbtapi.NBTItem; +import com.songoda.epicbuckets.utils.XMaterial; +import com.songoda.epicbuckets.utils.itemnbtapi.NBTItem; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.event.EventHandler; @@ -20,9 +20,9 @@ import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerInteractEvent; public class GenbucketPlaceListener implements Listener { - + private final EpicBuckets instance; - + public GenbucketPlaceListener(EpicBuckets instance) { this.instance = instance; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/PlayerJoinListeners.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/PlayerJoinListeners.java index a6dce98..999b599 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/PlayerJoinListeners.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/listeners/PlayerJoinListeners.java @@ -2,7 +2,7 @@ package com.songoda.epicbuckets.listeners; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.References; -import com.songoda.epicbuckets.util.ChatUtil; +import com.songoda.epicbuckets.utils.ChatUtil; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -21,19 +21,19 @@ public class PlayerJoinListeners implements Listener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { - Player player = event.getPlayer(); - if (player.isOp()) { - if (instance.getServer().getPluginManager().getPlugin("Factions") != null && instance.getServer().getPluginManager().getPlugin("FactionsFramework") == null) { - player.sendMessage(""); - player.sendMessage(ChatUtil.colorString(References.getPrefix() + "&7Here's the deal,")); - player.sendMessage(ChatUtil.colorString("&7I cannot give you full support for Factions out of the box.")); - player.sendMessage(ChatUtil.colorString("&7Things will work without it but if you wan't a flawless")); - player.sendMessage(ChatUtil.colorString("&7experience you need to download")); - player.sendMessage(ChatUtil.colorString("&7&6https://www.spigotmc.org/resources/54337/&7.")); - player.sendMessage(ChatUtil.colorString("&7If you don't care and don't want to see this message again")); - player.sendMessage(ChatUtil.colorString("&7turn &6Helpful-Tips &7off in the config.")); - player.sendMessage(""); - } + Player player = event.getPlayer(); + if (player.isOp()) { + if (instance.getServer().getPluginManager().getPlugin("Factions") != null && instance.getServer().getPluginManager().getPlugin("FactionsFramework") == null) { + player.sendMessage(""); + player.sendMessage(ChatUtil.colorString(References.getPrefix() + "&7Here's the deal,")); + player.sendMessage(ChatUtil.colorString("&7I cannot give you full support for Factions out of the box.")); + player.sendMessage(ChatUtil.colorString("&7Things will work without it but if you wan't a flawless")); + player.sendMessage(ChatUtil.colorString("&7experience you need to download")); + player.sendMessage(ChatUtil.colorString("&7&6https://www.spigotmc.org/resources/54337/&7.")); + player.sendMessage(ChatUtil.colorString("&7If you don't care and don't want to see this message again")); + player.sendMessage(ChatUtil.colorString("&7turn &6Helpful-Tips &7off in the config.")); + player.sendMessage(""); } + } } } \ No newline at end of file diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/Shop.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/Shop.java index 83a4787..7261803 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/Shop.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/Shop.java @@ -2,9 +2,9 @@ package com.songoda.epicbuckets.shop; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.genbucket.GenbucketType; -import com.songoda.epicbuckets.util.InventoryHelper; -import com.songoda.epicbuckets.util.Validator; -import com.songoda.epicbuckets.util.XMaterial; +import com.songoda.epicbuckets.utils.InventoryHelper; +import com.songoda.epicbuckets.utils.Validator; +import com.songoda.epicbuckets.utils.XMaterial; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.inventory.ItemStack; @@ -109,21 +109,21 @@ public class Shop { public SubShop getSubShop(XMaterial mat) { for (SubShop subShop : subShops.values()) { if (subShop.getGenItem().getType() == mat.parseMaterial() && - subShop.getGenItem().getDurability() == mat.parseItem().getDurability()) { + subShop.getGenItem().getDurability() == mat.parseItem().getDurability()) { return subShop; } } return null; } - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - public boolean isEnabled() { return enabled; } + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public int getSlot() { return slot; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java index 9dc7fa1..2f14a1e 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java @@ -2,7 +2,7 @@ package com.songoda.epicbuckets.shop; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.genbucket.GenbucketType; -import com.songoda.epicbuckets.util.*; +import com.songoda.epicbuckets.utils.*; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; @@ -171,10 +171,18 @@ public class ShopManager { return useBackButtons; } + public void setUseBackButtons(boolean useBackButtons) { + this.useBackButtons = useBackButtons; + } + public boolean isCloseAfterPurchase() { return closeAfterPurchase; } + public void setCloseAfterPurchase(boolean closeAfterPurchase) { + this.closeAfterPurchase = closeAfterPurchase; + } + public String getBulkInventoryName() { return bulkInventoryName; } @@ -187,6 +195,10 @@ public class ShopManager { return bulkFillInventory; } + public void setBulkFillInventory(boolean bulkFillInventory) { + this.bulkFillInventory = bulkFillInventory; + } + public int getBulkBackButtonSlot() { return bulkBackButtonSlot; } @@ -202,16 +214,4 @@ public class ShopManager { public void setShopDatabase(HashMap shopDatabase) { this.shopDatabase = shopDatabase; } - - public void setBulkFillInventory(boolean bulkFillInventory) { - this.bulkFillInventory = bulkFillInventory; - } - - public void setUseBackButtons(boolean useBackButtons) { - this.useBackButtons = useBackButtons; - } - - public void setCloseAfterPurchase(boolean closeAfterPurchase) { - this.closeAfterPurchase = closeAfterPurchase; - } } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/SubShop.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/SubShop.java index 2846bbd..57ec9d9 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/SubShop.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/shop/SubShop.java @@ -1,9 +1,9 @@ package com.songoda.epicbuckets.shop; import com.songoda.epicbuckets.EpicBuckets; -import com.songoda.epicbuckets.util.InventoryHelper; -import com.songoda.epicbuckets.util.Validator; -import com.songoda.epicbuckets.util.XMaterial; +import com.songoda.epicbuckets.utils.InventoryHelper; +import com.songoda.epicbuckets.utils.Validator; +import com.songoda.epicbuckets.utils.XMaterial; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.inventory.ItemStack; @@ -85,14 +85,14 @@ public class SubShop { genShopItem = InventoryHelper.setDisplayName(InventoryHelper.setLore(genShopItem, getGenItemLore()), getShopName()); } - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - public boolean isEnabled() { return enabled; } + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public ItemStack getShopItem() { return shopItem; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ChatUtil.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ChatUtil.java similarity index 98% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ChatUtil.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ChatUtil.java index 6c411f9..f5dd36c 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ChatUtil.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ChatUtil.java @@ -1,4 +1,4 @@ -package com.songoda.epicbuckets.util; +package com.songoda.epicbuckets.utils; import com.songoda.epicbuckets.EpicBuckets; import org.bukkit.ChatColor; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ConfigWrapper.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ConfigWrapper.java similarity index 97% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ConfigWrapper.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ConfigWrapper.java index 8dd8961..ad8b104 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ConfigWrapper.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ConfigWrapper.java @@ -1,4 +1,4 @@ -package com.songoda.epicbuckets.util; +package com.songoda.epicbuckets.utils; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/Debugger.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/Debugger.java similarity index 95% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/Debugger.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/Debugger.java index 85671fb..19bc8ec 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/Debugger.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/Debugger.java @@ -1,4 +1,4 @@ -package com.songoda.epicbuckets.util; +package com.songoda.epicbuckets.utils; import com.songoda.epicbuckets.EpicBuckets; import org.bukkit.ChatColor; diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/InventoryHelper.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/InventoryHelper.java similarity index 92% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/InventoryHelper.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/InventoryHelper.java index ef0905f..595ee0d 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/InventoryHelper.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/InventoryHelper.java @@ -1,4 +1,4 @@ -package com.songoda.epicbuckets.util; +package com.songoda.epicbuckets.utils; import com.songoda.epicbuckets.EpicBuckets; import com.songoda.epicbuckets.shop.SubShop; @@ -52,7 +52,8 @@ public class InventoryHelper { lore.forEach(s -> { String line = s; if (line.contains("%price%")) line = line.replace("%price%", subShop.getPrice() + ""); - if (line.contains("%material%")) line = line.replace("%material%", subShop.getType().parseMaterial().name()); + if (line.contains("%material%")) + line = line.replace("%material%", subShop.getType().parseMaterial().name()); newLore.add(ChatColor.translateAlternateColorCodes('&', line)); }); im.setLore(newLore); diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/NBTHelper.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/NBTHelper.java similarity index 88% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/NBTHelper.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/NBTHelper.java index 23aa4b2..8ebb277 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/NBTHelper.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/NBTHelper.java @@ -1,8 +1,8 @@ -package com.songoda.epicbuckets.util; +package com.songoda.epicbuckets.utils; import com.songoda.epicbuckets.genbucket.GenbucketType; import com.songoda.epicbuckets.shop.SubShop; -import com.songoda.epicbuckets.util.itemnbtapi.NBTItem; +import com.songoda.epicbuckets.utils.itemnbtapi.NBTItem; import org.bukkit.inventory.ItemStack; public class NBTHelper { diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ServerVersion.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ServerVersion.java similarity index 95% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ServerVersion.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ServerVersion.java index 388586e..9779b28 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/ServerVersion.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/ServerVersion.java @@ -1,4 +1,4 @@ -package com.songoda.epicbuckets.util; +package com.songoda.epicbuckets.utils; public enum ServerVersion { diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/Validator.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/Validator.java similarity index 94% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/Validator.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/Validator.java index 6e29634..ff978e9 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/Validator.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/Validator.java @@ -1,4 +1,4 @@ -package com.songoda.epicbuckets.util; +package com.songoda.epicbuckets.utils; import com.songoda.epicbuckets.genbucket.GenbucketType; @@ -8,7 +8,7 @@ public class Validator { int i; if (isInt(s)) { i = Integer.parseInt(s); - if (i<=6) return i; + if (i <= 6) return i; } return -1; } diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/XMaterial.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/XMaterial.java similarity index 95% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/XMaterial.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/XMaterial.java index 4626130..fe7370b 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/XMaterial.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/XMaterial.java @@ -1,18 +1,19 @@ -package com.songoda.epicbuckets.util; -/** The MIT License (MIT) - * +package com.songoda.epicbuckets.utils; +/** + * The MIT License (MIT) + *

* Copyright (c) 2018 Hex_27 - * + *

* Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + *

* The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -22,11 +23,11 @@ package com.songoda.epicbuckets.util; * DEALINGS IN THE SOFTWARE. **/ -import java.util.HashMap; - import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +import java.util.HashMap; + public enum XMaterial { ACACIA_BOAT("BOAT_ACACIA", 0), @@ -878,29 +879,22 @@ public enum XMaterial { ZOMBIE_PIGMAN_SPAWN_EGG("MONSTER_EGG", 0), ZOMBIE_SPAWN_EGG("MONSTER_EGG", 0), ZOMBIE_VILLAGER_SPAWN_EGG("MONSTER_EGG", 0), - ZOMBIE_WALL_HEAD("SKULL", 0), - ; + ZOMBIE_WALL_HEAD("SKULL", 0),; + static int newV = -1; + private static HashMap cachedSearch = new HashMap<>(); String m; int data; - XMaterial(String m, int data ){ + XMaterial(String m, int data) { this.m = m; this.data = data; } - public ItemStack parseItem(){ - Material mat = parseMaterial(); - if(isNewVersion()){ - return new ItemStack(mat); - } - return new ItemStack(mat,1,(byte) data); - } - static int newV = -1; - public static boolean isNewVersion(){ - if(newV == 0) return false; - if(newV == 1) return true; + public static boolean isNewVersion() { + if (newV == 0) return false; + if (newV == 1) return true; Material mat = Material.matchMaterial("RED_WOOL"); - if(mat != null){ + if (mat != null) { newV = 1; return true; } @@ -908,43 +902,67 @@ public enum XMaterial { return false; } - private static HashMap cachedSearch = new HashMap<>(); - public static XMaterial requestXMaterial(String name, byte data){ - if(cachedSearch.containsKey(name.toUpperCase()+","+data)){ - return cachedSearch.get(name.toUpperCase()+","+data); + public static XMaterial requestXMaterial(String name, byte data) { + if (cachedSearch.containsKey(name.toUpperCase() + "," + data)) { + return cachedSearch.get(name.toUpperCase() + "," + data); } - for(XMaterial mat:XMaterial.values()){ - if(name.toUpperCase().equals(mat.m) && ((byte)mat.data) == data){ - cachedSearch.put(mat.m+","+data,mat); + for (XMaterial mat : XMaterial.values()) { + if (name.toUpperCase().equals(mat.m) && ((byte) mat.data) == data) { + cachedSearch.put(mat.m + "," + data, mat); return mat; } } return null; } - public boolean isSameMaterial(ItemStack comp){ - if(isNewVersion()){ + public static XMaterial fromString(String key) { + XMaterial xmat = null; + try { + xmat = XMaterial.valueOf(key); + return xmat; + } catch (IllegalArgumentException e) { + String[] split = key.split(":"); + if (split.length == 1) { + xmat = requestXMaterial(key, (byte) 0); + } else { + xmat = requestXMaterial(split[0], (byte) Integer.parseInt(split[1])); + } + return xmat; + } + + } + + public ItemStack parseItem() { + Material mat = parseMaterial(); + if (isNewVersion()) { + return new ItemStack(mat); + } + return new ItemStack(mat, 1, (byte) data); + } + + public boolean isSameMaterial(ItemStack comp) { + if (isNewVersion()) { return comp.getType() == this.parseMaterial(); } - if(comp.getType() == this.parseMaterial() && - (int) comp.getData().getData() == (int) this.data){ + if (comp.getType() == this.parseMaterial() && + (int) comp.getData().getData() == (int) this.data) { return true; } XMaterial xmat = fromMaterial(comp.getType()); - if(isDamageable(xmat)){ - if(this.parseMaterial() == comp.getType()){ + if (isDamageable(xmat)) { + if (this.parseMaterial() == comp.getType()) { return true; } } return false; } - public XMaterial fromMaterial(Material mat){ - try{ + public XMaterial fromMaterial(Material mat) { + try { return XMaterial.valueOf(mat.toString()); - }catch(IllegalArgumentException e){ - for(XMaterial xmat:XMaterial.values()){ - if(xmat.m.equals(mat.toString())){ + } catch (IllegalArgumentException e) { + for (XMaterial xmat : XMaterial.values()) { + if (xmat.m.equals(mat.toString())) { return xmat; } } @@ -952,27 +970,10 @@ public enum XMaterial { return null; } - public static XMaterial fromString(String key){ - XMaterial xmat = null; - try{ - xmat = XMaterial.valueOf(key); - return xmat; - }catch(IllegalArgumentException e){ - String[] split = key.split(":"); - if(split.length == 1){ - xmat = requestXMaterial(key,(byte) 0); - }else{ - xmat = requestXMaterial(split[0],(byte) Integer.parseInt(split[1])); - } - return xmat; - } - - } - - public boolean isDamageable(XMaterial type){ + public boolean isDamageable(XMaterial type) { String[] split = type.toString().split("_"); int length = split.length; - switch(split[length-1]){ + switch (split[length - 1]) { case "HELMET": return true; case "CHESTPLATE": @@ -1006,9 +1007,9 @@ public enum XMaterial { } } - public Material parseMaterial(){ + public Material parseMaterial() { Material mat = Material.matchMaterial(this.toString()); - if(mat != null){ + if (mat != null) { return mat; } return Material.matchMaterial(m); diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/AbstractAnvilGUI.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/AbstractAnvilGUI.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/AbstractAnvilGUI.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/AbstractAnvilGUI.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/AbstractGUI.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/AbstractGUI.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/AbstractGUI.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/AbstractGUI.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/Clickable.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/Clickable.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/Clickable.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/Clickable.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/OnClose.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/OnClose.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/OnClose.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/OnClose.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/Range.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/Range.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/gui/Range.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/gui/Range.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/ClassWrapper.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/ClassWrapper.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/ClassWrapper.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/ClassWrapper.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTCompound.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTCompound.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTCompound.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTCompound.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTContainer.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTContainer.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTContainer.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTContainer.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTEntity.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTEntity.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTEntity.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTEntity.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTFile.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTFile.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTFile.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTFile.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTItem.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTItem.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTItem.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTItem.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTList.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTList.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTList.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTList.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTListCompound.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTListCompound.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTListCompound.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTListCompound.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTReflectionUtil.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTReflectionUtil.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTReflectionUtil.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTReflectionUtil.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTTileEntity.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTTileEntity.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTTileEntity.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTTileEntity.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTType.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTType.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/NBTType.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/NBTType.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/ObjectCreator.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/ObjectCreator.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/ObjectCreator.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/ObjectCreator.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/ReflectionMethod.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/ReflectionMethod.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/ReflectionMethod.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/ReflectionMethod.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/utils/GsonWrapper.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/utils/GsonWrapper.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/utils/GsonWrapper.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/utils/GsonWrapper.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/utils/MinecraftVersion.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/utils/MinecraftVersion.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/itemnbtapi/utils/MinecraftVersion.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/itemnbtapi/utils/MinecraftVersion.java diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/version/NMSUtil.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/version/NMSUtil.java similarity index 100% rename from EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/util/version/NMSUtil.java rename to EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/utils/version/NMSUtil.java diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index bd0c7e5..5ac6aec 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -1,151 +1,152 @@ - - 4.0.0 - com.songoda - EpicBuckets - 1.0.2 - - src/main/java - clean package - - - true - src/main/resources - - - - - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - maven-shade-plugin - 2.4.3 - - - package - - shade - - - - - shaded - - - org.spigotmc:spigot - com.songoda:arconix - net.milkbowl.vault:VaultAPI - me.ryanhamshire:GriefPrevention - com.sk89q - com:plotsquared - me.markeh:factionsframework - com.massivecraft - - - - - co.aikar.commands - ${project.groupId}.${project.artifactId}.acf - - - de.tr7zw.itemnbtapi - ${project.groupId}.${project.artifactId}.itemnbtapi - - - - - - - - - 11_private - http://repo.songoda.com/repository/private - - - 22_vault - http://nexus.hc.to/content/repositories/pub_releases - - - 3_aikar - https://repo.aikar.co/content/groups/aikar/ - - - 44_jitpack.io - https://jitpack.io - - - - - org.spigotmc - spigot - 1.13.2 - provided - - - com.songoda - arconix - LATEST - provided - - - net.milkbowl.vault - VaultAPI - LATEST - provided - - - bukkit - org.bukkit - - - - - me.ryanhamshire - GriefPrevention - LATEST - provided - - - com.sk89q - worldedit - LATEST - provided - - - com.sk89q - worldguard - 6.2.2 - provided - - - com - plotsquared - RELEASE - provided - - - me.markeh - factionsframework - 1.2.0 - provided - - - com.massivecraft - factions - LATEST - provided - - - com.massivecraft - factionsuuid - LATEST - provided - - + + 4.0.0 + com.songoda + EpicBuckets + 1.0.2 + + src/main/java + clean package + + + true + src/main/resources + + + + + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + + + + maven-shade-plugin + 2.4.3 + + + package + + shade + + + + + shaded + + + org.spigotmc:spigot + com.songoda:arconix + net.milkbowl.vault:VaultAPI + me.ryanhamshire:GriefPrevention + com.sk89q + com:plotsquared + me.markeh:factionsframework + com.massivecraft + + + + + co.aikar.commands + ${project.groupId}.${project.artifactId}.acf + + + de.tr7zw.itemnbtapi + ${project.groupId}.${project.artifactId}.itemnbtapi + + + + + + + + + 11_private + http://repo.songoda.com/repository/private + + + 22_vault + http://nexus.hc.to/content/repositories/pub_releases + + + 3_aikar + https://repo.aikar.co/content/groups/aikar/ + + + 44_jitpack.io + https://jitpack.io + + + + + org.spigotmc + spigot + 1.13.2 + provided + + + com.songoda + arconix + LATEST + provided + + + net.milkbowl.vault + VaultAPI + LATEST + provided + + + bukkit + org.bukkit + + + + + me.ryanhamshire + GriefPrevention + LATEST + provided + + + com.sk89q + worldedit + LATEST + provided + + + com.sk89q + worldguard + 6.2.2 + provided + + + com + plotsquared + RELEASE + provided + + + me.markeh + factionsframework + 1.2.0 + provided + + + com.massivecraft + factions + LATEST + provided + + + com.massivecraft + factionsuuid + LATEST + provided + + diff --git a/pom.xml b/pom.xml index 5abb3bb..4574fe4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - 4.0.0