From aa25e4454266c52e39db7c2dee2f525bae3cb671 Mon Sep 17 00:00:00 2001 From: Matej Baco Date: Tue, 4 Jun 2019 21:59:58 +0200 Subject: [PATCH 1/2] added logPlayerConnections into config of bridge module --- .../ext/bridge/BridgeConfiguration.java | 2 + .../ext/bridge/node/CloudNetBridgeModule.java | 3 +- .../NodeCustomChannelMessageListener.java | 117 +++++++++++------- .../src/main/resources/module.json | 2 +- 4 files changed, 80 insertions(+), 44 deletions(-) diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java index ab84ca9404..3ee7cbce68 100644 --- a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java +++ b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java @@ -24,4 +24,6 @@ public final class BridgeConfiguration extends BasicJsonDocPropertyable { private Map messages; + private Boolean logPlayerConnections; + } \ No newline at end of file diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/CloudNetBridgeModule.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/CloudNetBridgeModule.java index e6cb2dfe83..1b10f47389 100644 --- a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/CloudNetBridgeModule.java +++ b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/CloudNetBridgeModule.java @@ -57,7 +57,8 @@ public void createConfiguration() new Pair<>("command-hub-already-in-hub", "&cYou are already connected"), new Pair<>("command-hub-no-server-found", "&7Hub server cannot be found"), new Pair<>("server-join-cancel-because-only-proxy", "&7You must connect from a original proxy server") - ) + ), + true )); if (this.bridgeConfiguration.getExcludedOnlyProxyWalkableGroups() == null) diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java index c611fba5f2..852935e96b 100644 --- a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java +++ b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java @@ -7,6 +7,7 @@ import de.dytanic.cloudnet.driver.event.EventListener; import de.dytanic.cloudnet.driver.event.events.channel.ChannelMessageReceiveEvent; import de.dytanic.cloudnet.ext.bridge.BridgeConfiguration; +import de.dytanic.cloudnet.ext.bridge.BridgeConfigurationProvider; import de.dytanic.cloudnet.ext.bridge.BridgeConstants; import de.dytanic.cloudnet.ext.bridge.event.*; import de.dytanic.cloudnet.ext.bridge.node.CloudNetBridgeModule; @@ -45,22 +46,30 @@ public void handle(ChannelMessageReceiveEvent event) { NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeProxyPlayerLoginRequestEvent(networkConnectionInfo)); - System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-login-request") - .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") - .replace("%name%", networkConnectionInfo.getName() + "") - .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-login-request") + .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") + .replace("%name%", networkConnectionInfo.getName() + "") + .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") + ); + } } break; case BridgeConstants.BRIDGE_EVENT_CHANNEL_MESSAGE_NAME_PROXY_LOGIN_SUCCESS: { NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeProxyPlayerLoginSuccessEvent(networkConnectionInfo)); - System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-login-success") - .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") - .replace("%name%", networkConnectionInfo.getName() + "") - .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-login-success") + .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") + .replace("%name%", networkConnectionInfo.getName() + "") + .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") + ); + } /*= -------------------------------------- =*/ //Player @@ -71,12 +80,16 @@ public void handle(ChannelMessageReceiveEvent event) { NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); NetworkServiceInfo networkServiceInfo = event.getData().get("networkServiceInfo", NetworkServiceInfo.class); - System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-server-connect-request") - .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") - .replace("%name%", networkConnectionInfo.getName() + "") - .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") - .replace("%server%", networkServiceInfo.getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-server-connect-request") + .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") + .replace("%name%", networkConnectionInfo.getName() + "") + .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") + .replace("%server%", networkServiceInfo.getServerName() + "") + ); + } CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeProxyPlayerServerConnectRequestEvent(networkConnectionInfo, networkServiceInfo)); } @@ -85,12 +98,16 @@ public void handle(ChannelMessageReceiveEvent event) { NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); NetworkServiceInfo networkServiceInfo = event.getData().get("networkServiceInfo", NetworkServiceInfo.class); - System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-server-switch") - .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") - .replace("%name%", networkConnectionInfo.getName() + "") - .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") - .replace("%server%", networkServiceInfo.getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-server-switch") + .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") + .replace("%name%", networkConnectionInfo.getName() + "") + .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") + .replace("%server%", networkServiceInfo.getServerName() + "") + ); + } CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeProxyPlayerServerSwitchEvent(networkConnectionInfo, networkServiceInfo)); } @@ -98,11 +115,15 @@ public void handle(ChannelMessageReceiveEvent event) case BridgeConstants.BRIDGE_EVENT_CHANNEL_MESSAGE_NAME_PROXY_DISCONNECT: { NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-disconnect") - .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") - .replace("%name%", networkConnectionInfo.getName() + "") - .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-disconnect") + .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") + .replace("%name%", networkConnectionInfo.getName() + "") + .replace("%proxy%", networkConnectionInfo.getNetworkService().getServerName() + "") + ); + } CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeProxyPlayerDisconnectEvent(networkConnectionInfo)); logoutPlayer(networkConnectionInfo); @@ -112,11 +133,15 @@ public void handle(ChannelMessageReceiveEvent event) { NetworkPlayerServerInfo networkPlayerServerInfo = event.getData().get("networkPlayerServerInfo", NetworkPlayerServerInfo.TYPE); NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - System.out.println(LanguageManager.getMessage("module-bridge-player-server-login-request") - .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") - .replace("%name%", networkPlayerServerInfo.getName() + "") - .replace("%server%", networkPlayerServerInfo.getNetworkService().getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-server-login-request") + .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") + .replace("%name%", networkPlayerServerInfo.getName() + "") + .replace("%server%", networkPlayerServerInfo.getNetworkService().getServerName() + "") + ); + } CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeServerPlayerLoginRequestEvent(networkConnectionInfo, networkPlayerServerInfo)); } @@ -125,11 +150,15 @@ public void handle(ChannelMessageReceiveEvent event) { NetworkPlayerServerInfo networkPlayerServerInfo = event.getData().get("networkPlayerServerInfo", NetworkPlayerServerInfo.TYPE); NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - System.out.println(LanguageManager.getMessage("module-bridge-player-server-login-success") - .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") - .replace("%name%", networkPlayerServerInfo.getName() + "") - .replace("%server%", networkPlayerServerInfo.getNetworkService().getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-server-login-success") + .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") + .replace("%name%", networkPlayerServerInfo.getName() + "") + .replace("%server%", networkPlayerServerInfo.getNetworkService().getServerName() + "") + ); + } CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeServerPlayerLoginSuccessEvent(networkConnectionInfo, networkPlayerServerInfo)); loginPlayer(networkConnectionInfo, networkPlayerServerInfo); @@ -139,11 +168,15 @@ public void handle(ChannelMessageReceiveEvent event) { NetworkPlayerServerInfo networkPlayerServerInfo = event.getData().get("networkPlayerServerInfo", NetworkPlayerServerInfo.TYPE); NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - System.out.println(LanguageManager.getMessage("module-bridge-player-server-disconnect") - .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") - .replace("%name%", networkPlayerServerInfo.getName() + "") - .replace("%server%", networkPlayerServerInfo.getNetworkService().getServerName() + "") - ); + + BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + if(bridgeConfiguration.getLogPlayerConnections() == true) { + System.out.println(LanguageManager.getMessage("module-bridge-player-server-disconnect") + .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") + .replace("%name%", networkPlayerServerInfo.getName() + "") + .replace("%server%", networkPlayerServerInfo.getNetworkService().getServerName() + "") + ); + } CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeServerPlayerDisconnectEvent(networkConnectionInfo, networkPlayerServerInfo)); logoutPlayer(networkConnectionInfo); diff --git a/cloudnet-modules/cloudnet-bridge/src/main/resources/module.json b/cloudnet-modules/cloudnet-bridge/src/main/resources/module.json index 85a175038e..53ba731e04 100644 --- a/cloudnet-modules/cloudnet-bridge/src/main/resources/module.json +++ b/cloudnet-modules/cloudnet-bridge/src/main/resources/module.json @@ -1,7 +1,7 @@ { "group": "de.dytanic.cloudnet.modules", "name": "CloudNet-Bridge", - "version": "1.0", + "version": "1.1", "author": "Dytanic", "website": "https://cloudnetservice.eu", "description": "Node extension for the CloudNet runtime, which optimize some features", From 8a9d3e8315b19b3d94b1879ad813845dfe5a3b1e Mon Sep 17 00:00:00 2001 From: Matej Baco Date: Tue, 4 Jun 2019 22:27:46 +0200 Subject: [PATCH 2/2] Pull Request bug fixes #1 --- .../ext/bridge/BridgeConfiguration.java | 4 +-- .../NodeCustomChannelMessageListener.java | 29 +++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java index 3ee7cbce68..0ac60326c3 100644 --- a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java +++ b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/BridgeConfiguration.java @@ -24,6 +24,6 @@ public final class BridgeConfiguration extends BasicJsonDocPropertyable { private Map messages; - private Boolean logPlayerConnections; - + private boolean logPlayerConnections; + } \ No newline at end of file diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java index 852935e96b..0b9a1ea7ea 100644 --- a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java +++ b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/listener/NodeCustomChannelMessageListener.java @@ -18,6 +18,11 @@ import java.util.function.Predicate; public final class NodeCustomChannelMessageListener { + private BridgeConfiguration bridgeConfiguration; + + public NodeCustomChannelMessageListener() { + bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); + } @EventListener public void handle(ChannelMessageReceiveEvent event) @@ -47,8 +52,7 @@ public void handle(ChannelMessageReceiveEvent event) NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeProxyPlayerLoginRequestEvent(networkConnectionInfo)); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-login-request") .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") .replace("%name%", networkConnectionInfo.getName() + "") @@ -62,8 +66,7 @@ public void handle(ChannelMessageReceiveEvent event) NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); CloudNetDriver.getInstance().getEventManager().callEvent(new BridgeProxyPlayerLoginSuccessEvent(networkConnectionInfo)); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-login-success") .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") .replace("%name%", networkConnectionInfo.getName() + "") @@ -81,8 +84,7 @@ public void handle(ChannelMessageReceiveEvent event) NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); NetworkServiceInfo networkServiceInfo = event.getData().get("networkServiceInfo", NetworkServiceInfo.class); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-server-connect-request") .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") .replace("%name%", networkConnectionInfo.getName() + "") @@ -99,8 +101,7 @@ public void handle(ChannelMessageReceiveEvent event) NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); NetworkServiceInfo networkServiceInfo = event.getData().get("networkServiceInfo", NetworkServiceInfo.class); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-server-switch") .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") .replace("%name%", networkConnectionInfo.getName() + "") @@ -116,8 +117,7 @@ public void handle(ChannelMessageReceiveEvent event) { NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-proxy-disconnect") .replace("%uniqueId%", networkConnectionInfo.getUniqueId() + "") .replace("%name%", networkConnectionInfo.getName() + "") @@ -134,8 +134,7 @@ public void handle(ChannelMessageReceiveEvent event) NetworkPlayerServerInfo networkPlayerServerInfo = event.getData().get("networkPlayerServerInfo", NetworkPlayerServerInfo.TYPE); NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-server-login-request") .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") .replace("%name%", networkPlayerServerInfo.getName() + "") @@ -151,8 +150,7 @@ public void handle(ChannelMessageReceiveEvent event) NetworkPlayerServerInfo networkPlayerServerInfo = event.getData().get("networkPlayerServerInfo", NetworkPlayerServerInfo.TYPE); NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-server-login-success") .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") .replace("%name%", networkPlayerServerInfo.getName() + "") @@ -169,8 +167,7 @@ public void handle(ChannelMessageReceiveEvent event) NetworkPlayerServerInfo networkPlayerServerInfo = event.getData().get("networkPlayerServerInfo", NetworkPlayerServerInfo.TYPE); NetworkConnectionInfo networkConnectionInfo = event.getData().get("networkConnectionInfo", NetworkConnectionInfo.TYPE); - BridgeConfiguration bridgeConfiguration = CloudNetBridgeModule.getInstance().getBridgeConfiguration(); - if(bridgeConfiguration.getLogPlayerConnections() == true) { + if(bridgeConfiguration.isLogPlayerConnections()) { System.out.println(LanguageManager.getMessage("module-bridge-player-server-disconnect") .replace("%uniqueId%", networkPlayerServerInfo.getUniqueId() + "") .replace("%name%", networkPlayerServerInfo.getName() + "")