TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge speedxx/2.x

Browse source
This commit is contained in:
speed 2020-12-24 13:48:38 -05:00 committed by GitHub
commit 910e896cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 155 additions and 756 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Essentials/build.gradle
View file

@ -6,6 +6,8 @@ dependencies {
api 'io.papermc:paperlib:1.0.6' api 'io.papermc:paperlib:1.0.6'
api 'org.bstats:bstats-bukkit:1.8'
// Providers // Providers
api project(':providers:BaseProviders') api project(':providers:BaseProviders')
api project(':providers:PaperProvider') api project(':providers:PaperProvider')
@ -20,10 +22,12 @@ dependencies {
shadowJar { shadowJar {
dependencies { dependencies {
include (dependency('io.papermc:paperlib')) include (dependency('io.papermc:paperlib'))
include (dependency('org.bstats:bstats-bukkit'))
include (project(':providers:BaseProviders')) include (project(':providers:BaseProviders'))
include (project(':providers:PaperProvider')) include (project(':providers:PaperProvider'))
include (project(':providers:NMSReflectionProvider')) include (project(':providers:NMSReflectionProvider'))
include (project(':providers:1_8Provider')) include (project(':providers:1_8Provider'))
} }
relocate 'io.papermc.lib', 'com.earth2me.essentials.paperlib' relocate 'io.papermc.lib', 'com.earth2me.essentials.paperlib'
relocate 'org.bstats.bukkit', 'com.earth2me.essentials.metrics'
} }

3
Essentials/src/main/java/com/earth2me/essentials/commands/Commandme.java
View file

@ -40,12 +40,13 @@ public class Commandme extends EssentialsCommand {
message = FormatUtil.formatMessage(user, "essentials.chat", message); message = FormatUtil.formatMessage(user, "essentials.chat", message);
user.setDisplayNick(); user.setDisplayNick();
final int radius = ess.getSettings().getChatRadius(); long radius = ess.getSettings().getChatRadius();
final String toSend = tl("action", user.getDisplayName(), message); final String toSend = tl("action", user.getDisplayName(), message);
if (radius < 1) { if (radius < 1) {
ess.broadcastMessage(user, toSend); ess.broadcastMessage(user, toSend);
return; return;
} }
radius *= radius;
final World world = user.getWorld(); final World world = user.getWorld();
final Location loc = user.getLocation(); final Location loc = user.getLocation();

729
Essentials/src/main/java/com/earth2me/essentials/metrics/Metrics.java
View file

@ -1,729 +0,0 @@
package com.earth2me.essentials.metrics;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
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 javax.net.ssl.HttpsURLConnection;
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;
import java.util.Map;
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;
/**
* bStats collects some data for plugin authors.
* <p>
* Check out https://bStats.org/ to learn more about bStats!
*/
@SuppressWarnings({"WeakerAccess", "unused"})
public class Metrics {
// 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";
// 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;
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!");
}
}
}
// Is bStats enabled on this server?
private final boolean enabled;
// The plugin
private final Plugin plugin;
// The plugin id
private final int pluginId;
// A list with all custom charts
private final List<CustomChart> charts = new ArrayList<>();
/**
* Class constructor.
*
* @param plugin The plugin which stats should be submitted.
* @param pluginId The id of the plugin.
* It can be found at <a href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
*/
public Metrics(final Plugin plugin, final int pluginId) {
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null!");
}
this.plugin = plugin;
this.pluginId = pluginId;
// Get the config file
final File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
final File configFile = new File(bStatsFolder, "config.yml");
final 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 no effect on the server performance!\n" +
"Check out https://bStats.org/ to learn more :)"
).copyDefaults(true);
try {
config.save(configFile);
} catch (final 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 (final Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
try {
service.getField("B_STATS_VERSION"); // Our identifier :)
found = true; // We aren't the first
break;
} catch (final NoSuchFieldException ignored) {
}
}
// Register our service
Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
if (!found) {
// We are the first!
startSubmitting();
}
}
}
/**
* 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(final Plugin plugin, final 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);
}
final HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
// Compress the data to save bandwidth
final 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);
try (final DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
outputStream.write(compressedData);
}
final StringBuilder builder = new StringBuilder();
try (final 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);
}
}
/**
* 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;
}
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
try (final GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
gzip.write(str.getBytes(StandardCharsets.UTF_8));
}
return outputStream.toByteArray();
}
/**
* 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(final 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 no 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() {
final JsonObject data = new JsonObject();
final String pluginName = plugin.getDescription().getName().replace("Essentials", "EssentialsX");
final String pluginVersion = plugin.getDescription().getVersion();
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
final JsonArray customCharts = new JsonArray();
for (final CustomChart customChart : charts) {
// Add the data of the custom charts
final JsonObject chart = customChart.getRequestJsonObject();
if (chart == null) { // If the chart is null, we skip it
continue;
}
customCharts.add(chart);
}
data.add("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;
final 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 (final Exception e) {
playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
}
final int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
final String bukkitVersion = Bukkit.getVersion();
final String bukkitName = Bukkit.getName();
// OS/Java specific data
final String javaVersion = System.getProperty("java.version");
final String osName = System.getProperty("os.name");
final String osArch = System.getProperty("os.arch");
final String osVersion = System.getProperty("os.version");
final int coreCount = Runtime.getRuntime().availableProcessors();
final JsonObject data = new JsonObject();
data.addProperty("serverUUID", serverUUID);
data.addProperty("playerAmount", playerAmount);
data.addProperty("onlineMode", onlineMode);
data.addProperty("bukkitVersion", bukkitVersion);
data.addProperty("bukkitName", bukkitName);
data.addProperty("javaVersion", javaVersion);
data.addProperty("osName", osName);
data.addProperty("osArch", osArch);
data.addProperty("osVersion", osVersion);
data.addProperty("coreCount", coreCount);
return data;
}
/**
* Collects the data and sends it afterwards.
*/
private void submitData() {
final JsonObject data = getServerData();
final JsonArray pluginData = new JsonArray();
// Search for all other bStats Metrics classes to get their plugin data
for (final Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
try {
service.getField("B_STATS_VERSION"); // Our identifier :)
for (final RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
try {
final Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
if (plugin instanceof JsonObject) {
pluginData.add((JsonObject) plugin);
} else { // old bstats version compatibility
try {
final Class<?> jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
final Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
jsonStringGetter.setAccessible(true);
final String jsonString = (String) jsonStringGetter.invoke(plugin);
final JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
pluginData.add(object);
}
} catch (final ClassNotFoundException e) {
// minecraft version 1.14+
if (logFailedRequests) {
this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception", e);
}
}
}
} catch (final NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
}
}
} catch (final NoSuchFieldException ignored) {
}
}
data.add("plugins", pluginData);
// Create a new thread for the connection to the bStats server
new Thread(() -> {
try {
// Send the data
sendData(plugin, data);
} catch (final Exception e) {
// Something went wrong! :(
if (logFailedRequests) {
plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
}
}
}).start();
}
/**
* 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(final String chartId) {
if (chartId == null || chartId.isEmpty()) {
throw new IllegalArgumentException("ChartId cannot be null or empty!");
}
this.chartId = chartId;
}
private JsonObject getRequestJsonObject() {
final JsonObject chart = new JsonObject();
chart.addProperty("chartId", chartId);
try {
final JsonObject data = getChartData();
if (data == null) {
// If the data is null we don't send the chart.
return null;
}
chart.add("data", data);
} catch (final 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<String> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimplePie(final String chartId, final Callable<String> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObject getChartData() throws Exception {
final JsonObject data = new JsonObject();
final String value = callable.call();
if (value == null || value.isEmpty()) {
// Null = skip the chart
return null;
}
data.addProperty("value", value);
return data;
}
}
/**
* Represents a custom advanced pie.
*/
public static class AdvancedPie extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public AdvancedPie(final String chartId, final Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObject getChartData() throws Exception {
final JsonObject data = new JsonObject();
final JsonObject values = new JsonObject();
final Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (final Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
continue; // Skip this invalid
}
allSkipped = false;
values.addProperty(entry.getKey(), entry.getValue());
}
if (allSkipped) {
// Null = skip the chart
return null;
}
data.add("values", values);
return data;
}
}
/**
* Represents a custom drilldown pie.
*/
public static class DrilldownPie extends CustomChart {
private final Callable<Map<String, Map<String, Integer>>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public DrilldownPie(final String chartId, final Callable<Map<String, Map<String, Integer>>> callable) {
super(chartId);
this.callable = callable;
}
@Override
public JsonObject getChartData() throws Exception {
final JsonObject data = new JsonObject();
final JsonObject values = new JsonObject();
final Map<String, Map<String, Integer>> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean reallyAllSkipped = true;
for (final Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
final JsonObject value = new JsonObject();
boolean allSkipped = true;
for (final Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
value.addProperty(valueEntry.getKey(), valueEntry.getValue());
allSkipped = false;
}
if (!allSkipped) {
reallyAllSkipped = false;
values.add(entryValues.getKey(), value);
}
}
if (reallyAllSkipped) {
// Null = skip the chart
return null;
}
data.add("values", values);
return data;
}
}
/**
* Represents a custom single line chart.
*/
public static class SingleLineChart extends CustomChart {
private final Callable<Integer> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SingleLineChart(final String chartId, final Callable<Integer> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObject getChartData() throws Exception {
final JsonObject data = new JsonObject();
final int value = callable.call();
if (value == 0) {
// Null = skip the chart
return null;
}
data.addProperty("value", value);
return data;
}
}
/**
* Represents a custom multi line chart.
*/
public static class MultiLineChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public MultiLineChart(final String chartId, final Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObject getChartData() throws Exception {
final JsonObject data = new JsonObject();
final JsonObject values = new JsonObject();
final Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (final Map.Entry<String, Integer> entry : map.entrySet()) {
if (entry.getValue() == 0) {
continue; // Skip this invalid
}
allSkipped = false;
values.addProperty(entry.getKey(), entry.getValue());
}
if (allSkipped) {
// Null = skip the chart
return null;
}
data.add("values", values);
return data;
}
}
/**
* Represents a custom simple bar chart.
*/
public static class SimpleBarChart extends CustomChart {
private final Callable<Map<String, Integer>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public SimpleBarChart(final String chartId, final Callable<Map<String, Integer>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObject getChartData() throws Exception {
final JsonObject data = new JsonObject();
final JsonObject values = new JsonObject();
final Map<String, Integer> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
for (final Map.Entry<String, Integer> entry : map.entrySet()) {
final JsonArray categoryValues = new JsonArray();
categoryValues.add(new JsonPrimitive(entry.getValue()));
values.add(entry.getKey(), categoryValues);
}
data.add("values", values);
return data;
}
}
/**
* Represents a custom advanced bar chart.
*/
public static class AdvancedBarChart extends CustomChart {
private final Callable<Map<String, int[]>> callable;
/**
* Class constructor.
*
* @param chartId The id of the chart.
* @param callable The callable which is used to request the chart data.
*/
public AdvancedBarChart(final String chartId, final Callable<Map<String, int[]>> callable) {
super(chartId);
this.callable = callable;
}
@Override
protected JsonObject getChartData() throws Exception {
final JsonObject data = new JsonObject();
final JsonObject values = new JsonObject();
final Map<String, int[]> map = callable.call();
if (map == null || map.isEmpty()) {
// Null = skip the chart
return null;
}
boolean allSkipped = true;
for (final Map.Entry<String, int[]> entry : map.entrySet()) {
if (entry.getValue().length == 0) {
continue; // Skip this invalid
}
allSkipped = false;
final JsonArray categoryValues = new JsonArray();
for (final int categoryValue : entry.getValue()) {
categoryValues.add(new JsonPrimitive(categoryValue));
}
values.add(entry.getKey(), categoryValues);
}
if (allSkipped) {
// Null = skip the chart
return null;
}
data.add("values", values);
return data;
}
}
}

1
Essentials/src/main/java/com/earth2me/essentials/metrics/MetricsWrapper.java
View file

@ -3,6 +3,7 @@ package com.earth2me.essentials.metrics;
import com.earth2me.essentials.Essentials; import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.register.payment.Methods; import com.earth2me.essentials.register.payment.Methods;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

11
Essentials/src/main/java/net/ess3/api/events/AfkStatusChangeEvent.java
View file

@ -1,11 +1,13 @@
package net.ess3.api.events; package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when a player's AFK status changes. * Fired when a player's AFK status changes.
*/ */
public class AfkStatusChangeEvent extends StatusChangeEvent { public class AfkStatusChangeEvent extends StatusChangeEvent {
private static final HandlerList handlers = new HandlerList();
private final Cause cause; private final Cause cause;
@Deprecated @Deprecated
@ -22,6 +24,15 @@ public class AfkStatusChangeEvent extends StatusChangeEvent {
return cause; return cause;
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
/** /**
* The cause of the AFK status change. * The cause of the AFK status change.
*/ */

12
Essentials/src/main/java/net/ess3/api/events/FlyStatusChangeEvent.java
View file

@ -1,12 +1,24 @@
package net.ess3.api.events; package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when a player's flight status is toggled using /fly. * Fired when a player's flight status is toggled using /fly.
*/ */
public class FlyStatusChangeEvent extends StatusChangeEvent { public class FlyStatusChangeEvent extends StatusChangeEvent {
private static final HandlerList handlers = new HandlerList();
public FlyStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) { public FlyStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) {
super(affected, controller, value); super(affected, controller, value);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

12
Essentials/src/main/java/net/ess3/api/events/GodStatusChangeEvent.java
View file

@ -1,6 +1,7 @@
package net.ess3.api.events; package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when a user's god status is toggled. * Fired when a user's god status is toggled.
@ -9,7 +10,18 @@ import net.ess3.api.IUser;
* and #getController methods are inverted. * and #getController methods are inverted.
*/ */
public class GodStatusChangeEvent extends StatusChangeEvent { public class GodStatusChangeEvent extends StatusChangeEvent {
private static final HandlerList handlers = new HandlerList();
public GodStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) { public GodStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) {
super(affected, controller, value); super(affected, controller, value);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

12
Essentials/src/main/java/net/ess3/api/events/IgnoreStatusChangeEvent.java
View file

@ -1,12 +1,24 @@
package net.ess3.api.events; package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* This event is currently unused, and is retained for ABI compatibility and potential future implementation. * This event is currently unused, and is retained for ABI compatibility and potential future implementation.
*/ */
public class IgnoreStatusChangeEvent extends StatusChangeEvent { public class IgnoreStatusChangeEvent extends StatusChangeEvent {
private static final HandlerList handlers = new HandlerList();
public IgnoreStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) { public IgnoreStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) {
super(affected, controller, value); super(affected, controller, value);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

12
Essentials/src/main/java/net/ess3/api/events/JailStatusChangeEvent.java
View file

@ -1,6 +1,7 @@
package net.ess3.api.events; package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when a player's jail status changes. * Fired when a player's jail status changes.
@ -9,7 +10,18 @@ import net.ess3.api.IUser;
* You <i>can</i>, however, access the player's current jail when they are about to be unjailed by calling {@link IUser#getJail()}. * You <i>can</i>, however, access the player's current jail when they are about to be unjailed by calling {@link IUser#getJail()}.
*/ */
public class JailStatusChangeEvent extends StatusChangeEvent { public class JailStatusChangeEvent extends StatusChangeEvent {
private static final HandlerList handlers = new HandlerList();
public JailStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) { public JailStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) {
super(affected, controller, value); super(affected, controller, value);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

11
Essentials/src/main/java/net/ess3/api/events/MuteStatusChangeEvent.java
View file

@ -1,6 +1,7 @@
package net.ess3.api.events; package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
import java.util.Optional; import java.util.Optional;
@ -8,6 +9,7 @@ import java.util.Optional;
* Fired when a player's mute status is changed. * Fired when a player's mute status is changed.
*/ */
public class MuteStatusChangeEvent extends StatusChangeEvent { public class MuteStatusChangeEvent extends StatusChangeEvent {
private static final HandlerList handlers = new HandlerList();
private final Long timestamp; private final Long timestamp;
private final String reason; private final String reason;
@ -30,4 +32,13 @@ public class MuteStatusChangeEvent extends StatusChangeEvent {
public String getReason() { public String getReason() {
return reason; return reason;
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

11
Essentials/src/main/java/net/ess3/api/events/NickChangeEvent.java
View file

@ -2,6 +2,7 @@ package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
/** /**
* Fired when a player's nickname is changed. * Fired when a player's nickname is changed.
@ -9,6 +10,7 @@ import org.bukkit.event.Cancellable;
* <b>WARNING: The values of {@link NickChangeEvent#getAffected()} and {@link NickChangeEvent#getController()} are inverted due to a long-standing implementation bug.</b> * <b>WARNING: The values of {@link NickChangeEvent#getAffected()} and {@link NickChangeEvent#getController()} are inverted due to a long-standing implementation bug.</b>
*/ */
public class NickChangeEvent extends StateChangeEvent implements Cancellable { public class NickChangeEvent extends StateChangeEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private final String newValue; private final String newValue;
public NickChangeEvent(final IUser affected, final IUser controller, final String value) { public NickChangeEvent(final IUser affected, final IUser controller, final String value) {
@ -41,4 +43,13 @@ public class NickChangeEvent extends StateChangeEvent implements Cancellable {
public IUser getController() { public IUser getController() {
return super.getController(); return super.getController();
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

12
Essentials/src/main/java/net/ess3/api/events/SignBreakEvent.java
View file

@ -2,6 +2,7 @@ package net.ess3.api.events;
import com.earth2me.essentials.signs.EssentialsSign; import com.earth2me.essentials.signs.EssentialsSign;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when an Essentials sign is broken. * Fired when an Essentials sign is broken.
@ -9,7 +10,18 @@ import net.ess3.api.IUser;
* This is primarily intended for use with EssentialsX's sign abstraction - external plugins should not listen on this event. * This is primarily intended for use with EssentialsX's sign abstraction - external plugins should not listen on this event.
*/ */
public class SignBreakEvent extends SignEvent { public class SignBreakEvent extends SignEvent {
private static final HandlerList handlers = new HandlerList();
public SignBreakEvent(final EssentialsSign.ISign sign, final EssentialsSign essSign, final IUser user) { public SignBreakEvent(final EssentialsSign.ISign sign, final EssentialsSign essSign, final IUser user) {
super(sign, essSign, user); super(sign, essSign, user);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

12
Essentials/src/main/java/net/ess3/api/events/SignCreateEvent.java
View file

@ -2,6 +2,7 @@ package net.ess3.api.events;
import com.earth2me.essentials.signs.EssentialsSign; import com.earth2me.essentials.signs.EssentialsSign;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when an Essentials sign is created. * Fired when an Essentials sign is created.
@ -9,7 +10,18 @@ import net.ess3.api.IUser;
* This is primarily intended for use with EssentialsX's sign abstraction - external plugins should not listen on this event. * This is primarily intended for use with EssentialsX's sign abstraction - external plugins should not listen on this event.
*/ */
public class SignCreateEvent extends SignEvent { public class SignCreateEvent extends SignEvent {
private static final HandlerList handlers = new HandlerList();
public SignCreateEvent(final EssentialsSign.ISign sign, final EssentialsSign essSign, final IUser user) { public SignCreateEvent(final EssentialsSign.ISign sign, final EssentialsSign essSign, final IUser user) {
super(sign, essSign, user); super(sign, essSign, user);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

13
Essentials/src/main/java/net/ess3/api/events/SignEvent.java
View file

@ -6,13 +6,11 @@ import net.ess3.api.IUser;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* This handles common boilerplate for other SignEvent * This handles common boilerplate for other SignEvent
*/ */
public class SignEvent extends Event implements Cancellable { public abstract class SignEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
final ISign sign; final ISign sign;
final EssentialsSign essSign; final EssentialsSign essSign;
final IUser user; final IUser user;
@ -25,10 +23,6 @@ public class SignEvent extends Event implements Cancellable {
this.user = user; this.user = user;
} }
public static HandlerList getHandlerList() {
return handlers;
}
public ISign getSign() { public ISign getSign() {
return sign; return sign;
} }
@ -41,11 +35,6 @@ public class SignEvent extends Event implements Cancellable {
return user; return user;
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
@Override @Override
public boolean isCancelled() { public boolean isCancelled() {
return cancelled; return cancelled;

12
Essentials/src/main/java/net/ess3/api/events/SignInteractEvent.java
View file

@ -2,6 +2,7 @@ package net.ess3.api.events;
import com.earth2me.essentials.signs.EssentialsSign; import com.earth2me.essentials.signs.EssentialsSign;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when an Essentials sign is interacted with. * Fired when an Essentials sign is interacted with.
@ -9,7 +10,18 @@ import net.ess3.api.IUser;
* This is primarily intended for use with EssentialsX's sign abstraction - external plugins should not listen on this event. * This is primarily intended for use with EssentialsX's sign abstraction - external plugins should not listen on this event.
*/ */
public class SignInteractEvent extends SignEvent { public class SignInteractEvent extends SignEvent {
private static final HandlerList handlers = new HandlerList();
public SignInteractEvent(final EssentialsSign.ISign sign, final EssentialsSign essSign, final IUser user) { public SignInteractEvent(final EssentialsSign.ISign sign, final EssentialsSign essSign, final IUser user) {
super(sign, essSign, user); super(sign, essSign, user);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

11
Essentials/src/main/java/net/ess3/api/events/StateChangeEvent.java
View file

@ -3,14 +3,12 @@ package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* This handles common boilerplate for events for changes in state. * This handles common boilerplate for events for changes in state.
* For boolean state, events should extend StatusChangeEvent instead. * For boolean state, events should extend StatusChangeEvent instead.
*/ */
public abstract class StateChangeEvent extends Event implements Cancellable { public abstract class StateChangeEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
final IUser affected; final IUser affected;
final IUser controller; final IUser controller;
private boolean cancelled = false; private boolean cancelled = false;
@ -27,10 +25,6 @@ public abstract class StateChangeEvent extends Event implements Cancellable {
this.controller = controller; this.controller = controller;
} }
public static HandlerList getHandlerList() {
return handlers;
}
/** /**
* Get the user who is affected by the state change. * Get the user who is affected by the state change.
* *
@ -49,11 +43,6 @@ public abstract class StateChangeEvent extends Event implements Cancellable {
return controller; return controller;
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
@Override @Override
public boolean isCancelled() { public boolean isCancelled() {
return cancelled; return cancelled;

12
Essentials/src/main/java/net/ess3/api/events/VanishStatusChangeEvent.java
View file

@ -1,6 +1,7 @@
package net.ess3.api.events; package net.ess3.api.events;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.HandlerList;
/** /**
* Fired when a player's vanish status changes due to the /vanish command. * Fired when a player's vanish status changes due to the /vanish command.
@ -9,7 +10,18 @@ import net.ess3.api.IUser;
* check with {@link IUser#isVanished()}. * check with {@link IUser#isVanished()}.
*/ */
public class VanishStatusChangeEvent extends StatusChangeEvent { public class VanishStatusChangeEvent extends StatusChangeEvent {
private static final HandlerList handlers = new HandlerList();
public VanishStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) { public VanishStatusChangeEvent(final IUser affected, final IUser controller, final boolean value) {
super(affected, controller, value); super(affected, controller, value);
} }
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
} }

4
Essentials/src/main/resources/config.yml
View file

@ -1034,11 +1034,13 @@ newbies:
# Set this to lowest, if you want Multiverse to handle the respawning. # Set this to lowest, if you want Multiverse to handle the respawning.
# Set this to high, if you want EssentialsSpawn to handle the respawning. # Set this to high, if you want EssentialsSpawn to handle the respawning.
# Set this to highest, if you want to force EssentialsSpawn to handle the respawning. # Set this to highest, if you want to force EssentialsSpawn to handle the respawning.
# Note: Changes will not apply until after the server is restarted.
respawn-listener-priority: high respawn-listener-priority: high
# What priority should we use for handling spawning on joining the server? # What priority should we use for handling spawning on joining the server?
# See respawn-listener-priority for possible values. # See respawn-listener-priority for possible values.
# Note: changing this may impact or break spawn-on-join functionality. # Note: Changing this may impact or break spawn-on-join functionality.
# Note: Changes will not apply until after the server is restarted.
spawn-join-listener-priority: high spawn-join-listener-priority: high
# When users die, should they respawn at their first home or bed, instead of the spawnpoint? # When users die, should they respawn at their first home or bed, instead of the spawnpoint?

4
Essentials/src/test/java/com/earth2me/essentials/FakeServer.java
View file

@ -1399,4 +1399,8 @@ public class FakeServer implements Server {
} }
} }
@Override
public int getMaxWorldSize() {
throw new UnsupportedOperationException("Not supported yet.");
}
} }

2
README.md
View file

@ -1,6 +1,6 @@
[![EssentialsX](https://i.imgur.com/CP4SZpB.png)](https://essentialsx.net) [![EssentialsX](https://i.imgur.com/CP4SZpB.png)](https://essentialsx.net)
[<img alt="Jenkins" src="https://img.shields.io/badge/-Download_from_Jenkins-D24939.svg?logo=jenkins&style=flat-square&logoColor=white" height=32>](http://ci.ender.zone/job/EssentialsX/) [<img alt="Dev Builds" src="https://img.shields.io/badge/-Download_dev_builds-D24939.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAAdVBMVEVHcEz////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////qLaloAAAAJnRSTlMA/go0+C4DzJ2IHr/rlvBznq9cGClUqdEiQuR74RHcPbdqw15Ykw3WSecAAAENSURBVFjD7ZdJFoIwEERpEgUBRXCe577/EV2ahBi6dKUvf1//BbpoIEn+lsvI4QIKFuywQI9Q2vkrfA0DMvM0wO/C1RSUH9zGqSmYfiDITUEeBVEQBVHw04Jvd+J8Ygom8Fqf7e0Xy7bA8unKfbWtDkh+eOYO5RAQjNkDMIkde9lJ83fyC+gmy580v0Fv8ALYSOrgFgCtQ5pxkCztKUDDPZzDdXj05ZmCdahZQB34tiOJgFq8ALI6rCsWUs19+cORxRxnngGWDOB5tmuG6Iyi0FCedCFZISHGjqBCBZUzQoaxr0HhAmX/HeACe7ekGoyTdhZDgx6gcaagwCPoznZsIYP2PNJqmYlZqiTy4gka59N5SBiJlAAAAABJRU5ErkJggg==&style=flat-square&logoColor=white" height=32>](https://essentialsx.net/downloads.html)
[<img alt="Discord" src="https://img.shields.io/badge/-Chat_on_Discord-7289DA.svg?logo=discord&style=flat-square&logoColor=white" height=32>](https://discord.gg/casfFyh) [<img alt="Discord" src="https://img.shields.io/badge/-Chat_on_Discord-7289DA.svg?logo=discord&style=flat-square&logoColor=white" height=32>](https://discord.gg/casfFyh)

11
build.gradle
View file

@ -20,6 +20,9 @@ allprojects {
} }
def commitsSinceLastTag() { def commitsSinceLastTag() {
if (grgit == null) {
return 0
}
def tags = grgit.tag.list().stream().map({it.commit}).toList() def tags = grgit.tag.list().stream().map({it.commit}).toList()
def commit = grgit.head() def commit = grgit.head()
def depth = 0 def depth = 0
@ -32,7 +35,7 @@ def commitsSinceLastTag() {
} }
ext { ext {
GIT_COMMIT = grgit.head().abbreviatedId GIT_COMMIT = grgit == null ? "unknown" : grgit.head().abbreviatedId
GIT_DEPTH = commitsSinceLastTag() GIT_DEPTH = commitsSinceLastTag()
fullVersion = "${version}-${GIT_COMMIT}".replace("-SNAPSHOT", "-dev+${GIT_DEPTH}") fullVersion = "${version}-${GIT_COMMIT}".replace("-SNAPSHOT", "-dev+${GIT_DEPTH}")
@ -61,6 +64,12 @@ subprojects {
includeGroup "com.github.milkbowl" includeGroup "com.github.milkbowl"
} }
} }
maven {
url = 'https://repo.codemc.org/repository/maven-public'
content {
includeGroup "org.bstats"
}
}
} }
dependencies { dependencies {