jitpack java 17]

I noticed that currently name lookups for UUIDs that are not cached, are
not supported in RedisBungee due to Mojang removing name history.

When looking at the usages, RedisBungee internally only uses the current
name (So no need for full name history), so I moved name lookups to
[PlayerDB](https://playerdb.co/), which does not have API rate limits
unlike Mojang's API.

closes #59

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,52 @@
+# used https://github.com/PaperMC/Paper/blob/master/.github/ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml as template
+name: Bug or incompatibility
+description: report issues within RedisBungee
+labels: [ "waiting" ]
+body:
+  - type: textarea
+    attributes:
+      label: intended behavior
+      description: what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: what the behavior you actually saw
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: either a video, or way you want to present it.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Velocity or Bungeecord Versions
+      description: |
+        Please provide Proxy version for either Bungeecord or Velocity
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: RedisBungee Version & Redis Version
+      description: |
+        RedisBungee version is Different from Redis Version!
+        good example:
+
+        Redis Version: 7.2
+        RedisBungee Version: 0.12.0
+        
+        in-case you used development branch you can use git commit hash Instead of the version
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Other
+      description: |
+        extra information that we might need to know?
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: if you find a bug please report it here...
-title: ''
-labels: waiting
-assignees: ham1255
-
----
-
-**Describe the bug**
-
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Redis version? it should be at least 6 and above.**
-
-**Bungeecord version or (the bungee fork name eg: waterfall) and your plugins**
- 
-
-**console logs?**
-please provide any errors if there any.

.github/ISSUE_TEMPLATE/question.md

@@ -1,10 +0,0 @@
----
-name: Question
-about: ask your questions here
-title: ''
-labels: question
-assignees: GovindasOM, ham1255
-
----
-
-## What is your question?

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,10 @@
+# used https://github.com/PaperMC/Paper/blob/master/.github/ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml as template
+name: Ask Question
+description: Ask any questions to the developers
+labels: [ "question"]
+body:
+  - type: textarea
+    attributes:
+      label: Your question?
+    validations:
+      required: true

.github/workflows/gradle.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Build with gradle
       run: ./gradlew shadowJar

README.md

@@ -176,9 +176,7 @@ If you are using static legacy method `RedisBungee#getPool()` it might fail in:
 
 ## Support
 
-You can join our matrix room [here](https://matrix.to/#/!zhedzmRNSZXfuOPZUB:govindas.net?via=govindas.net&via=matrix.org)
-
-![icon](https://matrix.org/images/matrix-logo-white.svg)
+open an issue with question button
 
 ## License
 

RedisBungee-API/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 }
 
 
-val jedisVersion = "4.3.2"
+val jedisVersion = "5.1.2"
 val configurateVersion = "3.7.3"
 val guavaVersion = "31.1-jre"
 

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/RedisBungeePlugin.java

@@ -35,6 +35,8 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 /**
  * This Class has all internal methods needed by every redis bungee plugin, and it can be used to implement another platforms than bungeecord or another forks of RedisBungee
+ * <p>
+ * Reason this is interface because some proxies implementations require the user to extend class for plugins for example bungeecord.
  *
  * @author Ham1255
  * @since 0.7.0

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/InitialUtils.java

@@ -12,8 +12,6 @@ package com.imaginarycode.minecraft.redisbungee.api.tasks;
 
 import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
 import com.imaginarycode.minecraft.redisbungee.api.util.RedisUtil;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisCluster;
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.UnifiedJedis;
 
@@ -28,12 +26,11 @@ public class InitialUtils {
             @Override
             public Void unifiedJedisTask(UnifiedJedis unifiedJedis) {
                 // This is more portable than INFO <section>
-
                 String info = new String((byte[]) unifiedJedis.sendCommand(Protocol.Command.INFO));
                 for (String s : info.split("\r\n")) {
                     if (s.startsWith("redis_version:")) {
                         String version = s.split(":")[1];
-                        plugin.logInfo(version + " <- redis version");
+                        plugin.logInfo("Redis server version: " + version);
                         if (!RedisUtil.isRedisVersionRight(version)) {
                             plugin.logFatal("Your version of Redis (" + version + ") is not at least version 3.0 RedisBungee requires a newer version of Redis.");
                             throw new RuntimeException("Unsupported Redis version detected");
@@ -62,7 +59,7 @@ public class InitialUtils {
                     } catch (IOException e) {
                         throw new RuntimeException(e);
                     }
-                    plugin.logInfo("crash file was deleted");
+                    plugin.logInfo("crash file was deleted continuing RedisBungee startup ");
                 } else if (unifiedJedis.hexists("heartbeats", plugin.getConfiguration().getProxyId())) {
                     try {
                         long value = Long.parseLong(unifiedJedis.hget("heartbeats", plugin.getConfiguration().getProxyId()));
@@ -81,7 +78,7 @@ public class InitialUtils {
     }
 
     private static void logImposter(RedisBungeePlugin<?> plugin) {
-       plugin.logFatal("You have launched a possible impostor Velocity / Bungeecord instance. Another instance is already running.");
+        plugin.logFatal("You have launched a possible impostor Velocity / Bungeecord instance. Another instance is already running.");
         plugin.logFatal("For data consistency reasons, RedisBungee will now disable itself.");
         plugin.logFatal("If this instance is coming up from a crash, create a file in your RedisBungee plugins directory with the name 'restarted_from_crash.txt' and RedisBungee will not perform this check.");
     }

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/RedisTask.java

@@ -20,6 +20,10 @@ import redis.clients.jedis.UnifiedJedis;
 
 import java.util.concurrent.Callable;
 
+/**
+ * Since Jedis now have UnifiedJedis which basically extended by cluster / single connections classes
+ * can help us to have shared code.
+ */
 public abstract class RedisTask<V> implements Runnable, Callable<V> {
 
     protected final Summoner<?> summoner;

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/NameFetcher.java

@@ -11,50 +11,49 @@
 package com.imaginarycode.minecraft.redisbungee.api.util.uuid;
 
 import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonObject;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.ResponseBody;
+
 import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-@Deprecated
 public class NameFetcher {
-    private static OkHttpClient httpClient;
-    private static final Gson gson = new Gson();
+	private static OkHttpClient httpClient;
+	private static final Gson gson = new Gson();
 
-    @Deprecated
-    public static void setHttpClient(OkHttpClient httpClient) {
-        throw new UnsupportedOperationException("Due mojang disabled the Names API NameFetcher no longer functions and has been disabled");
-        // NameFetcher.httpClient = httpClient;
-    }
+	public static void setHttpClient(OkHttpClient httpClient) {
+		NameFetcher.httpClient = httpClient;
+	}
 
-    @Deprecated
-    public static List<String> nameHistoryFromUuid(UUID uuid) throws IOException {
-        throw new UnsupportedOperationException("Due mojang disabled the Names API NameFetcher no longer functions and has been disabled");
-//        String url = "https://api.mojang.com/user/profiles/" + uuid.toString().replace("-", "") + "/names";
-//        Request request = new Request.Builder().url(url).get().build();
-//        ResponseBody body = httpClient.newCall(request).execute().body();
-//        String response = body.string();
-//        body.close();
-//
-//        Type listType = new TypeToken<List<Name>>() {
-//        }.getType();
-//        List<Name> names = gson.fromJson(response, listType);
-//
-//        List<String> humanNames = new ArrayList<>();
-//        for (Name name : names) {
-//            humanNames.add(name.name);
-//        }
-//        return humanNames;
-    }
+	public static List<String> nameHistoryFromUuid(UUID uuid) throws IOException {
+		String name = getName(uuid);
+		if (name == null) return Collections.emptyList();
+		return Collections.singletonList(name);
+	}
 
-    @Deprecated
-    public static class Name {
-        private String name;
-        private long changedToAt;
-    }
+	public static String getName(UUID uuid) throws IOException {
+		String url = "https://playerdb.co/api/player/minecraft/" + uuid.toString();
+		Request request = new Request.Builder()
+				.addHeader("User-Agent", "RedisBungee-ProxioDev")
+				.url(url)
+				.get()
+				.build();
+		ResponseBody body = httpClient.newCall(request).execute().body();
+		String response = body.string();
+		body.close();
+
+		JsonObject json = gson.fromJson(response, JsonObject.class);
+		if (!json.has("success") || !json.get("success").getAsBoolean()) return null;
+		if (!json.has("data")) return null;
+		JsonObject data = json.getAsJsonObject("data");
+		if (!data.has("player")) return null;
+		JsonObject player = data.getAsJsonObject("player");
+		if (!player.has("username")) return null;
+
+		return player.get("username").getAsString();
+	}
 }

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/UUIDTranslator.java

@@ -12,7 +12,6 @@ package com.imaginarycode.minecraft.redisbungee.api.util.uuid;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
 import com.google.gson.Gson;
 import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
 
@@ -169,17 +168,12 @@ public final class UUIDTranslator {
                 if (!expensiveLookups || !plugin.isOnlineMode())
                     return null;
 
-                // That didn't work. Let's ask Mojang. This call may fail, because Mojang is insane.
-                //
-                // UPDATE: Mojang has removed the API somewhere in september/2022 due privacy issues
-                // this is expected to fail now, so we will keep logging it until we figure out something or remove name fetching completely
-                // Name fetching class was deprecated as result
+                // That didn't work. Let's ask PlayerDB.
                 String name;
                 try {
-                    plugin.logFatal("Due Mojang removing the naming API, we were unable to fetch player names.");
-                    name = Iterables.getLast(NameFetcher.nameHistoryFromUuid(player));
+                    name = NameFetcher.getName(player);
                 } catch (Exception e) {
-                    plugin.logFatal("Unable to fetch name from Mojang for " + player);
+                    plugin.logFatal("Unable to fetch name from PlayerDB for " + player);
                     return null;
                 }
 

RedisBungee-API/src/main/resources/REDISBUNGEE_LICENSE

@@ -0,0 +1,203 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+   distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+    i) changes to the Program, and
+   ii) additions to the Program;
+
+   where such changes and/or additions to the Program originate from and are
+   distributed by that particular Contributor. A Contribution 'originates'
+   from a Contributor if it was added to the Program by such Contributor
+   itself or anyone acting on such Contributor's behalf. Contributions do not
+   include additions to the Program which: (i) are separate modules of
+   software distributed in conjunction with the Program under their own
+   license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+  a) Subject to the terms of this Agreement, each Contributor hereby grants
+     Recipient a non-exclusive, worldwide, royalty-free copyright license to
+     reproduce, prepare derivative works of, publicly display, publicly
+     perform, distribute and sublicense the Contribution of such Contributor,
+     if any, and such derivative works, in source code and object code form.
+  b) Subject to the terms of this Agreement, each Contributor hereby grants
+     Recipient a non-exclusive, worldwide, royalty-free patent license under
+     Licensed Patents to make, use, sell, offer to sell, import and otherwise
+     transfer the Contribution of such Contributor, if any, in source code and
+     object code form. This patent license shall apply to the combination of
+     the Contribution and the Program if, at the time the Contribution is
+     added by the Contributor, such addition of the Contribution causes such
+     combination to be covered by the Licensed Patents. The patent license
+     shall not apply to any other combinations which include the Contribution.
+     No hardware per se is licensed hereunder.
+  c) Recipient understands that although each Contributor grants the licenses
+     to its Contributions set forth herein, no assurances are provided by any
+     Contributor that the Program does not infringe the patent or other
+     intellectual property rights of any other entity. Each Contributor
+     disclaims any liability to Recipient for claims brought by any other
+     entity based on infringement of intellectual property rights or
+     otherwise. As a condition to exercising the rights and licenses granted
+     hereunder, each Recipient hereby assumes sole responsibility to secure
+     any other intellectual property rights needed, if any. For example, if a
+     third party patent license is required to allow Recipient to distribute
+     the Program, it is Recipient's responsibility to acquire that license
+     before distributing the Program.
+  d) Each Contributor represents that to its knowledge it has sufficient
+     copyright rights in its Contribution, if any, to grant the copyright
+     license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+  a) it complies with the terms and conditions of this Agreement; and
+  b) its license agreement:
+      i) effectively disclaims on behalf of all Contributors all warranties
+         and conditions, express and implied, including warranties or
+         conditions of title and non-infringement, and implied warranties or
+         conditions of merchantability and fitness for a particular purpose;
+     ii) effectively excludes on behalf of all Contributors all liability for
+         damages, including direct, indirect, special, incidental and
+         consequential damages, such as lost profits;
+    iii) states that any provisions which differ from this Agreement are
+         offered by that Contributor alone and not by any other party; and
+     iv) states that source code for the Program is available from such
+         Contributor, and informs licensees how to obtain it in a reasonable
+         manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+  a) it must be made available under this Agreement; and
+  b) a copy of this Agreement must be included with each copy of the Program.
+     Contributors may not remove or alter any copyright notices contained
+     within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits and
+other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such Commercial
+Contributor in connection with its distribution of the Program in a commercial
+product offering. The obligations in this section do not apply to any claims
+or Losses relating to any actual or alleged intellectual property
+infringement. In order to qualify, an Indemnified Contributor must:
+a) promptly notify the Commercial Contributor in writing of such claim, and
+b) allow the Commercial Contributor to control, and cooperate with the
+Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any such claim at
+its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.

