diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml
index a2e458db..b068b632 100644
--- a/SubServers.Bungee/common/pom.xml
+++ b/SubServers.Bungee/common/pom.xml
@@ -27,8 +27,8 @@
net.ME1312.Galaxi
- GalaxiUtil
- 22w11a
+ GalaxiBase
+ 22w16a
compile
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java
index c8486980..50ba884d 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java
@@ -151,7 +151,7 @@ public class ExternalSubLogger extends SubLogger {
if (writer != null) {
PrintWriter writer = this.writer;
this.writer = null;
- int l = (int) Math.floor((("---------- LOG START \u2014 " + name + " ----------").length() - 9) / 2);
+ int l = (("---------- LOG START \u2014 " + name + " ----------").length() - 9) / 2;
String s = "";
while (s.length() < l) s += '-';
writer.println(s + " LOG END " + s);
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
index 408bfe40..7f9b7dd2 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
@@ -174,7 +174,7 @@ public class InternalSubLogger extends SubLogger {
if (writer != null) {
PrintWriter writer = this.writer;
this.writer = null;
- int l = (int) Math.floor((("---------- LOG START \u2014 " + name + " ----------").length() - 9) / 2);
+ int l = (("---------- LOG START \u2014 " + name + " ----------").length() - 9) / 2;
String s = "";
while (s.length() < l) s += '-';
if (writer != null) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java
index da06f838..c3fa6cf9 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java
@@ -28,8 +28,7 @@ public class PacketAddServer implements PacketObjectIn, PacketObjectOut
* @param plugin SubPlugin
*/
public PacketAddServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java
index b4380dd9..91ae780e 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java
@@ -26,8 +26,7 @@ public class PacketCommandServer implements PacketObjectIn, PacketObjec
* @param plugin SubPlugin
*/
public PacketCommandServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java
index e0085954..0b60bfe1 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java
@@ -26,8 +26,7 @@ public class PacketDeleteServer implements PacketObjectIn, PacketObject
* @param plugin SubPlugin
*/
public PacketDeleteServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java
index 6274d667..ff246403 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java
@@ -24,8 +24,7 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO
* @param plugin SubPlugin
*/
public PacketDownloadGroupInfo(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
@@ -36,8 +35,7 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO
* @param tracker Receiver ID
*/
public PacketDownloadGroupInfo(SubProxy plugin, List groups, UUID tracker) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.tracker = tracker;
if (groups != null) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java
index ff854a0a..fad0b576 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java
@@ -26,8 +26,7 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb
* @param plugin SubPlugin
*/
public PacketDownloadHostInfo(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
@@ -38,8 +37,7 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb
* @param tracker Receiver ID
*/
public PacketDownloadHostInfo(SubProxy plugin, List hosts, UUID tracker) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.tracker = tracker;
if (hosts != null) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java
index 84f3293c..3c8ce52c 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java
@@ -26,8 +26,7 @@ public class PacketDownloadPlayerInfo implements PacketObjectIn, Packet
* @param plugin SubPlugin
*/
public PacketDownloadPlayerInfo(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
@@ -39,8 +38,7 @@ public class PacketDownloadPlayerInfo implements PacketObjectIn, Packet
* @param tracker Receiver ID
*/
public PacketDownloadPlayerInfo(SubProxy plugin, List names, List ids, UUID tracker) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.tracker = tracker;
if (ids != null) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java
index 3834a9a9..876e69ed 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java
@@ -26,8 +26,7 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO
* @param plugin SubPlugin
*/
public PacketDownloadProxyInfo(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
@@ -38,8 +37,7 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO
* @param tracker Receiver ID
*/
public PacketDownloadProxyInfo(SubProxy plugin, List proxies, UUID tracker) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.tracker = tracker;
if (proxies != null) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java
index a46914cb..241917d4 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java
@@ -26,8 +26,7 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet
* @param plugin SubPlugin
*/
public PacketDownloadServerInfo(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
@@ -38,8 +37,7 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet
* @param tracker Receiver ID
*/
public PacketDownloadServerInfo(SubProxy plugin, List servers, UUID tracker) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.tracker = tracker;
if (servers != null) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java
index 0ae0c170..3486f0aa 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java
@@ -27,8 +27,7 @@ public class PacketEditServer implements PacketObjectIn, PacketObjectOu
* @param plugin SubPlugin
*/
public PacketEditServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExControlServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExControlServer.java
index 795665b8..77b4b09a 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExControlServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExControlServer.java
@@ -72,7 +72,7 @@ public class PacketExControlServer implements PacketObjectIn, PacketObj
this.args = new Object[type.getArguments().length];
for (int i = 0; i < type.getArguments().length; ++i) {
- if (!type.getArguments()[i].isInstance(arguments[i])) throw new IllegalArgumentException("Argument " + (i+1) + " is not " + type.getArguments()[i].getCanonicalName());
+ if (!type.getArguments()[i].isInstance(arguments[i])) throw new IllegalArgumentException("Argument " + (i+1) + " is not " + type.getArguments()[i].getTypeName());
args[i] = arguments[i];
}
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java
index a606a2e1..12e71589 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java
@@ -32,8 +32,7 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject
* @param plugin SubPlugin
*/
public PacketExSyncPlayer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java
index 2581d4f3..c6caa20e 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java
@@ -31,8 +31,7 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn,
* @param plugin SubPlugin
*/
public PacketLinkExHost(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
index 002cc17d..818293cd 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
@@ -32,8 +32,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn,
* @param plugin SubPlugin
*/
public PacketLinkProxy(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java
index 14869ca4..73a5651d 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java
@@ -45,8 +45,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn,
* @param plugin SubPlugin
*/
public PacketLinkServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExEditServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExEditServer.java
index 238b9592..e732b3f7 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExEditServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExEditServer.java
@@ -74,7 +74,7 @@ public class PacketOutExEditServer implements PacketObjectOut {
this.args = new Object[type.getArguments().length];
for (int i = 0; i < type.getArguments().length; ++i) {
- if (!type.getArguments()[i].isInstance(arguments[i])) throw new IllegalArgumentException("Argument " + (i+1) + " is not " + type.getArguments()[i].getCanonicalName());
+ if (!type.getArguments()[i].isInstance(arguments[i])) throw new IllegalArgumentException("Argument " + (i+1) + " is not " + type.getArguments()[i].getTypeName());
args[i] = arguments[i];
}
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java
index 957e4c82..8582c98c 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java
@@ -28,8 +28,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
* @param plugin
*/
public PacketOutExRunEvent(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java
index 6e1716fa..f1e29d9b 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java
@@ -27,8 +27,7 @@ public class PacketRemoveServer implements PacketObjectIn, PacketObject
* @param plugin SubPlugin
*/
public PacketRemoveServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java
index ce2b682c..7ce8533e 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java
@@ -26,8 +26,7 @@ public class PacketRestartServer implements PacketObjectIn, PacketObjec
* @param plugin SubPlugin
*/
public PacketRestartServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java
index 48d171db..ba88b65c 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java
@@ -27,8 +27,7 @@ public class PacketStartServer implements PacketObjectIn, PacketObjectO
* @param plugin SubPlugin
*/
public PacketStartServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java
index 6bcd2e1f..cd5fcd4a 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java
@@ -26,8 +26,7 @@ public class PacketStopServer implements PacketObjectIn, PacketObjectOu
* @param plugin SubPlugin
*/
public PacketStopServer(SubProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java
index f973707e..550d5f04 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java
@@ -49,8 +49,7 @@ public class DefaultUIHandler implements UIHandler, Listener {
* @param plugin Event
*/
public DefaultUIHandler(SubPlugin plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
Bukkit.getPluginManager().registerEvents(this, plugin);
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java
index da7f333d..a8b6272a 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java
@@ -24,8 +24,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut {
* @param plugin SubServers.Client
*/
public PacketDownloadLang(SubPlugin plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketExControlPlayer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketExControlPlayer.java
index a2481909..4a17457f 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketExControlPlayer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketExControlPlayer.java
@@ -1,9 +1,11 @@
package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
import net.ME1312.SubData.Client.SubDataSender;
+import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@@ -14,13 +16,18 @@ import java.util.UUID;
* Player Control Packet
*/
public class PacketExControlPlayer implements PacketObjectIn, PacketObjectOut {
+ private SubPlugin plugin;
private int response;
private UUID tracker;
/**
* New PacketExControlPlayer (In)
+ *
+ * @param plugin SubServers.Client
*/
- public PacketExControlPlayer() {}
+ public PacketExControlPlayer(SubPlugin plugin) {
+ this.plugin = Util.nullpo(plugin);
+ }
/**
* New PacketExControlPlayer (Out)
@@ -48,13 +55,15 @@ public class PacketExControlPlayer implements PacketObjectIn, PacketObj
String command = data.getString(0x0001);
UUID target = (data.contains(0x0002)?data.getUUID(0x0002):null);
- CommandSender sender = Bukkit.getConsoleSender();
- if (target != null && (sender = Bukkit.getPlayer(target)) == null) {
- client.sendPacket(new PacketExControlPlayer(6, tracker));
- } else {
- Bukkit.getServer().dispatchCommand(sender, command);
- client.sendPacket(new PacketExControlPlayer(0, tracker));
- }
+ Bukkit.getScheduler().runTask(plugin, () -> {
+ CommandSender sender = Bukkit.getConsoleSender();
+ if (target != null && (sender = Bukkit.getPlayer(target)) == null) {
+ client.sendPacket(new PacketExControlPlayer(6, tracker));
+ } else {
+ Bukkit.getServer().dispatchCommand(sender, command);
+ client.sendPacket(new PacketExControlPlayer(0, tracker));
+ }
+ });
} catch (Throwable e) {
client.sendPacket(new PacketExControlPlayer(2, tracker));
e.printStackTrace();
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java
index a3a5e559..a16dfd15 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java
@@ -24,8 +24,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn,
* @param plugin SubServers.Client
*/
public PacketLinkServer(SubPlugin plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
* New PacketLinkServer (Out)
@@ -34,8 +33,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn,
* @param channel Channel ID
*/
public PacketLinkServer(SubPlugin plugin, int channel) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.channel = channel;
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java
index 5c88f139..aa2ff869 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java
@@ -105,7 +105,7 @@ public class SubProtocol extends SubDataProtocol {
registerPacket(0x0070, new PacketInExRunEvent(plugin));
registerPacket(0x0071, new PacketInExReset());
registerPacket(0x0072, new PacketInExReload(plugin));
- registerPacket(0x0078, new PacketExControlPlayer());
+ registerPacket(0x0078, new PacketExControlPlayer(plugin));
}
public static SubProtocol get() {
diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml
index 4bd6d7f6..968a962b 100644
--- a/SubServers.Client/Common/pom.xml
+++ b/SubServers.Client/Common/pom.xml
@@ -17,8 +17,8 @@
net.ME1312.Galaxi
- GalaxiUtil
- 22w11a
+ GalaxiBase
+ 22w16a
compile
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java
index f7e350c9..f8ec051e 100644
--- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java
+++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java
@@ -25,8 +25,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut {
* @param plugin SubServers.Client
*/
public PacketDownloadLang(SubPlugin plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java
index 51cefdad..bd87a46b 100644
--- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java
+++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java
@@ -26,8 +26,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn,
* @param plugin SubServers.Client
*/
public PacketLinkServer(SubPlugin plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
* New PacketLinkServer (Out)
@@ -36,8 +35,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn,
* @param channel Channel ID
*/
public PacketLinkServer(SubPlugin plugin, int channel) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.channel = channel;
}
diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java
index 5d61f39e..5cb4f242 100644
--- a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java
+++ b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java
@@ -236,12 +236,14 @@ public class HTMLogger extends AnsiOutputStream {
} else if (color < 16) {
return ANSI_BRIGHT_COLOR_MAP[color - 8];
} else if (color < 232) {
- int r = (int) (Math.floor((color - 16) / 36d) * (255 / 5));
- int g = (int) (Math.floor(((color - 16) % 36d) / 6d) * (255 / 5));
- int b = (int) (Math.floor(((color - 16) % 36d) % 6d) * (255 / 5));
+ float x = color - 16;
+ int r = (int) ((x / 36f) * 51);
+ x = (x % 36f) ;
+ int g = (int) ((x / 6f) * 51);
+ int b = (int) ((x % 6f) * 51);
return ((r >= 16)?"":"0") + Integer.toString(r, 16) + ((g >= 16)?"":"0") + Integer.toString(g, 16) + ((b >= 16)?"":"0") + Integer.toString(b, 16);
} else if (color < 256) {
- int gray = (int) ((255 / 25d) * (color - 232 + 1));
+ int gray = (int) (10.2f * (color - 231));
return ((gray >= 16)?"":"0") + Integer.toString(gray, 16) + ((gray >= 16)?"":"0") + Integer.toString(gray, 16) + ((gray >= 16)?"":"0") + Integer.toString(gray, 16);
} else {
throw new IOException("Invalid 8 Bit Color: " + color);
diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
index 24743aa9..5cf7daa4 100644
--- a/SubServers.Host/pom.xml
+++ b/SubServers.Host/pom.xml
@@ -30,13 +30,13 @@
net.ME1312.Galaxi
GalaxiEngine
- 22w11a
+ 22w16a
compile
net.ME1312.Galaxi
GalaxiUI
- 22w11a
+ 22w16a
runtime
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java
index 0dfbcef9..e1f07efb 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java
@@ -235,7 +235,7 @@ public class SubLoggerImpl {
if (writer != null) {
PrintWriter writer = this.writer;
this.writer = null;
- int l = (int) Math.floor((("---------- LOG START \u2014 " + name + " ----------").length() - 9) / 2);
+ int l = (("---------- LOG START \u2014 " + name + " ----------").length() - 9) / 2;
String s = "";
while (s.length() < l) s += '-';
if (writer != null) {
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExControlServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExControlServer.java
index b7ae2811..6ef60182 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExControlServer.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExControlServer.java
@@ -64,7 +64,7 @@ public class PacketExControlServer implements PacketObjectIn, PacketObj
this.args = new Object[type.getArguments().length];
for (int i = 0; i < type.getArguments().length; ++i) {
- if (!type.getArguments()[i].isInstance(arguments[i])) throw new IllegalArgumentException("Argument " + (i+1) + " is not " + type.getArguments()[i].getCanonicalName());
+ if (!type.getArguments()[i].isInstance(arguments[i])) throw new IllegalArgumentException("Argument " + (i+1) + " is not " + type.getArguments()[i].getTypeName());
args[i] = arguments[i];
}
}
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java
index f2cca6bb..1a675e96 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java
@@ -23,8 +23,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut {
* @param plugin SubServers.Client
*/
public PacketDownloadLang(ExProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java
index 37826af6..b5788dd0 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java
@@ -28,8 +28,7 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject
* @param plugin SubPlugin
*/
public PacketExSyncPlayer(ExProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java
index d79759b4..4d710c05 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java
@@ -23,8 +23,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn,
* @param plugin SubServers.Client
*/
public PacketLinkProxy(ExProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
* New PacketLinkProxy (Out)
@@ -33,8 +32,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn,
* @param channel Channel ID
*/
public PacketLinkProxy(ExProxy plugin, int channel) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.channel = channel;
}
diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java
index a23abf74..eb08ac0c 100644
--- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java
+++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java
@@ -23,8 +23,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut {
* @param plugin SubServers.Client
*/
public PacketDownloadLang(ExProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java
index 9a899ee0..3f05c773 100644
--- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java
+++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java
@@ -30,8 +30,7 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject
* @param plugin SubPlugin
*/
public PacketExSyncPlayer(ExProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java
index 4af29910..9d2ab2ad 100644
--- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java
+++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java
@@ -23,8 +23,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn,
* @param plugin SubServers.Client
*/
public PacketLinkProxy(ExProxy plugin) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
}
/**
* New PacketLinkProxy (Out)
@@ -33,8 +32,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn,
* @param channel Channel ID
*/
public PacketLinkProxy(ExProxy plugin, int channel) {
- Util.nullpo(plugin);
- this.plugin = plugin;
+ this.plugin = Util.nullpo(plugin);
this.channel = channel;
}