diff --git a/pom.xml b/pom.xml index 91e3475..b5563fb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 11.0 + 11.1 jar T2CodeLib diff --git a/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java b/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java index d401b1c..40c7da0 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java +++ b/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java @@ -8,6 +8,7 @@ import net.t2code.lib.Spigot.Lib.vault.Vault; import net.t2code.luckyBox.api.LuckyBoxAPI; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -44,21 +45,24 @@ public class CreateReportLog { pWriter.println("Online Mode: " + Bukkit.getOnlineMode()); pWriter.println("Worlds: " + Bukkit.getWorlds()); pWriter.println("OP-Player:"); - for (OfflinePlayer player : Bukkit.getOperators()){ - pWriter.println(" - Player: " +player.getName() + " - " + player.getUniqueId()); + for (OfflinePlayer player : Bukkit.getOperators()) { + pWriter.println(" - Player: " + player.getName() + " - " + player.getUniqueId()); } pWriter.println(); if (Vault.vaultEnable) { pWriter.println("Vault: " + Bukkit.getPluginManager().getPlugin("Vault").getName() + " - " + Bukkit.getPluginManager().getPlugin("Vault").getDescription().getVersion()); } else pWriter.println("Vault: not connected"); if (Main.eco != null) { - String st; - st = Main.eco.getName(); + String st = Main.eco.getName(); if (Main.eco.getName().equals("CMIEconomy")) st = "CMI"; - pWriter.println("Economy: " + Main.eco.isEnabled() + " - " + Main.eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion()); + if (Bukkit.getPluginManager().getPlugin(st) != null) { + pWriter.println("Economy: " + Main.eco.isEnabled() + " - " + st + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion()); + } else pWriter.println("Economy: " + Main.eco.isEnabled() + " - " + st); } else pWriter.println("Economy: not connected via vault"); if (Main.perm != null) { - pWriter.println("Permission: " + Main.perm.isEnabled() + " - " + Main.perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(Main.perm.getName()).getDescription().getVersion()); + if (Bukkit.getPluginManager().getPlugin(Main.perm.getName()) != null) { + pWriter.println("Permission: " + Main.perm.isEnabled() + " - " + Main.perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(Main.perm.getName()).getDescription().getVersion()); + } else pWriter.println("Permission: " + Main.perm.isEnabled() + " - " + Main.perm.getName()); } else pWriter.println("Permission: not connected via vault"); pWriter.println(); pWriter.println("Java: " + System.getProperty("java.version")); @@ -68,7 +72,7 @@ public class CreateReportLog { pWriter.println(); pWriter.println("T2CodeLib: " + Main.plugin.getDescription().getVersion()); pWriter.println(); - if (PluginCheck.luckyBox()){ + if (PluginCheck.luckyBox()) { pWriter.println("T2C-PremiumPlugins: "); pWriter.println("T2C-LuckyBox UID: " + LuckyBoxAPI.getUID()); pWriter.println("T2C-LuckyBox RID: " + LuckyBoxAPI.getRID()); @@ -185,7 +189,7 @@ public class CreateReportLog { while ((len = in.read(buf)) > 0) { try { zip.write(buf, 0, len); - } catch (Exception ex){ + } catch (Exception ex) { ex.printStackTrace(); } } diff --git a/src/main/java/net/t2code/lib/Spigot/system/Main.java b/src/main/java/net/t2code/lib/Spigot/system/Main.java index c933349..18e4381 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/Main.java +++ b/src/main/java/net/t2code/lib/Spigot/system/Main.java @@ -47,10 +47,11 @@ public final class Main extends JavaPlugin { plugin = this; autor = plugin.getDescription().getAuthors(); version = plugin.getDescription().getVersion(); - Long long_; + long long_; long_ = T2CodeTemplate.onLoadHeader(prefix, autor, version, spigot, discord); if (Util.getSnapshot()){ - send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected. Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!"); + send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected." + + " Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!"); send.console(prefix + " §4 §e-------------------"); try { Thread.sleep(5000); @@ -83,25 +84,26 @@ public final class Main extends JavaPlugin { ItemVersion.scan(); send.console(Main.prefix + " §3Server run on: §6" + MCVersion.isVersion + " / " + NMSVersion.isNMS); if (eco != null) { - String st; - st = eco.getName(); + String st = eco.getName(); if (eco.getName().equals("CMIEconomy")) st = "CMI"; if (Bukkit.getPluginManager().getPlugin(st) != null){ - send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion() + " §7- §e" + + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); if (perm != null) { if (Bukkit.getPluginManager().getPlugin(perm.getName()) != null){ - send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(perm.getName()).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(perm.getName()).getDescription().getVersion() + + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + if (PluginCheck.pluginCheck("PlaceholderAPI")) { - send.console(Main.prefix + " §3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + send.console(Main.prefix + " §3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); } - Main.plugin.getCommand("t2code").setExecutor(new CmdExecuter()); ConfigCreate.configCreate(); LanguagesCreate.langCreate(); diff --git a/target/classes/bungee.yml b/target/classes/bungee.yml index dbc00bd..ba3c3f6 100644 --- a/target/classes/bungee.yml +++ b/target/classes/bungee.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 11.0 +version: 11.1 main: net.t2code.lib.Bungee.BMain author: JaTiTV, Jkobs description: Libarie from T2Code Plugins \ No newline at end of file diff --git a/target/classes/net/t2code/lib/Spigot/system/CreateReportLog.class b/target/classes/net/t2code/lib/Spigot/system/CreateReportLog.class index 759aff7..e74a364 100644 Binary files a/target/classes/net/t2code/lib/Spigot/system/CreateReportLog.class and b/target/classes/net/t2code/lib/Spigot/system/CreateReportLog.class differ diff --git a/target/classes/net/t2code/lib/Spigot/system/Main.class b/target/classes/net/t2code/lib/Spigot/system/Main.class index 0c7d405..ea0bca2 100644 Binary files a/target/classes/net/t2code/lib/Spigot/system/Main.class and b/target/classes/net/t2code/lib/Spigot/system/Main.class differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index eb21bd1..c147c58 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 11.0 +version: 11.1 main: net.t2code.lib.Spigot.system.Main api-version: 1.13 prefix: T2CodeLib