From 05d115cd1913085b1fc8614d36a36dc2479b9eab Mon Sep 17 00:00:00 2001 From: Marc Baloup Date: Sat, 26 Oct 2019 23:15:49 +0200 Subject: [PATCH] Refactor package --- .../fr/pandacube/{java => }/Pandacube.java | 2 +- .../pandacube/java/external_tools/Main.java | 117 ------------------ .../java/util/measurement/MemoryUtil.java | 30 ----- .../fr/pandacube/{java => }/util/BiMap.java | 2 +- .../pandacube/{java => }/util/Callback.java | 2 +- .../pandacube/{java => }/util/DateUtil.java | 2 +- .../pandacube/{java => }/util/EnumUtil.java | 2 +- .../pandacube/{java => }/util/GifDecoder.java | 2 +- .../util/JArithmeticInterpreter.java | 2 +- .../fr/pandacube/{java => }/util/Log.java | 2 +- .../{java => }/util/MinecraftVersion.java | 2 +- .../{java => }/util/MinecraftWebUtil.java | 2 +- .../external_tools => util}/OfflineUUID.java | 4 +- .../util/PlayerNameHistoryLookup.java | 2 +- .../pandacube/{java => }/util/RandomUtil.java | 2 +- .../{java => }/util/ReflexionUtil.java | 2 +- .../{java => }/util/ServerPropertyFile.java | 2 +- .../pandacube/{java => }/util/StringUtil.java | 2 +- .../{java => }/util/ThrowableUtil.java | 2 +- .../{java => }/util/TypeConverter.java | 2 +- .../util/commands/AbstractCommand.java | 2 +- .../util/commands/BadCommandUsage.java | 2 +- .../{java => }/util/commands/TabProposal.java | 2 +- .../util/config/AbstractConfig.java | 4 +- .../util/config/AbstractConfigManager.java | 2 +- .../util/measurement/DistanceUtil.java | 2 +- .../util/measurement/MemoryUtil.java | 32 +++++ .../{java => }/util/measurement/TimeUtil.java | 2 +- .../util/network/client/TCPClient.java | 20 +-- .../network/client/TCPClientListener.java | 6 +- .../util/network/packet/Packet.java | 38 +++--- .../util/network/packet/PacketClient.java | 2 +- .../util/network/packet/PacketException.java | 2 +- .../util/network/packet/PacketServer.java | 2 +- .../util/network/packet/ResponseCallback.java | 2 +- .../network/packet/bytebuffer/Array8Bit.java | 2 +- .../network/packet/bytebuffer/ByteBuffer.java | 2 +- .../packet/bytebuffer/ByteSerializable.java | 2 +- .../Packet30ClientDeclareProcess.java | 6 +- .../core_slave/Packet31ClientClose.java | 6 +- .../Packet32ClientProcessQueryResponse.java | 8 +- .../core_slave/PacketB0ServerClose.java | 6 +- ...cketB1ServerProcessDeclarationConfirm.java | 6 +- .../PacketB2ServerConnectSuccess.java | 6 +- .../PacketB3ServerProcessInput.java | 6 +- .../PacketB4ServerProcessQuery.java | 8 +- .../global/Packet50ClientAuthenticate.java | 6 +- .../global/Packet51ClientLogRecord.java | 6 +- .../global/PacketD0ServerException.java | 6 +- .../PacketD1ServerCantAuthenticate.java | 6 +- .../packets/global/PacketD2ServerCommand.java | 6 +- .../packets/web/Packet00ClientWebRequest.java | 6 +- .../web/Packet80ServerWebResponse.java | 6 +- .../network/server/BandwidthCalculation.java | 4 +- .../util/network/server/TCPServer.java | 22 ++-- .../network/server/TCPServerListener.java | 6 +- .../network_api/client/AbstractRequest.java | 2 +- .../network_api/client/NetworkAPISender.java | 2 +- .../network_api/client/ResponseAnalyser.java | 2 +- .../server/AbstractRequestExecutor.java | 4 +- .../server/NAPIExecutionHandler.java | 2 +- .../server/NetworkAPIListener.java | 2 +- .../network_api/server/PacketExecutor.java | 6 +- .../network_api/server/RequestAnalyser.java | 2 +- .../util/network_api/server/Response.java | 2 +- .../server/ThreadNAPIExecutionHandler.java | 2 +- .../{java => }/util/orm/DBConnection.java | 2 +- .../fr/pandacube/{java => }/util/orm/ORM.java | 8 +- .../{java => }/util/orm/ORMException.java | 2 +- .../util/orm/ORMInitTableException.java | 2 +- .../{java => }/util/orm/SQLCustomType.java | 2 +- .../{java => }/util/orm/SQLElement.java | 6 +- .../{java => }/util/orm/SQLElementList.java | 8 +- .../{java => }/util/orm/SQLFKField.java | 4 +- .../{java => }/util/orm/SQLField.java | 2 +- .../{java => }/util/orm/SQLOrderBy.java | 2 +- .../{java => }/util/orm/SQLType.java | 4 +- .../{java => }/util/orm/SQLWhere.java | 4 +- .../{java => }/util/orm/SQLWhereChain.java | 2 +- .../{java => }/util/orm/SQLWhereComp.java | 2 +- .../{java => }/util/orm/SQLWhereLike.java | 2 +- .../{java => }/util/orm/SQLWhereNull.java | 5 +- .../{java => }/util/text_display/Display.java | 2 +- .../util/text_display/DisplayUtil.java | 2 +- .../util/text_display/TextProgressBar.java | 2 +- 85 files changed, 206 insertions(+), 320 deletions(-) rename src/main/java/fr/pandacube/{java => }/Pandacube.java (91%) delete mode 100644 src/main/java/fr/pandacube/java/external_tools/Main.java delete mode 100644 src/main/java/fr/pandacube/java/util/measurement/MemoryUtil.java rename src/main/java/fr/pandacube/{java => }/util/BiMap.java (97%) rename src/main/java/fr/pandacube/{java => }/util/Callback.java (71%) rename src/main/java/fr/pandacube/{java => }/util/DateUtil.java (98%) rename src/main/java/fr/pandacube/{java => }/util/EnumUtil.java (98%) rename src/main/java/fr/pandacube/{java => }/util/GifDecoder.java (99%) rename src/main/java/fr/pandacube/{java => }/util/JArithmeticInterpreter.java (99%) rename src/main/java/fr/pandacube/{java => }/util/Log.java (97%) rename src/main/java/fr/pandacube/{java => }/util/MinecraftVersion.java (99%) rename src/main/java/fr/pandacube/{java => }/util/MinecraftWebUtil.java (98%) rename src/main/java/fr/pandacube/{java/external_tools => util}/OfflineUUID.java (88%) rename src/main/java/fr/pandacube/{java => }/util/PlayerNameHistoryLookup.java (99%) rename src/main/java/fr/pandacube/{java => }/util/RandomUtil.java (96%) rename src/main/java/fr/pandacube/{java => }/util/ReflexionUtil.java (99%) rename src/main/java/fr/pandacube/{java => }/util/ServerPropertyFile.java (98%) rename src/main/java/fr/pandacube/{java => }/util/StringUtil.java (96%) rename src/main/java/fr/pandacube/{java => }/util/ThrowableUtil.java (93%) rename src/main/java/fr/pandacube/{java => }/util/TypeConverter.java (99%) rename src/main/java/fr/pandacube/{java => }/util/commands/AbstractCommand.java (96%) rename src/main/java/fr/pandacube/{java => }/util/commands/BadCommandUsage.java (95%) rename src/main/java/fr/pandacube/{java => }/util/commands/TabProposal.java (98%) rename src/main/java/fr/pandacube/{java => }/util/config/AbstractConfig.java (98%) rename src/main/java/fr/pandacube/{java => }/util/config/AbstractConfigManager.java (94%) rename src/main/java/fr/pandacube/{java => }/util/measurement/DistanceUtil.java (96%) create mode 100644 src/main/java/fr/pandacube/util/measurement/MemoryUtil.java rename src/main/java/fr/pandacube/{java => }/util/measurement/TimeUtil.java (96%) rename src/main/java/fr/pandacube/{java => }/util/network/client/TCPClient.java (92%) rename src/main/java/fr/pandacube/{java => }/util/network/client/TCPClientListener.java (90%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/Packet.java (67%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/PacketClient.java (84%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/PacketException.java (91%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/PacketServer.java (84%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/ResponseCallback.java (70%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/bytebuffer/Array8Bit.java (95%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/bytebuffer/ByteBuffer.java (99%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/bytebuffer/ByteSerializable.java (88%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/Packet30ClientDeclareProcess.java (77%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/Packet31ClientClose.java (60%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/Packet32ClientProcessQueryResponse.java (84%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/PacketB0ServerClose.java (60%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/PacketB1ServerProcessDeclarationConfirm.java (73%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/PacketB2ServerConnectSuccess.java (61%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/PacketB3ServerProcessInput.java (80%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/core_slave/PacketB4ServerProcessQuery.java (88%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/global/Packet50ClientAuthenticate.java (79%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/global/Packet51ClientLogRecord.java (87%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/global/PacketD0ServerException.java (77%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/global/PacketD1ServerCantAuthenticate.java (60%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/global/PacketD2ServerCommand.java (75%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/web/Packet00ClientWebRequest.java (79%) rename src/main/java/fr/pandacube/{java => }/util/network/packet/packets/web/Packet80ServerWebResponse.java (72%) rename src/main/java/fr/pandacube/{java => }/util/network/server/BandwidthCalculation.java (91%) rename src/main/java/fr/pandacube/{java => }/util/network/server/TCPServer.java (94%) rename src/main/java/fr/pandacube/{java => }/util/network/server/TCPServerListener.java (71%) rename src/main/java/fr/pandacube/{java => }/util/network_api/client/AbstractRequest.java (92%) rename src/main/java/fr/pandacube/{java => }/util/network_api/client/NetworkAPISender.java (91%) rename src/main/java/fr/pandacube/{java => }/util/network_api/client/ResponseAnalyser.java (96%) rename src/main/java/fr/pandacube/{java => }/util/network_api/server/AbstractRequestExecutor.java (92%) rename src/main/java/fr/pandacube/{java => }/util/network_api/server/NAPIExecutionHandler.java (81%) rename src/main/java/fr/pandacube/{java => }/util/network_api/server/NetworkAPIListener.java (97%) rename src/main/java/fr/pandacube/{java => }/util/network_api/server/PacketExecutor.java (90%) rename src/main/java/fr/pandacube/{java => }/util/network_api/server/RequestAnalyser.java (97%) rename src/main/java/fr/pandacube/{java => }/util/network_api/server/Response.java (91%) rename src/main/java/fr/pandacube/{java => }/util/network_api/server/ThreadNAPIExecutionHandler.java (80%) rename src/main/java/fr/pandacube/{java => }/util/orm/DBConnection.java (98%) rename src/main/java/fr/pandacube/{java => }/util/orm/ORM.java (95%) rename src/main/java/fr/pandacube/{java => }/util/orm/ORMException.java (89%) rename src/main/java/fr/pandacube/{java => }/util/orm/ORMInitTableException.java (93%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLCustomType.java (95%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLElement.java (96%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLElementList.java (94%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLFKField.java (94%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLField.java (94%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLOrderBy.java (93%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLType.java (94%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLWhere.java (78%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLWhereChain.java (92%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLWhereComp.java (93%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLWhereLike.java (91%) rename src/main/java/fr/pandacube/{java => }/util/orm/SQLWhereNull.java (90%) rename src/main/java/fr/pandacube/{java => }/util/text_display/Display.java (99%) rename src/main/java/fr/pandacube/{java => }/util/text_display/DisplayUtil.java (99%) rename src/main/java/fr/pandacube/{java => }/util/text_display/TextProgressBar.java (97%) diff --git a/src/main/java/fr/pandacube/java/Pandacube.java b/src/main/java/fr/pandacube/Pandacube.java similarity index 91% rename from src/main/java/fr/pandacube/java/Pandacube.java rename to src/main/java/fr/pandacube/Pandacube.java index 77ef761..04da388 100644 --- a/src/main/java/fr/pandacube/java/Pandacube.java +++ b/src/main/java/fr/pandacube/Pandacube.java @@ -1,4 +1,4 @@ -package fr.pandacube.java; +package fr.pandacube; import java.nio.charset.Charset; diff --git a/src/main/java/fr/pandacube/java/external_tools/Main.java b/src/main/java/fr/pandacube/java/external_tools/Main.java deleted file mode 100644 index be3c9cd..0000000 --- a/src/main/java/fr/pandacube/java/external_tools/Main.java +++ /dev/null @@ -1,117 +0,0 @@ -package fr.pandacube.java.external_tools; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -public class Main { - - - static class Row { - int rowid; - String date, user, uuid; - int wid, x, y, z, type, amount, action; - boolean rolled_back; - } - - - - static class Chest { - final int wid, x, y, z, hashCode; - List sources = new ArrayList<>(); - int actualCount = 0; - boolean alreadyRolledBack = false; - public Chest(int w, int wx, int wy, int wz) { - wid = w; - x = wx; - y = wy; - z = wz; - hashCode = Objects.hash(wid, x, y, z); - } - - @Override - public boolean equals(Object o) { - if (o == null || !(o instanceof Chest)) - return false; - Chest c = (Chest) o; - return wid == c.wid && x == c.x && y == c.y && z == c.z; - } - - @Override - public int hashCode() { - return hashCode; - } - - @Override - public String toString() { - return "world=" + wid + " - /tppos " + x + " " + y + " " + z + " - rolledBack=" + alreadyRolledBack + " - amount=" + actualCount; - } - - public String toCSVString() { - return wid + "," + x + "," + y + "," + z + "," + alreadyRolledBack + "," + actualCount; - } - } - - - - - public static void main(String args[]) throws Exception { - - /*CSVParser parser = new CSVParser(new FileReader("co_survie_container.csv"), CSVFormat.DEFAULT); - - - List rows = StreamSupport.stream(parser.spliterator(), false).map(r -> { - Row ret = new Row(); - ret.rowid = Integer.parseInt(r.get(0)); - ret.date = r.get(1); - ret.user = r.get(2); - ret.uuid = r.get(3); - ret.wid = Integer.parseInt(r.get(4)); - ret.x = Integer.parseInt(r.get(5)); - ret.y = Integer.parseInt(r.get(6)); - ret.z = Integer.parseInt(r.get(7)); - ret.type = Integer.parseInt(r.get(8)); - ret.amount = Integer.parseInt(r.get(9)); - ret.action = Integer.parseInt(r.get(10)); - ret.rolled_back = r.get(11).equals("1"); - return ret; - }).collect(Collectors.toList()); - - rows.sort(Comparator.comparingInt(r -> r.rowid)); - - List chests = new ArrayList<>(); - - - - for (Row row : rows) { - Chest c = new Chest(row.wid, row.x, row.y, row.z); - int idx = chests.indexOf(c); - c = (idx >= 0) ? chests.get(idx) : c; - if (idx < 0) { - chests.add(c); - idx = chests.size() - 1; - } - - c.sources.add(row); - - if (row.rolled_back) - c.alreadyRolledBack = true; - - if (!c.alreadyRolledBack) { - c.actualCount += (row.action == 1) ? row.amount : -row.amount; - if (c.actualCount == 0) { - chests.remove(idx); - } - } - - } - - - - chests.sort(Comparator.comparingInt(c -> c.actualCount)); - - chests.forEach(c -> System.out.println(c.toCSVString())); - */ - - } -} \ No newline at end of file diff --git a/src/main/java/fr/pandacube/java/util/measurement/MemoryUtil.java b/src/main/java/fr/pandacube/java/util/measurement/MemoryUtil.java deleted file mode 100644 index bac4099..0000000 --- a/src/main/java/fr/pandacube/java/util/measurement/MemoryUtil.java +++ /dev/null @@ -1,30 +0,0 @@ -package fr.pandacube.java.util.measurement; - -import java.text.DecimalFormat; - -public class MemoryUtil { - - private static final DecimalFormat format = new DecimalFormat("#####0.00"); - - public static String humanReadableSize(long octet, boolean si) { - - double size = octet; - - int diveBy = si ? 1000 : 1024; - - if (size < diveBy) return size + "o"; - size /= diveBy; - if (size < diveBy) return format.format(size) + (si ? "ko" : "kio"); - size /= diveBy; - if (size < diveBy) return format.format(size) + (si ? "Mo" : "Mio"); - size /= diveBy; - if (size < diveBy) return format.format(size) + (si ? "Go" : "Gio"); - size /= diveBy; - - return format.format(size) + (si ? "To" : "Tio"); - } - - public static String humanReadableSize(long octet) { - return humanReadableSize(octet, false); - } -} diff --git a/src/main/java/fr/pandacube/java/util/BiMap.java b/src/main/java/fr/pandacube/util/BiMap.java similarity index 97% rename from src/main/java/fr/pandacube/java/util/BiMap.java rename to src/main/java/fr/pandacube/util/BiMap.java index c4c0c30..3f2e0cc 100644 --- a/src/main/java/fr/pandacube/java/util/BiMap.java +++ b/src/main/java/fr/pandacube/util/BiMap.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/fr/pandacube/java/util/Callback.java b/src/main/java/fr/pandacube/util/Callback.java similarity index 71% rename from src/main/java/fr/pandacube/java/util/Callback.java rename to src/main/java/fr/pandacube/util/Callback.java index 143a70f..ea82732 100644 --- a/src/main/java/fr/pandacube/java/util/Callback.java +++ b/src/main/java/fr/pandacube/util/Callback.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; @FunctionalInterface public interface Callback { diff --git a/src/main/java/fr/pandacube/java/util/DateUtil.java b/src/main/java/fr/pandacube/util/DateUtil.java similarity index 98% rename from src/main/java/fr/pandacube/java/util/DateUtil.java rename to src/main/java/fr/pandacube/util/DateUtil.java index b5d5af2..4d2e109 100644 --- a/src/main/java/fr/pandacube/java/util/DateUtil.java +++ b/src/main/java/fr/pandacube/util/DateUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/src/main/java/fr/pandacube/java/util/EnumUtil.java b/src/main/java/fr/pandacube/util/EnumUtil.java similarity index 98% rename from src/main/java/fr/pandacube/java/util/EnumUtil.java rename to src/main/java/fr/pandacube/util/EnumUtil.java index 565fb73..f253e88 100644 --- a/src/main/java/fr/pandacube/java/util/EnumUtil.java +++ b/src/main/java/fr/pandacube/util/EnumUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; public class EnumUtil { diff --git a/src/main/java/fr/pandacube/java/util/GifDecoder.java b/src/main/java/fr/pandacube/util/GifDecoder.java similarity index 99% rename from src/main/java/fr/pandacube/java/util/GifDecoder.java rename to src/main/java/fr/pandacube/util/GifDecoder.java index 2bdf614..d383c17 100644 --- a/src/main/java/fr/pandacube/java/util/GifDecoder.java +++ b/src/main/java/fr/pandacube/util/GifDecoder.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.net.URL; import java.util.ArrayList; diff --git a/src/main/java/fr/pandacube/java/util/JArithmeticInterpreter.java b/src/main/java/fr/pandacube/util/JArithmeticInterpreter.java similarity index 99% rename from src/main/java/fr/pandacube/java/util/JArithmeticInterpreter.java rename to src/main/java/fr/pandacube/util/JArithmeticInterpreter.java index c63b43b..fb89ae3 100644 --- a/src/main/java/fr/pandacube/java/util/JArithmeticInterpreter.java +++ b/src/main/java/fr/pandacube/util/JArithmeticInterpreter.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; //****************************************************************************** //*** diff --git a/src/main/java/fr/pandacube/java/util/Log.java b/src/main/java/fr/pandacube/util/Log.java similarity index 97% rename from src/main/java/fr/pandacube/java/util/Log.java rename to src/main/java/fr/pandacube/util/Log.java index 62bc8dc..04215a8 100644 --- a/src/main/java/fr/pandacube/java/util/Log.java +++ b/src/main/java/fr/pandacube/util/Log.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; diff --git a/src/main/java/fr/pandacube/java/util/MinecraftVersion.java b/src/main/java/fr/pandacube/util/MinecraftVersion.java similarity index 99% rename from src/main/java/fr/pandacube/java/util/MinecraftVersion.java rename to src/main/java/fr/pandacube/util/MinecraftVersion.java index e5a37dd..0209f9e 100644 --- a/src/main/java/fr/pandacube/java/util/MinecraftVersion.java +++ b/src/main/java/fr/pandacube/util/MinecraftVersion.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/fr/pandacube/java/util/MinecraftWebUtil.java b/src/main/java/fr/pandacube/util/MinecraftWebUtil.java similarity index 98% rename from src/main/java/fr/pandacube/java/util/MinecraftWebUtil.java rename to src/main/java/fr/pandacube/util/MinecraftWebUtil.java index a22723e..2724522 100644 --- a/src/main/java/fr/pandacube/java/util/MinecraftWebUtil.java +++ b/src/main/java/fr/pandacube/util/MinecraftWebUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; public class MinecraftWebUtil { diff --git a/src/main/java/fr/pandacube/java/external_tools/OfflineUUID.java b/src/main/java/fr/pandacube/util/OfflineUUID.java similarity index 88% rename from src/main/java/fr/pandacube/java/external_tools/OfflineUUID.java rename to src/main/java/fr/pandacube/util/OfflineUUID.java index 09bc77d..008e26b 100644 --- a/src/main/java/fr/pandacube/java/external_tools/OfflineUUID.java +++ b/src/main/java/fr/pandacube/util/OfflineUUID.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.external_tools; +package fr.pandacube.util; import java.nio.charset.Charset; import java.util.UUID; @@ -17,7 +17,7 @@ public class OfflineUUID { return UUID.nameUUIDFromBytes(from_str); } - public static UUID[] getFromNickName(String[] nicknames) { + public static UUID[] getFromNickNames(String[] nicknames) { if (nicknames == null) throw new NullPointerException(); UUID[] uuids = new UUID[nicknames.length]; diff --git a/src/main/java/fr/pandacube/java/util/PlayerNameHistoryLookup.java b/src/main/java/fr/pandacube/util/PlayerNameHistoryLookup.java similarity index 99% rename from src/main/java/fr/pandacube/java/util/PlayerNameHistoryLookup.java rename to src/main/java/fr/pandacube/util/PlayerNameHistoryLookup.java index b101fcb..a92e8a5 100644 --- a/src/main/java/fr/pandacube/java/util/PlayerNameHistoryLookup.java +++ b/src/main/java/fr/pandacube/util/PlayerNameHistoryLookup.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/fr/pandacube/java/util/RandomUtil.java b/src/main/java/fr/pandacube/util/RandomUtil.java similarity index 96% rename from src/main/java/fr/pandacube/java/util/RandomUtil.java rename to src/main/java/fr/pandacube/util/RandomUtil.java index 3a7215a..5e7544c 100644 --- a/src/main/java/fr/pandacube/java/util/RandomUtil.java +++ b/src/main/java/fr/pandacube/util/RandomUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.util.List; import java.util.Random; diff --git a/src/main/java/fr/pandacube/java/util/ReflexionUtil.java b/src/main/java/fr/pandacube/util/ReflexionUtil.java similarity index 99% rename from src/main/java/fr/pandacube/java/util/ReflexionUtil.java rename to src/main/java/fr/pandacube/util/ReflexionUtil.java index 7e22575..c087699 100644 --- a/src/main/java/fr/pandacube/java/util/ReflexionUtil.java +++ b/src/main/java/fr/pandacube/util/ReflexionUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/fr/pandacube/java/util/ServerPropertyFile.java b/src/main/java/fr/pandacube/util/ServerPropertyFile.java similarity index 98% rename from src/main/java/fr/pandacube/java/util/ServerPropertyFile.java rename to src/main/java/fr/pandacube/util/ServerPropertyFile.java index c13b6e4..e56fb77 100644 --- a/src/main/java/fr/pandacube/java/util/ServerPropertyFile.java +++ b/src/main/java/fr/pandacube/util/ServerPropertyFile.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/main/java/fr/pandacube/java/util/StringUtil.java b/src/main/java/fr/pandacube/util/StringUtil.java similarity index 96% rename from src/main/java/fr/pandacube/java/util/StringUtil.java rename to src/main/java/fr/pandacube/util/StringUtil.java index c599f0b..49e45e1 100644 --- a/src/main/java/fr/pandacube/java/util/StringUtil.java +++ b/src/main/java/fr/pandacube/util/StringUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.util.List; diff --git a/src/main/java/fr/pandacube/java/util/ThrowableUtil.java b/src/main/java/fr/pandacube/util/ThrowableUtil.java similarity index 93% rename from src/main/java/fr/pandacube/java/util/ThrowableUtil.java rename to src/main/java/fr/pandacube/util/ThrowableUtil.java index f2bf69d..e0b161c 100644 --- a/src/main/java/fr/pandacube/java/util/ThrowableUtil.java +++ b/src/main/java/fr/pandacube/util/ThrowableUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/fr/pandacube/java/util/TypeConverter.java b/src/main/java/fr/pandacube/util/TypeConverter.java similarity index 99% rename from src/main/java/fr/pandacube/java/util/TypeConverter.java rename to src/main/java/fr/pandacube/util/TypeConverter.java index 294dc6a..b420681 100644 --- a/src/main/java/fr/pandacube/java/util/TypeConverter.java +++ b/src/main/java/fr/pandacube/util/TypeConverter.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util; +package fr.pandacube.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/pandacube/java/util/commands/AbstractCommand.java b/src/main/java/fr/pandacube/util/commands/AbstractCommand.java similarity index 96% rename from src/main/java/fr/pandacube/java/util/commands/AbstractCommand.java rename to src/main/java/fr/pandacube/util/commands/AbstractCommand.java index 2329370..9333187 100644 --- a/src/main/java/fr/pandacube/java/util/commands/AbstractCommand.java +++ b/src/main/java/fr/pandacube/util/commands/AbstractCommand.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.commands; +package fr.pandacube.util.commands; import java.util.Arrays; diff --git a/src/main/java/fr/pandacube/java/util/commands/BadCommandUsage.java b/src/main/java/fr/pandacube/util/commands/BadCommandUsage.java similarity index 95% rename from src/main/java/fr/pandacube/java/util/commands/BadCommandUsage.java rename to src/main/java/fr/pandacube/util/commands/BadCommandUsage.java index 095c3d7..2db96a7 100644 --- a/src/main/java/fr/pandacube/java/util/commands/BadCommandUsage.java +++ b/src/main/java/fr/pandacube/util/commands/BadCommandUsage.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.commands; +package fr.pandacube.util.commands; import java.util.logging.Logger; diff --git a/src/main/java/fr/pandacube/java/util/commands/TabProposal.java b/src/main/java/fr/pandacube/util/commands/TabProposal.java similarity index 98% rename from src/main/java/fr/pandacube/java/util/commands/TabProposal.java rename to src/main/java/fr/pandacube/util/commands/TabProposal.java index 3e8e213..e9f77c8 100644 --- a/src/main/java/fr/pandacube/java/util/commands/TabProposal.java +++ b/src/main/java/fr/pandacube/util/commands/TabProposal.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.commands; +package fr.pandacube.util.commands; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/fr/pandacube/java/util/config/AbstractConfig.java b/src/main/java/fr/pandacube/util/config/AbstractConfig.java similarity index 98% rename from src/main/java/fr/pandacube/java/util/config/AbstractConfig.java rename to src/main/java/fr/pandacube/util/config/AbstractConfig.java index d7f7a59..973b807 100644 --- a/src/main/java/fr/pandacube/java/util/config/AbstractConfig.java +++ b/src/main/java/fr/pandacube/util/config/AbstractConfig.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.config; +package fr.pandacube.util.config; import java.io.BufferedReader; import java.io.File; @@ -9,7 +9,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import fr.pandacube.java.util.Log; +import fr.pandacube.util.Log; import net.md_5.bungee.api.ChatColor; /** * Classe chargeant en mémoire un fichier de configuration ou un dossier donné diff --git a/src/main/java/fr/pandacube/java/util/config/AbstractConfigManager.java b/src/main/java/fr/pandacube/util/config/AbstractConfigManager.java similarity index 94% rename from src/main/java/fr/pandacube/java/util/config/AbstractConfigManager.java rename to src/main/java/fr/pandacube/util/config/AbstractConfigManager.java index aa03a8a..066bd54 100644 --- a/src/main/java/fr/pandacube/java/util/config/AbstractConfigManager.java +++ b/src/main/java/fr/pandacube/util/config/AbstractConfigManager.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.config; +package fr.pandacube.util.config; import java.io.File; import java.io.IOException; diff --git a/src/main/java/fr/pandacube/java/util/measurement/DistanceUtil.java b/src/main/java/fr/pandacube/util/measurement/DistanceUtil.java similarity index 96% rename from src/main/java/fr/pandacube/java/util/measurement/DistanceUtil.java rename to src/main/java/fr/pandacube/util/measurement/DistanceUtil.java index ce93eba..07ae91c 100644 --- a/src/main/java/fr/pandacube/java/util/measurement/DistanceUtil.java +++ b/src/main/java/fr/pandacube/util/measurement/DistanceUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.measurement; +package fr.pandacube.util.measurement; import java.text.DecimalFormat; import java.util.Arrays; diff --git a/src/main/java/fr/pandacube/util/measurement/MemoryUtil.java b/src/main/java/fr/pandacube/util/measurement/MemoryUtil.java new file mode 100644 index 0000000..36b6f32 --- /dev/null +++ b/src/main/java/fr/pandacube/util/measurement/MemoryUtil.java @@ -0,0 +1,32 @@ +package fr.pandacube.util.measurement; + +import java.text.DecimalFormat; + +public class MemoryUtil { + + private static final DecimalFormat format = new DecimalFormat("#####0.00"); + + public static String humanReadableSize(long octet, boolean si) { + + boolean neg = octet < 0; + + double size = Math.abs(octet); + + int diveBy = si ? 1000 : 1024; + + if (size < diveBy) return (neg ? "-" : "") + size + "o"; + size /= diveBy; + if (size < diveBy) return (neg ? "-" : "") + format.format(size) + (si ? "ko" : "kio"); + size /= diveBy; + if (size < diveBy) return (neg ? "-" : "") + format.format(size) + (si ? "Mo" : "Mio"); + size /= diveBy; + if (size < diveBy) return (neg ? "-" : "") + format.format(size) + (si ? "Go" : "Gio"); + size /= diveBy; + + return (neg ? "-" : "") + format.format(size) + (si ? "To" : "Tio"); + } + + public static String humanReadableSize(long octet) { + return humanReadableSize(octet, false); + } +} diff --git a/src/main/java/fr/pandacube/java/util/measurement/TimeUtil.java b/src/main/java/fr/pandacube/util/measurement/TimeUtil.java similarity index 96% rename from src/main/java/fr/pandacube/java/util/measurement/TimeUtil.java rename to src/main/java/fr/pandacube/util/measurement/TimeUtil.java index d9b2c9c..8531c01 100644 --- a/src/main/java/fr/pandacube/java/util/measurement/TimeUtil.java +++ b/src/main/java/fr/pandacube/util/measurement/TimeUtil.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.measurement; +package fr.pandacube.util.measurement; public class TimeUtil { public static String durationToString(long msec_time, boolean dec_seconde) { diff --git a/src/main/java/fr/pandacube/java/util/network/client/TCPClient.java b/src/main/java/fr/pandacube/util/network/client/TCPClient.java similarity index 92% rename from src/main/java/fr/pandacube/java/util/network/client/TCPClient.java rename to src/main/java/fr/pandacube/util/network/client/TCPClient.java index c84960b..0ba6877 100644 --- a/src/main/java/fr/pandacube/java/util/network/client/TCPClient.java +++ b/src/main/java/fr/pandacube/util/network/client/TCPClient.java @@ -1,4 +1,4 @@ -package fr.pandacube.java.util.network.client; +package fr.pandacube.util.network.client; import java.io.Closeable; import java.io.IOException; @@ -17,17 +17,17 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; import org.apache.commons.lang.builder.ToStringBuilder; - -import fr.pandacube.java.Pandacube; -import fr.pandacube.java.util.Log; -import fr.pandacube.java.util.network.packet.Packet; -import fr.pandacube.java.util.network.packet.PacketClient; -import fr.pandacube.java.util.network.packet.PacketException; -import fr.pandacube.java.util.network.packet.PacketServer; -import fr.pandacube.java.util.network.packet.ResponseCallback; -import fr.pandacube.java.util.network.packet.packets.global.PacketD0ServerException; import org.javatuples.Pair; +import fr.pandacube.Pandacube; +import fr.pandacube.util.Log; +import fr.pandacube.util.network.packet.Packet; +import fr.pandacube.util.network.packet.PacketClient; +import fr.pandacube.util.network.packet.PacketException; +import fr.pandacube.util.network.packet.PacketServer; +import fr.pandacube.util.network.packet.ResponseCallback; +import fr.pandacube.util.network.packet.packets.global.PacketD0ServerException; + public class TCPClient extends Thread implements Closeable { private Socket socket; diff --git a/src/main/java/fr/pandacube/java/util/network/client/TCPClientListener.java b/src/main/java/fr/pandacube/util/network/client/TCPClientListener.java similarity index 90% rename from src/main/java/fr/pandacube/java/util/network/client/TCPClientListener.java rename to src/main/java/fr/pandacube/util/network/client/TCPClientListener.java index 4b1615d..1a60b4d 100644 --- a/src/main/java/fr/pandacube/java/util/network/client/TCPClientListener.java +++ b/src/main/java/fr/pandacube/util/network/client/TCPClientListener.java @@ -1,7 +1,7 @@ -package fr.pandacube.java.util.network.client; +package fr.pandacube.util.network.client; -import fr.pandacube.java.util.Log; -import fr.pandacube.java.util.network.packet.PacketServer; +import fr.pandacube.util.Log; +import fr.pandacube.util.network.packet.PacketServer; public interface TCPClientListener { diff --git a/src/main/java/fr/pandacube/java/util/network/packet/Packet.java b/src/main/java/fr/pandacube/util/network/packet/Packet.java similarity index 67% rename from src/main/java/fr/pandacube/java/util/network/packet/Packet.java rename to src/main/java/fr/pandacube/util/network/packet/Packet.java index 007bca0..d9b4d68 100644 --- a/src/main/java/fr/pandacube/java/util/network/packet/Packet.java +++ b/src/main/java/fr/pandacube/util/network/packet/Packet.java @@ -1,28 +1,28 @@ -package fr.pandacube.java.util.network.packet; +package fr.pandacube.util.network.packet; import java.nio.charset.Charset; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import fr.pandacube.java.Pandacube; -import fr.pandacube.java.util.Log; -import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer; -import fr.pandacube.java.util.network.packet.bytebuffer.ByteSerializable; -import fr.pandacube.java.util.network.packet.packets.core_slave.Packet31ClientClose; -import fr.pandacube.java.util.network.packet.packets.core_slave.Packet30ClientDeclareProcess; -import fr.pandacube.java.util.network.packet.packets.core_slave.Packet32ClientProcessQueryResponse; -import fr.pandacube.java.util.network.packet.packets.core_slave.PacketB0ServerClose; -import fr.pandacube.java.util.network.packet.packets.core_slave.PacketB2ServerConnectSuccess; -import fr.pandacube.java.util.network.packet.packets.core_slave.PacketB1ServerProcessDeclarationConfirm; -import fr.pandacube.java.util.network.packet.packets.core_slave.PacketB3ServerProcessInput; -import fr.pandacube.java.util.network.packet.packets.core_slave.PacketB4ServerProcessQuery; -import fr.pandacube.java.util.network.packet.packets.global.Packet50ClientAuthenticate; -import fr.pandacube.java.util.network.packet.packets.global.Packet51ClientLogRecord; -import fr.pandacube.java.util.network.packet.packets.global.PacketD1ServerCantAuthenticate; -import fr.pandacube.java.util.network.packet.packets.global.PacketD0ServerException; -import fr.pandacube.java.util.network.packet.packets.web.Packet00ClientWebRequest; -import fr.pandacube.java.util.network.packet.packets.web.Packet80ServerWebResponse; +import fr.pandacube.Pandacube; +import fr.pandacube.util.Log; +import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer; +import fr.pandacube.util.network.packet.bytebuffer.ByteSerializable; +import fr.pandacube.util.network.packet.packets.core_slave.Packet30ClientDeclareProcess; +import fr.pandacube.util.network.packet.packets.core_slave.Packet31ClientClose; +import fr.pandacube.util.network.packet.packets.core_slave.Packet32ClientProcessQueryResponse; +import fr.pandacube.util.network.packet.packets.core_slave.PacketB0ServerClose; +import fr.pandacube.util.network.packet.packets.core_slave.PacketB1ServerProcessDeclarationConfirm; +import fr.pandacube.util.network.packet.packets.core_slave.PacketB2ServerConnectSuccess; +import fr.pandacube.util.network.packet.packets.core_slave.PacketB3ServerProcessInput; +import fr.pandacube.util.network.packet.packets.core_slave.PacketB4ServerProcessQuery; +import fr.pandacube.util.network.packet.packets.global.Packet50ClientAuthenticate; +import fr.pandacube.util.network.packet.packets.global.Packet51ClientLogRecord; +import fr.pandacube.util.network.packet.packets.global.PacketD0ServerException; +import fr.pandacube.util.network.packet.packets.global.PacketD1ServerCantAuthenticate; +import fr.pandacube.util.network.packet.packets.web.Packet00ClientWebRequest; +import fr.pandacube.util.network.packet.packets.web.Packet80ServerWebResponse; /** 
  * Identification des packets réseaux
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/PacketClient.java b/src/main/java/fr/pandacube/util/network/packet/PacketClient.java
similarity index 84%
rename from src/main/java/fr/pandacube/java/util/network/packet/PacketClient.java
rename to src/main/java/fr/pandacube/util/network/packet/PacketClient.java
index 37eb157..e79d9fd 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/PacketClient.java
+++ b/src/main/java/fr/pandacube/util/network/packet/PacketClient.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.packet;
+package fr.pandacube.util.network.packet;
 
 /**
  * On attend d'un instance de {@link PacketClient} qu'il soit envoyé depuis
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/PacketException.java b/src/main/java/fr/pandacube/util/network/packet/PacketException.java
similarity index 91%
rename from src/main/java/fr/pandacube/java/util/network/packet/PacketException.java
rename to src/main/java/fr/pandacube/util/network/packet/PacketException.java
index 355cb6e..2f27055 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/PacketException.java
+++ b/src/main/java/fr/pandacube/util/network/packet/PacketException.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.packet;
+package fr.pandacube.util.network.packet;
 
 /**
  * 
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/PacketServer.java b/src/main/java/fr/pandacube/util/network/packet/PacketServer.java
similarity index 84%
rename from src/main/java/fr/pandacube/java/util/network/packet/PacketServer.java
rename to src/main/java/fr/pandacube/util/network/packet/PacketServer.java
index d729719..2299806 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/PacketServer.java
+++ b/src/main/java/fr/pandacube/util/network/packet/PacketServer.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.packet;
+package fr.pandacube.util.network.packet;
 
 /**
  * On attend d'un instance de {@link PacketServer} qu'il soit envoyé depuis
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/ResponseCallback.java b/src/main/java/fr/pandacube/util/network/packet/ResponseCallback.java
similarity index 70%
rename from src/main/java/fr/pandacube/java/util/network/packet/ResponseCallback.java
rename to src/main/java/fr/pandacube/util/network/packet/ResponseCallback.java
index a6a669e..f6ffbc9 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/ResponseCallback.java
+++ b/src/main/java/fr/pandacube/util/network/packet/ResponseCallback.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.packet;
+package fr.pandacube.util.network.packet;
 
 @FunctionalInterface
 public interface ResponseCallback {
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/Array8Bit.java b/src/main/java/fr/pandacube/util/network/packet/bytebuffer/Array8Bit.java
similarity index 95%
rename from src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/Array8Bit.java
rename to src/main/java/fr/pandacube/util/network/packet/bytebuffer/Array8Bit.java
index a7c3280..8e5e9b3 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/Array8Bit.java
+++ b/src/main/java/fr/pandacube/util/network/packet/bytebuffer/Array8Bit.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.packet.bytebuffer;
+package fr.pandacube.util.network.packet.bytebuffer;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/ByteBuffer.java b/src/main/java/fr/pandacube/util/network/packet/bytebuffer/ByteBuffer.java
similarity index 99%
rename from src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/ByteBuffer.java
rename to src/main/java/fr/pandacube/util/network/packet/bytebuffer/ByteBuffer.java
index 37ca99d..38c4745 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/ByteBuffer.java
+++ b/src/main/java/fr/pandacube/util/network/packet/bytebuffer/ByteBuffer.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.packet.bytebuffer;
+package fr.pandacube.util.network.packet.bytebuffer;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/ByteSerializable.java b/src/main/java/fr/pandacube/util/network/packet/bytebuffer/ByteSerializable.java
similarity index 88%
rename from src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/ByteSerializable.java
rename to src/main/java/fr/pandacube/util/network/packet/bytebuffer/ByteSerializable.java
index 8069096..f7035b9 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/bytebuffer/ByteSerializable.java
+++ b/src/main/java/fr/pandacube/util/network/packet/bytebuffer/ByteSerializable.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.packet.bytebuffer;
+package fr.pandacube.util.network.packet.bytebuffer;
 
 /**
  * Cette interface permet à un {@link ByteBuffer} de sérialiser sous forme de
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet30ClientDeclareProcess.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet30ClientDeclareProcess.java
similarity index 77%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet30ClientDeclareProcess.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet30ClientDeclareProcess.java
index 3cc8b2d..7cd826e 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet30ClientDeclareProcess.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet30ClientDeclareProcess.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class Packet30ClientDeclareProcess extends PacketClient {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet31ClientClose.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet31ClientClose.java
similarity index 60%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet31ClientClose.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet31ClientClose.java
index 33c25a4..3c56745 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet31ClientClose.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet31ClientClose.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class Packet31ClientClose extends PacketClient {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet32ClientProcessQueryResponse.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet32ClientProcessQueryResponse.java
similarity index 84%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet32ClientProcessQueryResponse.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet32ClientProcessQueryResponse.java
index c7421f0..229229e 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/Packet32ClientProcessQueryResponse.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/Packet32ClientProcessQueryResponse.java
@@ -1,8 +1,8 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
-import fr.pandacube.java.util.network.packet.packets.core_slave.PacketB4ServerProcessQuery.QueryType;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.packets.core_slave.PacketB4ServerProcessQuery.QueryType;
 
 public class Packet32ClientProcessQueryResponse extends PacketClient {
 
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB0ServerClose.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB0ServerClose.java
similarity index 60%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB0ServerClose.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB0ServerClose.java
index 99a850a..31169c3 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB0ServerClose.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB0ServerClose.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketB0ServerClose extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB1ServerProcessDeclarationConfirm.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB1ServerProcessDeclarationConfirm.java
similarity index 73%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB1ServerProcessDeclarationConfirm.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB1ServerProcessDeclarationConfirm.java
index dc8a7a6..de47a59 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB1ServerProcessDeclarationConfirm.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB1ServerProcessDeclarationConfirm.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketB1ServerProcessDeclarationConfirm extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB2ServerConnectSuccess.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB2ServerConnectSuccess.java
similarity index 61%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB2ServerConnectSuccess.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB2ServerConnectSuccess.java
index 84fa737..c5154d8 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB2ServerConnectSuccess.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB2ServerConnectSuccess.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketB2ServerConnectSuccess extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB3ServerProcessInput.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB3ServerProcessInput.java
similarity index 80%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB3ServerProcessInput.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB3ServerProcessInput.java
index 000cb65..e596318 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB3ServerProcessInput.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB3ServerProcessInput.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketB3ServerProcessInput extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB4ServerProcessQuery.java b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB4ServerProcessQuery.java
similarity index 88%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB4ServerProcessQuery.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB4ServerProcessQuery.java
index f1538d1..1dc0e33 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/core_slave/PacketB4ServerProcessQuery.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/core_slave/PacketB4ServerProcessQuery.java
@@ -1,8 +1,8 @@
-package fr.pandacube.java.util.network.packet.packets.core_slave;
+package fr.pandacube.util.network.packet.packets.core_slave;
 
-import fr.pandacube.java.util.RandomUtil;
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.RandomUtil;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketB4ServerProcessQuery extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/Packet50ClientAuthenticate.java b/src/main/java/fr/pandacube/util/network/packet/packets/global/Packet50ClientAuthenticate.java
similarity index 79%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/global/Packet50ClientAuthenticate.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/global/Packet50ClientAuthenticate.java
index 05c822a..363692c 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/Packet50ClientAuthenticate.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/global/Packet50ClientAuthenticate.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.global;
+package fr.pandacube.util.network.packet.packets.global;
 
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class Packet50ClientAuthenticate extends PacketClient {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/Packet51ClientLogRecord.java b/src/main/java/fr/pandacube/util/network/packet/packets/global/Packet51ClientLogRecord.java
similarity index 87%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/global/Packet51ClientLogRecord.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/global/Packet51ClientLogRecord.java
index 9249fc3..4a4ec63 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/Packet51ClientLogRecord.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/global/Packet51ClientLogRecord.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.global;
+package fr.pandacube.util.network.packet.packets.global;
 
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class Packet51ClientLogRecord extends PacketClient {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD0ServerException.java b/src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD0ServerException.java
similarity index 77%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD0ServerException.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD0ServerException.java
index af7cd29..55a4cbb 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD0ServerException.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD0ServerException.java
@@ -1,10 +1,10 @@
-package fr.pandacube.java.util.network.packet.packets.global;
+package fr.pandacube.util.network.packet.packets.global;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketD0ServerException extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD1ServerCantAuthenticate.java b/src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD1ServerCantAuthenticate.java
similarity index 60%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD1ServerCantAuthenticate.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD1ServerCantAuthenticate.java
index 3dce844..035ed4e 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD1ServerCantAuthenticate.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD1ServerCantAuthenticate.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.global;
+package fr.pandacube.util.network.packet.packets.global;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketD1ServerCantAuthenticate extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD2ServerCommand.java b/src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD2ServerCommand.java
similarity index 75%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD2ServerCommand.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD2ServerCommand.java
index 5a93a1b..233c326 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/global/PacketD2ServerCommand.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/global/PacketD2ServerCommand.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.global;
+package fr.pandacube.util.network.packet.packets.global;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class PacketD2ServerCommand extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/web/Packet00ClientWebRequest.java b/src/main/java/fr/pandacube/util/network/packet/packets/web/Packet00ClientWebRequest.java
similarity index 79%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/web/Packet00ClientWebRequest.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/web/Packet00ClientWebRequest.java
index 976205e..56c7d04 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/web/Packet00ClientWebRequest.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/web/Packet00ClientWebRequest.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.web;
+package fr.pandacube.util.network.packet.packets.web;
 
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class Packet00ClientWebRequest extends PacketClient {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/packet/packets/web/Packet80ServerWebResponse.java b/src/main/java/fr/pandacube/util/network/packet/packets/web/Packet80ServerWebResponse.java
similarity index 72%
rename from src/main/java/fr/pandacube/java/util/network/packet/packets/web/Packet80ServerWebResponse.java
rename to src/main/java/fr/pandacube/util/network/packet/packets/web/Packet80ServerWebResponse.java
index bc3b6a4..01f1d88 100644
--- a/src/main/java/fr/pandacube/java/util/network/packet/packets/web/Packet80ServerWebResponse.java
+++ b/src/main/java/fr/pandacube/util/network/packet/packets/web/Packet80ServerWebResponse.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.packet.packets.web;
+package fr.pandacube.util.network.packet.packets.web;
 
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
 
 public class Packet80ServerWebResponse extends PacketServer {
 	
diff --git a/src/main/java/fr/pandacube/java/util/network/server/BandwidthCalculation.java b/src/main/java/fr/pandacube/util/network/server/BandwidthCalculation.java
similarity index 91%
rename from src/main/java/fr/pandacube/java/util/network/server/BandwidthCalculation.java
rename to src/main/java/fr/pandacube/util/network/server/BandwidthCalculation.java
index 81c9e26..2327c7a 100644
--- a/src/main/java/fr/pandacube/java/util/network/server/BandwidthCalculation.java
+++ b/src/main/java/fr/pandacube/util/network/server/BandwidthCalculation.java
@@ -1,10 +1,10 @@
-package fr.pandacube.java.util.network.server;
+package fr.pandacube.util.network.server;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import fr.pandacube.java.util.network.server.TCPServer.TCPServerClientConnection;
+import fr.pandacube.util.network.server.TCPServer.TCPServerClientConnection;
 
 public class BandwidthCalculation {
 
diff --git a/src/main/java/fr/pandacube/java/util/network/server/TCPServer.java b/src/main/java/fr/pandacube/util/network/server/TCPServer.java
similarity index 94%
rename from src/main/java/fr/pandacube/java/util/network/server/TCPServer.java
rename to src/main/java/fr/pandacube/util/network/server/TCPServer.java
index 8aeb8ab..a5c9210 100644
--- a/src/main/java/fr/pandacube/java/util/network/server/TCPServer.java
+++ b/src/main/java/fr/pandacube/util/network/server/TCPServer.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network.server;
+package fr.pandacube.util.network.server;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -23,18 +23,18 @@ import java.util.function.Predicate;
 import java.util.logging.Level;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
-
-import fr.pandacube.java.Pandacube;
-import fr.pandacube.java.util.Log;
-import fr.pandacube.java.util.network.packet.Packet;
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.packet.PacketException;
-import fr.pandacube.java.util.network.packet.PacketServer;
-import fr.pandacube.java.util.network.packet.ResponseCallback;
-import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer;
-import fr.pandacube.java.util.network.packet.packets.global.PacketD0ServerException;
 import org.javatuples.Pair;
 
+import fr.pandacube.Pandacube;
+import fr.pandacube.util.Log;
+import fr.pandacube.util.network.packet.Packet;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.packet.PacketException;
+import fr.pandacube.util.network.packet.PacketServer;
+import fr.pandacube.util.network.packet.ResponseCallback;
+import fr.pandacube.util.network.packet.bytebuffer.ByteBuffer;
+import fr.pandacube.util.network.packet.packets.global.PacketD0ServerException;
+
 /**
  *
  * @author Marc Baloup
diff --git a/src/main/java/fr/pandacube/java/util/network/server/TCPServerListener.java b/src/main/java/fr/pandacube/util/network/server/TCPServerListener.java
similarity index 71%
rename from src/main/java/fr/pandacube/java/util/network/server/TCPServerListener.java
rename to src/main/java/fr/pandacube/util/network/server/TCPServerListener.java
index bfe8352..a987c64 100644
--- a/src/main/java/fr/pandacube/java/util/network/server/TCPServerListener.java
+++ b/src/main/java/fr/pandacube/util/network/server/TCPServerListener.java
@@ -1,7 +1,7 @@
-package fr.pandacube.java.util.network.server;
+package fr.pandacube.util.network.server;
 
-import fr.pandacube.java.util.network.packet.PacketClient;
-import fr.pandacube.java.util.network.server.TCPServer.TCPServerClientConnection;
+import fr.pandacube.util.network.packet.PacketClient;
+import fr.pandacube.util.network.server.TCPServer.TCPServerClientConnection;
 
 public interface TCPServerListener {
 
diff --git a/src/main/java/fr/pandacube/java/util/network_api/client/AbstractRequest.java b/src/main/java/fr/pandacube/util/network_api/client/AbstractRequest.java
similarity index 92%
rename from src/main/java/fr/pandacube/java/util/network_api/client/AbstractRequest.java
rename to src/main/java/fr/pandacube/util/network_api/client/AbstractRequest.java
index 40cf448..3168d06 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/client/AbstractRequest.java
+++ b/src/main/java/fr/pandacube/util/network_api/client/AbstractRequest.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.client;
+package fr.pandacube.util.network_api.client;
 
 import java.io.PrintStream;
 
diff --git a/src/main/java/fr/pandacube/java/util/network_api/client/NetworkAPISender.java b/src/main/java/fr/pandacube/util/network_api/client/NetworkAPISender.java
similarity index 91%
rename from src/main/java/fr/pandacube/java/util/network_api/client/NetworkAPISender.java
rename to src/main/java/fr/pandacube/util/network_api/client/NetworkAPISender.java
index 421b4b9..1b1db64 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/client/NetworkAPISender.java
+++ b/src/main/java/fr/pandacube/util/network_api/client/NetworkAPISender.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.client;
+package fr.pandacube.util.network_api.client;
 
 import java.io.IOException;
 import java.io.PrintStream;
diff --git a/src/main/java/fr/pandacube/java/util/network_api/client/ResponseAnalyser.java b/src/main/java/fr/pandacube/util/network_api/client/ResponseAnalyser.java
similarity index 96%
rename from src/main/java/fr/pandacube/java/util/network_api/client/ResponseAnalyser.java
rename to src/main/java/fr/pandacube/util/network_api/client/ResponseAnalyser.java
index 3dc6847..2487687 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/client/ResponseAnalyser.java
+++ b/src/main/java/fr/pandacube/util/network_api/client/ResponseAnalyser.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.client;
+package fr.pandacube.util.network_api.client;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/fr/pandacube/java/util/network_api/server/AbstractRequestExecutor.java b/src/main/java/fr/pandacube/util/network_api/server/AbstractRequestExecutor.java
similarity index 92%
rename from src/main/java/fr/pandacube/java/util/network_api/server/AbstractRequestExecutor.java
rename to src/main/java/fr/pandacube/util/network_api/server/AbstractRequestExecutor.java
index 705555d..7dee114 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/server/AbstractRequestExecutor.java
+++ b/src/main/java/fr/pandacube/util/network_api/server/AbstractRequestExecutor.java
@@ -1,11 +1,11 @@
-package fr.pandacube.java.util.network_api.server;
+package fr.pandacube.util.network_api.server;
 
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.InetAddress;
 import java.net.Socket;
 
-import fr.pandacube.java.util.Log;
+import fr.pandacube.util.Log;
 
 public abstract class AbstractRequestExecutor {
 
diff --git a/src/main/java/fr/pandacube/java/util/network_api/server/NAPIExecutionHandler.java b/src/main/java/fr/pandacube/util/network_api/server/NAPIExecutionHandler.java
similarity index 81%
rename from src/main/java/fr/pandacube/java/util/network_api/server/NAPIExecutionHandler.java
rename to src/main/java/fr/pandacube/util/network_api/server/NAPIExecutionHandler.java
index 65c88bf..7e7aa87 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/server/NAPIExecutionHandler.java
+++ b/src/main/java/fr/pandacube/util/network_api/server/NAPIExecutionHandler.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.server;
+package fr.pandacube.util.network_api.server;
 
 /**
  * Interface permettant de gérer l'exécution asynchrone d'un PacketExecutor.
diff --git a/src/main/java/fr/pandacube/java/util/network_api/server/NetworkAPIListener.java b/src/main/java/fr/pandacube/util/network_api/server/NetworkAPIListener.java
similarity index 97%
rename from src/main/java/fr/pandacube/java/util/network_api/server/NetworkAPIListener.java
rename to src/main/java/fr/pandacube/util/network_api/server/NetworkAPIListener.java
index 2930196..5df807c 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/server/NetworkAPIListener.java
+++ b/src/main/java/fr/pandacube/util/network_api/server/NetworkAPIListener.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.server;
+package fr.pandacube.util.network_api.server;
 
 import java.io.IOException;
 import java.net.ServerSocket;
diff --git a/src/main/java/fr/pandacube/java/util/network_api/server/PacketExecutor.java b/src/main/java/fr/pandacube/util/network_api/server/PacketExecutor.java
similarity index 90%
rename from src/main/java/fr/pandacube/java/util/network_api/server/PacketExecutor.java
rename to src/main/java/fr/pandacube/util/network_api/server/PacketExecutor.java
index f75bcd4..62ebcc0 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/server/PacketExecutor.java
+++ b/src/main/java/fr/pandacube/util/network_api/server/PacketExecutor.java
@@ -1,11 +1,11 @@
-package fr.pandacube.java.util.network_api.server;
+package fr.pandacube.util.network_api.server;
 
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.Socket;
 
-import fr.pandacube.java.util.Log;
-import fr.pandacube.java.util.network_api.server.RequestAnalyser.BadRequestException;
+import fr.pandacube.util.Log;
+import fr.pandacube.util.network_api.server.RequestAnalyser.BadRequestException;
 
 /**
  * Prends en charge un socket client et le transmet au gestionnaire de paquet
diff --git a/src/main/java/fr/pandacube/java/util/network_api/server/RequestAnalyser.java b/src/main/java/fr/pandacube/util/network_api/server/RequestAnalyser.java
similarity index 97%
rename from src/main/java/fr/pandacube/java/util/network_api/server/RequestAnalyser.java
rename to src/main/java/fr/pandacube/util/network_api/server/RequestAnalyser.java
index 609eb09..8fc6e9d 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/server/RequestAnalyser.java
+++ b/src/main/java/fr/pandacube/util/network_api/server/RequestAnalyser.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.server;
+package fr.pandacube.util.network_api.server;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/fr/pandacube/java/util/network_api/server/Response.java b/src/main/java/fr/pandacube/util/network_api/server/Response.java
similarity index 91%
rename from src/main/java/fr/pandacube/java/util/network_api/server/Response.java
rename to src/main/java/fr/pandacube/util/network_api/server/Response.java
index 242ae2d..f680d94 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/server/Response.java
+++ b/src/main/java/fr/pandacube/util/network_api/server/Response.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.server;
+package fr.pandacube.util.network_api.server;
 
 import java.io.PrintStream;
 
diff --git a/src/main/java/fr/pandacube/java/util/network_api/server/ThreadNAPIExecutionHandler.java b/src/main/java/fr/pandacube/util/network_api/server/ThreadNAPIExecutionHandler.java
similarity index 80%
rename from src/main/java/fr/pandacube/java/util/network_api/server/ThreadNAPIExecutionHandler.java
rename to src/main/java/fr/pandacube/util/network_api/server/ThreadNAPIExecutionHandler.java
index ffdc0bb..d0f9459 100644
--- a/src/main/java/fr/pandacube/java/util/network_api/server/ThreadNAPIExecutionHandler.java
+++ b/src/main/java/fr/pandacube/util/network_api/server/ThreadNAPIExecutionHandler.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.network_api.server;
+package fr.pandacube.util.network_api.server;
 
 public class ThreadNAPIExecutionHandler implements NAPIExecutionHandler {
 
diff --git a/src/main/java/fr/pandacube/java/util/orm/DBConnection.java b/src/main/java/fr/pandacube/util/orm/DBConnection.java
similarity index 98%
rename from src/main/java/fr/pandacube/java/util/orm/DBConnection.java
rename to src/main/java/fr/pandacube/util/orm/DBConnection.java
index 2f74199..b649762 100644
--- a/src/main/java/fr/pandacube/java/util/orm/DBConnection.java
+++ b/src/main/java/fr/pandacube/util/orm/DBConnection.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/src/main/java/fr/pandacube/java/util/orm/ORM.java b/src/main/java/fr/pandacube/util/orm/ORM.java
similarity index 95%
rename from src/main/java/fr/pandacube/java/util/orm/ORM.java
rename to src/main/java/fr/pandacube/util/orm/ORM.java
index 5e20e49..e94f2c5 100644
--- a/src/main/java/fr/pandacube/java/util/orm/ORM.java
+++ b/src/main/java/fr/pandacube/util/orm/ORM.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -11,9 +11,9 @@ import java.util.function.Consumer;
 
 import org.javatuples.Pair;
 
-import fr.pandacube.java.util.Log;
-import fr.pandacube.java.util.orm.SQLWhereChain.SQLBoolOp;
-import fr.pandacube.java.util.orm.SQLWhereComp.SQLComparator;
+import fr.pandacube.util.Log;
+import fr.pandacube.util.orm.SQLWhereChain.SQLBoolOp;
+import fr.pandacube.util.orm.SQLWhereComp.SQLComparator;
 
 /**
  * ORM = Object-Relational Mapping
diff --git a/src/main/java/fr/pandacube/java/util/orm/ORMException.java b/src/main/java/fr/pandacube/util/orm/ORMException.java
similarity index 89%
rename from src/main/java/fr/pandacube/java/util/orm/ORMException.java
rename to src/main/java/fr/pandacube/util/orm/ORMException.java
index 8af71a1..fa7f9c2 100644
--- a/src/main/java/fr/pandacube/java/util/orm/ORMException.java
+++ b/src/main/java/fr/pandacube/util/orm/ORMException.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 public class ORMException extends Exception {
 	private static final long serialVersionUID = 1L;
diff --git a/src/main/java/fr/pandacube/java/util/orm/ORMInitTableException.java b/src/main/java/fr/pandacube/util/orm/ORMInitTableException.java
similarity index 93%
rename from src/main/java/fr/pandacube/java/util/orm/ORMInitTableException.java
rename to src/main/java/fr/pandacube/util/orm/ORMInitTableException.java
index 44e0479..7e0f791 100644
--- a/src/main/java/fr/pandacube/java/util/orm/ORMInitTableException.java
+++ b/src/main/java/fr/pandacube/util/orm/ORMInitTableException.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 public class ORMInitTableException extends ORMException {
 	private static final long serialVersionUID = 1L;
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLCustomType.java b/src/main/java/fr/pandacube/util/orm/SQLCustomType.java
similarity index 95%
rename from src/main/java/fr/pandacube/java/util/orm/SQLCustomType.java
rename to src/main/java/fr/pandacube/util/orm/SQLCustomType.java
index a076def..2ad7e74 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLCustomType.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLCustomType.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLElement.java b/src/main/java/fr/pandacube/util/orm/SQLElement.java
similarity index 96%
rename from src/main/java/fr/pandacube/java/util/orm/SQLElement.java
rename to src/main/java/fr/pandacube/util/orm/SQLElement.java
index 445e37c..e7b1802 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLElement.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLElement.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.lang.reflect.Modifier;
 import java.sql.PreparedStatement;
@@ -20,8 +20,8 @@ import org.apache.commons.lang.builder.ToStringBuilder;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 
-import fr.pandacube.java.util.Log;
-import fr.pandacube.java.util.orm.SQLWhereComp.SQLComparator;
+import fr.pandacube.util.Log;
+import fr.pandacube.util.orm.SQLWhereComp.SQLComparator;
 
 public abstract class SQLElement> {
 	/** cache for fields for each subclass of SQLElement */
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLElementList.java b/src/main/java/fr/pandacube/util/orm/SQLElementList.java
similarity index 94%
rename from src/main/java/fr/pandacube/java/util/orm/SQLElementList.java
rename to src/main/java/fr/pandacube/util/orm/SQLElementList.java
index d6df8ba..4bccb45 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLElementList.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLElementList.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -13,9 +13,9 @@ import java.util.stream.Collectors;
 
 import com.google.gson.JsonArray;
 
-import fr.pandacube.java.util.Log;
-import fr.pandacube.java.util.orm.SQLWhereChain.SQLBoolOp;
-import fr.pandacube.java.util.orm.SQLWhereComp.SQLComparator;
+import fr.pandacube.util.Log;
+import fr.pandacube.util.orm.SQLWhereChain.SQLBoolOp;
+import fr.pandacube.util.orm.SQLWhereComp.SQLComparator;
 
 /**
  *
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLFKField.java b/src/main/java/fr/pandacube/util/orm/SQLFKField.java
similarity index 94%
rename from src/main/java/fr/pandacube/java/util/orm/SQLFKField.java
rename to src/main/java/fr/pandacube/util/orm/SQLFKField.java
index 96559b5..9209a9a 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLFKField.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLFKField.java
@@ -1,6 +1,6 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
-import fr.pandacube.java.util.Log;
+import fr.pandacube.util.Log;
 
 /**
  * 
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLField.java b/src/main/java/fr/pandacube/util/orm/SQLField.java
similarity index 94%
rename from src/main/java/fr/pandacube/java/util/orm/SQLField.java
rename to src/main/java/fr/pandacube/util/orm/SQLField.java
index 154678b..f048944 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLField.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLField.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLOrderBy.java b/src/main/java/fr/pandacube/util/orm/SQLOrderBy.java
similarity index 93%
rename from src/main/java/fr/pandacube/java/util/orm/SQLOrderBy.java
rename to src/main/java/fr/pandacube/util/orm/SQLOrderBy.java
index 1822a78..2f85d79 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLOrderBy.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLOrderBy.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLType.java b/src/main/java/fr/pandacube/util/orm/SQLType.java
similarity index 94%
rename from src/main/java/fr/pandacube/java/util/orm/SQLType.java
rename to src/main/java/fr/pandacube/util/orm/SQLType.java
index 3ca3d08..80420dd 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLType.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLType.java
@@ -1,9 +1,9 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.sql.Date;
 import java.util.UUID;
 
-import fr.pandacube.java.util.EnumUtil;
+import fr.pandacube.util.EnumUtil;
 
 public class SQLType {
 
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLWhere.java b/src/main/java/fr/pandacube/util/orm/SQLWhere.java
similarity index 78%
rename from src/main/java/fr/pandacube/java/util/orm/SQLWhere.java
rename to src/main/java/fr/pandacube/util/orm/SQLWhere.java
index 75e9fa5..c4e30a3 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLWhere.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLWhere.java
@@ -1,10 +1,10 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.List;
 
 import org.javatuples.Pair;
 
-import fr.pandacube.java.util.Log;
+import fr.pandacube.util.Log;
 
 public abstract class SQLWhere {
 
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLWhereChain.java b/src/main/java/fr/pandacube/util/orm/SQLWhereChain.java
similarity index 92%
rename from src/main/java/fr/pandacube/java/util/orm/SQLWhereChain.java
rename to src/main/java/fr/pandacube/util/orm/SQLWhereChain.java
index 813ebc4..7f7d2d7 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLWhereChain.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLWhereChain.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLWhereComp.java b/src/main/java/fr/pandacube/util/orm/SQLWhereComp.java
similarity index 93%
rename from src/main/java/fr/pandacube/java/util/orm/SQLWhereComp.java
rename to src/main/java/fr/pandacube/util/orm/SQLWhereComp.java
index 544dbb0..377cb31 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLWhereComp.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLWhereComp.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLWhereLike.java b/src/main/java/fr/pandacube/util/orm/SQLWhereLike.java
similarity index 91%
rename from src/main/java/fr/pandacube/java/util/orm/SQLWhereLike.java
rename to src/main/java/fr/pandacube/util/orm/SQLWhereLike.java
index d7c4186..e8cc35c 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLWhereLike.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLWhereLike.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/fr/pandacube/java/util/orm/SQLWhereNull.java b/src/main/java/fr/pandacube/util/orm/SQLWhereNull.java
similarity index 90%
rename from src/main/java/fr/pandacube/java/util/orm/SQLWhereNull.java
rename to src/main/java/fr/pandacube/util/orm/SQLWhereNull.java
index 1a85caf..28d7f4c 100644
--- a/src/main/java/fr/pandacube/java/util/orm/SQLWhereNull.java
+++ b/src/main/java/fr/pandacube/util/orm/SQLWhereNull.java
@@ -1,12 +1,13 @@
-package fr.pandacube.java.util.orm;
+package fr.pandacube.util.orm;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 
-import fr.pandacube.java.util.Log;
 import org.javatuples.Pair;
 
+import fr.pandacube.util.Log;
+
 public class SQLWhereNull extends SQLWhere {
 
 	private SQLField fild;
diff --git a/src/main/java/fr/pandacube/java/util/text_display/Display.java b/src/main/java/fr/pandacube/util/text_display/Display.java
similarity index 99%
rename from src/main/java/fr/pandacube/java/util/text_display/Display.java
rename to src/main/java/fr/pandacube/util/text_display/Display.java
index e4b8f26..77d5e0b 100644
--- a/src/main/java/fr/pandacube/java/util/text_display/Display.java
+++ b/src/main/java/fr/pandacube/util/text_display/Display.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.text_display;
+package fr.pandacube.util.text_display;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/fr/pandacube/java/util/text_display/DisplayUtil.java b/src/main/java/fr/pandacube/util/text_display/DisplayUtil.java
similarity index 99%
rename from src/main/java/fr/pandacube/java/util/text_display/DisplayUtil.java
rename to src/main/java/fr/pandacube/util/text_display/DisplayUtil.java
index e0b6079..7413c7d 100644
--- a/src/main/java/fr/pandacube/java/util/text_display/DisplayUtil.java
+++ b/src/main/java/fr/pandacube/util/text_display/DisplayUtil.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.text_display;
+package fr.pandacube.util.text_display;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/fr/pandacube/java/util/text_display/TextProgressBar.java b/src/main/java/fr/pandacube/util/text_display/TextProgressBar.java
similarity index 97%
rename from src/main/java/fr/pandacube/java/util/text_display/TextProgressBar.java
rename to src/main/java/fr/pandacube/util/text_display/TextProgressBar.java
index db00813..1288755 100644
--- a/src/main/java/fr/pandacube/java/util/text_display/TextProgressBar.java
+++ b/src/main/java/fr/pandacube/util/text_display/TextProgressBar.java
@@ -1,4 +1,4 @@
-package fr.pandacube.java.util.text_display;
+package fr.pandacube.util.text_display;
 
 import net.md_5.bungee.api.ChatColor;