names = new ArrayList<>();
for (Player player : Bukkit.getOnlinePlayers())
{
- if (!TotalFreedomMod.plugin().al.isVanished(player.getName()))
+ if (!TotalFreedomMod.plugin().al.isVanished(player))
{
names.add(player.getName());
}
diff --git a/src/main/java/org/bstats/Metrics.java b/src/main/java/org/bstats/Metrics.java
index 87545c38..4fd5ae54 100644
--- a/src/main/java/org/bstats/Metrics.java
+++ b/src/main/java/org/bstats/Metrics.java
@@ -1,12 +1,19 @@
package org.bstats;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -15,23 +22,22 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
import java.util.concurrent.Callable;
+import java.util.logging.Level;
import java.util.zip.GZIPOutputStream;
import javax.net.ssl.HttpsURLConnection;
-import me.totalfreedom.totalfreedommod.util.FLog;
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.bukkit.plugin.java.JavaPlugin;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
/**
* bStats collects some data for plugin authors.
*
* Check out https://bStats.org/ to learn more about bStats!
*/
+@SuppressWarnings({"WeakerAccess", "unused"})
public class Metrics
{
static
@@ -57,14 +63,26 @@ public class Metrics
// 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 JavaPlugin plugin;
+ private final Plugin plugin;
+
+ // The plugin id
+ private final int pluginId;
// A list with all custom charts
private final List charts = new ArrayList<>();
@@ -72,15 +90,18 @@ public class Metrics
/**
* Class constructor.
*
- * @param plugin The plugin which stats should be submitted.
+ * @param plugin The plugin which stats should be submitted.
+ * @param pluginId The id of the plugin.
+ * It can be found at What is my plugin id?
*/
- public Metrics(JavaPlugin plugin)
+ public Metrics(Plugin plugin, int pluginId)
{
if (plugin == null)
{
throw new IllegalArgumentException("Plugin cannot be null!");
}
this.plugin = plugin;
+ this.pluginId = pluginId;
// Get the config file
File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
@@ -90,12 +111,17 @@ public class Metrics
// 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(
@@ -114,9 +140,13 @@ public class Metrics
}
// Load the data
+ enabled = config.getBoolean("enabled", true);
serverUUID = config.getString("serverUuid");
logFailedRequests = config.getBoolean("logFailedRequests", false);
- if (config.getBoolean("enabled", true))
+ 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
@@ -142,6 +172,16 @@ public class Metrics
}
}
+ /**
+ * Checks if bStats is enabled.
+ *
+ * @return Whether bStats is enabled or not.
+ */
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+
/**
* Adds a custom chart.
*
@@ -174,14 +214,7 @@ public class Metrics
}
// 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, new Runnable()
- {
- @Override
- public void run()
- {
- submitData();
- }
- });
+ 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
@@ -195,26 +228,28 @@ public class Metrics
*
* @return The plugin specific data.
*/
- public JSONObject getPluginData()
+ public JsonObject getPluginData()
{
- JSONObject data = new JSONObject();
+ JsonObject data = new JsonObject();
+ String pluginName = plugin.getDescription().getName();
String pluginVersion = plugin.getDescription().getVersion();
- data.put("pluginName", "TotalFreedomMod"); // Append the name of the plugin
- data.put("pluginVersion", pluginVersion); // Append the version of the plugin
- JSONArray customCharts = new JSONArray();
+ data.addProperty("pluginName", pluginName); // Append the name of the plugin
+ data.addProperty("id", pluginId); // Append the id of the plugin
+ data.addProperty("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();
+ JsonObject chart = customChart.getRequestJsonObject();
if (chart == null)
{ // If the chart is null, we skip it
continue;
}
customCharts.add(chart);
}
- data.put("customCharts", customCharts);
+ data.add("customCharts", customCharts);
return data;
}
@@ -224,7 +259,7 @@ public class Metrics
*
* @return The server specific data.
*/
- private JSONObject getServerData()
+ private JsonObject getServerData()
{
// Minecraft specific data
int playerAmount;
@@ -242,8 +277,8 @@ public class Metrics
playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
}
int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
- String bukkitVersion = org.bukkit.Bukkit.getVersion();
- bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
+ String bukkitVersion = Bukkit.getVersion();
+ String bukkitName = Bukkit.getName();
// OS/Java specific data
String javaVersion = System.getProperty("java.version");
@@ -252,19 +287,20 @@ public class Metrics
String osVersion = System.getProperty("os.version");
int coreCount = Runtime.getRuntime().availableProcessors();
- JSONObject data = new JSONObject();
+ JsonObject data = new JsonObject();
- data.put("serverUUID", serverUUID);
+ data.addProperty("serverUUID", serverUUID);
- data.put("playerAmount", playerAmount);
- data.put("onlineMode", onlineMode);
- data.put("bukkitVersion", bukkitVersion);
+ data.addProperty("playerAmount", playerAmount);
+ data.addProperty("onlineMode", onlineMode);
+ data.addProperty("bukkitVersion", bukkitVersion);
+ data.addProperty("bukkitName", bukkitName);
- data.put("javaVersion", javaVersion);
- data.put("osName", osName);
- data.put("osArch", osArch);
- data.put("osVersion", osVersion);
- data.put("coreCount", coreCount);
+ data.addProperty("javaVersion", javaVersion);
+ data.addProperty("osName", osName);
+ data.addProperty("osArch", osArch);
+ data.addProperty("osVersion", osVersion);
+ data.addProperty("coreCount", coreCount);
return data;
}
@@ -274,9 +310,9 @@ public class Metrics
*/
private void submitData()
{
- final JSONObject data = getServerData();
+ final JsonObject data = getServerData();
- JSONArray pluginData = new JSONArray();
+ JsonArray pluginData = new JsonArray();
// Search for all other bStats Metrics classes to get their plugin data
for (Class> service : Bukkit.getServicesManager().getKnownServices())
{
@@ -288,7 +324,34 @@ public class Metrics
{
try
{
- pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
+ Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
+ if (plugin instanceof JsonObject)
+ {
+ pluginData.add((JsonObject)plugin);
+ }
+ else
+ { // old bstats version compatibility
+ try
+ {
+ Class> jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
+ if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple))
+ {
+ Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
+ jsonStringGetter.setAccessible(true);
+ String jsonString = (String)jsonStringGetter.invoke(plugin);
+ JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
+ pluginData.add(object);
+ }
+ }
+ catch (ClassNotFoundException e)
+ {
+ // minecraft version 1.14+
+ if (logFailedRequests)
+ {
+ this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception", e);
+ }
+ }
+ }
}
catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored)
{
@@ -300,26 +363,22 @@ public class Metrics
}
}
- data.put("plugins", pluginData);
+ data.add("plugins", pluginData);
// Create a new thread for the connection to the bStats server
- new Thread(new Runnable()
+ new Thread(() ->
{
- @Override
- public void run()
+ try
{
- try
+ // Send the data
+ sendData(plugin, data);
+ }
+ catch (Exception e)
+ {
+ // Something went wrong! :(
+ if (logFailedRequests)
{
- // Send the data
- sendData(data);
- }
- catch (Exception e)
- {
- // Something went wrong! :(
- if (logFailedRequests)
- {
- FLog.warning("Could not submit plugin stats of " + plugin.getName() + e);
- }
+ plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
}
}
}).start();
@@ -328,10 +387,11 @@ public class Metrics
/**
* Sends the data to the bStats server.
*
- * @param data The data to send.
+ * @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(JSONObject data) throws Exception
+ private static void sendData(Plugin plugin, JsonObject data) throws Exception
{
if (data == null)
{
@@ -341,6 +401,10 @@ public class Metrics
{
throw new IllegalAccessException("This method must not be called from the main thread!");
}
+ if (logSentData)
+ {
+ plugin.getLogger().info("Sending data to bStats: " + data);
+ }
HttpsURLConnection connection = (HttpsURLConnection)new URL(URL).openConnection();
// Compress the data to save bandwidth
@@ -357,12 +421,25 @@ public class Metrics
// Send data
connection.setDoOutput(true);
- DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
- outputStream.write(compressedData);
- outputStream.flush();
- outputStream.close();
+ try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()))
+ {
+ outputStream.write(compressedData);
+ }
- connection.getInputStream().close(); // We don't care about the response - Just send our data :)
+ StringBuilder builder = new StringBuilder();
+ try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream())))
+ {
+ String line;
+ while ((line = bufferedReader.readLine()) != null)
+ {
+ builder.append(line);
+ }
+ }
+
+ if (logResponseStatusText)
+ {
+ plugin.getLogger().info("Sent data to bStats and received response: " + builder);
+ }
}
/**
@@ -379,9 +456,10 @@ public class Metrics
return null;
}
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
- gzip.write(str.getBytes("UTF-8"));
- gzip.close();
+ try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream))
+ {
+ gzip.write(str.getBytes(StandardCharsets.UTF_8));
+ }
return outputStream.toByteArray();
}
@@ -408,32 +486,32 @@ public class Metrics
this.chartId = chartId;
}
- private JSONObject getRequestJsonObject()
+ private JsonObject getRequestJsonObject()
{
- JSONObject chart = new JSONObject();
- chart.put("chartId", chartId);
+ JsonObject chart = new JsonObject();
+ chart.addProperty("chartId", chartId);
try
{
- JSONObject data = getChartData();
+ JsonObject data = getChartData();
if (data == null)
{
// If the data is null we don't send the chart.
return null;
}
- chart.put("data", data);
+ chart.add("data", data);
}
catch (Throwable t)
{
if (logFailedRequests)
{
- FLog.warning("Failed to get data for custom chart with id " + chartId + t);
+ 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;
+ protected abstract JsonObject getChartData() throws Exception;
}
@@ -458,16 +536,16 @@ public class Metrics
}
@Override
- protected JSONObject getChartData() throws Exception
+ protected JsonObject getChartData() throws Exception
{
- JSONObject data = new JSONObject();
+ JsonObject data = new JsonObject();
String value = callable.call();
if (value == null || value.isEmpty())
{
// Null = skip the chart
return null;
}
- data.put("value", value);
+ data.addProperty("value", value);
return data;
}
}
@@ -493,10 +571,10 @@ public class Metrics
}
@Override
- protected JSONObject getChartData() throws Exception
+ protected JsonObject getChartData() throws Exception
{
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ JsonObject data = new JsonObject();
+ JsonObject values = new JsonObject();
Map map = callable.call();
if (map == null || map.isEmpty())
{
@@ -511,14 +589,14 @@ public class Metrics
continue; // Skip this invalid
}
allSkipped = false;
- values.put(entry.getKey(), entry.getValue());
+ values.addProperty(entry.getKey(), entry.getValue());
}
if (allSkipped)
{
// Null = skip the chart
return null;
}
- data.put("values", values);
+ data.add("values", values);
return data;
}
}
@@ -544,10 +622,10 @@ public class Metrics
}
@Override
- public JSONObject getChartData() throws Exception
+ public JsonObject getChartData() throws Exception
{
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ JsonObject data = new JsonObject();
+ JsonObject values = new JsonObject();
Map> map = callable.call();
if (map == null || map.isEmpty())
{
@@ -557,17 +635,17 @@ public class Metrics
boolean reallyAllSkipped = true;
for (Map.Entry> entryValues : map.entrySet())
{
- JSONObject value = new JSONObject();
+ JsonObject value = new JsonObject();
boolean allSkipped = true;
for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet())
{
- value.put(valueEntry.getKey(), valueEntry.getValue());
+ value.addProperty(valueEntry.getKey(), valueEntry.getValue());
allSkipped = false;
}
if (!allSkipped)
{
reallyAllSkipped = false;
- values.put(entryValues.getKey(), value);
+ values.add(entryValues.getKey(), value);
}
}
if (reallyAllSkipped)
@@ -575,7 +653,7 @@ public class Metrics
// Null = skip the chart
return null;
}
- data.put("values", values);
+ data.add("values", values);
return data;
}
}
@@ -601,16 +679,16 @@ public class Metrics
}
@Override
- protected JSONObject getChartData() throws Exception
+ protected JsonObject getChartData() throws Exception
{
- JSONObject data = new JSONObject();
+ JsonObject data = new JsonObject();
int value = callable.call();
if (value == 0)
{
// Null = skip the chart
return null;
}
- data.put("value", value);
+ data.addProperty("value", value);
return data;
}
@@ -637,10 +715,10 @@ public class Metrics
}
@Override
- protected JSONObject getChartData() throws Exception
+ protected JsonObject getChartData() throws Exception
{
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ JsonObject data = new JsonObject();
+ JsonObject values = new JsonObject();
Map map = callable.call();
if (map == null || map.isEmpty())
{
@@ -655,14 +733,14 @@ public class Metrics
continue; // Skip this invalid
}
allSkipped = false;
- values.put(entry.getKey(), entry.getValue());
+ values.addProperty(entry.getKey(), entry.getValue());
}
if (allSkipped)
{
// Null = skip the chart
return null;
}
- data.put("values", values);
+ data.add("values", values);
return data;
}
@@ -689,10 +767,10 @@ public class Metrics
}
@Override
- protected JSONObject getChartData() throws Exception
+ protected JsonObject getChartData() throws Exception
{
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ JsonObject data = new JsonObject();
+ JsonObject values = new JsonObject();
Map map = callable.call();
if (map == null || map.isEmpty())
{
@@ -701,11 +779,11 @@ public class Metrics
}
for (Map.Entry entry : map.entrySet())
{
- JSONArray categoryValues = new JSONArray();
- categoryValues.add(entry.getValue());
- values.put(entry.getKey(), categoryValues);
+ JsonArray categoryValues = new JsonArray();
+ categoryValues.add(new JsonPrimitive(entry.getValue()));
+ values.add(entry.getKey(), categoryValues);
}
- data.put("values", values);
+ data.add("values", values);
return data;
}
@@ -732,10 +810,10 @@ public class Metrics
}
@Override
- protected JSONObject getChartData() throws Exception
+ protected JsonObject getChartData() throws Exception
{
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ JsonObject data = new JsonObject();
+ JsonObject values = new JsonObject();
Map map = callable.call();
if (map == null || map.isEmpty())
{
@@ -750,19 +828,19 @@ public class Metrics
continue; // Skip this invalid
}
allSkipped = false;
- JSONArray categoryValues = new JSONArray();
+ JsonArray categoryValues = new JsonArray();
for (int categoryValue : entry.getValue())
{
- categoryValues.add(categoryValue);
+ categoryValues.add(new JsonPrimitive(categoryValue));
}
- values.put(entry.getKey(), categoryValues);
+ values.add(entry.getKey(), categoryValues);
}
if (allSkipped)
{
// Null = skip the chart
return null;
}
- data.put("values", values);
+ data.add("values", values);
return data;
}
}
diff --git a/src/main/resources/permissions.yml b/src/main/resources/permissions.yml
index 52e839e9..70a40b63 100644
--- a/src/main/resources/permissions.yml
+++ b/src/main/resources/permissions.yml
@@ -9,7 +9,8 @@
# This is used to remove all permission begging with the root node
# This is useful when a plugin gives all permissions to a player because they are opped
remove:
- - "coreprotect"
+ - "voxelsniper"
+ - "bending"
# Operator permission nodes
operators:
@@ -35,27 +36,12 @@ operators:
- "worldedit.removebelow"
- "worldedit.removenear"
- "worldedit.replacenear"
- - "worldedit.clipboard.save"
- - "worldedit.clipboard.load"
- - "worldedit.schematic.save"
- - "worldedit.schematic.load"
- - "worldedit.schematic.formats"
- # CoreProtect
- - "coreprotect.inspect"
- - "coreprotect.lookup"
- - "coreprotect.help"
- - "coreprotect.status"
- - "coreprotect.lookup.block"
- - "coreprotect.lookup.click"
- - "coreprotect.lookup.container"
- - "coreprotect.container"
- - "coreprotect.core"
- - "coreprotect.coreprotect"
- - "coreprotect.co"
+ # LibsDisguises
+ - "libsdisguises.noactionbar"
# WorldGuard
- - "worldguard.region.list.own"
+ - "worldgyardregion.list.own"
- "worldguard.region.addmember.own.*"
- "worldguard.region.removemember.own.*"
- "worldguard.region.info.*"
@@ -70,16 +56,19 @@ master_builders:
- "worldedit.thaw"
- "worldguard.region.bypass.hubworld"
- "worldguard.region.bypass.masterbuilderworld"
+ - "voxelsniper.sniper"
+ - "voxelsniper.goto"
+ - "voxelsniper.brush.*"
# Super Admin permission nodes
super_admins:
- "coreprotect.*"
- "worldedit.*"
- "worldguard.*"
+ - "bending.*"
# Telnet Admin permission nodes
telnet_admins: []
# Senior Admin permission nodes
-senior_admins: []
-
+senior_admins: []
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index b3400b4f..0db49012 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,6 +2,6 @@ name: TotalFreedomMod
main: me.totalfreedom.totalfreedommod.TotalFreedomMod
version: ${project.version}
description: Plugin for the Total Freedom server.
-softdepend: [BukkitTelnet, Essentials, LibsDisguises, WorldEdit, WorldGuard, WorldGuardExtraFlags, TFGuilds]
+softdepend: [BukkitTelnet, Essentials, LibsDisguises, WorldEdit, WorldGuard, WorldGuardExtraFlags, TFGuilds, SuperVanish, PremiumVanish]
authors: [Madgeek1450, Prozza]
api-version: 1.16
\ No newline at end of file