RedisBungee-API/src/main/resources/config.yml

@@ -74,9 +74,7 @@ override-bungee-commands: false
 exempt-ip-addresses: []
 
 # restore old login when online behavior before 0.9.0 update
-# uncomment to enable it
-
-# disable-kick-when-online: true
+disable-kick-when-online: false
 
 # Config version DO NOT CHANGE!!!!
 config-version: 1

RedisBungee-Bungee/build.gradle.kts

@@ -12,11 +12,11 @@ repositories {
 }
 val bungeecordApiVersion = "1.19-R0.1-SNAPSHOT"
 dependencies {
-    api(project(":RedisBungee-API")) {
+    api(project(":RedisBungee-API"))
+    compileOnly("net.md-5:bungeecord-api:$bungeecordApiVersion") {
         exclude("com.google.guava", "guava")
         exclude("com.google.code.gson", "gson")
     }
-    compileOnly("net.md-5:bungeecord-api:$bungeecordApiVersion")
 }
 
 description = "RedisBungee Bungeecord implementation"
@@ -37,7 +37,7 @@ tasks {
             "https://ci.md-5.net/job/BungeeCord/ws/api/target/apidocs/", // bungeecord api
         )
         val apiDocs = File(rootProject.projectDir, "RedisBungee-API/build/docs/javadoc")
-        options.linksOffline("https://ci.limework.net/RedisBungee/RedisBungee-API/build/docs/javadoc",  apiDocs.path)
+        options.linksOffline("https://ci.limework.net/RedisBungee/RedisBungee-API/build/docs/javadoc", apiDocs.path)
     }
     runWaterfall {
         waterfallVersion("1.19")
@@ -65,10 +65,14 @@ tasks {
         relocate("com.squareup.okhttp", "com.imaginarycode.minecraft.redisbungee.internal.okhttp")
         relocate("okio", "com.imaginarycode.minecraft.redisbungee.internal.okio")
         relocate("org.json", "com.imaginarycode.minecraft.redisbungee.internal.json")
-
         // configurate shade
         relocate("ninja.leaping.configurate", "com.imaginarycode.minecraft.redisbungee.internal.configurate")
         relocate("org.yaml", "com.imaginarycode.minecraft.redisbungee.internal.yml")
+        relocate("com.google.common", "com.imaginarycode.minecraft.redisbungee.internal.com.google.common")
+        relocate("com.google.errorprone", "com.imaginarycode.minecraft.redisbungee.internal.com.google.errorprone")
+        relocate("com.google.gson", "com.imaginarycode.minecraft.redisbungee.internal.com.google.gson")
+        relocate("com.google.j2objc", "com.imaginarycode.minecraft.redisbungee.internal.com.google.j2objc")
+        relocate("com.google.thirdparty", "com.imaginarycode.minecraft.redisbungee.internal.com.google.thirdparty")
     }
 
 }

RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java

@@ -198,6 +198,7 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin<ProxiedPlay
 
     @Override
     public void initialize() {
+        logInfo("Initializing RedisBungee.....");
         ThreadFactory factory = ((ThreadPoolExecutor) getExecutorService()).getThreadFactory();
         ScheduledExecutorService service = Executors.newScheduledThreadPool(24, factory);
         try {
@@ -222,7 +223,7 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin<ProxiedPlay
         httpClient = new OkHttpClient();
         Dispatcher dispatcher = new Dispatcher(getExecutorService());
         httpClient.setDispatcher(dispatcher);
-        //NameFetcher.setHttpClient(httpClient);
+        NameFetcher.setHttpClient(httpClient);
         UUIDFetcher.setHttpClient(httpClient);
         InitialUtils.checkRedisVersion(this);
         // check if this proxy is recovering from a crash and start heart the beat.
@@ -266,10 +267,12 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin<ProxiedPlay
             getProxy().getPluginManager().registerCommand(this, new RedisBungeeCommands.PlayerProxyCommand(this));
             getProxy().getPluginManager().registerCommand(this, new RedisBungeeCommands.PlistCommand(this));
         }
+        logInfo("RedisBungee initialized successfully ");
     }
 
     @Override
     public void stop() {
+        logInfo("Turning off redis connections.....");
         // Poison the PubSub listener
         if (psl != null) {
             psl.poison();
@@ -287,7 +290,7 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin<ProxiedPlay
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-
+        logInfo("RedisBungee shutdown");
     }
 
     @Override

RedisBungee-Velocity/build.gradle.kts

@@ -18,8 +18,8 @@ dependencies {
         exclude("com.google.code.gson", "gson")
         exclude("org.spongepowered", "configurate-yaml")
     }
-    compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
-    annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
+    compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
+    annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
 }
 
 description = "RedisBungee Velocity implementation"
