diff --git a/Plugins[Modified]/Mineplex.Bungee.Mineplexer/pom.xml b/Plugins[Modified]/Mineplex.Bungee.Mineplexer/pom.xml index 2386a6ea..5b15f062 100644 --- a/Plugins[Modified]/Mineplex.Bungee.Mineplexer/pom.xml +++ b/Plugins[Modified]/Mineplex.Bungee.Mineplexer/pom.xml @@ -31,6 +31,7 @@ net.md-5 bungeecord-api + 1.16-R0.4 diff --git a/Plugins[Modified]/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java b/Plugins[Modified]/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java index 9c6cdfbc..9e117ebb 100644 --- a/Plugins[Modified]/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java +++ b/Plugins[Modified]/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java @@ -49,10 +49,10 @@ public class PlayerCount implements Listener, Runnable Region.ALL, BungeeServer.class, "bungeeServers"); if (_region == Region.US) - _secondRepository = new RedisDataRepository(new ConnectionData("10.81.1.156", 6379, ConnectionType.MASTER, "ServerStatus"), new ConnectionData("10.81.1.156", 6377, ConnectionType.SLAVE, "ServerStatus"), + _secondRepository = new RedisDataRepository(new ConnectionData("127.0.0.1", 6379, ConnectionType.MASTER, "ServerStatus"), new ConnectionData("127.0.0.1", 6377, ConnectionType.SLAVE, "ServerStatus"), Region.ALL, BungeeServer.class, "bungeeServers"); else - _secondRepository = new RedisDataRepository(new ConnectionData("10.33.53.16", 6379, ConnectionType.MASTER, "ServerStatus"), new ConnectionData("10.33.53.16", 6377, ConnectionType.SLAVE, "ServerStatus"), + _secondRepository = new RedisDataRepository(new ConnectionData("127.0.0.1", 6379, ConnectionType.MASTER, "ServerStatus"), new ConnectionData("127.0.0.1", 6377, ConnectionType.SLAVE, "ServerStatus"), Region.ALL, BungeeServer.class, "bungeeServers"); } diff --git a/Plugins[Modified]/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java b/Plugins[Modified]/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java index 12ff80b0..eeb3b963 100644 --- a/Plugins[Modified]/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java +++ b/Plugins[Modified]/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java @@ -97,7 +97,7 @@ public class BungeeRotator _repository = new RedisDataRepository(ServerManager.getConnection(true, ServerManager.SERVER_STATUS_LABEL), ServerManager.getConnection(false, ServerManager.SERVER_STATUS_LABEL), Region.ALL, BungeeServer.class, "bungeeServers"); - _secondRepository = new RedisDataRepository(new ConnectionData("10.81.1.156", 6379, ConnectionType.MASTER, "ServerStatus"), new ConnectionData("10.81.1.156", 6377, ConnectionType.SLAVE, "ServerStatus"), + _secondRepository = new RedisDataRepository(new ConnectionData("127.0.0.1", 6379, ConnectionType.MASTER, "ServerStatus"), new ConnectionData("127.0.0.1", 6377, ConnectionType.SLAVE, "ServerStatus"), Region.ALL, BungeeServer.class, "bungeeServers"); //_ipRepository = new PlayerStatsRepository(); diff --git a/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml b/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml index 602d03d7..63db5413 100644 --- a/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml +++ b/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml @@ -15,7 +15,7 @@ com.google.guava guava - 31.0.1-jre + 23.0 compile diff --git a/Plugins[Modified]/Mineplex.Core/pom.xml b/Plugins[Modified]/Mineplex.Core/pom.xml index 4c557e62..0700c798 100644 --- a/Plugins[Modified]/Mineplex.Core/pom.xml +++ b/Plugins[Modified]/Mineplex.Core/pom.xml @@ -14,7 +14,7 @@ com.google.guava guava - 31.0.1-jre + 23.0 compile diff --git a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/playerCount/PlayerCountManager.java b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/playerCount/PlayerCountManager.java index 0f069bd4..3c45648e 100644 --- a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/playerCount/PlayerCountManager.java +++ b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/playerCount/PlayerCountManager.java @@ -31,10 +31,10 @@ public class PlayerCountManager extends MiniPlugin Region.ALL, BungeeServer.class, "bungeeServers"); if (_region == Region.US) - _secondRepository = new RedisDataRepository(new ConnectionData("10.81.1.156", 6379, ConnectionData.ConnectionType.MASTER, "ServerStatus"), new ConnectionData("10.81.1.156", 6377, ConnectionData.ConnectionType.SLAVE, "ServerStatus"), + _secondRepository = new RedisDataRepository(new ConnectionData("127.0.0.1", 6379, ConnectionData.ConnectionType.MASTER, "ServerStatus"), new ConnectionData("127.0.0.1", 6377, ConnectionData.ConnectionType.SLAVE, "ServerStatus"), Region.ALL, BungeeServer.class, "bungeeServers"); else - _secondRepository = new RedisDataRepository(new ConnectionData("10.33.53.16", 6379, ConnectionData.ConnectionType.MASTER, "ServerStatus"), new ConnectionData("10.33.53.16", 6377, ConnectionData.ConnectionType.SLAVE, "ServerStatus"), + _secondRepository = new RedisDataRepository(new ConnectionData("127.0.0.1", 6379, ConnectionData.ConnectionType.MASTER, "ServerStatus"), new ConnectionData("127.0.0.1", 6377, ConnectionData.ConnectionType.SLAVE, "ServerStatus"), Region.ALL, BungeeServer.class, "bungeeServers"); //updatePlayerCount(); diff --git a/Plugins[Modified]/Mineplex.ServerData/pom.xml b/Plugins[Modified]/Mineplex.ServerData/pom.xml index 133ab94b..d8d3846a 100644 --- a/Plugins[Modified]/Mineplex.ServerData/pom.xml +++ b/Plugins[Modified]/Mineplex.ServerData/pom.xml @@ -37,7 +37,7 @@ com.google.guava guava - 31.0.1-jre + 23.0 compile diff --git a/Plugins[Modified]/plugin.xml b/Plugins[Modified]/plugin.xml index e9a58a1b..dfbcc9a3 100644 --- a/Plugins[Modified]/plugin.xml +++ b/Plugins[Modified]/plugin.xml @@ -33,7 +33,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.2 + 3.4.1 package @@ -45,10 +45,9 @@ com.google.common mineplex.google.common - - - com.google.thirdparty.publicsuffix - mineplex.google.thirdparty.publicsuffix + + mineplex.core.profileCache.* +