serializeCache = new HashMap<>();
- public static boolean isLegacyFuel(Material material) {
-
- if (material == null) return false;
- switch(material.ordinal() + 1) {
- case 6:
- case 7:
- case 18:
- case 26:
- case 36:
- case 48:
- case 54:
- case 55:
- case 59:
- case 66:
- case 73:
- case 85:
- case 86:
- case 97:
- case 100:
- case 101:
- case 108:
- case 127:
- case 135:
- case 136:
- case 137:
- case 144:
- case 147:
- case 152:
- case 163:
- case 164:
- case 165:
- case 172:
- case 174:
- case 184:
- case 185:
- case 186:
- case 187:
- case 188:
- case 189:
- case 190:
- case 191:
- case 192:
- case 193:
- case 206:
- case 260:
- case 262:
- case 267:
- case 268:
- case 269:
- case 270:
- case 279:
- case 280:
- case 289:
- case 322:
- case 323:
- case 326:
- case 332:
- case 345:
- case 368:
- case 424:
- case 426:
- case 427:
- case 428:
- case 429:
- case 430:
- case 443:
- case 444:
- case 445:
- case 446:
- case 447:
- return true;
- default:
- return false;
- }
- }
-
public static boolean isSync(Player p) {
if (p.getItemInHand().hasItemMeta()
&& p.getItemInHand().getType() != Material.AIR
@@ -118,37 +43,8 @@ public class Methods {
return false;
}
- public static ItemStack getGlass() {
- EpicHoppers instance = EpicHoppers.getInstance();
- return Methods.getGlass(instance.getConfig().getBoolean("Interfaces.Replace Glass Type 1 With Rainbow Glass"), instance.getConfig().getInt("Interfaces.Glass Type 1"));
- }
-
- public static ItemStack getBackgroundGlass(boolean type) {
- EpicHoppers instance = EpicHoppers.getInstance();
- if (type)
- return getGlass(false, instance.getConfig().getInt("Interfaces.Glass Type 2"));
- else
- return getGlass(false, instance.getConfig().getInt("Interfaces.Glass Type 3"));
- }
-
- private static ItemStack getGlass(Boolean rainbow, int type) {
- int randomNum = 1 + (int) (Math.random() * 6);
- ItemStack glass;
- if (rainbow) {
- glass = new ItemStack(EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_13) ?
- Material.LEGACY_STAINED_GLASS_PANE : Material.valueOf("STAINED_GLASS_PANE"), 1, (short) randomNum);
- } else {
- glass = new ItemStack(EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_13) ?
- Material.LEGACY_STAINED_GLASS_PANE : Material.valueOf("STAINED_GLASS_PANE"), 1, (short) type);
- }
- ItemMeta glassmeta = glass.getItemMeta();
- glassmeta.setDisplayName("§l");
- glass.setItemMeta(glassmeta);
- return glass;
- }
-
public static boolean isSimilarMaterial(ItemStack is1, ItemStack is2) {
- if (EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_13)) {
+ if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {
return is1.getType() == is2.getType();
} else {
return is1.getType() == is2.getType() && (is1.getDurability() == -1 || is2.getDurability() == -1 || is1.getDurability() == is2.getDurability());
diff --git a/src/main/java/com/songoda/epichoppers/utils/Metrics.java b/src/main/java/com/songoda/epichoppers/utils/Metrics.java
deleted file mode 100644
index 792f0cd..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/Metrics.java
+++ /dev/null
@@ -1,695 +0,0 @@
-package com.songoda.epichoppers.utils;
-
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.ServicePriority;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * bStats collects some data for plugin authors.
- *
- * Check out https://bStats.org/ to learn more about bStats!
- */
-@SuppressWarnings({"WeakerAccess", "unused"})
-public class Metrics {
-
- static {
- // You can use the property to disable the check in your test environment
- if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) {
- // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
- final String defaultPackage = new String(
- new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'});
- final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
- // We want to make sure nobody just copy & pastes the example and use the wrong package names
- if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
- throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
- }
- }
- }
-
- // The version of this bStats class
- public static final int B_STATS_VERSION = 1;
-
- // The url to which the data is sent
- private static final String URL = "https://bStats.org/submitData/bukkit";
-
- // Is bStats enabled on this server?
- private boolean enabled;
-
- // Should failed requests be logged?
- private static boolean logFailedRequests;
-
- // Should the sent data be logged?
- private static boolean logSentData;
-
- // Should the response text be logged?
- private static boolean logResponseStatusText;
-
- // The uuid of the server
- private static String serverUUID;
-
- // The plugin
- private final Plugin plugin;
-
- // A list with all custom charts
- private final List charts = new ArrayList<>();
-
- /**
- * Class constructor.
- *
- * @param plugin The plugin which stats should be submitted.
- */
- public Metrics(Plugin plugin) {
- if (plugin == null) {
- throw new IllegalArgumentException("Plugin cannot be null!");
- }
- this.plugin = plugin;
-
- // Get the config file
- File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
- File configFile = new File(bStatsFolder, "config.yml");
- YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-
- // Check if the config file exists
- if (!config.isSet("serverUuid")) {
-
- // Add default values
- config.addDefault("enabled", true);
- // Every server gets it's unique random id.
- config.addDefault("serverUuid", UUID.randomUUID().toString());
- // Should failed request be logged?
- config.addDefault("logFailedRequests", false);
- // Should the sent data be logged?
- config.addDefault("logSentData", false);
- // Should the response text be logged?
- config.addDefault("logResponseStatusText", false);
-
- // Inform the server owners about bStats
- config.options().header(
- "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
- "To honor their work, you should not disable it.\n" +
- "This has nearly blacklist effect on the server performance!\n" +
- "Check out https://bStats.org/ to learn more :)"
- ).copyDefaults(true);
- try {
- config.save(configFile);
- } catch (IOException ignored) { }
- }
-
- // Load the data
- enabled = config.getBoolean("enabled", true);
- serverUUID = config.getString("serverUuid");
- logFailedRequests = config.getBoolean("logFailedRequests", false);
- logSentData = config.getBoolean("logSentData", false);
- logResponseStatusText = config.getBoolean("logResponseStatusText", false);
-
- if (enabled) {
- boolean found = false;
- // Search for all other bStats Metrics classes to see if we are the first one
- for (Class service : Bukkit.getServicesManager().getKnownServices()) {
- try {
- service.getField("B_STATS_VERSION"); // Our identifier :)
- found = true; // We aren't the first
- break;
- } catch (NoSuchFieldException ignored) { }
- }
- // Register our service
- Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
- if (!found) {
- // We are the first!
- startSubmitting();
- }
- }
- }
-
- /**
- * Checks if bStats is enabled.
- *
- * @return Whether bStats is enabled or not.
- */
- public boolean isEnabled() {
- return enabled;
- }
-
- /**
- * Adds a custom chart.
- *
- * @param chart The chart to add.
- */
- public void addCustomChart(CustomChart chart) {
- if (chart == null) {
- throw new IllegalArgumentException("Chart cannot be null!");
- }
- charts.add(chart);
- }
-
- /**
- * Starts the Scheduler which submits our data every 30 minutes.
- */
- private void startSubmitting() {
- final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
- timer.scheduleAtFixedRate(new TimerTask() {
- @Override
- public void run() {
- if (!plugin.isEnabled()) { // Plugin was disabled
- timer.cancel();
- return;
- }
- // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
- // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
- Bukkit.getScheduler().runTask(plugin, () -> submitData());
- }
- }, 1000 * 60 * 5, 1000 * 60 * 30);
- // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
- // WARNING: Changing the frequency has blacklist effect but your plugin WILL be blocked/deleted!
- // WARNING: Just don't do it!
- }
-
- /**
- * Gets the plugin specific data.
- * This method is called using Reflection.
- *
- * @return The plugin specific data.
- */
- public JSONObject getPluginData() {
- JSONObject data = new JSONObject();
-
- String pluginName = plugin.getDescription().getName();
- String pluginVersion = plugin.getDescription().getVersion();
-
- data.put("pluginName", pluginName); // Append the name of the plugin
- data.put("pluginVersion", pluginVersion); // Append the version of the plugin
- JSONArray customCharts = new JSONArray();
- for (CustomChart customChart : charts) {
- // Add the data of the custom charts
- JSONObject chart = customChart.getRequestJsonObject();
- if (chart == null) { // If the chart is null, we skip it
- continue;
- }
- customCharts.add(chart);
- }
- data.put("customCharts", customCharts);
-
- return data;
- }
-
- /**
- * Gets the server specific data.
- *
- * @return The server specific data.
- */
- private JSONObject getServerData() {
- // Minecraft specific data
- int playerAmount;
- try {
- // Around MC 1.8 the return type was changed to a collection from an array,
- // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
- Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
- playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
- ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
- : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
- } catch (Exception e) {
- playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
- }
- int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
- String bukkitVersion = Bukkit.getVersion();
-
- // OS/Java specific data
- String javaVersion = System.getProperty("java.version");
- String osName = System.getProperty("os.name");
- String osArch = System.getProperty("os.arch");
- String osVersion = System.getProperty("os.version");
- int coreCount = Runtime.getRuntime().availableProcessors();
-
- JSONObject data = new JSONObject();
-
- data.put("serverUUID", serverUUID);
-
- data.put("playerAmount", playerAmount);
- data.put("onlineMode", onlineMode);
- data.put("bukkitVersion", bukkitVersion);
-
- data.put("javaVersion", javaVersion);
- data.put("osName", osName);
- data.put("osArch", osArch);
- data.put("osVersion", osVersion);
- data.put("coreCount", coreCount);
-
- return data;
- }
-
- /**
- * Collects the data and sends it afterwards.
- */
- private void submitData() {
- final JSONObject data = getServerData();
-
- JSONArray pluginData = new JSONArray();
- // Search for all other bStats Metrics classes to get their plugin data
- for (Class service : Bukkit.getServicesManager().getKnownServices()) {
- try {
- service.getField("B_STATS_VERSION"); // Our identifier :)
-
- for (RegisteredServiceProvider provider : Bukkit.getServicesManager().getRegistrations(service)) {
- try {
- pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
- } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
- }
- } catch (NoSuchFieldException ignored) { }
- }
-
- data.put("plugins", pluginData);
-
- // Create a new thread for the connection to the bStats server
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- // Send the data
- sendData(plugin, data);
- } catch (Exception e) {
- // Something went wrong! :(
- if (logFailedRequests) {
- plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
- }
- }
- }
- }).start();
- }
-
- /**
- * Sends the data to the bStats server.
- *
- * @param plugin Any plugin. It's just used to get a logger instance.
- * @param data The data to send.
- * @throws Exception If the request failed.
- */
- private static void sendData(Plugin plugin, JSONObject data) throws Exception {
- if (data == null) {
- throw new IllegalArgumentException("Data cannot be null!");
- }
- if (Bukkit.isPrimaryThread()) {
- throw new IllegalAccessException("This method must not be called from the main thread!");
- }
- if (logSentData) {
- plugin.getLogger().info("Sending data to bStats: " + data.toString());
- }
- HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
-
- // Compress the data to save bandwidth
- byte[] compressedData = compress(data.toString());
-
- // Add headers
- connection.setRequestMethod("POST");
- connection.addRequestProperty("Accept", "application/json");
- connection.addRequestProperty("Connection", "close");
- connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
- connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
- connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
- connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
-
- // Send data
- connection.setDoOutput(true);
- DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
- outputStream.write(compressedData);
- outputStream.flush();
- outputStream.close();
-
- InputStream inputStream = connection.getInputStream();
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
-
- StringBuilder builder = new StringBuilder();
- String line;
- while ((line = bufferedReader.readLine()) != null) {
- builder.append(line);
- }
- bufferedReader.close();
- if (logResponseStatusText) {
- plugin.getLogger().info("Sent data to bStats and received response: " + builder.toString());
- }
- }
-
- /**
- * Gzips the given String.
- *
- * @param str The string to gzip.
- * @return The gzipped String.
- * @throws IOException If the compression failed.
- */
- private static byte[] compress(final String str) throws IOException {
- if (str == null) {
- return null;
- }
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
- gzip.write(str.getBytes(StandardCharsets.UTF_8));
- gzip.close();
- return outputStream.toByteArray();
- }
-
- /**
- * Represents a custom chart.
- */
- public static abstract class CustomChart {
-
- // The id of the chart
- final String chartId;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- */
- CustomChart(String chartId) {
- if (chartId == null || chartId.isEmpty()) {
- throw new IllegalArgumentException("ChartId cannot be null or empty!");
- }
- this.chartId = chartId;
- }
-
- private JSONObject getRequestJsonObject() {
- JSONObject chart = new JSONObject();
- chart.put("chartId", chartId);
- try {
- JSONObject data = getChartData();
- if (data == null) {
- // If the data is null we don't send the chart.
- return null;
- }
- chart.put("data", data);
- } catch (Throwable t) {
- if (logFailedRequests) {
- Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
- }
- return null;
- }
- return chart;
- }
-
- protected abstract JSONObject getChartData() throws Exception;
-
- }
-
- /**
- * Represents a custom simple pie.
- */
- public static class SimplePie extends CustomChart {
-
- private final Callable callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public SimplePie(String chartId, Callable callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- String value = callable.call();
- if (value == null || value.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- data.put("value", value);
- return data;
- }
- }
-
- /**
- * Represents a custom advanced pie.
- */
- public static class AdvancedPie extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public AdvancedPie(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.put(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
- }
-
- /**
- * Represents a custom drilldown pie.
- */
- public static class DrilldownPie extends CustomChart {
-
- private final Callable>> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public DrilldownPie(String chartId, Callable>> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- public JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- Map> map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean reallyAllSkipped = true;
- for (Map.Entry> entryValues : map.entrySet()) {
- JSONObject value = new JSONObject();
- boolean allSkipped = true;
- for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) {
- value.put(valueEntry.getKey(), valueEntry.getValue());
- allSkipped = false;
- }
- if (!allSkipped) {
- reallyAllSkipped = false;
- values.put(entryValues.getKey(), value);
- }
- }
- if (reallyAllSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
- }
-
- /**
- * Represents a custom single line chart.
- */
- public static class SingleLineChart extends CustomChart {
-
- private final Callable callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public SingleLineChart(String chartId, Callable callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- int value = callable.call();
- if (value == 0) {
- // Null = skip the chart
- return null;
- }
- data.put("value", value);
- return data;
- }
-
- }
-
- /**
- * Represents a custom multi line chart.
- */
- public static class MultiLineChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public MultiLineChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.put(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom simple bar chart.
- */
- public static class SimpleBarChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public SimpleBarChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- for (Map.Entry entry : map.entrySet()) {
- JSONArray categoryValues = new JSONArray();
- categoryValues.add(entry.getValue());
- values.put(entry.getKey(), categoryValues);
- }
- data.put("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom advanced bar chart.
- */
- public static class AdvancedBarChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId The id of the chart.
- * @param callable The callable which is used to request the chart data.
- */
- public AdvancedBarChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue().length == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- JSONArray categoryValues = new JSONArray();
- for (int categoryValue : entry.getValue()) {
- categoryValues.add(categoryValue);
- }
- values.put(entry.getKey(), categoryValues);
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.put("values", values);
- return data;
- }
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java b/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java
deleted file mode 100644
index 4dfb20e..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.songoda.epichoppers.utils;
-
-import com.songoda.epichoppers.EpicHoppers;
-import org.bukkit.Bukkit;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-public class MySQLDatabase {
-
- private final EpicHoppers instance;
-
- private Connection connection;
-
- public MySQLDatabase(EpicHoppers instance) {
- this.instance = instance;
- try {
- Class.forName("com.mysql.jdbc.Driver");
-
- String url = "jdbc:mysql://" + instance.getConfig().getString("Database.IP") + ":" + instance.getConfig().getString("Database.Port") + "/" + instance.getConfig().getString("Database.Database Name") + "?autoReconnect=true&useSSL=false";
- this.connection = DriverManager.getConnection(url, instance.getConfig().getString("Database.Username"), instance.getConfig().getString("Database.Password"));
-
- //ToDo: This is sloppy
- connection.createStatement().execute(
- "CREATE TABLE IF NOT EXISTS `" + instance.getConfig().getString("Database.Prefix") + "sync` (\n" +
- "\t`location` TEXT NULL,\n" +
- "\t`level` INT NULL,\n" +
- "\t`block` TEXT NULL,\n" +
- "\t`placedby` TEXT NULL,\n" +
- "\t`player` TEXT NULL,\n" +
- "\t`teleporttrigger` TEXT NULL,\n" +
- "\t`whitelist` TEXT NULL,\n" +
- "\t`blacklist` TEXT NULL,\n" +
- "\t`void` TEXT NULL,\n" +
- "\t`black` TEXT NULL\n" +
- ")");
-
- connection.createStatement().execute("CREATE TABLE IF NOT EXISTS `" + instance.getConfig().getString("Database.Prefix") + "boosts` (\n" +
- "\t`endtime` TEXT NULL,\n" +
- "\t`amount` INT NULL,\n" +
- "\t`uuid` TEXT NULL\n" +
- ")");
-
- } catch (ClassNotFoundException | SQLException e) {
- Bukkit.getLogger().severe("Database connection failed.");
- Bukkit.getLogger().severe(e.getMessage());
- }
- }
-
- public Connection getConnection() {
- return connection;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/songoda/epichoppers/utils/ServerVersion.java b/src/main/java/com/songoda/epichoppers/utils/ServerVersion.java
deleted file mode 100644
index 34f6ca5..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/ServerVersion.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.songoda.epichoppers.utils;
-
-public enum ServerVersion {
-
- UNKNOWN("unknown_server_version"),
- V1_7("org.bukkit.craftbukkit.v1_7"),
- V1_8("org.bukkit.craftbukkit.v1_8"),
- V1_9("org.bukkit.craftbukkit.v1_9"),
- V1_10("org.bukkit.craftbukkit.v1_10"),
- V1_11("org.bukkit.craftbukkit.v1_11"),
- V1_12("org.bukkit.craftbukkit.v1_12"),
- V1_13("org.bukkit.craftbukkit.v1_13"),
- V1_14("org.bukkit.craftbukkit.v1_14");
-
-
- private final String packagePrefix;
-
- ServerVersion(String packagePrefix) {
- this.packagePrefix = packagePrefix;
- }
-
- public static ServerVersion fromPackageName(String packageName) {
- for (ServerVersion version : values())
- if (packageName.startsWith(version.packagePrefix)) return version;
- return ServerVersion.UNKNOWN;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java b/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java
index 7e2b869..34f7e9c 100644
--- a/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java
+++ b/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java
@@ -1,8 +1,7 @@
package com.songoda.epichoppers.utils;
-import com.songoda.epichoppers.EpicHoppers;
-import java.util.HashMap;
-import java.util.Map;
+import com.songoda.core.compatibility.CompatibleMaterial;
+import com.songoda.core.compatibility.ServerVersion;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
@@ -13,6 +12,9 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Persistent storage intended for streamlining read/write for storage
* containers in large batches
@@ -26,10 +28,10 @@ public class StorageContainerCache {
Cache cache = inventoryCache.get(b);
if (cache == null) {
Material type = b.getType();
- if(type == Material.CHEST || type == Material.TRAPPED_CHEST) {
+ if (type == Material.CHEST || type == Material.TRAPPED_CHEST) {
Block b2 = findAdjacentDoubleChest(b);
//System.out.println("Adjacent to " + b + " = " + b2);
- if(b2 != null && (cache = inventoryCache.get(b2)) != null) {
+ if (b2 != null && (cache = inventoryCache.get(b2)) != null) {
return cache;
}
}
@@ -49,14 +51,14 @@ public class StorageContainerCache {
* @return
*/
public static Block findAdjacentDoubleChest(Block block) {
- if(EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_13)) {
+ if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {
final BlockData d = block.getBlockData();
if (d instanceof Chest) {
final Chest c = (Chest) d;
- if(c.getType() != Chest.Type.SINGLE) {
+ if (c.getType() != Chest.Type.SINGLE) {
// this is a double chest - check the other chest for registration data
Block other = null;
- switch(c.getFacing()) {
+ switch (c.getFacing()) {
case SOUTH:
other = block.getRelative(c.getType() != Chest.Type.RIGHT ? BlockFace.WEST : BlockFace.EAST);
break;
@@ -195,16 +197,16 @@ public class StorageContainerCache {
/**
* Add a number of items to this container's inventory later.
*
- * @param item item to add
+ * @param item item to add
* @param amountToAdd how many of this item to attempt to add
* @return how many items were added
*/
public int addAny(ItemStack item, int amountToAdd) {
-
+
// Don't transfer shulker boxes into other shulker boxes, that's a bad idea.
if (type.name().contains("SHULKER_BOX") && item.getType().name().contains("SHULKER_BOX"))
return 0;
-
+
int totalAdded = 0;
if (cachedInventory != null && item != null) {
final int maxStack = item.getMaxStackSize();
@@ -245,11 +247,11 @@ public class StorageContainerCache {
public boolean addItem(ItemStack item) {
if (cachedInventory == null || item == null || item.getAmount() <= 0)
return false;
-
+
// Don't transfer shulker boxes into other shulker boxes, that's a bad idea.
if (type.name().contains("SHULKER_BOX") && item.getType().name().contains("SHULKER_BOX"))
return false;
-
+
// grab the amount to move and the max item stack size
int toAdd = item.getAmount();
final int maxStack = item.getMaxStackSize();
@@ -278,12 +280,12 @@ public class StorageContainerCache {
case "BLAST_FURNACE":
case "BURNING_FURNACE":
case "FURNACE": {
-
+
check = new boolean[3];
-
- boolean isFuel = !item.getType().name().contains("LOG") && (EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_13) ? item.getType().isFuel() : Methods.isLegacyFuel(item.getType()));
+
+ boolean isFuel = !item.getType().name().contains("LOG") && CompatibleMaterial.getMaterial(item.getType()).isFuel();
// fuel is 2nd slot, input is first
- if (isFuel)
+ if (isFuel)
check[1] = true;
else
check[0] = true;
@@ -310,7 +312,7 @@ public class StorageContainerCache {
// free space!
toAdd -= Math.min(maxStack - cacheItem.getAmount(), toAdd);
check[i] = true;
- } else
+ } else
check[i] = false;
}
}
diff --git a/src/main/java/com/songoda/epichoppers/utils/gui/AbstractGUI.java b/src/main/java/com/songoda/epichoppers/utils/gui/AbstractGUI.java
deleted file mode 100644
index 67a0f1b..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/gui/AbstractGUI.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.songoda.epichoppers.utils.gui;
-
-import com.songoda.epichoppers.EpicHoppers;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.bukkit.event.EventPriority;
-
-public abstract class AbstractGUI implements Listener {
-
- private static boolean listenersInitialized = false;
- protected Player player;
- protected Inventory inventory = null;
- protected boolean cancelBottom = false;
- private Map clickables = new HashMap<>();
- private List onCloses = new ArrayList<>();
- private Map draggableRanges = new HashMap<>();
-
- public AbstractGUI(Player player) {
- this.player = player;
- }
-
- public static void initializeListeners(JavaPlugin plugin) {
- if (listenersInitialized) return;
-
- Bukkit.getPluginManager().registerEvents(new Listener() {
- @EventHandler
- public void onClickGUI(InventoryClickEvent event) {
- Inventory inventory = event.getClickedInventory();
- if (inventory == null) return;
- AbstractGUI gui = getGUIFromInventory(inventory);
- Player player = (Player) event.getWhoClicked();
-
- boolean bottom = false;
-
- InventoryType type = event.getClickedInventory().getType();
- if (type != InventoryType.CHEST && type != InventoryType.PLAYER) return;
-
- if (gui == null && event.getWhoClicked().getOpenInventory().getTopInventory() != null) {
- Inventory top = event.getWhoClicked().getOpenInventory().getTopInventory();
- gui = getGUIFromInventory(top);
-
- if (gui != null && gui.cancelBottom) event.setCancelled(true);
- bottom = true;
- }
-
- if (gui == null) return;
-
- if (!bottom) event.setCancelled(true);
-
- if (!gui.draggableRanges.isEmpty() && !bottom) {
- for (Map.Entry entry : gui.draggableRanges.entrySet()) {
- Range range = entry.getKey();
- if (range.getMax() == range.getMin() && event.getSlot() == range.getMin()
- || event.getSlot() >= range.getMin() && event.getSlot() <= range.getMax()) {
- event.setCancelled(!entry.getValue());
- if (!entry.getValue()) break;
- }
- }
- }
-
- Map entries = new HashMap<>(gui.clickables);
-
- for (Map.Entry entry : entries.entrySet()) {
- Range range = entry.getKey();
- if (range.isBottom() && !bottom || !range.isBottom() && bottom || range.getClickType() != null && range.getClickType() != event.getClick())
- continue;
- if (event.getSlot() >= range.getMin() && event.getSlot() <= range.getMax()) {
- entry.getValue().Clickable(player, inventory, event.getCursor(), event.getSlot(), event.getClick());
- player.playSound(player.getLocation(), entry.getKey().getOnClickSound(), 1F, 1F);
- }
- }
- }
-
- @EventHandler(priority = EventPriority.LOW)
- public void onCloseGUI(InventoryCloseEvent event) {
- Inventory inventory = event.getInventory();
- AbstractGUI gui = getGUIFromInventory(inventory);
-
- if (gui == null || gui.inventory == null) return;
-
- for (OnClose onClose : gui.onCloses) {
- onClose.OnClose((Player) event.getPlayer(), inventory);
- }
- }
-
- private AbstractGUI getGUIFromInventory(Inventory inventory) {
- if (inventory.getHolder() == null) return null;
- InventoryHolder holder = inventory.getHolder();
- if (!(holder instanceof GUIHolder)) return null;
-
- return ((AbstractGUI.GUIHolder) holder).getGUI();
- }
- }, plugin);
- listenersInitialized = true;
- }
-
- protected void init(String title, int slots) {
- if(title.length() > 32)
- title = title.substring(0, 31);
- if (inventory == null
- || inventory.getSize() != slots
- || !ChatColor.translateAlternateColorCodes('&', title).equals(player.getOpenInventory().getTitle())) {
- this.inventory = Bukkit.getServer().createInventory(new GUIHolder(), slots, ChatColor.translateAlternateColorCodes('&', title));
- registerClickables();
- registerOnCloses();
- }
- constructGUI();
- initializeListeners(EpicHoppers.getInstance());
- player.openInventory(inventory);
- }
-
- protected abstract void constructGUI();
-
- protected void addDraggable(Range range, boolean option) {
- this.draggableRanges.put(range, option);
- }
-
- protected void removeDraggable() {
- this.draggableRanges.clear();
- }
-
- protected abstract void registerClickables();
-
- protected abstract void registerOnCloses();
-
- protected ItemStack createButton(int slot, Inventory inventory, ItemStack item, String name, String... lore) {
- ItemMeta meta = item.getItemMeta();
- meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name));
- if (lore != null && lore.length != 0) {
- List newLore = new ArrayList<>();
- for (String line : lore) newLore.add(ChatColor.translateAlternateColorCodes('&', line));
- meta.setLore(newLore);
- }
- item.setItemMeta(meta);
- inventory.setItem(slot, item);
- return item;
- }
-
- protected ItemStack createButton(int slot, ItemStack item, String name, String... lore) {
- return createButton(slot, inventory, item, name, lore);
- }
-
- protected ItemStack createButton(int slot, Inventory inventory, Material material, String name, String... lore) {
- return createButton(slot, inventory, new ItemStack(material), name, lore);
- }
-
- protected ItemStack createButton(int slot, Material material, String name, String... lore) {
- return createButton(slot, inventory, new ItemStack(material), name, lore);
- }
-
- protected ItemStack createButton(int slot, Material material, String name, ArrayList lore) {
- return createButton(slot, material, name, lore.toArray(new String[0]));
- }
-
- protected void registerClickable(int min, int max, ClickType clickType, boolean bottom, Clickable clickable) {
- clickables.put(new Range(min, max, clickType, bottom), clickable);
- }
-
- protected void registerClickable(int min, int max, ClickType clickType, Clickable clickable) {
- registerClickable(min, max, clickType, false, clickable);
- }
-
- protected void registerClickable(int slot, ClickType clickType, Clickable clickable) {
- registerClickable(slot, slot, clickType, false, clickable);
- }
-
- protected void registerClickable(int min, int max, Clickable clickable) {
- registerClickable(min, max, null, false, clickable);
- }
-
- protected void registerClickable(int slot, boolean bottom, Clickable clickable) {
- registerClickable(slot, slot, null, bottom, clickable);
- }
-
- protected void registerClickable(int slot, Clickable clickable) {
- registerClickable(slot, slot, null, false, clickable);
- }
-
- protected void resetClickables() {
- clickables.clear();
- }
-
- protected void registerOnClose(OnClose onClose) {
- onCloses.add(onClose);
- }
-
- public Inventory getInventory() {
- return inventory;
- }
-
- public class GUIHolder implements InventoryHolder {
-
- @Override
- public Inventory getInventory() {
- return inventory;
- }
-
- public AbstractGUI getGUI() {
- return AbstractGUI.this;
- }
- }
-}
diff --git a/src/main/java/com/songoda/epichoppers/utils/gui/Clickable.java b/src/main/java/com/songoda/epichoppers/utils/gui/Clickable.java
deleted file mode 100644
index 2d0d558..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/gui/Clickable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.songoda.epichoppers.utils.gui;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
-public interface Clickable {
-
- void Clickable(Player player, Inventory inventory, ItemStack cursor, int slot, ClickType type);
-}
diff --git a/src/main/java/com/songoda/epichoppers/utils/gui/OnClose.java b/src/main/java/com/songoda/epichoppers/utils/gui/OnClose.java
deleted file mode 100644
index af076cd..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/gui/OnClose.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.songoda.epichoppers.utils.gui;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
-public interface OnClose {
-
- void OnClose(Player player, Inventory inventory);
-
-}
diff --git a/src/main/java/com/songoda/epichoppers/utils/gui/Range.java b/src/main/java/com/songoda/epichoppers/utils/gui/Range.java
deleted file mode 100644
index 30e1194..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/gui/Range.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.songoda.epichoppers.utils.gui;
-
-import com.songoda.epichoppers.EpicHoppers;
-import com.songoda.epichoppers.utils.ServerVersion;
-import org.bukkit.Sound;
-import org.bukkit.event.inventory.ClickType;
-
-public class Range {
-
- private int min;
- private int max;
- private ClickType clickType;
- private boolean bottom;
- private Sound onClickSound;
-
- public Range(int min, int max, ClickType clickType, boolean bottom) {
- this.min = min;
- this.max = max;
- this.clickType = clickType;
- this.bottom = bottom;
- if (EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_9)) onClickSound = Sound.UI_BUTTON_CLICK;
- }
-
- public Range(int min, int max, Sound onClickSound, ClickType clickType, boolean bottom) {
- this.min = min;
- this.max = max;
- this.onClickSound = onClickSound;
- this.clickType = clickType;
- this.bottom = bottom;
- }
-
- public int getMin() {
- return min;
- }
-
- public int getMax() {
- return max;
- }
-
- public ClickType getClickType() {
- return clickType;
- }
-
- public boolean isBottom() {
- return bottom;
- }
-
- public Sound getOnClickSound() {
- return onClickSound;
- }
-}
diff --git a/src/main/java/com/songoda/epichoppers/utils/locale/Locale.java b/src/main/java/com/songoda/epichoppers/utils/locale/Locale.java
deleted file mode 100644
index 3adc965..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/locale/Locale.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package com.songoda.epichoppers.utils.locale;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Assists in the utilization of localization files.
- * Created to be used by the Songoda Team.
- *
- * @author Brianna O'Keefe - Songoda
- */
-public class Locale {
-
- private static final List LOCALES = new ArrayList<>();
- 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 final Map nodes = new HashMap<>();
-
- private static String defaultLocale;
-
- private File file;
- private String name;
-
- /**
- * Instantiate the Locale class for future use
- *
- * @param name the name of the instantiated language
- */
- private Locale(String name) {
- if (plugin == null)
- return;
-
- this.name = name;
-
- String fileName = name + FILE_EXTENSION;
- this.file = new File(localeFolder, fileName);
-
- if (!this.reloadMessages()) return;
-
- plugin.getLogger().info("Loaded locale \"" + fileName + "\"");
- }
-
- /**
- * Initialize the class to load all existing language files and update them.
- * This must be called before any other methods in this class as otherwise
- * the methods will fail to invoke
- *
- * @param plugin the plugin instance
- * @param defaultLocale the default language
- */
- public Locale(JavaPlugin plugin, String defaultLocale) {
-
- Locale.plugin = plugin;
- Locale.localeFolder = new File(plugin.getDataFolder(), "locales/");
-
- if (!localeFolder.exists()) localeFolder.mkdirs();
-
- //Save the default locale file.
- Locale.defaultLocale = defaultLocale;
- saveLocale(defaultLocale);
-
- for (File file : localeFolder.listFiles()) {
- String fileName = file.getName();
- if (!fileName.endsWith(FILE_EXTENSION)) continue;
-
- String name = fileName.substring(0, fileName.lastIndexOf('.'));
-
- if (name.split("_").length != 2) continue;
- if (localeLoaded(name)) continue;
-
- LOCALES.add(new Locale(name));
- }
- }
-
- /**
- * Save a locale file from the InputStream, to the locale folder
- *
- * @param fileName the name of the file to save
- * @return true if the operation was successful, false otherwise
- */
- public static boolean saveLocale(String fileName) {
- return saveLocale(plugin.getResource(defaultLocale + FILE_EXTENSION), fileName);
- }
-
-
- /**
- * Save a locale file from the InputStream, to the locale folder
- *
- * @param in file to save
- * @param fileName the name of the file to save
- * @return true if the operation was successful, false otherwise
- */
- public static boolean saveLocale(InputStream in, String fileName) {
- if (!localeFolder.exists()) localeFolder.mkdirs();
-
- if (!fileName.endsWith(FILE_EXTENSION))
- fileName = (fileName.lastIndexOf(".") == -1 ? fileName : fileName.substring(0, fileName.lastIndexOf('.'))) + FILE_EXTENSION;
-
- File destinationFile = new File(localeFolder, fileName);
- if (destinationFile.exists())
- return compareFiles(in, destinationFile);
-
- try (OutputStream outputStream = new FileOutputStream(destinationFile)) {
- copy(in, outputStream);
-
- fileName = fileName.substring(0, fileName.lastIndexOf('.'));
-
- if (fileName.split("_").length != 2) return false;
-
- LOCALES.add(new Locale(fileName));
- if (defaultLocale == null) defaultLocale = fileName;
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-
- // Write new changes to existing files, if any at all
- private static boolean compareFiles(InputStream in, File existingFile) {
- InputStream defaultFile =
- in == null ? plugin.getResource((defaultLocale != null ? defaultLocale : "en_US") + FILE_EXTENSION) : in;
-
- boolean changed = false;
-
- List defaultLines, existingLines;
- try (BufferedReader defaultReader = new BufferedReader(new InputStreamReader(defaultFile));
- BufferedReader existingReader = new BufferedReader(new FileReader(existingFile));
- BufferedWriter writer = new BufferedWriter(new FileWriter(existingFile, true))) {
- defaultLines = defaultReader.lines().collect(Collectors.toList());
- existingLines = existingReader.lines().map(s -> s.split("\\s*=")[0]).collect(Collectors.toList());
-
- for (String defaultValue : defaultLines) {
- if (defaultValue.isEmpty() || defaultValue.startsWith("#")) continue;
-
- String key = defaultValue.split("\\s*=")[0];
-
- if (!existingLines.contains(key)) {
- if (!changed) {
- writer.newLine();
- writer.newLine();
- // Leave a note alerting the user of the newly added messages.
- writer.write("# New messages for " + plugin.getName() + " v" + plugin.getDescription().getVersion() + ".");
-
- // If changes were found outside of the default file leave a note explaining that.
- if (in == null) {
- writer.newLine();
- writer.write("# These translations were found untranslated, join");
- writer.newLine();
- writer.write("# our translation Discord https://discord.gg/f7fpZEf");
- writer.newLine();
- writer.write("# to request an official update!");
- }
- }
-
- writer.newLine();
- writer.write(defaultValue);
-
- changed = true;
- }
- }
- if (in != null && !changed) compareFiles(null, existingFile);
- } catch (IOException e) {
- return false;
- }
-
- return changed;
- }
-
-
- /**
- * Check whether a locale exists and is registered or not
- *
- * @param name the whole language tag (i.e. "en_US")
- * @return true if it exists
- */
- public static boolean localeLoaded(String name) {
- for (Locale locale : LOCALES)
- if (locale.getName().equals(name)) return true;
- return false;
- }
-
-
- /**
- * Get a locale by its entire proper name (i.e. "en_US")
- *
- * @param name the full name of the locale
- * @return locale of the specified name
- */
- public static Locale getLocale(String name) {
- for (Locale locale : LOCALES)
- if (locale.getName().equalsIgnoreCase(name)) return locale;
- return null;
- }
-
- /**
- * 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.trim().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;
- }
-
- /**
- * Supply the Message object with the plugins prefix.
- *
- * @param message message to be applied
- * @return applied message
- */
- private Message supplyPrefix(Message message) {
- return message.setPrefix(this.nodes.getOrDefault("general.nametag.prefix", "[Plugin]"));
- }
-
- /**
- * Create a new unsaved Message
- *
- * @param message the message to create
- * @return the created message
- */
- public Message newMessage(String message) {
- return supplyPrefix(new Message(message));
- }
-
- /**
- * Get a message set for a specific node.
- *
- * @param node the node to get
- * @return the message for the specified node
- */
- public Message getMessage(String node) {
- return this.getMessageOrDefault(node, node);
- }
-
- /**
- * 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 Message getMessageOrDefault(String node, String defaultValue) {
- return supplyPrefix(new Message(this.nodes.getOrDefault(node, defaultValue)));
- }
-
- /**
- * Return the locale name (i.e. "en_US")
- *
- * @return the locale name
- */
- public String getName() {
- return name;
- }
-
- private static void copy(InputStream input, OutputStream output) {
- int n;
- byte[] buffer = new byte[1024 * 4];
-
- try {
- while ((n = input.read(buffer)) != -1) {
- output.write(buffer, 0, n);
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/src/main/java/com/songoda/epichoppers/utils/locale/Message.java b/src/main/java/com/songoda/epichoppers/utils/locale/Message.java
deleted file mode 100644
index 9e717d4..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/locale/Message.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.songoda.epichoppers.utils.locale;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-/**
- * The Message object. This holds the message to be sent
- * as well as the plugins prefix so that they can both be
- * easily manipulated then deployed
- */
-public class Message {
-
- private String prefix = null;
- private String message;
-
- /**
- * create a new message
- *
- * @param message the message text
- */
- public Message(String message) {
- this.message = message;
- }
-
- /**
- * Format and send the held message to a player
- *
- * @param player player to send the message to
- */
- public void sendMessage(Player player) {
- player.sendMessage(this.getMessage());
- }
-
- /**
- * Format and send the held message with the
- * appended plugin prefix to a player
- *
- * @param player player to send the message to
- */
- public void sendPrefixedMessage(Player player) {
- player.sendMessage(this.getPrefixedMessage());
- }
-
- /**
- * Format and send the held message to a player
- *
- * @param sender command sender to send the message to
- */
- public void sendMessage(CommandSender sender) {
- sender.sendMessage(this.getMessage());
- }
-
- /**
- * Format and send the held message with the
- * appended plugin prefix to a command sender
- *
- * @param sender command sender to send the message to
- */
- public void sendPrefixedMessage(CommandSender sender) {
- sender.sendMessage(this.getPrefixedMessage());
- }
-
- /**
- * Format the held message and append the plugins
- * prefix
- *
- * @return the prefixed message
- */
- public String getPrefixedMessage() {
- return ChatColor.translateAlternateColorCodes('&',(prefix == null ? "" : this.prefix)
- + " " + this.message);
- }
-
- /**
- * Get and format the held message
- *
- * @return the message
- */
- public String getMessage() {
- return ChatColor.translateAlternateColorCodes('&', this.message);
- }
-
- /**
- * Get the held message
- *
- * @return the message
- */
- public String getUnformattedMessage() {
- return this.message;
- }
-
- /**
- * Replace the provided placeholder with the
- * provided object
- *
- * @param placeholder the placeholder to replace
- * @param replacement the replacement object
- * @return the modified Message
- */
- public Message processPlaceholder(String placeholder, Object replacement) {
- this.message = message.replace("%" + placeholder + "%", replacement.toString());
- return this;
- }
-
- Message setPrefix(String prefix) {
- this.prefix = prefix;
- return this;
- }
-
- @Override
- public String toString() {
- return this.message;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/songoda/epichoppers/utils/settings/Category.java b/src/main/java/com/songoda/epichoppers/utils/settings/Category.java
deleted file mode 100644
index 961dfc6..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/settings/Category.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.songoda.epichoppers.utils.settings;
-
-public enum Category {
-
- ECONOMY("Settings regarding economy.",
- "Only one economy option can be used at a time. If you enable more than",
- "one of these the first one will be used."),
- MAIN("General settings and options."),
- INTERFACES("These settings allow you to alter the way interfaces look.",
- "They are used in GUI's to make patterns, change them up then open up a",
- "GUI to see how it works."),
- DATABASE("Settings regarding the Database."),
- SYSTEM("System related settings.");
-
- private String[] comments;
-
-
- Category(String... comments) {
- this.comments = comments;
- }
-
- public String[] getComments() {
- return comments;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/songoda/epichoppers/utils/settings/Setting.java b/src/main/java/com/songoda/epichoppers/utils/settings/Setting.java
deleted file mode 100644
index 4d4dcae..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/settings/Setting.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.songoda.epichoppers.utils.settings;
-
-import com.songoda.epichoppers.EpicHoppers;
-import com.songoda.epichoppers.utils.ServerVersion;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public enum Setting {
-
- HOPPER_UPGRADING("Main.Allow hopper Upgrading", true,
- "Should hoppers be upgradable?"),
-
- UPGRADE_WITH_ECONOMY("Main.Upgrade With Economy", true,
- "Should you be able to upgrade hoppers with economy?"),
-
- UPGRADE_WITH_XP("Main.Upgrade With XP", true,
- "Should you be able to upgrade hoppers with experience?"),
-
- TELEPORT("Main.Allow Players To Teleport Through Hoppers", true,
- "Should players be able to teleport through hoppers?"),
-
- ENDERCHESTS("Main.Support Enderchests", true,
- "Should hoppers dump items into a player enderchests?"),
-
- PARTICLE_TYPE("Main.Upgrade Particle Type", "SPELL_WITCH",
- "The type of particle shown when a hopper is upgraded."),
-
- HOP_TICKS("Main.Amount of Ticks Between Hops", 8L,
- "The amount of ticks between hopper transfers."),
-
- AUTOSAVE("Main.Auto Save Interval In Seconds", 15,
- "The amount of time in between saving to file.",
- "This is purely a safety function to prevent against unplanned crashes or",
- "restarts. With that said it is advised to keep this enabled.",
- "If however you enjoy living on the edge, feel free to turn it off."),
-
- TELEPORT_TICKS("Main.Amount of Ticks Between Teleport", 10L,
- "The cooldown between teleports. It prevents players",
- "from getting stuck in a teleport loop."),
-
- SYNC_TIMEOUT("Main.Timeout When Syncing Hoppers", 300L,
- "The amount of time in ticks a player has between hitting the hopper",
- "Link button and performing the link. When the time is up the link event is canceled."),
-
- MAX_CHUNK("Main.Max Hoppers Per Chunk", -1,
- "The maximum amount of hoppers per chunk."),
-
- BLOCKBREAK_PARTICLE("Main.BlockBreak Particle Type", "LAVA",
- "The particle shown when the block break module performs a block break."),
-
- BLACKLIST("Main.BlockBreak Blacklisted Blocks",
- Arrays.asList("BEDROCK", "END_PORTAL", "ENDER_PORTAL", "END_PORTAL_FRAME", "ENDER_PORTAL_FRAME", "PISTON_HEAD", "PISTON_EXTENSION", "RAIL", "RAILS", "ACTIVATOR_RAIL", "DETECTOR_RAIL", "POWERED_RAIL"),
- "Anything listed here will not be broken by the block break module."),
-
- AUTOCRAFT_JAM_EJECT("Main.AutoCraft Jam Eject", false,
- "AutoCraft module needs a free slot to craft items with.",
- "Normally, crafting hoppers won't grab items that would fill that slot.",
- "This option ejects items if that last slot is forcibly filled"),
-
- AUTOSELL_PRICES("Main.AutoSell Prices",
- Arrays.asList("STONE,0.50", "COBBLESTONE,0.20", "IRON_ORE,0.35", "COAL_ORE,0.20"),
- "These are the prices used by the auto sell module."),
-
- AUTOSELL_SHOPGUIPLUS("Main.Use ShopGuiPlus for Prices", false,
- "Should prices be grabbed from ShopGuiPlus?",
- "If ShopGuiPlus is not enabled or the player is offline the default price list will be used.",
- "If this is something that you do not want then you should empty the default list."),
-
- VAULT_ECONOMY("Economy.Use Vault Economy", true,
- "Should Vault be used?"),
-
- RESERVE_ECONOMY("Economy.Use Reserve Economy", true,
- "Should Reserve be used?"),
-
- PLAYER_POINTS_ECONOMY("Economy.Use Player Points Economy", false,
- "Should PlayerPoints be used?"),
-
- RAINBOW("Interfaces.Replace Glass Type 1 With Rainbow Glass", false),
- ECO_ICON("Interfaces.Economy Icon", EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_13) ? "SUNFLOWER" : "DOUBLE_PLANT"),
- XP_ICON("Interfaces.XP Icon", EpicHoppers.getInstance().isServerVersionAtLeast(ServerVersion.V1_13) ? "EXPERIENCE_BOTTLE" : "EXP_BOTTLE"),
- GLASS_TYPE_1("Interfaces.Glass Type 1", 7),
- GLASS_TYPE_2("Interfaces.Glass Type 2", 11),
- GLASS_TYPE_3("Interfaces.Glass Type 3", 3),
-
- DATABASE_SUPPORT("Database.Activate Mysql Support", false,
- "Should MySQL be used for data storage?"),
-
- DATABASE_IP("Database.IP", "127.0.0.1",
- "MySQL IP"),
-
- DATABASE_PORT("Database.Port", 3306,
- "MySQL Port"),
-
- DATABASE_NAME("Database.Database Name", "EpicHoppers",
- "The database you are inserting data into."),
-
- DATABASE_PREFIX("Database.Prefix", "EH-",
- "The prefix for tables inserted into the database."),
-
- DATABASE_USERNAME("Database.Username", "PUT_USERNAME_HERE",
- "MySQL Username"),
-
- DATABASE_PASSWORD("Database.Password", "PUT_PASSWORD_HERE",
- "MySQL Password"),
-
- LANGUGE_MODE("System.Language Mode", "en_US",
- "The enabled language file.",
- "More language files (if available) can be found in the plugins data folder.");
-
- private String setting;
- private Object option;
- private String[] comments;
-
- Setting(String setting, Object option, String... comments) {
- this.setting = setting;
- this.option = option;
- this.comments = comments;
- }
-
- Setting(String setting, Object option) {
- this.setting = setting;
- this.option = option;
- this.comments = null;
- }
-
- public static Setting getSetting(String setting) {
- List settings = Arrays.stream(values()).filter(setting1 -> setting1.setting.equals(setting)).collect(Collectors.toList());
- if (settings.isEmpty()) return null;
- return settings.get(0);
- }
-
- public String getSetting() {
- return setting;
- }
-
- public Object getOption() {
- return option;
- }
-
- public String[] getComments() {
- return comments;
- }
-
- public List getStringList() {
- return EpicHoppers.getInstance().getConfig().getStringList(setting);
- }
-
- public boolean getBoolean() {
- return EpicHoppers.getInstance().getConfig().getBoolean(setting);
- }
-
- public int getInt() {
- return EpicHoppers.getInstance().getConfig().getInt(setting);
- }
-
- public long getLong() {
- return EpicHoppers.getInstance().getConfig().getLong(setting);
- }
-
- public String getString() {
- return EpicHoppers.getInstance().getConfig().getString(setting);
- }
-
- public char getChar() {
- return EpicHoppers.getInstance().getConfig().getString(setting).charAt(0);
- }
-
- public double getDouble() {
- return EpicHoppers.getInstance().getConfig().getDouble(setting);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/songoda/epichoppers/utils/settings/SettingsManager.java b/src/main/java/com/songoda/epichoppers/utils/settings/SettingsManager.java
deleted file mode 100644
index 9583c6d..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/settings/SettingsManager.java
+++ /dev/null
@@ -1,311 +0,0 @@
-package com.songoda.epichoppers.utils.settings;
-
-import com.songoda.epichoppers.EpicHoppers;
-import com.songoda.epichoppers.utils.Methods;
-import com.songoda.epichoppers.utils.ServerVersion;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Created by songoda on 6/4/2017.
- */
-public class SettingsManager implements Listener {
-
- private final EpicHoppers plugin;
- private Map cat = new HashMap<>();
- private Map current = new HashMap<>();
-
- public SettingsManager(EpicHoppers plugin) {
- this.plugin = plugin;
- Bukkit.getPluginManager().registerEvents(this, plugin);
- }
-
- @EventHandler
- public void onInventoryClick(InventoryClickEvent event) {
- if (event.getView().getType() != InventoryType.CHEST) return;
- ItemStack clickedItem = event.getCurrentItem();
-
- if (event.getInventory() != event.getWhoClicked().getOpenInventory().getTopInventory()
- || clickedItem == null || !clickedItem.hasItemMeta()
- || !clickedItem.getItemMeta().hasDisplayName()) {
- return;
- }
-
- if (event.getView().getTitle().equals(plugin.getName() + " Settings Manager")) {
- event.setCancelled(true);
- if (clickedItem.getType().name().contains("STAINED_GLASS")) return;
-
- String type = ChatColor.stripColor(clickedItem.getItemMeta().getDisplayName());
- this.cat.put((Player) event.getWhoClicked(), type);
- this.openEditor((Player) event.getWhoClicked());
- } else if (event.getView().getTitle().equals(plugin.getName() + " Settings Editor")) {
- event.setCancelled(true);
- if (clickedItem.getType().name().contains("STAINED_GLASS")) return;
-
- Player player = (Player) event.getWhoClicked();
-
- String key = cat.get(player) + "." + ChatColor.stripColor(clickedItem.getItemMeta().getDisplayName());
-
- if (plugin.getConfig().get(key).getClass().getName().equals("java.lang.Boolean")) {
- this.plugin.getConfig().set(key, !plugin.getConfig().getBoolean(key));
- this.finishEditing(player);
- } else {
- this.editObject(player, key);
- }
- }
- }
-
- @EventHandler
- public void onChat(AsyncPlayerChatEvent event) {
- Player player = event.getPlayer();
- if (!current.containsKey(player)) return;
-
- String value = current.get(player);
- FileConfiguration config = plugin.getConfig();
- if (config.isLong(value)) {
- config.set(value, Long.parseLong(event.getMessage()));
- } else if (config.isInt(value)) {
- config.set(value, Integer.parseInt(event.getMessage()));
- } else if (config.isDouble(value)) {
- config.set(value, Double.parseDouble(event.getMessage()));
- } else if (config.isString(value)) {
- config.set(value, event.getMessage());
- }
-
- Bukkit.getScheduler().scheduleSyncDelayedTask(EpicHoppers.getInstance(), () ->
- this.finishEditing(player), 0L);
-
- event.setCancelled(true);
- }
-
- private void finishEditing(Player player) {
- this.current.remove(player);
- this.saveConfig();
- this.openEditor(player);
- }
-
- private void editObject(Player player, String current) {
- this.current.put(player, ChatColor.stripColor(current));
-
- player.closeInventory();
- player.sendMessage("");
- player.sendMessage(Methods.formatText("&7Please enter a value for &6" + current + "&7."));
- if (plugin.getConfig().isInt(current) || plugin.getConfig().isDouble(current)) {
- player.sendMessage(Methods.formatText("&cUse only numbers."));
- }
- player.sendMessage("");
- }
-
- public void openSettingsManager(Player player) {
- Inventory inventory = Bukkit.createInventory(null, 27, plugin.getName() + " Settings Manager");
- ItemStack glass = Methods.getGlass();
- for (int i = 0; i < inventory.getSize(); i++) {
- inventory.setItem(i, glass);
- }
-
- int slot = 10;
- for (String key : plugin.getConfig().getDefaultSection().getKeys(false)) {
- ItemStack item = new ItemStack(plugin.isServerVersionAtLeast(ServerVersion.V1_13) ? Material.LEGACY_WOOL : Material.valueOf("WOOL"), 1, (byte) (slot - 9));
- ItemMeta meta = item.getItemMeta();
- meta.setLore(Collections.singletonList(Methods.formatText("&6Click To Edit This Category.")));
- meta.setDisplayName(Methods.formatText("&f&l" + key));
- item.setItemMeta(meta);
- inventory.setItem(slot, item);
- slot++;
- }
-
- player.openInventory(inventory);
- }
-
- private void openEditor(Player player) {
- Inventory inventory = Bukkit.createInventory(null, 54, plugin.getName() + " Settings Editor");
- FileConfiguration config = plugin.getConfig();
-
- int slot = 0;
- for (String key : config.getConfigurationSection(cat.get(player)).getKeys(true)) {
- String fKey = cat.get(player) + "." + key;
- ItemStack item = new ItemStack(Material.DIAMOND_HELMET);
- ItemMeta meta = item.getItemMeta();
- meta.setDisplayName(Methods.formatText("&6" + key));
-
- List lore = new ArrayList<>();
- if (config.isBoolean(fKey)) {
- item.setType(Material.LEVER);
- lore.add(Methods.formatText(config.getBoolean(fKey) ? "&atrue" : "&cfalse"));
- } else if (config.isString(fKey)) {
- item.setType(Material.PAPER);
- lore.add(Methods.formatText("&7" + config.getString(fKey)));
- } else if (config.isInt(fKey)) {
- item.setType(plugin.isServerVersionAtLeast(ServerVersion.V1_13) ? Material.CLOCK : Material.valueOf("WATCH"));
- lore.add(Methods.formatText("&7" + config.getInt(fKey)));
- } else if (config.isLong(fKey)) {
- item.setType(plugin.isServerVersionAtLeast(ServerVersion.V1_13) ? Material.CLOCK : Material.valueOf("WATCH"));
- lore.add(Methods.formatText("&7" + config.getLong(fKey)));
- } else if (config.isDouble(fKey)) {
- item.setType(plugin.isServerVersionAtLeast(ServerVersion.V1_13) ? Material.CLOCK : Material.valueOf("WATCH"));
- lore.add(Methods.formatText("&7" + config.getDouble(fKey)));
- }
-
- Setting setting = Setting.getSetting(fKey);
-
- if (setting != null && setting.getComments() != null) {
- lore.add("");
-
- String comment = String.join(" ", setting.getComments());
-
- int lastIndex = 0;
- for (int n = 0; n < comment.length(); n++) {
- if (n - lastIndex < 30)
- continue;
-
- if (comment.charAt(n) == ' ') {
- lore.add(Methods.formatText("&8" + comment.substring(lastIndex, n).trim()));
- lastIndex = n;
- }
- }
-
- if (lastIndex - comment.length() < 30)
- lore.add(Methods.formatText("&8" + comment.substring(lastIndex).trim()));
-
- }
-
- meta.setLore(lore);
- item.setItemMeta(meta);
-
- inventory.setItem(slot, item);
- slot++;
- }
-
- player.openInventory(inventory);
- }
-
- public void reloadConfig() {
- plugin.reloadConfig();
- this.setupConfig();
- }
-
- public void setupConfig() {
- FileConfiguration config = plugin.getConfig();
-
- for (Setting setting : Setting.values()) {
- config.addDefault(setting.getSetting(), setting.getOption());
- }
- plugin.getConfig().options().copyDefaults(true);
- saveConfig();
- }
-
- private void saveConfig() {
- String dump = plugin.getConfig().saveToString();
-
- StringBuilder config = new StringBuilder();
-
- BufferedReader bufReader = new BufferedReader(new StringReader(dump));
-
- try {
- boolean first = true;
-
- String line;
- int currentTab = 0;
- String category = "";
-
- while ((line = bufReader.readLine()) != null) {
- if (line.trim().startsWith("#")) continue;
-
- int tabChange = line.length() - line.trim().length();
- if (currentTab != tabChange) {
- category = category.contains(".") && tabChange != 0 ? category.substring(0, category.indexOf(".")) : "";
- currentTab = tabChange;
- }
-
- if (line.endsWith(":")) {
- bufReader.mark(1000);
- String found = bufReader.readLine();
- bufReader.reset();
-
- if (!found.trim().startsWith("-")) {
-
- String newCategory = line.substring(0, line.length() - 1).trim();
-
- if (category.equals(""))
- category = newCategory;
- else
- category += "." + newCategory;
-
- currentTab = tabChange + 2;
-
- if (!first) {
- config.append("\n\n");
- } else {
- first = false;
- }
-
- if (!category.contains("."))
- config.append("#").append("\n");
- try {
- Category categoryObj = Category.valueOf(category.toUpperCase()
- .replace(" ", "_")
- .replace(".", "_"));
-
- config.append(new String(new char[tabChange]).replace('\0', ' '));
- for (String l : categoryObj.getComments())
- config.append("# ").append(l).append("\n");
- } catch (IllegalArgumentException e) {
- config.append("# ").append(category).append("\n");
- }
- if (!category.contains("."))
- config.append("#").append("\n");
-
- config.append(line).append("\n");
-
- continue;
- }
- }
-
- if (line.trim().startsWith("-")) {
- config.append(line).append("\n");
- continue;
- }
-
- String key = category + "." + (line.split(":")[0].trim());
- for (Setting setting : Setting.values()) {
- if (!setting.getSetting().equals(key) || setting.getComments() == null) continue;
- config.append(" ").append("\n");
- for (String l : setting.getComments()) {
- config.append(new String(new char[currentTab]).replace('\0', ' '));
- config.append("# ").append(l).append("\n");
- }
- }
- config.append(line).append("\n");
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- try {
- if (!plugin.getDataFolder().exists())
- plugin.getDataFolder().mkdir();
- BufferedWriter writer =
- new BufferedWriter(new FileWriter(new File(plugin.getDataFolder() + File.separator + "config.yml")));
- writer.write(config.toString());
- writer.flush();
- writer.close();
-
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/songoda/epichoppers/utils/updateModules/LocaleModule.java b/src/main/java/com/songoda/epichoppers/utils/updateModules/LocaleModule.java
deleted file mode 100644
index 51856bb..0000000
--- a/src/main/java/com/songoda/epichoppers/utils/updateModules/LocaleModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.songoda.epichoppers.utils.updateModules;
-
-import com.songoda.epichoppers.utils.locale.Locale;
-import com.songoda.update.Module;
-import com.songoda.update.Plugin;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-public class LocaleModule implements Module {
-
- @Override
- public void run(Plugin plugin) {
- JSONObject json = plugin.getJson();
- try {
- JSONArray files = (JSONArray) json.get("neededFiles");
- for (Object o : files) {
- JSONObject file = (JSONObject) o;
-
- if (file.get("type").equals("locale")) {
- InputStream in = new URL((String) file.get("link")).openStream();
- Locale.saveLocale(in, (String) file.get("name"));
- }
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
-}