@@ -42,11 +42,11 @@ tasks {
         options.linksOffline("https://ci.limework.net/RedisBungee/RedisBungee-API/build/docs/javadoc",  apiDocs.path)
     }
     runVelocity {
-        velocityVersion("3.2.0-SNAPSHOT")
+        velocityVersion("3.3.0-SNAPSHOT")
     }
     compileJava {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(11)
+        options.release.set(17)
     }
     javadoc {
         options.encoding = Charsets.UTF_8.name()

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java

@@ -34,6 +34,7 @@ import com.imaginarycode.minecraft.redisbungee.events.PlayerLeftNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
 import com.squareup.okhttp.Dispatcher;
 import com.squareup.okhttp.OkHttpClient;
+import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
@@ -109,7 +110,7 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
         this.httpClient = new OkHttpClient();
         Dispatcher dispatcher = new Dispatcher(Executors.newFixedThreadPool(6));
         this.httpClient.setDispatcher(dispatcher);
-        //NameFetcher.setHttpClient(httpClient);
+        NameFetcher.setHttpClient(httpClient);
         UUIDFetcher.setHttpClient(httpClient);
     }
 
@@ -245,6 +246,7 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
 
     @Override
     public void initialize() {
+        logInfo("Initializing RedisBungee.....");
         updateProxiesIds();
         // start heartbeat task
         heartbeatTask = getProxy().getScheduler().buildTask(this, new HeartbeatTask(this, this.globalPlayerCount)).repeat(HeartbeatTask.INTERVAL, HeartbeatTask.REPEAT_INTERVAL_TIME_UNIT).schedule();
@@ -283,10 +285,12 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
             getProxy().getCommandManager().register("ip", new RedisBungeeCommands.IpCommand(this), "playerip", "rip", "rplayerip");
             getProxy().getCommandManager().register("find", new RedisBungeeCommands.FindCommand(this), "rfind");
         }
