feat: Добавлена настройка network-debug
This commit is contained in:
@@ -423,6 +423,10 @@ public class InnerCoreServer {
|
||||
return singleton.getPropertyBoolean("allow-unsafe-scripting", true);
|
||||
}
|
||||
|
||||
public static boolean isDebugInnerCoreNetwork(){
|
||||
return singleton.getPropertyBoolean("network-debug", false);
|
||||
}
|
||||
|
||||
public static boolean isDeveloperMode() {
|
||||
return singleton.getPropertyBoolean("developer-mode", false);
|
||||
}
|
||||
|
||||
@@ -196,6 +196,8 @@ public class ConnectedClient extends Thread implements ChannelInterface.OnPacket
|
||||
|
||||
public void send(String name, Object data) {
|
||||
try{
|
||||
if(InnerCoreServer.isDebugInnerCoreNetwork())
|
||||
Logger.debug("Send packet "+name+", state: "+getClientState().name());
|
||||
if(!channel.isClosed() && (name.startsWith("system") || name.startsWith("server_fixed") || getClientState() == ClientState.OPEN))
|
||||
channel.send(name, data);
|
||||
}catch (Throwable e){
|
||||
@@ -211,7 +213,9 @@ public class ConnectedClient extends Thread implements ChannelInterface.OnPacket
|
||||
|
||||
public<T> void send(String name, T data, Class<T> dataType) {
|
||||
try{
|
||||
if(!channel.isClosed())
|
||||
if(InnerCoreServer.isDebugInnerCoreNetwork())
|
||||
Logger.debug("Send packet "+name+", state: "+getClientState().name());
|
||||
if(!channel.isClosed() && (name.startsWith("system") || name.startsWith("server_fixed") || getClientState() == ClientState.OPEN))
|
||||
channel.send(name, data, dataType);
|
||||
}catch (Throwable e){
|
||||
ICLog.e("Network", "error send "+playerUid, e);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.zhekasmirnov.apparatus.multiplayer.server;
|
||||
|
||||
import android.util.Pair;
|
||||
import com.reider745.InnerCoreServer;
|
||||
import com.zhekasmirnov.apparatus.adapter.innercore.EngineConfig;
|
||||
import com.zhekasmirnov.apparatus.mcpe.NativeNetworking;
|
||||
import com.zhekasmirnov.apparatus.multiplayer.NetworkConfig;
|
||||
@@ -146,12 +147,16 @@ public class ModdedServer implements SocketServer.IClientConnectListener, Native
|
||||
}
|
||||
|
||||
for (String name : initializationPacketListenerMap.keySet()) {
|
||||
if(InnerCoreServer.isDebugInnerCoreNetwork())
|
||||
Logger.debug("Initialization packet received "+name);
|
||||
for (ConnectedClient.InitializationPacketListener listener : initializationPacketListenerMap.get(name)) {
|
||||
client.addInitializationPacketListener(name, listener);
|
||||
}
|
||||
}
|
||||
|
||||
client.getChannelInterface().addListener((String name, Object data, Class<?> dataType) -> {
|
||||
if(InnerCoreServer.isDebugInnerCoreNetwork())
|
||||
Logger.debug("Packet received "+name);
|
||||
int separatorIndex = name.indexOf('#');
|
||||
String meta = null;
|
||||
if (separatorIndex != -1) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.zhekasmirnov.apparatus.multiplayer.socket;
|
||||
|
||||
import com.reider745.InnerCoreServer;
|
||||
import com.zhekasmirnov.apparatus.multiplayer.ThreadTypeMarker;
|
||||
import com.zhekasmirnov.apparatus.multiplayer.channel.data.DataChannel;
|
||||
import com.zhekasmirnov.apparatus.multiplayer.channel.data.DataChannelFactory;
|
||||
@@ -43,7 +44,8 @@ public class SocketServer {
|
||||
continue;
|
||||
}
|
||||
|
||||
Logger.debug("New socket connection "+socket.getInetAddress());
|
||||
if(InnerCoreServer.isDebugInnerCoreNetwork())
|
||||
Logger.debug("New socket connection "+socket.getInetAddress());
|
||||
|
||||
try {
|
||||
int protocol = socket.getInputStream().read();
|
||||
|
||||
Reference in New Issue
Block a user