Move away from Jitpack for Bungee

GeyserMC · Apr 19, 2024 · cbf270f · cbf270f
1 parent c702a66
commit cbf270f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,7 +31,7 @@
 import jakarta.inject.Singleton;
 
 @Factory
-public class SpigotPlatformModule {
+public final class SpigotPlatformModule {
     @Bean
     @Named("packetEncoder")
     @Singleton

diff --git a/...ity/base/src/main/java/org/geysermc/floodgate/velocity/module/VelocityPlatformModule.java b/...ity/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(
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,10 +38,6 @@ dependencyResolutionManagement { @@
             }
             mavenCentral()
-            maven("https://jitpack.io") {
-                content { includeGroupByRegex("com\\.github\\..*") }
-            }
         }
     }
@@ Expand Down @@