+        logInfo("RedisBungee initialized successfully ");
     }
 
     @Override
     public void stop() {
+        logInfo("Turning off redis connections.....");
         // Poison the PubSub listener
         if (psl != null) {
             psl.poison();
@@ -306,10 +310,12 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
 
         this.httpClient.getDispatcher().getExecutorService().shutdown();
         try {
+            logInfo("waiting for httpclient thread-pool termination.....");
             this.httpClient.getDispatcher().getExecutorService().awaitTermination(20, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
+        logInfo("RedisBungee shutdown complete");
     }
 
     @Override
@@ -330,13 +336,13 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
         this.proxiesIds = this.getCurrentProxiesIds(false);
     }
 
-    @Subscribe
-    public void proxyInit(ProxyInitializeEvent event) {
+    @Subscribe(order = PostOrder.FIRST)
+    public void onProxyInitializeEvent(ProxyInitializeEvent event) {
         initialize();
     }
 
-    @Subscribe
-    public void proxyShutdownEvent(ProxyShutdownEvent event) {
+    @Subscribe(order = PostOrder.LAST)
+    public void onProxyShutdownEvent(ProxyShutdownEvent event) {
         stop();
     }
 

gradle.properties

@@ -1,2 +1,2 @@
 group = com.imaginarycode.minecraft
-version = 0.11.0-SNAPSHOT
+version = 0.11.4-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

jitpack.yml

@@ -1,2 +1,2 @@
 jdk:
-  - openjdk11
+  - openjdk17