Skip to content

Various fixes, untested. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cybertiger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Various fixes, untested. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 65 additions & 53 deletions src/main/java/fr/Alphart/BungeePlayerCounter/BPC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,63 +25,68 @@
import fr.Alphart.BungeePlayerCounter.Servers.ServerCoordinator;

@Getter
public class BPC extends JavaPlugin{
public class BPC extends JavaPlugin {

private static String prefix = _("&4[&aBPC&4]&e");
@Getter
private static BPC instance;
private ServerCoordinator serverCoordinator;
private PluginMessageWriter pmWriter;
private Configuration conf;
private ScoreboardHandler scoreboardHandler;
private boolean debugMode = false;

public void onEnable() {
BPC.instance = this;

conf = new Configuration(getConfig());
pmWriter = new PluginMessageWriter(conf.getPluginMessageChannel());
serverCoordinator = new ServerCoordinator();
scoreboardHandler = new ScoreboardHandler(serverCoordinator);

Bukkit.getPluginManager().registerEvents(new PlayerListener(), this);
getCommand("bpc").setExecutor(new BaseCommands());
}

public void onDisable(){
Bukkit.getMessenger().unregisterOutgoingPluginChannel(this);
Bukkit.getMessenger().unregisterIncomingPluginChannel(this);
HandlerList.unregisterAll(this);
private static BPC instance;
private ServerCoordinator serverCoordinator;
private PluginMessageWriter pmWriter;
private Configuration conf;
private ScoreboardHandler scoreboardHandler;
private boolean debugMode = false;

public void onEnable() {
if (!GsonLoader.loadGson()) {
getServer().getPluginManager().disablePlugin(this);
return;
}
BPC.instance = this;

conf = new Configuration(getConfig());
pmWriter = new PluginMessageWriter(conf.getPluginMessageChannel());
serverCoordinator = new ServerCoordinator();
scoreboardHandler = new ScoreboardHandler(serverCoordinator);

Bukkit.getPluginManager().registerEvents(new PlayerListener(), this);
getCommand("bpc").setExecutor(new BaseCommands());
}

public void onDisable() {
Bukkit.getMessenger().unregisterOutgoingPluginChannel(this);
Bukkit.getMessenger().unregisterIncomingPluginChannel(this);
HandlerList.unregisterAll(this);
Bukkit.getScheduler().cancelTasks(this);
BPC.instance = null;
}
}

public void reload() {
onDisable();
reloadConfig();
onEnable();
if(!Bukkit.getOnlinePlayers().isEmpty()){
public void reload() {
onDisable();
reloadConfig();
onEnable();
if (!Bukkit.getOnlinePlayers().isEmpty()) {
final Player sender = Bukkit.getOnlinePlayers().iterator().next();
if(serverCoordinator.getCurrentServer().isEmpty()){
if (serverCoordinator.getCurrentServer().isEmpty()) {
BPC.getInstance().getPmWriter().sendGetCurrentServerMessage(sender);
}
if(serverCoordinator.getServerGroups().size() <= 1){
if (serverCoordinator.getServerGroups().size() <= 1) {
BPC.getInstance().getPmWriter().sendGetServersListMessage(sender);
}
}
}
public boolean toggleDebug(){
if(debugMode){
for(final Handler handler : getLogger().getHandlers()){
}

public boolean toggleDebug() {
if (debugMode) {
for (final Handler handler : getLogger().getHandlers()) {
getLogger().removeHandler(handler);
}
getLogger().setLevel(Level.INFO);
getLogger().setUseParentHandlers(true);
getLogger().info("The debug mode is now disabled ! Log are available in the debug.log file located in BPC folder");
}else{
try{
} else {
try {
final File debugFile = new File(getDataFolder(), "debug.log");
if(debugFile.exists()){
if (debugFile.exists()) {
debugFile.delete();
}
// Write header into debug log
Expand All @@ -95,44 +100,51 @@ public boolean toggleDebug(){
handler.setFormatter(new Formatter() {
private final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
private final String pattern = "time [level] message\n";

@Override
public String format(LogRecord record) {
return pattern.replace("level", record.getLevel().getName())
.replace("message", record.getMessage())
.replace("[BungeePlayerCounter]", "")
.replace("time", sdf.format(Calendar.getInstance().getTime()));
.replace("message", record.getMessage())
.replace("[BungeePlayerCounter]", "")
.replace("time", sdf.format(Calendar.getInstance().getTime()));
}
});
getLogger().addHandler(handler);
getLogger().setLevel(Level.CONFIG);
getLogger().info("The debug mode is now enabled ! Log are available in the debug.log file located in BPC folder");
getLogger().setUseParentHandlers(false);
}catch(final Exception e){
} catch (final Exception e) {
getLogger().log(Level.SEVERE, "An exception occured during the initialization of debug logging file", e);
}
}
return debugMode = !debugMode;
}
public static String _(final String message, final Object... args){

public static String _(final String message, final Object... args) {
return ChatColor.translateAlternateColorCodes('&', String.format(message, args));
}
public static String __(final String message, final Object... args){

public static String __(final String message, final Object... args) {
return prefix + ChatColor.translateAlternateColorCodes('&', String.format(message, args));
}
public static void info(final String message){

public static void info(final String message) {
getInstance().getLogger().info(message);
}
public static void debug(final String message, final Object... args){

public static void debug(final String message, final Object... args) {
getInstance().getLogger().log(Level.CONFIG, String.format(message, args));
}
public static void debug(final String message, final Throwable throwable){

public static void debug(final String message, final Throwable throwable) {
getInstance().getLogger().log(Level.CONFIG, message, throwable);
}
public static void severe(final String message){

public static void severe(final String message) {
getInstance().getLogger().log(Level.SEVERE, message);
}
public static void severe(final String message, final Throwable throwable){

public static void severe(final String message, final Throwable throwable) {
getInstance().getLogger().log(Level.SEVERE, message + "Please report this :", throwable);
}
}
}
69 changes: 69 additions & 0 deletions src/main/java/fr/Alphart/BungeePlayerCounter/GsonLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package fr.Alphart.BungeePlayerCounter;

import com.google.gson.Gson;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;

public final class GsonLoader {
public static boolean loadGson() {
try {
Class.forName("com.google.gson.Gson");
return true;
} catch (final Throwable t) {
BPC.info("Gson wasn't found... Please update to spigot 1.8.3 or earlier."
+ "BPC will try to dynamically load it.");
}
final File bpcFolder = BPC.getInstance().getDataFolder();
final File gsonPath = new File(bpcFolder + File.separator + "lib" + File.separator
+ "gson.jar");
new File(bpcFolder + File.separator + "lib").mkdir();

// Download the driver if it doesn't exist
if (!gsonPath.exists()) {
BPC.info("Gson was not found. It is being downloaded, please wait ...");

final String gsonDL = "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar";
FileOutputStream fos = null;
try {
final ReadableByteChannel rbc = Channels.newChannel(new URL(gsonDL).openStream());
fos = new FileOutputStream(gsonPath);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
} catch (final IOException e) {
BPC.severe("An error occured during the download of Gson.", e);
return false;
} finally {
if (fos != null) {
try {
fos.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
BPC.info("Gson has been successfully downloaded.");
}

try {
URLClassLoader systemClassLoader;
URL gsonUrl;
Class<URLClassLoader> sysclass;
gsonUrl = gsonPath.toURI().toURL();
systemClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
sysclass = URLClassLoader.class;
final Method method = sysclass.getDeclaredMethod("addURL", new Class[]{URL.class});
method.setAccessible(true);
method.invoke(systemClassLoader, new Object[]{gsonUrl});

return true;
} catch (final Throwable t) {
BPC.severe("Gson cannot be loaded.", t);
}
return false;
}
}
60 changes: 60 additions & 0 deletions src/main/java/fr/Alphart/BungeePlayerCounter/Servers/PingResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package fr.Alphart.BungeePlayerCounter.Servers;

import java.util.List;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

/**
*
* @author antony
*/
@Getter
@ToString
public class PingResponse {
private String description;
private Players players;
private Version version;
private String favicon;
@Setter
private long time;
private final Pinger outer;

public PingResponse(final Pinger outer) {
this.outer = outer;
}

public boolean isFull() {
return players.max <= players.online;
}

@Getter
@ToString
public class Players {

private int max;
private int online;
private List<Player> sample;

@Getter
public class Player {

private String name;
private String id;
}
}

@Getter
@ToString
public class Version {

private String name;
private String protocol;
}

}
Loading