diff --git a/README.md b/README.md
index fd9a53a..3a77256 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ This is the unfinished port of the WebDisplays mod for Minecraft 1.12.2. The tex
* Peripheral: OpenComputers interface
* Server blocks (to store some of the player's web pages)
* Read config (see "Config elements" below)
+* Miniserv timeout
### TODO
* French translations
diff --git a/src/main/java/net/montoyo/wd/WebDisplays.java b/src/main/java/net/montoyo/wd/WebDisplays.java
index 392cae2..536bc8a 100644
--- a/src/main/java/net/montoyo/wd/WebDisplays.java
+++ b/src/main/java/net/montoyo/wd/WebDisplays.java
@@ -34,9 +34,8 @@ import net.montoyo.wd.block.BlockScreen;
import net.montoyo.wd.core.*;
import net.montoyo.wd.entity.TileEntityScreen;
import net.montoyo.wd.item.*;
-import net.montoyo.wd.miniserv.client.Client;
import net.montoyo.wd.miniserv.server.Server;
-import net.montoyo.wd.net.CMessageServerInfo;
+import net.montoyo.wd.net.client.CMessageServerInfo;
import net.montoyo.wd.net.Messages;
import net.montoyo.wd.utilities.Log;
import net.montoyo.wd.utilities.Util;
diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java
index 18d5282..43b057e 100644
--- a/src/main/java/net/montoyo/wd/client/ClientProxy.java
+++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java
@@ -53,8 +53,8 @@ import net.montoyo.wd.data.GuiData;
import net.montoyo.wd.entity.TileEntityScreen;
import net.montoyo.wd.item.ItemMulti;
import net.montoyo.wd.miniserv.client.Client;
-import net.montoyo.wd.net.SMessagePadCtrl;
-import net.montoyo.wd.net.SMessageScreenCtrl;
+import net.montoyo.wd.net.server.SMessagePadCtrl;
+import net.montoyo.wd.net.server.SMessageScreenCtrl;
import net.montoyo.wd.utilities.*;
import javax.annotation.Nonnull;
diff --git a/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java b/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java
index 8a3060d..e1b7a0c 100644
--- a/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java
+++ b/src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java
@@ -18,7 +18,7 @@ import net.montoyo.wd.core.IScreenQueryHandler;
import net.montoyo.wd.core.IUpgrade;
import net.montoyo.wd.core.JSServerRequest;
import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.net.SMessageScreenCtrl;
+import net.montoyo.wd.net.server.SMessageScreenCtrl;
import net.montoyo.wd.utilities.*;
import java.util.ArrayDeque;
diff --git a/src/main/java/net/montoyo/wd/client/WDScheme.java b/src/main/java/net/montoyo/wd/client/WDScheme.java
index 179ff67..22c12ec 100644
--- a/src/main/java/net/montoyo/wd/client/WDScheme.java
+++ b/src/main/java/net/montoyo/wd/client/WDScheme.java
@@ -15,11 +15,14 @@ import net.montoyo.wd.miniserv.client.ClientTaskGetFile;
import net.montoyo.wd.utilities.Log;
import net.montoyo.wd.utilities.Util;
+import java.io.UnsupportedEncodingException;
import java.util.UUID;
public class WDScheme implements IScheme {
+ private static final String ERROR_PAGE = "%d %s
Miniserv powered by WebDisplays";
private ClientTaskGetFile task;
+ private boolean isErrorPage;
@Override
public SchemePreResponse processRequest(String url) {
@@ -65,13 +68,30 @@ public class WDScheme implements IScheme {
resp.setStatus(200);
resp.setStatusText("OK");
resp.setResponseLength(-1);
- } else if(status == Constants.GETF_STATUS_NOT_FOUND) {
- resp.setStatus(404);
- resp.setStatusText("Not Found");
- resp.setResponseLength(0);
+ return;
+ }
+
+ int errCode;
+ String errStr;
+
+ if(status == Constants.GETF_STATUS_NOT_FOUND) {
+ errCode = 404;
+ errStr = "Not Found";
} else {
- resp.setStatus(500);
- resp.setStatusText("Internal Server Error");
+ errCode = 500;
+ errStr = "Internal Server Error";
+ }
+
+ resp.setStatus(errCode);
+ resp.setStatusText(errStr);
+
+ try {
+ dataToWrite = String.format(ERROR_PAGE, errCode, errStr).getBytes("UTF-8");
+ dataOffset = 0;
+ amountToWrite = dataToWrite.length;
+ isErrorPage = true;
+ resp.setResponseLength(amountToWrite);
+ } catch(UnsupportedEncodingException ex) {
resp.setResponseLength(0);
}
}
@@ -83,6 +103,11 @@ public class WDScheme implements IScheme {
@Override
public boolean readResponse(ISchemeResponseData data) {
if(dataToWrite == null) {
+ if(isErrorPage) {
+ data.setAmountRead(0);
+ return false;
+ }
+
dataToWrite = task.waitForData();
dataOffset = 3; //packet ID + size
amountToWrite = task.getDataLength();
@@ -105,7 +130,9 @@ public class WDScheme implements IScheme {
amountToWrite -= toWrite;
if(amountToWrite <= 0) {
- task.nextData();
+ if(!isErrorPage)
+ task.nextData();
+
dataToWrite = null;
}
diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiKeyboard.java b/src/main/java/net/montoyo/wd/client/gui/GuiKeyboard.java
index 8206b95..87e4970 100644
--- a/src/main/java/net/montoyo/wd/client/gui/GuiKeyboard.java
+++ b/src/main/java/net/montoyo/wd/client/gui/GuiKeyboard.java
@@ -14,7 +14,7 @@ import net.montoyo.wd.client.gui.controls.Control;
import net.montoyo.wd.client.gui.controls.Label;
import net.montoyo.wd.client.gui.loading.FillControl;
import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.net.SMessageScreenCtrl;
+import net.montoyo.wd.net.server.SMessageScreenCtrl;
import net.montoyo.wd.utilities.BlockSide;
import net.montoyo.wd.utilities.Log;
import net.montoyo.wd.utilities.Util;
diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java b/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java
index 3e50c0d..1644551 100644
--- a/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java
+++ b/src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java
@@ -9,7 +9,7 @@ import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.client.gui.controls.Button;
import net.montoyo.wd.client.gui.controls.TextField;
import net.montoyo.wd.client.gui.loading.FillControl;
-import net.montoyo.wd.net.SMessageRedstoneCtrl;
+import net.montoyo.wd.net.server.SMessageRedstoneCtrl;
import net.montoyo.wd.utilities.Util;
import net.montoyo.wd.utilities.Vector3i;
diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java b/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java
index e0d3270..b92e39e 100644
--- a/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java
+++ b/src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java
@@ -12,7 +12,7 @@ import net.montoyo.wd.client.gui.controls.*;
import net.montoyo.wd.client.gui.loading.FillControl;
import net.montoyo.wd.core.ScreenRights;
import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.net.SMessageScreenCtrl;
+import net.montoyo.wd.net.server.SMessageScreenCtrl;
import net.montoyo.wd.utilities.*;
import java.util.ArrayList;
diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java b/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java
index c271efc..9711c29 100644
--- a/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java
+++ b/src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java
@@ -10,8 +10,8 @@ import net.montoyo.wd.client.gui.controls.Button;
import net.montoyo.wd.client.gui.controls.TextField;
import net.montoyo.wd.client.gui.loading.FillControl;
import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.net.SMessagePadCtrl;
-import net.montoyo.wd.net.SMessageScreenCtrl;
+import net.montoyo.wd.net.server.SMessagePadCtrl;
+import net.montoyo.wd.net.server.SMessageScreenCtrl;
import net.montoyo.wd.utilities.BlockSide;
import net.montoyo.wd.utilities.Util;
import net.montoyo.wd.utilities.Vector3i;
diff --git a/src/main/java/net/montoyo/wd/client/gui/WDScreen.java b/src/main/java/net/montoyo/wd/client/gui/WDScreen.java
index 82828cb..3993ffe 100644
--- a/src/main/java/net/montoyo/wd/client/gui/WDScreen.java
+++ b/src/main/java/net/montoyo/wd/client/gui/WDScreen.java
@@ -18,7 +18,7 @@ import net.montoyo.wd.client.gui.controls.Event;
import net.montoyo.wd.client.gui.loading.FillControl;
import net.montoyo.wd.client.gui.loading.GuiLoader;
import net.montoyo.wd.client.gui.loading.JsonOWrapper;
-import net.montoyo.wd.net.SMessageACQuery;
+import net.montoyo.wd.net.server.SMessageACQuery;
import net.montoyo.wd.utilities.Log;
import net.montoyo.wd.utilities.NameUUIDPair;
import org.lwjgl.input.Keyboard;
diff --git a/src/main/java/net/montoyo/wd/data/GuiData.java b/src/main/java/net/montoyo/wd/data/GuiData.java
index 122861b..ef355a7 100644
--- a/src/main/java/net/montoyo/wd/data/GuiData.java
+++ b/src/main/java/net/montoyo/wd/data/GuiData.java
@@ -10,7 +10,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.montoyo.wd.WebDisplays;
-import net.montoyo.wd.net.CMessageOpenGui;
+import net.montoyo.wd.net.client.CMessageOpenGui;
import java.util.HashMap;
diff --git a/src/main/java/net/montoyo/wd/data/ScreenConfigData.java b/src/main/java/net/montoyo/wd/data/ScreenConfigData.java
index c927b65..9fd7bda 100644
--- a/src/main/java/net/montoyo/wd/data/ScreenConfigData.java
+++ b/src/main/java/net/montoyo/wd/data/ScreenConfigData.java
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.client.gui.GuiScreenConfig;
import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.net.CMessageOpenGui;
+import net.montoyo.wd.net.client.CMessageOpenGui;
import net.montoyo.wd.utilities.BlockSide;
import net.montoyo.wd.utilities.Log;
import net.montoyo.wd.utilities.NameUUIDPair;
diff --git a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java
index 4e670a5..8ddd04e 100644
--- a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java
+++ b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java
@@ -25,10 +25,10 @@ import net.montoyo.wd.core.IUpgrade;
import net.montoyo.wd.core.JSServerRequest;
import net.montoyo.wd.core.ScreenRights;
import net.montoyo.wd.data.ScreenConfigData;
-import net.montoyo.wd.net.CMessageAddScreen;
-import net.montoyo.wd.net.CMessageJSResponse;
-import net.montoyo.wd.net.CMessageScreenUpdate;
-import net.montoyo.wd.net.SMessageRequestTEData;
+import net.montoyo.wd.net.client.CMessageAddScreen;
+import net.montoyo.wd.net.client.CMessageJSResponse;
+import net.montoyo.wd.net.client.CMessageScreenUpdate;
+import net.montoyo.wd.net.server.SMessageRequestTEData;
import net.montoyo.wd.utilities.*;
import net.montoyo.wd.utilities.Rotation;
diff --git a/src/main/java/net/montoyo/wd/miniserv/client/Client.java b/src/main/java/net/montoyo/wd/miniserv/client/Client.java
index 5ae19bc..3a69d5b 100644
--- a/src/main/java/net/montoyo/wd/miniserv/client/Client.java
+++ b/src/main/java/net/montoyo/wd/miniserv/client/Client.java
@@ -6,7 +6,7 @@ package net.montoyo.wd.miniserv.client;
import net.minecraft.client.Minecraft;
import net.montoyo.wd.miniserv.*;
-import net.montoyo.wd.net.SMessageMiniservConnect;
+import net.montoyo.wd.net.server.SMessageMiniservConnect;
import net.montoyo.wd.utilities.Log;
import net.montoyo.wd.utilities.Util;
diff --git a/src/main/java/net/montoyo/wd/miniserv/client/ClientTaskGetFile.java b/src/main/java/net/montoyo/wd/miniserv/client/ClientTaskGetFile.java
index ec062c0..ce28fb1 100644
--- a/src/main/java/net/montoyo/wd/miniserv/client/ClientTaskGetFile.java
+++ b/src/main/java/net/montoyo/wd/miniserv/client/ClientTaskGetFile.java
@@ -121,7 +121,7 @@ public class ClientTaskGetFile extends ClientTask {
while(data == null) {
if(System.currentTimeMillis() - t > 10000) {
- data = new byte[1];
+ data = new byte[0];
dataLen = -1;
dataLock.unlock();
return data;
diff --git a/src/main/java/net/montoyo/wd/net/Messages.java b/src/main/java/net/montoyo/wd/net/Messages.java
index a64e586..15e5910 100644
--- a/src/main/java/net/montoyo/wd/net/Messages.java
+++ b/src/main/java/net/montoyo/wd/net/Messages.java
@@ -7,6 +7,8 @@ package net.montoyo.wd.net;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import net.montoyo.wd.net.client.*;
+import net.montoyo.wd.net.server.*;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
diff --git a/src/main/java/net/montoyo/wd/net/CMessageACResult.java b/src/main/java/net/montoyo/wd/net/client/CMessageACResult.java
similarity index 95%
rename from src/main/java/net/montoyo/wd/net/CMessageACResult.java
rename to src/main/java/net/montoyo/wd/net/client/CMessageACResult.java
index 28581a4..1d8e3a8 100644
--- a/src/main/java/net/montoyo/wd/net/CMessageACResult.java
+++ b/src/main/java/net/montoyo/wd/net/client/CMessageACResult.java
@@ -2,13 +2,14 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.client;
import com.mojang.authlib.GameProfile;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.WebDisplays;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.NameUUIDPair;
@Message(messageId = 6, side = Side.CLIENT)
diff --git a/src/main/java/net/montoyo/wd/net/CMessageAddScreen.java b/src/main/java/net/montoyo/wd/net/client/CMessageAddScreen.java
similarity index 98%
rename from src/main/java/net/montoyo/wd/net/CMessageAddScreen.java
rename to src/main/java/net/montoyo/wd/net/client/CMessageAddScreen.java
index 14681da..97c9335 100644
--- a/src/main/java/net/montoyo/wd/net/CMessageAddScreen.java
+++ b/src/main/java/net/montoyo/wd/net/client/CMessageAddScreen.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.client;
import io.netty.buffer.ByteBuf;
import net.minecraft.item.ItemStack;
@@ -13,6 +13,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.SharedProxy;
import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.*;
import java.util.ArrayList;
diff --git a/src/main/java/net/montoyo/wd/net/CMessageJSResponse.java b/src/main/java/net/montoyo/wd/net/client/CMessageJSResponse.java
similarity index 96%
rename from src/main/java/net/montoyo/wd/net/CMessageJSResponse.java
rename to src/main/java/net/montoyo/wd/net/client/CMessageJSResponse.java
index d2ec2b9..fab9be6 100644
--- a/src/main/java/net/montoyo/wd/net/CMessageJSResponse.java
+++ b/src/main/java/net/montoyo/wd/net/client/CMessageJSResponse.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.client;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.ByteBufUtils;
@@ -10,6 +10,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.core.JSServerRequest;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.Log;
@Message(messageId = 9, side = Side.CLIENT)
diff --git a/src/main/java/net/montoyo/wd/net/CMessageMiniservKey.java b/src/main/java/net/montoyo/wd/net/client/CMessageMiniservKey.java
similarity index 94%
rename from src/main/java/net/montoyo/wd/net/CMessageMiniservKey.java
rename to src/main/java/net/montoyo/wd/net/client/CMessageMiniservKey.java
index aaca486..fbd5568 100644
--- a/src/main/java/net/montoyo/wd/net/CMessageMiniservKey.java
+++ b/src/main/java/net/montoyo/wd/net/client/CMessageMiniservKey.java
@@ -2,13 +2,14 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.client;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.miniserv.client.Client;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.Log;
@Message(messageId = 11, side = Side.CLIENT)
diff --git a/src/main/java/net/montoyo/wd/net/CMessageOpenGui.java b/src/main/java/net/montoyo/wd/net/client/CMessageOpenGui.java
similarity index 97%
rename from src/main/java/net/montoyo/wd/net/CMessageOpenGui.java
rename to src/main/java/net/montoyo/wd/net/client/CMessageOpenGui.java
index 5ff55db..1f64e89 100644
--- a/src/main/java/net/montoyo/wd/net/CMessageOpenGui.java
+++ b/src/main/java/net/montoyo/wd/net/client/CMessageOpenGui.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.client;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.ByteBufUtils;
diff --git a/src/main/java/net/montoyo/wd/net/CMessageScreenUpdate.java b/src/main/java/net/montoyo/wd/net/client/CMessageScreenUpdate.java
similarity index 99%
rename from src/main/java/net/montoyo/wd/net/CMessageScreenUpdate.java
rename to src/main/java/net/montoyo/wd/net/client/CMessageScreenUpdate.java
index 06d8b46..36bb387 100644
--- a/src/main/java/net/montoyo/wd/net/CMessageScreenUpdate.java
+++ b/src/main/java/net/montoyo/wd/net/client/CMessageScreenUpdate.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.client;
import io.netty.buffer.ByteBuf;
import net.minecraft.item.ItemStack;
@@ -13,6 +13,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.SharedProxy;
import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.*;
import javax.annotation.Nullable;
diff --git a/src/main/java/net/montoyo/wd/net/CMessageServerInfo.java b/src/main/java/net/montoyo/wd/net/client/CMessageServerInfo.java
similarity index 93%
rename from src/main/java/net/montoyo/wd/net/CMessageServerInfo.java
rename to src/main/java/net/montoyo/wd/net/client/CMessageServerInfo.java
index 8a8aa4f..d4810a7 100644
--- a/src/main/java/net/montoyo/wd/net/CMessageServerInfo.java
+++ b/src/main/java/net/montoyo/wd/net/client/CMessageServerInfo.java
@@ -2,13 +2,14 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.client;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.miniserv.client.Client;
+import net.montoyo.wd.net.Message;
@Message(messageId = 12, side = Side.CLIENT)
public class CMessageServerInfo implements IMessage, Runnable {
diff --git a/src/main/java/net/montoyo/wd/net/SMessageACQuery.java b/src/main/java/net/montoyo/wd/net/server/SMessageACQuery.java
similarity index 95%
rename from src/main/java/net/montoyo/wd/net/SMessageACQuery.java
rename to src/main/java/net/montoyo/wd/net/server/SMessageACQuery.java
index 6978080..f842c78 100644
--- a/src/main/java/net/montoyo/wd/net/SMessageACQuery.java
+++ b/src/main/java/net/montoyo/wd/net/server/SMessageACQuery.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.server;
import com.mojang.authlib.GameProfile;
import io.netty.buffer.ByteBuf;
@@ -14,6 +14,8 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.WebDisplays;
+import net.montoyo.wd.net.Message;
+import net.montoyo.wd.net.client.CMessageACResult;
import net.montoyo.wd.utilities.NameUUIDPair;
import java.util.ArrayList;
diff --git a/src/main/java/net/montoyo/wd/net/SMessageMiniservConnect.java b/src/main/java/net/montoyo/wd/net/server/SMessageMiniservConnect.java
similarity index 93%
rename from src/main/java/net/montoyo/wd/net/SMessageMiniservConnect.java
rename to src/main/java/net/montoyo/wd/net/server/SMessageMiniservConnect.java
index 976e271..6700fd1 100644
--- a/src/main/java/net/montoyo/wd/net/SMessageMiniservConnect.java
+++ b/src/main/java/net/montoyo/wd/net/server/SMessageMiniservConnect.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.server;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -11,6 +11,8 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.miniserv.server.ClientManager;
import net.montoyo.wd.miniserv.server.Server;
+import net.montoyo.wd.net.Message;
+import net.montoyo.wd.net.client.CMessageMiniservKey;
@Message(messageId = 10, side = Side.SERVER)
public class SMessageMiniservConnect implements IMessage {
diff --git a/src/main/java/net/montoyo/wd/net/SMessagePadCtrl.java b/src/main/java/net/montoyo/wd/net/server/SMessagePadCtrl.java
similarity index 97%
rename from src/main/java/net/montoyo/wd/net/SMessagePadCtrl.java
rename to src/main/java/net/montoyo/wd/net/server/SMessagePadCtrl.java
index 5d409f7..11ecc09 100644
--- a/src/main/java/net/montoyo/wd/net/SMessagePadCtrl.java
+++ b/src/main/java/net/montoyo/wd/net/server/SMessagePadCtrl.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.server;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
@@ -17,6 +17,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.WebDisplays;
+import net.montoyo.wd.net.Message;
@Message(messageId = 7, side = Side.SERVER)
public class SMessagePadCtrl implements IMessage, Runnable {
diff --git a/src/main/java/net/montoyo/wd/net/SMessageRedstoneCtrl.java b/src/main/java/net/montoyo/wd/net/server/SMessageRedstoneCtrl.java
similarity index 97%
rename from src/main/java/net/montoyo/wd/net/SMessageRedstoneCtrl.java
rename to src/main/java/net/montoyo/wd/net/server/SMessageRedstoneCtrl.java
index 2679b8c..1786849 100644
--- a/src/main/java/net/montoyo/wd/net/SMessageRedstoneCtrl.java
+++ b/src/main/java/net/montoyo/wd/net/server/SMessageRedstoneCtrl.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.server;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
@@ -18,6 +18,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.wd.core.ScreenRights;
import net.montoyo.wd.entity.TileEntityRedCtrl;
import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.Util;
import net.montoyo.wd.utilities.Vector3i;
diff --git a/src/main/java/net/montoyo/wd/net/SMessageRequestTEData.java b/src/main/java/net/montoyo/wd/net/server/SMessageRequestTEData.java
similarity index 96%
rename from src/main/java/net/montoyo/wd/net/SMessageRequestTEData.java
rename to src/main/java/net/montoyo/wd/net/server/SMessageRequestTEData.java
index b6a5b38..e59adb8 100644
--- a/src/main/java/net/montoyo/wd/net/SMessageRequestTEData.java
+++ b/src/main/java/net/montoyo/wd/net/server/SMessageRequestTEData.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.server;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -15,6 +15,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
import net.montoyo.mcef.utilities.Log;
import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.Vector3i;
@Message(messageId = 1, side = Side.SERVER)
diff --git a/src/main/java/net/montoyo/wd/net/SMessageScreenCtrl.java b/src/main/java/net/montoyo/wd/net/server/SMessageScreenCtrl.java
similarity index 99%
rename from src/main/java/net/montoyo/wd/net/SMessageScreenCtrl.java
rename to src/main/java/net/montoyo/wd/net/server/SMessageScreenCtrl.java
index 16976f9..252de44 100644
--- a/src/main/java/net/montoyo/wd/net/SMessageScreenCtrl.java
+++ b/src/main/java/net/montoyo/wd/net/server/SMessageScreenCtrl.java
@@ -2,7 +2,7 @@
* Copyright (C) 2018 BARBOTIN Nicolas
*/
-package net.montoyo.wd.net;
+package net.montoyo.wd.net.server;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.state.IBlockState;
@@ -25,6 +25,7 @@ import net.montoyo.wd.core.JSServerRequest;
import net.montoyo.wd.core.MissingPermissionException;
import net.montoyo.wd.core.ScreenRights;
import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.net.Message;
import net.montoyo.wd.utilities.*;
@Message(messageId = 2, side = Side.SERVER)