From 79fc7c426b300226cdb7ff20af082b7f89ff8433 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Wed, 18 Apr 2018 17:22:38 +0300 Subject: [PATCH] mcstats.org > bstats.org (#1478) Switch to bstats --- .gitignore | 18 +- dist/pom.xml | 1 - main/pom.xml | 29 +- .../main/java/net/citizensnpcs/Citizens.java | 88 +- .../main/java/net/citizensnpcs/Metrics.java | 787 ------------------ .../npc/CitizensTraitFactory.java | 46 +- v1_10_R1/pom.xml | 2 +- v1_11_R1/pom.xml | 2 +- v1_12_R1/pom.xml | 2 +- v1_8_R3/pom.xml | 2 +- 10 files changed, 75 insertions(+), 902 deletions(-) delete mode 100644 main/src/main/java/net/citizensnpcs/Metrics.java diff --git a/.gitignore b/.gitignore index 7314b8111..cb458706b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ -/bin -target +# Project files +.settings/ +.idea/ .classpath .project -.settings -Citizens.jar +*.iml + +# Build files +target/ +bin/ +*.jar *.jardesc *.lnk -*.iml -/.idea -dependency-reduced-pom.xml + + diff --git a/dist/pom.xml b/dist/pom.xml index db555ae84..ad90859af 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,6 @@ single - false src/main/assembly/all-jar.xml diff --git a/main/pom.xml b/main/pom.xml index 2c6663f37..ac2e8358b 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -12,18 +12,19 @@ UTF-8 - 1.12.1-R0.1-SNAPSHOT + 1.12.1-R0.1-SNAPSHOT 2.0.22-SNAPSHOT 1.5.4 1.4.12 + 1.2 Unknown Unknown - bukkit-repo - http://repo.bukkit.org/content/groups/public/ + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ everything @@ -33,15 +34,12 @@ vault-repo http://nexus.hc.to/content/repositories/pub_releases + + bstats-repo + https://repo.bstats.org/content/repositories/releases/ + - - - bukkit-plugins - http://repo.bukkit.org/content/groups/public - - - org.bukkit @@ -70,6 +68,12 @@ jar provided + + org.bstats + bstats-bukkit + ${bstats.version} + compile + org.powermock powermock-module-junit4 @@ -139,6 +143,7 @@ true + false net.citizensnpcs:citizensapi @@ -152,6 +157,10 @@ gnu.trove lib.trove + + org.bstats + net.citizensnpcs.util.metrics + diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java index 77e42378f..c447d0d18 100644 --- a/main/src/main/java/net/citizensnpcs/Citizens.java +++ b/main/src/main/java/net/citizensnpcs/Citizens.java @@ -1,21 +1,7 @@ package net.citizensnpcs; -import java.io.File; -import java.io.IOException; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; - -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.RegisteredServiceProvider; -import org.bukkit.plugin.java.JavaPlugin; - import com.google.common.collect.Iterables; import com.google.common.collect.Maps; - import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensPlugin; @@ -24,11 +10,7 @@ import net.citizensnpcs.api.command.CommandContext; import net.citizensnpcs.api.command.CommandManager; import net.citizensnpcs.api.command.CommandManager.CommandInfo; import net.citizensnpcs.api.command.Injector; -import net.citizensnpcs.api.event.CitizensDisableEvent; -import net.citizensnpcs.api.event.CitizensEnableEvent; -import net.citizensnpcs.api.event.CitizensPreReloadEvent; -import net.citizensnpcs.api.event.CitizensReloadEvent; -import net.citizensnpcs.api.event.DespawnReason; +import net.citizensnpcs.api.event.*; import net.citizensnpcs.api.exception.NPCLoadException; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPCDataStore; @@ -38,17 +20,8 @@ import net.citizensnpcs.api.scripting.EventRegistrar; import net.citizensnpcs.api.scripting.ObjectProvider; import net.citizensnpcs.api.scripting.ScriptCompiler; import net.citizensnpcs.api.trait.TraitFactory; -import net.citizensnpcs.api.util.Messaging; -import net.citizensnpcs.api.util.NBTStorage; -import net.citizensnpcs.api.util.Storage; -import net.citizensnpcs.api.util.Translator; -import net.citizensnpcs.api.util.YamlStorage; -import net.citizensnpcs.commands.AdminCommands; -import net.citizensnpcs.commands.EditorCommands; -import net.citizensnpcs.commands.NPCCommands; -import net.citizensnpcs.commands.TemplateCommands; -import net.citizensnpcs.commands.TraitCommands; -import net.citizensnpcs.commands.WaypointCommands; +import net.citizensnpcs.api.util.*; +import net.citizensnpcs.commands.*; import net.citizensnpcs.editor.Editor; import net.citizensnpcs.npc.CitizensNPCRegistry; import net.citizensnpcs.npc.CitizensTraitFactory; @@ -57,12 +30,23 @@ import net.citizensnpcs.npc.ai.speech.Chat; import net.citizensnpcs.npc.ai.speech.CitizensSpeechFactory; import net.citizensnpcs.npc.profile.ProfileFetcher; import net.citizensnpcs.npc.skin.Skin; -import net.citizensnpcs.util.Messages; -import net.citizensnpcs.util.NMS; -import net.citizensnpcs.util.PlayerUpdateTask; -import net.citizensnpcs.util.StringHelper; -import net.citizensnpcs.util.Util; +import net.citizensnpcs.util.*; import net.milkbowl.vault.economy.Economy; +import org.bstats.bukkit.Metrics; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.RegisteredServiceProvider; +import org.bukkit.plugin.java.JavaPlugin; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.Callable; public class Citizens extends JavaPlugin implements CitizensPlugin { private final CommandManager commands = new CommandManager(); @@ -414,32 +398,20 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { private void startMetrics() { try { - Metrics metrics = new Metrics(Citizens.this); - if (metrics.isOptOut()) - return; - metrics.addCustomData(new Metrics.Plotter("Total NPCs") { + Metrics metrics = new Metrics(this); + + metrics.addCustomChart(new Metrics.SingleLineChart("total_npcs", new Callable() { @Override - public int getValue() { - if (npcRegistry == null) - return 0; + public Integer call() { + if (npcRegistry == null) return 0; return Iterables.size(npcRegistry); } - }); - metrics.addCustomData(new Metrics.Plotter("Total goals") { - @Override - public int getValue() { - if (npcRegistry == null) - return 0; - int goalCount = 0; - for (NPC npc : npcRegistry) { - goalCount += Iterables.size(npc.getDefaultGoalController()); - } - return goalCount; - } - }); - traitFactory.addPlotters(metrics.createGraph("traits")); - metrics.start(); - } catch (IOException e) { + })); + + // todo: Read the comment in CitizensTraitFactory. + // traitFactory.addPlotters(metrics.createGraph("traits")); + + } catch (Exception e) { Messaging.logTr(Messages.METRICS_ERROR_NOTIFICATION, e.getMessage()); } } diff --git a/main/src/main/java/net/citizensnpcs/Metrics.java b/main/src/main/java/net/citizensnpcs/Metrics.java deleted file mode 100644 index 7b9c2a39d..000000000 --- a/main/src/main/java/net/citizensnpcs/Metrics.java +++ /dev/null @@ -1,787 +0,0 @@ -/* - * Copyright 2011-2013 Tyler Blair. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and contributors and should not be interpreted as representing official policies, - * either expressed or implied, of anybody else. - */ -package net.citizensnpcs; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.Proxy; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; -import java.util.logging.Level; -import java.util.zip.GZIPOutputStream; - -import org.bukkit.Bukkit; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.scheduler.BukkitTask; - -public class Metrics { - /** - * The plugin configuration file - */ - private final YamlConfiguration configuration; - - /** - * The plugin configuration file - */ - private final File configurationFile; - - /** - * Debug mode - */ - private final boolean debug; - - /** - * All of the custom graphs to submit to metrics - */ - private final Set graphs = Collections.synchronizedSet(new HashSet()); - - /** - * Unique server id - */ - private final String guid; - - /** - * Lock for synchronization - */ - private final Object optOutLock = new Object(); - - /** - * The plugin this metrics submits for - */ - private final Plugin plugin; - - /** - * The scheduled task - */ - private volatile BukkitTask task = null; - - public Metrics(final Plugin plugin) throws IOException { - if (plugin == null) { - throw new IllegalArgumentException("Plugin cannot be null"); - } - - this.plugin = plugin; - - // load the config - configurationFile = getConfigFile(); - configuration = YamlConfiguration.loadConfiguration(configurationFile); - - // add some defaults - configuration.addDefault("opt-out", false); - configuration.addDefault("guid", UUID.randomUUID().toString()); - configuration.addDefault("debug", false); - - // Do we need to create the file? - if (configuration.get("guid", null) == null) { - configuration.options().header("http://mcstats.org").copyDefaults(true); - configuration.save(configurationFile); - } - - // Load the guid then - guid = configuration.getString("guid"); - debug = configuration.getBoolean("debug", false); - } - - public void addCustomData(Plotter plotter) { - Graph graph = new Graph(plotter.name); - graph.addPlotter(plotter); - addGraph(graph); - } - - /** - * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend - * - * @param graph - * The name of the graph - */ - public void addGraph(final Graph graph) { - if (graph == null) { - throw new IllegalArgumentException("Graph cannot be null"); - } - - graphs.add(graph); - } - - /** - * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics - * website. Plotters can be added to the graph object returned. - * - * @param name - * The name of the graph - * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given - */ - public Graph createGraph(final String name) { - if (name == null) { - throw new IllegalArgumentException("Graph name cannot be null"); - } - - // Construct the graph object - final Graph graph = new Graph(name); - - // Now we can add our graph - graphs.add(graph); - - // and return back - return graph; - } - - /** - * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task. - * - * @throws java.io.IOException - */ - public void disable() throws IOException { - // This has to be synchronized or it can collide with the check in the - // task. - synchronized (optOutLock) { - // Check if the server owner has already set opt-out, if not, set - // it. - if (!isOptOut()) { - configuration.set("opt-out", true); - configuration.save(configurationFile); - } - - // Disable Task, if it is running - if (task != null) { - task.cancel(); - task = null; - } - } - } - - /** - * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task. - * - * @throws java.io.IOException - */ - public void enable() throws IOException { - // This has to be synchronized or it can collide with the check in the - // task. - synchronized (optOutLock) { - // Check if the server owner has already set opt-out, if not, set - // it. - if (isOptOut()) { - configuration.set("opt-out", false); - configuration.save(configurationFile); - } - - // Enable Task, if it is not running - if (task == null) { - start(); - } - } - } - - /** - * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status - * - * @return the File object for the config file - */ - public File getConfigFile() { - // I believe the easiest way to get the base folder (e.g craftbukkit set - // via -P) for plugins to use - // is to abuse the plugin object we already have - // plugin.getDataFolder() => base/plugins/PluginA/ - // pluginsFolder => base/plugins/ - // The base is not necessarily relative to the startup directory. - File pluginsFolder = plugin.getDataFolder().getParentFile(); - - // return => base/plugins/PluginMetrics/config.yml - return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml"); - } - - /** - * Check if mineshafter is present. If it is, we need to bypass it to send POST requests - * - * @return true if mineshafter is installed on the server - */ - private boolean isMineshafterPresent() { - try { - Class.forName("mineshafter.MineServer"); - return true; - } catch (Exception e) { - return false; - } - } - - /** - * Has the server owner denied plugin metrics? - * - * @return true if metrics should be opted out of it - */ - public boolean isOptOut() { - synchronized (optOutLock) { - try { - // Reload the metrics file - configuration.load(getConfigFile()); - } catch (IOException ex) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); - } - return true; - } catch (InvalidConfigurationException ex) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage()); - } - return true; - } - return configuration.getBoolean("opt-out", false); - } - } - - /** - * Generic method that posts a plugin to the metrics website - */ - private void postPlugin(final boolean isPing) throws IOException { - // Server software specific section - PluginDescriptionFile description = plugin.getDescription(); - String pluginName = description.getName(); - boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if - // online mode - // is enabled - String pluginVersion = description.getVersion(); - String serverVersion = Bukkit.getVersion(); - int playersOnline = Bukkit.getServer().getOnlinePlayers().size(); - - // END server software specific section -- all code below does not use - // any code outside of this class / Java - - // Construct the post data - StringBuilder json = new StringBuilder(1024); - json.append('{'); - - // The plugin's description file containg all of the plugin data such as - // name, version, author, etc - appendJSONPair(json, "guid", guid); - appendJSONPair(json, "plugin_version", pluginVersion); - appendJSONPair(json, "server_version", serverVersion); - appendJSONPair(json, "players_online", Integer.toString(playersOnline)); - - // New data as of R6 - String osname = System.getProperty("os.name"); - String osarch = System.getProperty("os.arch"); - String osversion = System.getProperty("os.version"); - String java_version = System.getProperty("java.version"); - int coreCount = Runtime.getRuntime().availableProcessors(); - - // normalize os arch .. amd64 -> x86_64 - if (osarch.equals("amd64")) { - osarch = "x86_64"; - } - - appendJSONPair(json, "osname", osname); - appendJSONPair(json, "osarch", osarch); - appendJSONPair(json, "osversion", osversion); - appendJSONPair(json, "cores", Integer.toString(coreCount)); - appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0"); - appendJSONPair(json, "java_version", java_version); - - // If we're pinging, append it - if (isPing) { - appendJSONPair(json, "ping", "1"); - } - - if (graphs.size() > 0) { - synchronized (graphs) { - json.append(','); - json.append('"'); - json.append("graphs"); - json.append('"'); - json.append(':'); - json.append('{'); - - boolean firstGraph = true; - - final Iterator iter = graphs.iterator(); - - while (iter.hasNext()) { - Graph graph = iter.next(); - - StringBuilder graphJson = new StringBuilder(); - graphJson.append('{'); - - for (Plotter plotter : graph.getPlotters()) { - appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue())); - } - - graphJson.append('}'); - - if (!firstGraph) { - json.append(','); - } - - json.append(escapeJSON(graph.getName())); - json.append(':'); - json.append(graphJson); - - firstGraph = false; - } - - json.append('}'); - } - } - - // close json - json.append('}'); - - // Create the url - URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName))); - - // Connect to the website - URLConnection connection; - - // Mineshafter creates a socks proxy, so we can safely bypass it - // It does not reroute POST requests so we need to go around it - if (isMineshafterPresent()) { - connection = url.openConnection(Proxy.NO_PROXY); - } else { - connection = url.openConnection(); - } - - byte[] uncompressed = json.toString().getBytes(); - byte[] compressed = gzip(json.toString()); - - // Headers - connection.addRequestProperty("User-Agent", "MCStats/" + REVISION); - connection.addRequestProperty("Content-Type", "application/json"); - connection.addRequestProperty("Content-Encoding", "gzip"); - connection.addRequestProperty("Content-Length", Integer.toString(compressed.length)); - connection.addRequestProperty("Accept", "application/json"); - connection.addRequestProperty("Connection", "close"); - - connection.setDoOutput(true); - - if (debug) { - System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length - + " compressed=" + compressed.length); - } - - // Write the data - OutputStream os = connection.getOutputStream(); - os.write(compressed); - os.flush(); - - // Now read the response - final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); - String response = reader.readLine(); - - // close resources - os.close(); - reader.close(); - - if (response == null || response.startsWith("ERR") || response.startsWith("7")) { - if (response == null) { - response = "null"; - } else if (response.startsWith("7")) { - response = response.substring(response.startsWith("7,") ? 2 : 1); - } - - throw new IOException(response); - } else { - // Is this the first update this hour? - if (response.equals("1") || response.contains("This is your first update this hour")) { - synchronized (graphs) { - final Iterator iter = graphs.iterator(); - - while (iter.hasNext()) { - final Graph graph = iter.next(); - - for (Plotter plotter : graph.getPlotters()) { - plotter.reset(); - } - } - } - } - } - } - - /** - * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the - * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200 - * ticks. - * - * @return True if statistics measuring is running, otherwise false. - */ - public boolean start() { - synchronized (optOutLock) { - // Did we opt out? - if (isOptOut()) { - return false; - } - - // Is metrics already running? - if (task != null) { - return true; - } - - // Begin hitting the server with glorious data - task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() { - - private boolean firstPost = true; - - @Override - public void run() { - try { - // This has to be synchronized or it can collide with - // the disable method. - synchronized (optOutLock) { - // Disable Task, if it is running and the server - // owner decided to opt-out - if (isOptOut() && task != null) { - task.cancel(); - task = null; - // Tell all plotters to stop gathering - // information. - for (Graph graph : graphs) { - graph.onOptOut(); - } - } - } - - // We use the inverse of firstPost because if it is the - // first time we are posting, - // it is not a interval ping, so it evaluates to FALSE - // Each time thereafter it will evaluate to TRUE, i.e - // PING! - postPlugin(!firstPost); - - // After the first post we set firstPost to false - // Each post thereafter will be a ping - firstPost = false; - } catch (IOException e) { - if (debug) { - Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage()); - } - } - } - }, 0, PING_INTERVAL * 1200); - - return true; - } - } - - /** - * Represents a custom graph on the website - */ - public static class Graph { - - /** - * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is - * rejected - */ - private final String name; - - /** - * The set of plotters that are contained within this graph - */ - private final Set plotters = new LinkedHashSet(); - - private Graph(final String name) { - this.name = name; - } - - /** - * Add a plotter to the graph, which will be used to plot entries - * - * @param plotter - * the plotter to add to the graph - */ - public void addPlotter(final Plotter plotter) { - plotters.add(plotter); - } - - @Override - public boolean equals(final Object object) { - if (!(object instanceof Graph)) { - return false; - } - - final Graph graph = (Graph) object; - return graph.name.equals(name); - } - - /** - * Gets the graph's name - * - * @return the Graph's name - */ - public String getName() { - return name; - } - - /** - * Gets an unmodifiable set of the plotter objects in the graph - * - * @return an unmodifiable {@link java.util.Set} of the plotter objects - */ - public Set getPlotters() { - return Collections.unmodifiableSet(plotters); - } - - @Override - public int hashCode() { - return name.hashCode(); - } - - /** - * Called when the server owner decides to opt-out of BukkitMetrics while the server is running. - */ - protected void onOptOut() { - } - - /** - * Remove a plotter from the graph - * - * @param plotter - * the plotter to remove from the graph - */ - public void removePlotter(final Plotter plotter) { - plotters.remove(plotter); - } - } - - /** - * Interface used to collect custom data for a plugin - */ - public static abstract class Plotter { - - /** - * The plot's name - */ - private final String name; - - /** - * Construct a plotter with the default plot name - */ - public Plotter() { - this("Default"); - } - - /** - * Construct a plotter with a specific plot name - * - * @param name - * the name of the plotter to use, which will show up on the website - */ - public Plotter(final String name) { - this.name = name; - } - - @Override - public boolean equals(final Object object) { - if (!(object instanceof Plotter)) { - return false; - } - - final Plotter plotter = (Plotter) object; - return plotter.name.equals(name) && plotter.getValue() == getValue(); - } - - /** - * Get the column name for the plotted point - * - * @return the plotted point's column name - */ - public String getColumnName() { - return name; - } - - /** - * Get the current value for the plotted point. Since this function defers to an external function it may or may - * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called - * from any thread so care should be taken when accessing resources that need to be synchronized. - * - * @return the current value for the point to be plotted. - */ - public abstract int getValue(); - - @Override - public int hashCode() { - return getColumnName().hashCode(); - } - - /** - * Called after the website graphs have been updated - */ - public void reset() { - } - } - - /** - * Appends a json encoded key/value pair to the given string builder. - * - * @param json - * @param key - * @param value - * @throws UnsupportedEncodingException - */ - private static void appendJSONPair(StringBuilder json, String key, String value) - throws UnsupportedEncodingException { - boolean isValueNumeric = false; - - try { - if (value.equals("0") || !value.endsWith("0")) { - Double.parseDouble(value); - isValueNumeric = true; - } - } catch (NumberFormatException e) { - isValueNumeric = false; - } - - if (json.charAt(json.length() - 1) != '{') { - json.append(','); - } - - json.append(escapeJSON(key)); - json.append(':'); - - if (isValueNumeric) { - json.append(value); - } else { - json.append(escapeJSON(value)); - } - } - - /** - * Escape a string to create a valid JSON string - * - * @param text - * @return - */ - private static String escapeJSON(String text) { - StringBuilder builder = new StringBuilder(); - - builder.append('"'); - for (int index = 0; index < text.length(); index++) { - char chr = text.charAt(index); - - switch (chr) { - case '"': - case '\\': - builder.append('\\'); - builder.append(chr); - break; - case '\b': - builder.append("\\b"); - break; - case '\t': - builder.append("\\t"); - break; - case '\n': - builder.append("\\n"); - break; - case '\r': - builder.append("\\r"); - break; - default: - if (chr < ' ') { - String t = "000" + Integer.toHexString(chr); - builder.append("\\u" + t.substring(t.length() - 4)); - } else { - builder.append(chr); - } - break; - } - } - builder.append('"'); - - return builder.toString(); - } - - /** - * GZip compress a string of bytes - * - * @param input - * @return - */ - public static byte[] gzip(String input) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gzos = null; - - try { - gzos = new GZIPOutputStream(baos); - gzos.write(input.getBytes("UTF-8")); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (gzos != null) - try { - gzos.close(); - } catch (IOException ignore) { - } - } - - return baos.toByteArray(); - } - - /** - * Encode text as UTF-8 - * - * @param text - * the text to encode - * @return the encoded text, as UTF-8 - */ - private static String urlEncode(final String text) throws UnsupportedEncodingException { - return URLEncoder.encode(text, "UTF-8"); - } - - /** - * The base url of the metrics domain - */ - private static final String BASE_URL = "http://report.mcstats.org"; - - /** - * Interval of time to ping (in minutes) - */ - private static final int PING_INTERVAL = 15; - - /** - * The url used to report a server's status - */ - private static final String REPORT_URL = "/plugin/%s"; - - /** - * The current revision number - */ - private final static int REVISION = 7; -} \ No newline at end of file diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java b/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java index d60e3b9a7..c332c272a 100644 --- a/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java +++ b/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java @@ -1,51 +1,23 @@ package net.citizensnpcs.npc; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - -import net.citizensnpcs.Metrics; -import net.citizensnpcs.Metrics.Graph; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.TraitFactory; import net.citizensnpcs.api.trait.TraitInfo; -import net.citizensnpcs.api.trait.trait.Equipment; -import net.citizensnpcs.api.trait.trait.Inventory; -import net.citizensnpcs.api.trait.trait.MobType; -import net.citizensnpcs.api.trait.trait.Owner; -import net.citizensnpcs.api.trait.trait.Spawned; -import net.citizensnpcs.api.trait.trait.Speech; -import net.citizensnpcs.trait.Age; -import net.citizensnpcs.trait.Anchors; -import net.citizensnpcs.trait.ArmorStandTrait; -import net.citizensnpcs.trait.Controllable; -import net.citizensnpcs.trait.CurrentLocation; -import net.citizensnpcs.trait.Gravity; -import net.citizensnpcs.trait.HorseModifiers; -import net.citizensnpcs.trait.LookClose; -import net.citizensnpcs.trait.MountTrait; -import net.citizensnpcs.trait.OcelotModifiers; -import net.citizensnpcs.trait.Poses; -import net.citizensnpcs.trait.Powered; -import net.citizensnpcs.trait.RabbitType; -import net.citizensnpcs.trait.Saddle; -import net.citizensnpcs.trait.ScriptTrait; -import net.citizensnpcs.trait.SheepTrait; -import net.citizensnpcs.trait.SkinLayers; -import net.citizensnpcs.trait.SlimeSize; -import net.citizensnpcs.trait.VillagerProfession; -import net.citizensnpcs.trait.WitherTrait; -import net.citizensnpcs.trait.WolfModifiers; -import net.citizensnpcs.trait.WoolColor; +import net.citizensnpcs.api.trait.trait.*; +import net.citizensnpcs.trait.*; import net.citizensnpcs.trait.text.Text; import net.citizensnpcs.trait.waypoint.Waypoints; +import org.bstats.bukkit.Metrics; + +import java.util.List; +import java.util.Map; +import java.util.Set; public class CitizensTraitFactory implements TraitFactory { private final List defaultTraits = Lists.newArrayList(); @@ -95,6 +67,9 @@ public class CitizensTraitFactory implements TraitFactory { } } + /* + TODO: We are waiting for multiline charts in bStats to implement this + * public void addPlotters(Graph graph) { for (Map.Entry entry : registered.entrySet()) { if (INTERNAL_TRAITS.contains(entry.getKey()) || entry.getKey() == null) @@ -114,6 +89,7 @@ public class CitizensTraitFactory implements TraitFactory { }); } } + */ private T create(TraitInfo info) { return info.tryCreateInstance(); diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml index 24fc9a8c8..5d154b5af 100644 --- a/v1_10_R1/pom.xml +++ b/v1_10_R1/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 1.10-R0.1-SNAPSHOT + 1.10-R0.1-SNAPSHOT diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml index 4325c4eb3..e9da15c9e 100644 --- a/v1_11_R1/pom.xml +++ b/v1_11_R1/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 1.11-R0.1-SNAPSHOT + 1.11-R0.1-SNAPSHOT diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml index 2eb6bfdc8..2804553c2 100644 --- a/v1_12_R1/pom.xml +++ b/v1_12_R1/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 1.12.1-R0.1-SNAPSHOT + 1.12.1-R0.1-SNAPSHOT diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index a8916edc9..21c523afa 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 1.8.7-R0.1-SNAPSHOT + 1.8.7-R0.1-SNAPSHOT