From cbf270f5f7489f462d8f9c8866ee7267b2008026 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Fri, 19 Apr 2024 20:19:01 +0200
Subject: [PATCH] Move away from Jitpack for Bungee

---
 .../floodgate/bungee/addon/data/BungeeDataAddon.java      | 8 ++++----
 .../floodgate/bungee/listener/BungeeListener.java         | 3 ---
 .../org/geysermc/floodgate/core/module/CommonModule.java  | 2 +-
 gradle/libs.versions.toml                                 | 4 ++--
 settings.gradle.kts                                       | 4 ----
 .../floodgate/spigot/module/SpigotPlatformModule.java     | 2 +-
 .../floodgate/velocity/module/VelocityPlatformModule.java | 2 +-
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/bungee/base/src/main/java/org/geysermc/floodgate/bungee/addon/data/BungeeDataAddon.java b/bungee/base/src/main/java/org/geysermc/floodgate/bungee/addon/data/BungeeDataAddon.java
index 9dec9148..1d4f659d 100644
--- a/bungee/base/src/main/java/org/geysermc/floodgate/bungee/addon/data/BungeeDataAddon.java
+++ b/bungee/base/src/main/java/org/geysermc/floodgate/bungee/addon/data/BungeeDataAddon.java
@@ -47,22 +47,22 @@ public class BungeeDataAddon implements InjectorAddon {
     FloodgateDataHandler handshakeHandler;
 
     @Inject
-    private ProxyFloodgateConfig config;
+    ProxyFloodgateConfig config;
 
     @Inject
     FloodgateLogger logger;
 
     @Inject
     @Named("packetHandler")
-    private String packetHandler;
+    String packetHandler;
 
     @Inject
     @Named("packetDecoder")
-    private String packetDecoder;
+    String packetDecoder;
 
     @Inject
     @Named("packetEncoder")
-    private String packetEncoder;
+    String packetEncoder;
 
     @Inject
     @Named("connectionAttribute")
diff --git a/bungee/base/src/main/java/org/geysermc/floodgate/bungee/listener/BungeeListener.java b/bungee/base/src/main/java/org/geysermc/floodgate/bungee/listener/BungeeListener.java
index 0b168063..b9cb202c 100644
--- a/bungee/base/src/main/java/org/geysermc/floodgate/bungee/listener/BungeeListener.java
+++ b/bungee/base/src/main/java/org/geysermc/floodgate/bungee/listener/BungeeListener.java
@@ -46,14 +46,12 @@
 import org.geysermc.floodgate.core.api.SimpleFloodgateApi;
 import org.geysermc.floodgate.core.config.ProxyFloodgateConfig;
 import org.geysermc.floodgate.core.listener.McListener;
-import org.geysermc.floodgate.core.logger.FloodgateLogger;
 import org.geysermc.floodgate.core.skin.SkinApplier;
 import org.geysermc.floodgate.core.skin.SkinDataImpl;
 import org.geysermc.floodgate.core.util.LanguageManager;
 import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 @Singleton
-@SuppressWarnings("ConstantConditions")
 public final class BungeeListener implements Listener, McListener {
     private static final Field PLAYER_NAME;
 
@@ -66,7 +64,6 @@ public final class BungeeListener implements Listener, McListener {
     @Inject ProxyFloodgateConfig config;
     @Inject SimpleFloodgateApi api;
     @Inject LanguageManager languageManager;
-    @Inject FloodgateLogger logger;
     @Inject SkinApplier skinApplier;
 
     @Inject
diff --git a/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java
index 55241e6b..3e1618ce 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java
+++ b/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java
@@ -42,7 +42,7 @@
 import org.geysermc.floodgate.core.crypto.topping.Topping;
 
 @Factory
-public class CommonModule {
+public final class CommonModule {
     @Bean(preDestroy = "shutdown")
     @Singleton
     @Named("commonPool")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc4b7128..f7236b47 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ adventure = "4.16.0"
 adventure-platform = "4.3.2"
 
 # bungee
-bungee = "master-SNAPSHOT"
+bungee = "1.20-R0.3-SNAPSHOT"
 
 # spigot
 paper = "1.20.2-R0.1-SNAPSHOT"
@@ -82,7 +82,7 @@ junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 
 # bungee
-bungee = { module = "com.github.SpigotMC.BungeeCord:bungeecord-proxy", version.ref = "bungee" }
+bungee = { module = "net.md-5:bungeecord-proxy", version.ref = "bungee" }
 cloud-bungee = { module = "org.incendo:cloud-bungee", version.ref = "cloud" }
 
 # spigot
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3beb2ed3..e2f0c1a5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,10 +38,6 @@ dependencyResolutionManagement {
         }
 
         mavenCentral()
-
-        maven("https://jitpack.io") {
-            content { includeGroupByRegex("com\\.github\\..*") }
-        }
     }
 }
 
diff --git a/spigot/base/src/main/java/org/geysermc/floodgate/spigot/module/SpigotPlatformModule.java b/spigot/base/src/main/java/org/geysermc/floodgate/spigot/module/SpigotPlatformModule.java
index 203b10af..25d39bca 100644
--- a/spigot/base/src/main/java/org/geysermc/floodgate/spigot/module/SpigotPlatformModule.java
+++ b/spigot/base/src/main/java/org/geysermc/floodgate/spigot/module/SpigotPlatformModule.java
@@ -31,7 +31,7 @@
 import jakarta.inject.Singleton;
 
 @Factory
-public class SpigotPlatformModule {
+public final class SpigotPlatformModule {
     @Bean
     @Named("packetEncoder")
     @Singleton
diff --git a/velocity/base/src/main/java/org/geysermc/floodgate/velocity/module/VelocityPlatformModule.java b/velocity/base/src/main/java/org/geysermc/floodgate/velocity/module/VelocityPlatformModule.java
index 1663ca1f..0f649fd2 100644
--- a/velocity/base/src/main/java/org/geysermc/floodgate/velocity/module/VelocityPlatformModule.java
+++ b/velocity/base/src/main/java/org/geysermc/floodgate/velocity/module/VelocityPlatformModule.java
@@ -40,7 +40,7 @@
 import org.incendo.cloud.velocity.VelocityCommandManager;
 
 @Factory
-public class VelocityPlatformModule {
+public final class VelocityPlatformModule {
     @Bean
     @Singleton
     public CommandManager<UserAudience> commandManager(