mirror of
https://github.com/kiranhart/Auction-House.git
synced 2025-02-16 19:21:20 +01:00
pushes
This commit is contained in:
Kiran Hart
parent
61076d28a3
commit
8ddaa2b88a
@ -4,7 +4,7 @@
|
||||
<groupId>com.kiranhart</groupId>
|
||||
<artifactId>AuctionHouse</artifactId>
|
||||
<name>AuctionHouse</name>
|
||||
<version>1.12</version>
|
||||
<version>1.12.3</version>
|
||||
<description>The ultimate auction house plugin</description>
|
||||
<url>https://www.kiranhart.com</url>
|
||||
<build>
|
||||
@ -63,20 +63,24 @@
|
||||
<artifactId>bukkit</artifactId>
|
||||
<version>1.15.2-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<groupId>commons-lang</groupId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>guava</artifactId>
|
||||
<groupId>com.google.guava</groupId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>snakeyaml</artifactId>
|
||||
<groupId>org.yaml</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<groupId>commons-lang</groupId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>guava</artifactId>
|
||||
<groupId>com.google.guava</groupId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>gson</artifactId>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<artifactId>snakeyaml</artifactId>
|
||||
<groupId>org.yaml</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.MilkBowl</groupId>
|
||||
|
||||
8
pom.xml
8
pom.xml
@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>com.kiranhart</groupId>
|
||||
<artifactId>AuctionHouse</artifactId>
|
||||
<version>1.12</version>
|
||||
<version>1.12.3</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>AuctionHouse</name>
|
||||
@ -95,11 +95,5 @@
|
||||
<version>LATEST</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.8.6</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
@ -7,6 +7,7 @@ import com.kiranhart.auctionhouse.auction.AuctionItem;
|
||||
import com.kiranhart.auctionhouse.cmds.CommandManager;
|
||||
import com.kiranhart.auctionhouse.inventory.AGUI;
|
||||
import com.kiranhart.auctionhouse.listeners.AGUIListener;
|
||||
import com.kiranhart.auctionhouse.util.Metrics;
|
||||
import com.kiranhart.auctionhouse.util.economy.Economy;
|
||||
import com.kiranhart.auctionhouse.util.economy.VaultEconomy;
|
||||
import com.kiranhart.auctionhouse.util.locale.Locale;
|
||||
@ -53,6 +54,7 @@ public final class Core extends JavaPlugin {
|
||||
|
||||
private boolean locked = false;
|
||||
private HartUpdater updater;
|
||||
private Metrics metrics;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
@ -146,9 +148,14 @@ public final class Core extends JavaPlugin {
|
||||
//Begin the update checker
|
||||
if (getConfig().getBoolean("update-checker")) {
|
||||
getServer().getScheduler().runTaskTimerAsynchronously(this, () -> {
|
||||
updater = new HartUpdater();
|
||||
updater = new HartUpdater(this, getDescription().getVersion());
|
||||
}, 0, 20 * getConfig().getInt("update-delay"));
|
||||
}
|
||||
|
||||
//Start Metrics
|
||||
if (getConfig().getBoolean("metrics")) {
|
||||
metrics = new Metrics(this, 6806);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
package com.kiranhart.auctionhouse.api.version;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.kiranhart.auctionhouse.api.statics.AuctionPermissions;
|
||||
import com.kiranhart.auctionhouse.util.Debugger;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
@ -21,43 +20,60 @@ import static org.bukkit.ChatColor.translateAlternateColorCodes;
|
||||
*/
|
||||
public class HartUpdater {
|
||||
|
||||
private String VERSION = "1.12";
|
||||
public HartUpdater(JavaPlugin plugin, String v) {
|
||||
|
||||
public HartUpdater() {
|
||||
try {
|
||||
URL url = new URL("https://api.spigotmc.org/legacy/update.php?resource=60325");
|
||||
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||
connection.setRequestMethod("GET");
|
||||
connection.connect();
|
||||
BufferedReader json = new BufferedReader(new InputStreamReader(connection.getInputStream()));
|
||||
String url = "https://api.spigotmc.org/legacy/update.php?resource=75600";
|
||||
|
||||
Plugin plugin = new Gson().fromJson(json, Plugin.class);
|
||||
HttpURLConnection httpClient = (HttpURLConnection) new URL(url).openConnection();
|
||||
|
||||
if (!VERSION.equalsIgnoreCase(plugin.version)) {
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b======================="));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&eAuction House Updater"));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&fLatest Version: &6" + plugin.version));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&fCurrent Version: &6" + this.VERSION));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&cPlease update the plugin."));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
|
||||
Bukkit.getOnlinePlayers().forEach(p -> {
|
||||
if (p.isOp() || p.hasPermission(AuctionPermissions.ADMIN)) {
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&b======================="));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&eAuction House Updater"));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&fLatest Version: &6" + plugin.version));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&fCurrent Version: &6" + this.VERSION));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&cPlease update the plugin."));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
}
|
||||
});
|
||||
|
||||
// optional default is GET
|
||||
httpClient.setRequestMethod("GET");
|
||||
|
||||
//add request header
|
||||
httpClient.setRequestProperty("User-Agent", "Mozilla/5.0");
|
||||
|
||||
int responseCode = httpClient.getResponseCode();
|
||||
System.out.println("\nSending 'GET' request to URL : " + url);
|
||||
System.out.println("Response Code : " + responseCode);
|
||||
|
||||
try (BufferedReader in = new BufferedReader(new InputStreamReader(httpClient.getInputStream()))) {
|
||||
|
||||
StringBuilder response = new StringBuilder();
|
||||
String line;
|
||||
|
||||
while ((line = in.readLine()) != null) {
|
||||
response.append(line);
|
||||
}
|
||||
|
||||
if (!v.equalsIgnoreCase(response.toString())) {
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b======================="));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&e" + plugin.getDescription().getName() + " Updater"));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&fLatest Version: &6" + response.toString()));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&fCurrent Version: &6" + v));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&cPlease update the plugin."));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
|
||||
Bukkit.getOnlinePlayers().forEach(p -> {
|
||||
if (p.isOp() || p.hasPermission(AuctionPermissions.ADMIN)) {
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&b======================="));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&e" + plugin.getDescription().getName() + " Updater"));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&fLatest Version: &6" + response.toString()));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&fCurrent Version: &6" + v));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&cPlease update the plugin."));
|
||||
p.sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b======================="));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&e" + plugin.getDescription().getName() + " is update to date"));
|
||||
Bukkit.getConsoleSender().sendMessage(translateAlternateColorCodes('&', "&b-----------------------"));
|
||||
}
|
||||
}
|
||||
|
||||
connection.disconnect();
|
||||
|
||||
} catch (IOException e) {
|
||||
} catch (Exception e) {
|
||||
Debugger.report(e, false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,10 +14,12 @@ import com.kiranhart.auctionhouse.cmds.SubCommand;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
/**
|
||||
* The current file has been created by Kiran Hart
|
||||
@ -47,16 +49,6 @@ public class SellCommand extends SubCommand {
|
||||
return;
|
||||
}
|
||||
|
||||
Core.getInstance().getConfig().getStringList("blocked-items").forEach(blockedItem -> {
|
||||
String[] item = blockedItem.split(":");
|
||||
if (AuctionAPI.getInstance().getItemInHand(p) != null || AuctionAPI.getInstance().getItemInHand(p).getType() != XMaterial.AIR.parseMaterial()) {
|
||||
if (AuctionAPI.getInstance().getItemInHand(p).getType() == XMaterial.matchXMaterial(item[0].toUpperCase(), Byte.parseByte(item[1])).get().parseMaterial()) {
|
||||
Core.getInstance().getLocale().getMessage(AuctionLang.BLOCKED_ITEM).processPlaceholder("item", AuctionAPI.getInstance().getItemInHand(p).getType().name()).sendPrefixedMessage(p);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
int timeLimit;
|
||||
List<Integer> times = new ArrayList<>();
|
||||
|
||||
@ -106,10 +98,15 @@ public class SellCommand extends SubCommand {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
AuctionItem auctionItem = new AuctionItem(p.getUniqueId(), AuctionAPI.getInstance().getItemInHand(p), timeLimit, buyNow, 0, buyNow);
|
||||
AuctionStartEvent auctionStartEvent = new AuctionStartEvent(auctionItem);
|
||||
Core.getInstance().getServer().getPluginManager().callEvent(auctionStartEvent);
|
||||
|
||||
if (checkBlockedItem(p)) {
|
||||
auctionStartEvent.setCancelled(true);
|
||||
}
|
||||
|
||||
if (!auctionStartEvent.isCancelled()) {
|
||||
Core.getInstance().getAuctionItems().add(0, auctionItem);
|
||||
Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_LISTED).processPlaceholder("itemname", auctionItem.getDisplayName()).processPlaceholder("price", AuctionAPI.getInstance().getFriendlyNumber(buyNow)).sendPrefixedMessage(p);
|
||||
@ -117,29 +114,6 @@ public class SellCommand extends SubCommand {
|
||||
AuctionAPI.getInstance().setItemInHand(p, null);
|
||||
p.updateInventory();
|
||||
|
||||
//Discord Hook //TODO FINISH DISCORD WEB HOOK
|
||||
// if (Core.getInstance().getConfig().getBoolean("discord.enabled")) {
|
||||
|
||||
//Discord Hook
|
||||
// if (Core.getInstance().getConfig().getBoolean("discord.enabled")) {
|
||||
// DiscordHook discordHook = new DiscordHook(Core.getInstance().getConfig().getString("discord.webhook"));
|
||||
//
|
||||
//
|
||||
// List<FieldEmbed> embeds = new ArrayList<>();
|
||||
// for (String s : Core.getInstance().getConfig().getConfigurationSection("discord.add").getKeys(false)) {
|
||||
// embeds.add(new DiscordMessageWrapper("discord.add." + s, auctionItem).getFieldEmbed());
|
||||
// }
|
||||
//
|
||||
// DiscordEmbed de = DiscordEmbed.builder()
|
||||
// .title(Core.getInstance().getConfig().getString("discord.title"))
|
||||
// .color(1)
|
||||
// .fields(embeds)
|
||||
// .build();
|
||||
//
|
||||
// DiscordMessage dm = DiscordMessage.builder().username(Core.getInstance().getConfig().getString("discord.username")).content("").avatarUrl(Core.getInstance().getConfig().getString("discord.profilepicture")).embeds(Arrays.asList(de)).build();
|
||||
// discordHook.send(dm);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -210,34 +184,13 @@ public class SellCommand extends SubCommand {
|
||||
AuctionStartEvent auctionStartEvent = new AuctionStartEvent(auctionItem);
|
||||
Core.getInstance().getServer().getPluginManager().callEvent(auctionStartEvent);
|
||||
|
||||
if (checkBlockedItem(p)) {
|
||||
auctionStartEvent.setCancelled(true);
|
||||
}
|
||||
|
||||
if (!auctionStartEvent.isCancelled()) {
|
||||
Core.getInstance().getAuctionItems().add(0, auctionItem);
|
||||
Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_LISTED_WITH_BID).processPlaceholder("itemname", auctionItem.getDisplayName()).processPlaceholder("price", AuctionAPI.getInstance().getFriendlyNumber(buyNow)).sendPrefixedMessage(p);
|
||||
|
||||
//Discord Hook //TODO FINISH BID DISCORD HOOK
|
||||
// if (Core.getInstance().getConfig().getBoolean("discord.enabled")) {
|
||||
//
|
||||
// //Discord Hook
|
||||
// if (Core.getInstance().getConfig().getBoolean("discord.enabled")) {
|
||||
// DiscordHook discordHook = new DiscordHook(Core.getInstance().getConfig().getString("discord.webhook"));
|
||||
//
|
||||
//
|
||||
// List<FieldEmbed> embeds = new ArrayList<>();
|
||||
// for (String s : Core.getInstance().getConfig().getConfigurationSection("discord.add").getKeys(false)) {
|
||||
// embeds.add(new DiscordMessageWrapper("discord.add." + s, auctionItem).getFieldEmbed());
|
||||
// }
|
||||
//
|
||||
// DiscordEmbed de = DiscordEmbed.builder()
|
||||
// .title(Core.getInstance().getConfig().getString("discord.title"))
|
||||
// .color(1)
|
||||
// .fields(embeds)
|
||||
// .build();
|
||||
//
|
||||
// DiscordMessage dm = DiscordMessage.builder().username(Core.getInstance().getConfig().getString("discord.username")).content("").avatarUrl(Core.getInstance().getConfig().getString("discord.profilepicture")).embeds(Arrays.asList(de)).build();
|
||||
// discordHook.send(dm);
|
||||
// }
|
||||
// }
|
||||
|
||||
AuctionAPI.getInstance().setItemInHand(p, null);
|
||||
}
|
||||
} else {
|
||||
@ -247,6 +200,21 @@ public class SellCommand extends SubCommand {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private boolean checkBlockedItem(Player p) {
|
||||
AtomicBoolean isBlocked = new AtomicBoolean(false);
|
||||
Core.getInstance().getConfig().getStringList("blocked-items").forEach(blockedItem -> {
|
||||
if (AuctionAPI.getInstance().getItemInHand(p) != null || AuctionAPI.getInstance().getItemInHand(p).getType() != XMaterial.AIR.parseMaterial()) {
|
||||
ItemStack blocked = XMaterial.matchXMaterial(blockedItem).get().parseItem();
|
||||
if (AuctionAPI.getInstance().getItemInHand(p).getType() == blocked.getType() && AuctionAPI.getInstance().getItemInHand(p).getDurability() == blocked.getDurability()) {
|
||||
Core.getInstance().getLocale().getMessage(AuctionLang.BLOCKED_ITEM).processPlaceholder("item", AuctionAPI.getInstance().getItemInHand(p).getType().name()).sendPrefixedMessage(p);
|
||||
isBlocked.set(true);
|
||||
}
|
||||
}
|
||||
});
|
||||
return isBlocked.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String name() {
|
||||
return Core.getInstance().getCommandManager().sell;
|
||||
|
||||
724
src/main/java/com/kiranhart/auctionhouse/util/Metrics.java
Normal file
724
src/main/java/com/kiranhart/auctionhouse/util/Metrics.java
Normal file
@ -0,0 +1,724 @@
|
||||
package com.kiranhart.auctionhouse.util;
|
||||
|
||||
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.*;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.logging.Level;
|
||||
import java.util.zip.GZIPOutputStream;
|
||||
|
||||
/**
|
||||
* bStats collects some data for plugin authors.
|
||||
* <p>
|
||||
* Check out https://bStats.org/ to learn more about bStats!
|
||||
*/
|
||||
@SuppressWarnings({"WeakerAccess", "unused"})
|
||||
public class Metrics {
|
||||
|
||||
static {
|
||||
// You can use the property to disable the check in your test environment
|
||||
if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) {
|
||||
// Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
|
||||
final String defaultPackage = new String(
|
||||
new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'});
|
||||
final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
|
||||
// We want to make sure nobody just copy & pastes the example and use the wrong package names
|
||||
if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
|
||||
throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The version of this bStats class
|
||||
public static final int B_STATS_VERSION = 1;
|
||||
|
||||
// The url to which the data is sent
|
||||
private static final String URL = "https://bStats.org/submitData/bukkit";
|
||||
|
||||
// Is bStats enabled on this server?
|
||||
private boolean enabled;
|
||||
|
||||
// Should failed requests be logged?
|
||||
private static boolean logFailedRequests;
|
||||
|
||||
// Should the sent data be logged?
|
||||
private static boolean logSentData;
|
||||
|
||||
// Should the response text be logged?
|
||||
private static boolean logResponseStatusText;
|
||||
|
||||
// The uuid of the server
|
||||
private static String serverUUID;
|
||||
|
||||
// The plugin
|
||||
private final Plugin plugin;
|
||||
|
||||
// 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(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");
|
||||
File configFile = new File(bStatsFolder, "config.yml");
|
||||
YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
|
||||
|
||||
// Check if the config file exists
|
||||
if (!config.isSet("serverUuid")) {
|
||||
|
||||
// Add default values
|
||||
config.addDefault("enabled", true);
|
||||
// Every server gets it's unique random id.
|
||||
config.addDefault("serverUuid", UUID.randomUUID().toString());
|
||||
// Should failed request be logged?
|
||||
config.addDefault("logFailedRequests", false);
|
||||
// Should the sent data be logged?
|
||||
config.addDefault("logSentData", false);
|
||||
// Should the response text be logged?
|
||||
config.addDefault("logResponseStatusText", false);
|
||||
|
||||
// Inform the server owners about bStats
|
||||
config.options().header(
|
||||
"bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
|
||||
"To honor their work, you should not disable it.\n" +
|
||||
"This has nearly no effect on the server performance!\n" +
|
||||
"Check out https://bStats.org/ to learn more :)"
|
||||
).copyDefaults(true);
|
||||
try {
|
||||
config.save(configFile);
|
||||
} catch (IOException ignored) {
|
||||
}
|
||||
}
|
||||
|
||||
// Load the data
|
||||
enabled = config.getBoolean("enabled", true);
|
||||
serverUUID = config.getString("serverUuid");
|
||||
logFailedRequests = config.getBoolean("logFailedRequests", false);
|
||||
logSentData = config.getBoolean("logSentData", false);
|
||||
logResponseStatusText = config.getBoolean("logResponseStatusText", false);
|
||||
|
||||
if (enabled) {
|
||||
boolean found = false;
|
||||
// Search for all other bStats Metrics classes to see if we are the first one
|
||||
for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
|
||||
try {
|
||||
service.getField("B_STATS_VERSION"); // Our identifier :)
|
||||
found = true; // We aren't the first
|
||||
break;
|
||||
} catch (NoSuchFieldException ignored) {
|
||||
}
|
||||
}
|
||||
// Register our service
|
||||
Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
|
||||
if (!found) {
|
||||
// We are the first!
|
||||
startSubmitting();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if bStats is enabled.
|
||||
*
|
||||
* @return Whether bStats is enabled or not.
|
||||
*/
|
||||
public boolean isEnabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a custom chart.
|
||||
*
|
||||
* @param chart The chart to add.
|
||||
*/
|
||||
public void addCustomChart(CustomChart chart) {
|
||||
if (chart == null) {
|
||||
throw new IllegalArgumentException("Chart cannot be null!");
|
||||
}
|
||||
charts.add(chart);
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the Scheduler which submits our data every 30 minutes.
|
||||
*/
|
||||
private void startSubmitting() {
|
||||
final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
|
||||
timer.scheduleAtFixedRate(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (!plugin.isEnabled()) { // Plugin was disabled
|
||||
timer.cancel();
|
||||
return;
|
||||
}
|
||||
// Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
|
||||
// Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
|
||||
Bukkit.getScheduler().runTask(plugin, () -> submitData());
|
||||
}
|
||||
}, 1000 * 60 * 5, 1000 * 60 * 30);
|
||||
// Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
|
||||
// WARNING: Changing the frequency has 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() {
|
||||
JsonObject data = new JsonObject();
|
||||
|
||||
String pluginName = plugin.getDescription().getName();
|
||||
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
|
||||
JsonArray customCharts = new JsonArray();
|
||||
for (CustomChart customChart : charts) {
|
||||
// Add the data of the custom charts
|
||||
JsonObject chart = customChart.getRequestJsonObject();
|
||||
if (chart == null) { // If the chart is null, we skip it
|
||||
continue;
|
||||
}
|
||||
customCharts.add(chart);
|
||||
}
|
||||
data.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;
|
||||
Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
|
||||
playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
|
||||
? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
|
||||
: ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
|
||||
} catch (Exception e) {
|
||||
playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
|
||||
}
|
||||
int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
|
||||
String bukkitVersion = Bukkit.getVersion();
|
||||
String bukkitName = Bukkit.getName();
|
||||
|
||||
// OS/Java specific data
|
||||
String javaVersion = System.getProperty("java.version");
|
||||
String osName = System.getProperty("os.name");
|
||||
String osArch = System.getProperty("os.arch");
|
||||
String osVersion = System.getProperty("os.version");
|
||||
int coreCount = Runtime.getRuntime().availableProcessors();
|
||||
|
||||
JsonObject data = new JsonObject();
|
||||
|
||||
data.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();
|
||||
|
||||
JsonArray pluginData = new JsonArray();
|
||||
// Search for all other bStats Metrics classes to get their plugin data
|
||||
for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
|
||||
try {
|
||||
service.getField("B_STATS_VERSION"); // Our identifier :)
|
||||
|
||||
for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
|
||||
try {
|
||||
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) {
|
||||
}
|
||||
}
|
||||
} catch (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 (Exception e) {
|
||||
// Something went wrong! :(
|
||||
if (logFailedRequests) {
|
||||
plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
|
||||
}
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends the data to the bStats server.
|
||||
*
|
||||
* @param plugin Any plugin. It's just used to get a logger instance.
|
||||
* @param data The data to send.
|
||||
* @throws Exception If the request failed.
|
||||
*/
|
||||
private static void sendData(Plugin plugin, JsonObject data) throws Exception {
|
||||
if (data == null) {
|
||||
throw new IllegalArgumentException("Data cannot be null!");
|
||||
}
|
||||
if (Bukkit.isPrimaryThread()) {
|
||||
throw new IllegalAccessException("This method must not be called from the main thread!");
|
||||
}
|
||||
if (logSentData) {
|
||||
plugin.getLogger().info("Sending data to bStats: " + data);
|
||||
}
|
||||
HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
|
||||
|
||||
// Compress the data to save bandwidth
|
||||
byte[] compressedData = compress(data.toString());
|
||||
|
||||
// Add headers
|
||||
connection.setRequestMethod("POST");
|
||||
connection.addRequestProperty("Accept", "application/json");
|
||||
connection.addRequestProperty("Connection", "close");
|
||||
connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
|
||||
connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
|
||||
connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
|
||||
connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
|
||||
|
||||
// Send data
|
||||
connection.setDoOutput(true);
|
||||
try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
|
||||
outputStream.write(compressedData);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gzips the given String.
|
||||
*
|
||||
* @param str The string to gzip.
|
||||
* @return The gzipped String.
|
||||
* @throws IOException If the compression failed.
|
||||
*/
|
||||
private static byte[] compress(final String str) throws IOException {
|
||||
if (str == null) {
|
||||
return null;
|
||||
}
|
||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
||||
try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
|
||||
gzip.write(str.getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
return outputStream.toByteArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* Represents a custom chart.
|
||||
*/
|
||||
public static abstract class CustomChart {
|
||||
|
||||
// The id of the chart
|
||||
final String chartId;
|
||||
|
||||
/**
|
||||
* Class constructor.
|
||||
*
|
||||
* @param chartId The id of the chart.
|
||||
*/
|
||||
CustomChart(String chartId) {
|
||||
if (chartId == null || chartId.isEmpty()) {
|
||||
throw new IllegalArgumentException("ChartId cannot be null or empty!");
|
||||
}
|
||||
this.chartId = chartId;
|
||||
}
|
||||
|
||||
private JsonObject getRequestJsonObject() {
|
||||
JsonObject chart = new JsonObject();
|
||||
chart.addProperty("chartId", chartId);
|
||||
try {
|
||||
JsonObject data = getChartData();
|
||||
if (data == null) {
|
||||
// If the data is null we don't send the chart.
|
||||
return null;
|
||||
}
|
||||
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);
|
||||
}
|
||||
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(String chartId, Callable<String> callable) {
|
||||
super(chartId);
|
||||
this.callable = callable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonObject getChartData() throws Exception {
|
||||
JsonObject data = new JsonObject();
|
||||
String value = callable.call();
|
||||
if (value == null || value.isEmpty()) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
data.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(String chartId, Callable<Map<String, Integer>> callable) {
|
||||
super(chartId);
|
||||
this.callable = callable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonObject getChartData() throws Exception {
|
||||
JsonObject data = new JsonObject();
|
||||
JsonObject values = new JsonObject();
|
||||
Map<String, Integer> map = callable.call();
|
||||
if (map == null || map.isEmpty()) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
boolean allSkipped = true;
|
||||
for (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(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
|
||||
super(chartId);
|
||||
this.callable = callable;
|
||||
}
|
||||
|
||||
@Override
|
||||
public JsonObject getChartData() throws Exception {
|
||||
JsonObject data = new JsonObject();
|
||||
JsonObject values = new JsonObject();
|
||||
Map<String, Map<String, Integer>> map = callable.call();
|
||||
if (map == null || map.isEmpty()) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
boolean reallyAllSkipped = true;
|
||||
for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
|
||||
JsonObject value = new JsonObject();
|
||||
boolean allSkipped = true;
|
||||
for (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(String chartId, Callable<Integer> callable) {
|
||||
super(chartId);
|
||||
this.callable = callable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonObject getChartData() throws Exception {
|
||||
JsonObject data = new JsonObject();
|
||||
int value = callable.call();
|
||||
if (value == 0) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
data.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(String chartId, Callable<Map<String, Integer>> callable) {
|
||||
super(chartId);
|
||||
this.callable = callable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonObject getChartData() throws Exception {
|
||||
JsonObject data = new JsonObject();
|
||||
JsonObject values = new JsonObject();
|
||||
Map<String, Integer> map = callable.call();
|
||||
if (map == null || map.isEmpty()) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
boolean allSkipped = true;
|
||||
for (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(String chartId, Callable<Map<String, Integer>> callable) {
|
||||
super(chartId);
|
||||
this.callable = callable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonObject getChartData() throws Exception {
|
||||
JsonObject data = new JsonObject();
|
||||
JsonObject values = new JsonObject();
|
||||
Map<String, Integer> map = callable.call();
|
||||
if (map == null || map.isEmpty()) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
for (Map.Entry<String, Integer> entry : map.entrySet()) {
|
||||
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(String chartId, Callable<Map<String, int[]>> callable) {
|
||||
super(chartId);
|
||||
this.callable = callable;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonObject getChartData() throws Exception {
|
||||
JsonObject data = new JsonObject();
|
||||
JsonObject values = new JsonObject();
|
||||
Map<String, int[]> map = callable.call();
|
||||
if (map == null || map.isEmpty()) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
boolean allSkipped = true;
|
||||
for (Map.Entry<String, int[]> entry : map.entrySet()) {
|
||||
if (entry.getValue().length == 0) {
|
||||
continue; // Skip this invalid
|
||||
}
|
||||
allSkipped = false;
|
||||
JsonArray categoryValues = new JsonArray();
|
||||
for (int categoryValue : entry.getValue()) {
|
||||
categoryValues.add(new JsonPrimitive(categoryValue));
|
||||
}
|
||||
values.add(entry.getKey(), categoryValues);
|
||||
}
|
||||
if (allSkipped) {
|
||||
// Null = skip the chart
|
||||
return null;
|
||||
}
|
||||
data.add("values", values);
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -2,9 +2,10 @@ lang: "en_US"
|
||||
debugger: true
|
||||
update-checker: false #this is a new feature, disable if it causes issues
|
||||
update-delay: 60 #in seconds
|
||||
metrics: true
|
||||
|
||||
settings:
|
||||
default-auction-time: 900
|
||||
default-auction-time: 900600
|
||||
max-auction-price: 1000000
|
||||
max-auction-start: 1000000
|
||||
max-auction-increment: 1000000
|
||||
|
||||
Loading…
Reference in New Issue
Block a user