diff --git a/build.gradle b/build.gradle
index 2f5c3d0..f51c478 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,3 @@
-plugins {
- id 'fabric-loom' version '0.2.0-SNAPSHOT'
-}
-
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'idea'
@@ -26,11 +22,9 @@ configurations {
}
repositories {
- maven { url "http://repo.maven.apache.org/maven2" }
+ maven { url "https://repo.maven.apache.org/maven2" }
maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
-}
-
-minecraft {
+ maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
// includeLibs just says to include the library in the final jar
@@ -41,7 +35,7 @@ dependencies {
compile group: 'com.google.inject', name: 'guice', version:'4.0'
// For spigot api
- implementation "org.bukkit:bukkit:1.16.1-R0.1-SNAPSHOT"
+ implementation "org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT"
// For bukkit api
implementation "net.md-5:bungeecord-api:1.15-SNAPSHOT"
diff --git a/src/main/java/com/sekwah/advancedportals/fabric/AdvancedPortalsMod.java b/src/main/java/com/sekwah/advancedportals/fabric/AdvancedPortalsMod.java
deleted file mode 100644
index 88d82ec..0000000
--- a/src/main/java/com/sekwah/advancedportals/fabric/AdvancedPortalsMod.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sekwah.advancedportals.fabric;
-
-import net.fabricmc.api.ModInitializer;
-
-public class AdvancedPortalsMod implements ModInitializer {
- @Override
- public void onInitialize() {
- // This code runs as soon as Minecraft is in a mod-load-ready state.
- // However, some things (like resources) may still be uninitialized.
- // Proceed with mild caution.
-
- System.out.println("Hello Fabric world!");
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/sekwah/advancedportals/fabric/mixins/common/PlayerMixin.java b/src/main/java/com/sekwah/advancedportals/fabric/mixins/common/PlayerMixin.java
deleted file mode 100644
index fb4736a..0000000
--- a/src/main/java/com/sekwah/advancedportals/fabric/mixins/common/PlayerMixin.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.sekwah.advancedportals.fabric.mixins.common;
-
-import net.minecraft.entity.player.PlayerEntity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(PlayerEntity.class)
-public class PlayerMixin {
-
- @Inject(method="setPosition", at=@At("HEAD"))
- public void setPosition(double x, double y, double z, CallbackInfo info) {
- System.out.println("MOVE");
- }
-
-
-}
diff --git a/src/main/java/com/sekwah/advancedportals/metrics/Metrics.java b/src/main/java/com/sekwah/advancedportals/metrics/Metrics.java
index 98a3cad..a513903 100644
--- a/src/main/java/com/sekwah/advancedportals/metrics/Metrics.java
+++ b/src/main/java/com/sekwah/advancedportals/metrics/Metrics.java
@@ -1,22 +1,21 @@
package com.sekwah.advancedportals.metrics;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
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;
import javax.net.ssl.HttpsURLConnection;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
+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;
@@ -24,9 +23,10 @@ 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 {
@@ -49,14 +49,23 @@ 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;
// A list with all custom charts
private final List charts = new ArrayList<>();
@@ -66,7 +75,7 @@ public class Metrics {
*
* @param plugin The plugin which stats should be submitted.
*/
- public Metrics(JavaPlugin plugin) {
+ public Metrics(Plugin plugin) {
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null!");
}
@@ -86,6 +95,10 @@ public class Metrics {
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(
@@ -100,9 +113,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
for (Class> service : Bukkit.getServicesManager().getKnownServices()) {
@@ -121,6 +138,15 @@ public class Metrics {
}
}
+ /**
+ * Checks if bStats is enabled.
+ *
+ * @return Whether bStats is enabled or not.
+ */
+ public boolean isEnabled() {
+ return enabled;
+ }
+
/**
* Adds a custom chart.
*
@@ -147,14 +173,9 @@ 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);
+ }, 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 no effect but your plugin WILL be blocked/deleted!
// WARNING: Just don't do it!
@@ -166,24 +187,24 @@ public class Metrics {
*
* @return The plugin specific data.
*/
- public JSONObject getPluginData() {
- JSONObject data = new JSONObject();
+ 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();
+ data.addProperty("pluginName", pluginName); // Append the name 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;
}
@@ -193,7 +214,7 @@ public class Metrics {
*
* @return The server specific data.
*/
- private JSONObject getServerData() {
+ private JsonObject getServerData() {
// Minecraft specific data
int playerAmount;
try {
@@ -207,8 +228,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");
@@ -217,19 +238,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;
}
@@ -238,9 +260,9 @@ public class Metrics {
* Collects the data and sends it afterwards.
*/
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()) {
try {
@@ -248,13 +270,33 @@ public class Metrics {
for (RegisteredServiceProvider> provider : Bukkit.getServicesManager().getRegistrations(service)) {
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);
+ }
+ continue; // continue looping since we cannot do any other thing.
+ }
+ }
} catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
}
} catch (NoSuchFieldException ignored) { }
}
- data.put("plugins", pluginData);
+ data.add("plugins", pluginData);
// Create a new thread for the connection to the bStats server
new Thread(new Runnable() {
@@ -262,7 +304,7 @@ public class Metrics {
public void run() {
try {
// Send the data
- sendData(data);
+ sendData(plugin, data);
} catch (Exception e) {
// Something went wrong! :(
if (logFailedRequests) {
@@ -276,16 +318,20 @@ public class Metrics {
/**
* 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(JSONObject data) throws Exception {
+ 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
@@ -307,7 +353,18 @@ public class Metrics {
outputStream.flush();
outputStream.close();
- connection.getInputStream().close(); // We don't care about the response - Just send our data :)
+ 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());
+ }
}
/**
@@ -323,7 +380,7 @@ public class Metrics {
}
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
- gzip.write(str.getBytes("UTF-8"));
+ gzip.write(str.getBytes(StandardCharsets.UTF_8));
gzip.close();
return outputStream.toByteArray();
}
@@ -348,16 +405,16 @@ public class Metrics {
this.chartId = chartId;
}
- private JSONObject getRequestJsonObject() {
- JSONObject chart = new JSONObject();
- chart.put("chartId", chartId);
+ private JsonObject getRequestJsonObject() {
+ 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) {
Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
@@ -367,7 +424,7 @@ public class Metrics {
return chart;
}
- protected abstract JSONObject getChartData() throws Exception;
+ protected abstract JsonObject getChartData() throws Exception;
}
@@ -390,14 +447,14 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
+ 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);
+ data.addProperty("value", value);
return data;
}
}
@@ -421,9 +478,9 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ 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
@@ -435,13 +492,13 @@ 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;
}
}
@@ -465,9 +522,9 @@ public class Metrics {
}
@Override
- public JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ 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
@@ -475,22 +532,22 @@ 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) {
// Null = skip the chart
return null;
}
- data.put("values", values);
+ data.add("values", values);
return data;
}
}
@@ -514,14 +571,14 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
+ 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);
+ data.addProperty("value", value);
return data;
}
@@ -546,9 +603,9 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ 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
@@ -560,13 +617,13 @@ 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;
}
@@ -591,20 +648,20 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ 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();
+ JsonArray categoryValues = new JsonArray();
categoryValues.add(entry.getValue());
- values.put(entry.getKey(), categoryValues);
+ values.add(entry.getKey(), categoryValues);
}
- data.put("values", values);
+ data.add("values", values);
return data;
}
@@ -629,9 +686,9 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ 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
@@ -643,19 +700,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);
}
- 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;
}
-
}
-}
\ No newline at end of file
+
+}