avior/better-tp
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

quick

Browse Source
This commit is contained in:
Florian Bouillon
2018-09-05 20:11:38 +02:00
parent 8e8e0e4cfb
commit eeedbbc753
33 changed files with 592 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/DeltaWings/Minecraft/BetterTP/Api/API.java Normal file
View File

@ -0,0 +1,19 @@
package net.DeltaWings.Minecraft.BetterTP.Api;
import java.util.ArrayList;
import net.DeltaWings.Minecraft.BetterTP.Libs.Config;
/**
* API
*/
public class API {
public static ArrayList<String> homelist(String player) {
Config c = new Config("data", player);
if(c.exist()) {
return c.getSection("");
}
return new ArrayList<>();
}
}

32
src/main/java/net/DeltaWings/Minecraft/BetterTP/Charts.java Normal file
View File

@ -0,0 +1,32 @@
package net.DeltaWings.Minecraft.BetterTP;
import java.io.File;
import java.util.concurrent.Callable;
import org.bstats.bukkit.Metrics;
import net.DeltaWings.Minecraft.BetterTP.Libs.Config;
import net.DeltaWings.Minecraft.BetterTP.Libs.FileManager;
public class Charts {
private Main i = Main.getInstance();
private String j = File.separator;
private final File d = new File(i.getDataFolder() + j + "data");
public Charts(Metrics metrics) {
metrics.addCustomChart(new Metrics.SingleLineChart("home_number", new Callable<Integer>(){
@Override
public Integer call() throws Exception {
Integer result = 0;
for (String conf : FileManager.listFiles(d)) {
Config c = new Config("data", conf);
result += c.getSection("").size();
}
return result;
}
}));
}
}

63
src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Bettertp.java
View File

@ -1,7 +1,9 @@
package net.DeltaWings.Minecraft.BetterTP.Commands;
import net.DeltaWings.Minecraft.BetterTP.Api.API;
import net.DeltaWings.Minecraft.BetterTP.Libs.Config;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@ -12,13 +14,23 @@ import java.io.IOException;
public class Bettertp implements CommandExecutor {
Config m = new Config("", "messages");
@Override
public boolean onCommand(CommandSender s, Command unu2, String unu1, String[] a) {
Config m = new Config("", "messages");
Config g = new Config("", "config");
if(s instanceof Player && s.hasPermission("bettertp.admin")) {
Player p = (Player) s;
if(a.length == 2) {
if((a.length == 2 || a.length == 3) && a[0].equalsIgnoreCase("home")) {
if(a.length == 2) home(s, a[1], "home");
else home(s, a[1], a[2]);
} else if((a.length == 2 || a.length == 3) && a[0].equalsIgnoreCase("delhome")) {
if(a.length == 2) delhome(s, a[1], "home");
else delhome(s, a[1], a[2]);
} else if(a.length == 2 && a[0].equalsIgnoreCase("homelist")) {
homelist(s, a[1]);
} else if(a.length == 2) {
if(a[0].equalsIgnoreCase("set")) {
if(a[1].equalsIgnoreCase("spawn")) {
Config c = null;
@ -98,4 +110,51 @@ public class Bettertp implements CommandExecutor {
}
return false;
}
private void set() {
}
private void help() {
}
private void home(CommandSender s, String player, String home) {
Config cp = new Config("data", player);
if(cp.exist()) {
String t = home+".";
((Player) s).teleport(new Location(Bukkit.getServer().getWorld(cp.getString(t+"world")), cp.getDouble(t+"x"), cp.getDouble(t+"y"), cp.getDouble(t+"z")));
}
((Player) s).sendMessage("Sended you to " + player + " home : " + home);
}
private void delhome(CommandSender s, String player, String home) {
Config cp = new Config("data", player);
if(cp.exist() && cp.isSet(home)) {
cp.set(home, null);
try {
cp.save();
} catch ( IOException e ) {
e.printStackTrace();
s.sendMessage("Error, Please call an Admin !");
}
s.sendMessage(m.getString("home.deleted").replace("[home]", home).replace("&", "§"));
}
}
private void homelist(CommandSender s, String player) {
Config c = new Config("", "messages");
s.sendMessage(c.getString("help.top").replace("[help]", "Homelist").replace("&", "§"));
for(String a : API.homelist(s.getName())) {
s.sendMessage(("&4| &9").replace("&", "§") + a);
}
s.sendMessage(c.getString("help.bottom").replace("[help]", "Homelist").replace("&", "§"));
}
}

2
src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Home.java
View File

@ -53,3 +53,5 @@ public class Home implements CommandExecutor {
return false;
}
}
// /home [home]

3
src/main/java/net/DeltaWings/Minecraft/BetterTP/Commands/Homelist.java
View File

@ -1,6 +1,7 @@
package net.DeltaWings.Minecraft.BetterTP.Commands;
import net.DeltaWings.Minecraft.BetterTP.Libs.Config;
import net.DeltaWings.Minecraft.BetterTP.Api.API;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@ -13,7 +14,7 @@ public class Homelist implements CommandExecutor {
if(s instanceof Player) {
Config c = new Config("", "messages");
s.sendMessage(c.getString("help.top").replace("[help]", "Homelist").replace("&", "§"));
for(String a : new Config("data", s.getName()).getSection("")) {
for(String a : API.homelist(s.getName())) {
s.sendMessage(("&4| &9").replace("&", "§") + a);
}
s.sendMessage(c.getString("help.bottom").replace("[help]", "Homelist").replace("&", "§"));

89
src/main/java/net/DeltaWings/Minecraft/BetterTP/Libs/FileManager.java Normal file
View File

@ -0,0 +1,89 @@
package net.DeltaWings.Minecraft.BetterTP.Libs;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class FileManager {
public static List<String> listFiles(String path) {
String[] t = new File(path).list();
if(t == null) return new ArrayList<>();
else return Arrays.asList(t);
}
public static List<String> listFiles(File path) {
String[] t = path.list();
if(t == null) return new ArrayList<>();
else return Arrays.asList(t);
}
public static void delete(File path) {
path.delete();
}
public static void delete(String path) {
File f = new File(path);
f.delete();
}
public static void createFile(String path) {
try {
new File(path).createNewFile();
} catch ( IOException e ) {
e.printStackTrace();
}
}
public static void createFile(File path) {
try {
path.createNewFile();
} catch ( IOException e ) {
e.printStackTrace();
}
}
public static void createFolder(File path) {
path.mkdirs();
}
public static void createFolder(String path) {
new File(path).mkdirs();
}
public static void archive(String srcFolder, String destZipFile) {
try {
FileOutputStream f = new FileOutputStream(destZipFile);
ZipOutputStream z = new ZipOutputStream(f);
b(srcFolder, z);
z.close();
} catch ( Exception e ) {
e.printStackTrace();
}
}
private static void a(String p, String s, ZipOutputStream z) throws Exception {
File f = new File(s);
if (f.isDirectory()) b(s, z);
else {
byte[] b = new byte[1024];
int l;
FileInputStream i = new FileInputStream(s);
z.putNextEntry(new ZipEntry(p + "/" + f.getName()));
while ((l = i.read(b)) > 0) z.write(b, 0, l);
}
}
private static void b(String s, ZipOutputStream z) throws Exception {
File f = new File(s);
String[] l = f.list();
if(l != null) for (String n : l) a(f.getName(), s + File.separator + n, z);
}
}

12
src/main/java/net/DeltaWings/Minecraft/BetterTP/Main.java
View File

@ -8,6 +8,8 @@ import org.bukkit.command.PluginCommand;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import org.bstats.bukkit.Metrics;
import java.io.IOException;
import java.util.logging.Level;
@ -36,6 +38,8 @@ public final class Main extends JavaPlugin {
debug("Loading Variables");
PluginManager pm = getServer().getPluginManager();
PluginCommand bettertp = getCommand("Bettertp");
PluginCommand home = getCommand("Home");
PluginCommand delhome = getCommand("Delhome");
debug("Loaded variables");
debug("Loading Configuration");
@ -59,15 +63,17 @@ public final class Main extends JavaPlugin {
bettertp.setTabCompleter(new BettertpTab());
getCommand("Spawn").setExecutor(new Spawn());
getCommand("Lobby").setExecutor(new Lobby());
getCommand("Home").setExecutor(new Home());
home.setExecutor(new Home());
home.setTabCompleter(new HomeTab());
getCommand("Sethome").setExecutor(new Sethome());
getCommand("Delhome").setExecutor(new Delhome());
delhome.setExecutor(new Delhome());
delhome.setTabCompleter(new DelhomeTab());
getCommand("Homelist").setExecutor(new Homelist());
debug("Loaded Commands");
debug("Enabling Metrics");
//new Metrics(this);
new Charts(new Metrics(this));
log("Metrics Started : https://bstats.org/plugin/bukkit/plugin/");
log("Loaded !");

284
src/main/java/net/DeltaWings/Minecraft/BetterTP/Metrics.java
View File

@ -1,284 +0,0 @@
package net.DeltaWings.Minecraft.BetterTP;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
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.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
import java.util.logging.Level;
import java.util.zip.GZIPOutputStream;
/**
* bStats collects some data for plugin authors.
*
* Check out https://bStats.org/ to learn more about bStats!
*/
public class Metrics {
static {
// 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' });
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";
// Should failed requests be logged?
private static boolean logFailedRequests;
// The uuid of the server
private static String serverUUID;
// The plugin
private final JavaPlugin plugin;
/**
* Class constructor.
*
* @param plugin The plugin which stats should be submitted.
*/
public Metrics(JavaPlugin plugin) {
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null!");
}
this.plugin = plugin;
// 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);
// 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
serverUUID = config.getString("serverUuid");
logFailedRequests = config.getBoolean("logFailedRequests", false);
if (config.getBoolean("enabled", true)) {
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();
}
}
}
/**
* 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.put("pluginName", pluginName); // Append the name of the plugin
data.put("pluginVersion", pluginVersion); // Append the version of the plugin
JSONArray customCharts = new JSONArray();
data.put("customCharts", customCharts);
return data;
}
/**
* Gets the server specific data.
*
* @return The server specific data.
*/
private JSONObject getServerData() {
// Minecraft specific data
int playerAmount = Bukkit.getOnlinePlayers().size();
int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
String bukkitVersion = Bukkit.getVersion();
bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
// 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.put("serverUUID", serverUUID);
data.put("playerAmount", playerAmount);
data.put("onlineMode", onlineMode);
data.put("bukkitVersion", bukkitVersion);
data.put("javaVersion", javaVersion);
data.put("osName", osName);
data.put("osArch", osArch);
data.put("osVersion", osVersion);
data.put("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 :)
} catch (NoSuchFieldException ignored) {
continue; // Continue "searching"
}
// Found one!
try {
pluginData.add(service.getMethod("getPluginData").invoke(Bukkit.getServicesManager().load(service)));
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
}
data.put("plugins", pluginData);
// Create a new thread for the connection to the bStats server
new Thread(() -> {
try {
// Send the data
sendData(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 data The data to send.
* @throws Exception If the request failed.
*/
private static void sendData(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!");
}
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);
DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
outputStream.write(compressedData);
outputStream.flush();
outputStream.close();
connection.getInputStream().close(); // We don't care about the response - Just send our data :)
}
/**
* 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();
GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
gzip.write(str.getBytes("UTF-8"));
gzip.close();
return outputStream.toByteArray();
}
}

9
src/main/java/net/DeltaWings/Minecraft/BetterTP/TabCompleter/BettertpTab.java
View File

@ -1,6 +1,9 @@
package net.DeltaWings.Minecraft.BetterTP.TabCompleter;
import net.DeltaWings.Minecraft.BetterTP.Main;
import net.DeltaWings.Minecraft.BetterTP.Api.API;
import net.DeltaWings.Minecraft.BetterTP.Libs.Config;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
@ -11,7 +14,7 @@ import java.util.List;
public class BettertpTab implements TabCompleter {
private final String[] menu = new String[]{"set", "del", "delete", "help", "config"}, setdel = new String[]{"spawn","lobby"}, confopt = new String[]{""};
private final String[] menu = new String[]{"set", "del", "delete", "help", "home", "delhome"}, setdel = new String[]{"spawn","lobby"}, confopt = new String[]{""};
@Override
public List<String> onTabComplete(CommandSender s, Command c, String unused, String[] a) {
@ -36,6 +39,10 @@ public class BettertpTab implements TabCompleter {
for (String t : y) if (t.startsWith(a[1].toLowerCase())) l.add(t);
return l;
} else return Arrays.asList(y);
} else if(a.length == 3) {
if(a[0].equalsIgnoreCase("home") || a[0].equalsIgnoreCase("delhome")) {
return API.homelist(a[1]);
}
}
return null;
}

20
src/main/java/net/DeltaWings/Minecraft/BetterTP/TabCompleter/DelhomeTab.java Normal file
View File

@ -0,0 +1,20 @@
package net.DeltaWings.Minecraft.BetterTP.TabCompleter;
import net.DeltaWings.Minecraft.BetterTP.Libs.Config;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import java.util.List;
public class DelhomeTab implements TabCompleter {
@Override
public List<String> onTabComplete(CommandSender s, Command u1, String unused, String[] a) {
if( a.length == 1) {
Config c = new Config("data", s.getName());
return c.getSection("");
} else return null;
}
}

19
src/main/java/net/DeltaWings/Minecraft/BetterTP/TabCompleter/HomeTab.java Normal file
View File

@ -0,0 +1,19 @@
package net.DeltaWings.Minecraft.BetterTP.TabCompleter;
import net.DeltaWings.Minecraft.BetterTP.Api.API;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import java.util.List;
public class HomeTab implements TabCompleter {
@Override
public List<String> onTabComplete(CommandSender s, Command u1, String unused, String[] a) {
if( a.length == 1) {
return API.homelist(s.getName());
} else return null;
}
}