1
0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00

Move away from Jitpack for Bungee

This commit is contained in:
Tim203
2024-04-19 20:19:01 +02:00
parent c702a66c71
commit cbf270f5f7
7 changed files with 9 additions and 16 deletions

View File

@@ -47,22 +47,22 @@ public class BungeeDataAddon implements InjectorAddon {
FloodgateDataHandler handshakeHandler; FloodgateDataHandler handshakeHandler;
@Inject @Inject
private ProxyFloodgateConfig config; ProxyFloodgateConfig config;
@Inject @Inject
FloodgateLogger logger; FloodgateLogger logger;
@Inject @Inject
@Named("packetHandler") @Named("packetHandler")
private String packetHandler; String packetHandler;
@Inject @Inject
@Named("packetDecoder") @Named("packetDecoder")
private String packetDecoder; String packetDecoder;
@Inject @Inject
@Named("packetEncoder") @Named("packetEncoder")
private String packetEncoder; String packetEncoder;
@Inject @Inject
@Named("connectionAttribute") @Named("connectionAttribute")

View File

@@ -46,14 +46,12 @@ import org.geysermc.floodgate.bungee.player.BungeeConnectionManager;
import org.geysermc.floodgate.core.api.SimpleFloodgateApi; import org.geysermc.floodgate.core.api.SimpleFloodgateApi;
import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; import org.geysermc.floodgate.core.config.ProxyFloodgateConfig;
import org.geysermc.floodgate.core.listener.McListener; 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.SkinApplier;
import org.geysermc.floodgate.core.skin.SkinDataImpl; import org.geysermc.floodgate.core.skin.SkinDataImpl;
import org.geysermc.floodgate.core.util.LanguageManager; import org.geysermc.floodgate.core.util.LanguageManager;
import org.geysermc.floodgate.core.util.ReflectionUtils; import org.geysermc.floodgate.core.util.ReflectionUtils;
@Singleton @Singleton
@SuppressWarnings("ConstantConditions")
public final class BungeeListener implements Listener, McListener { public final class BungeeListener implements Listener, McListener {
private static final Field PLAYER_NAME; private static final Field PLAYER_NAME;
@@ -66,7 +64,6 @@ public final class BungeeListener implements Listener, McListener {
@Inject ProxyFloodgateConfig config; @Inject ProxyFloodgateConfig config;
@Inject SimpleFloodgateApi api; @Inject SimpleFloodgateApi api;
@Inject LanguageManager languageManager; @Inject LanguageManager languageManager;
@Inject FloodgateLogger logger;
@Inject SkinApplier skinApplier; @Inject SkinApplier skinApplier;
@Inject @Inject

View File

@@ -42,7 +42,7 @@ import org.geysermc.floodgate.core.crypto.topping.Base64Topping;
import org.geysermc.floodgate.core.crypto.topping.Topping; import org.geysermc.floodgate.core.crypto.topping.Topping;
@Factory @Factory
public class CommonModule { public final class CommonModule {
@Bean(preDestroy = "shutdown") @Bean(preDestroy = "shutdown")
@Singleton @Singleton
@Named("commonPool") @Named("commonPool")

View File

@@ -21,7 +21,7 @@ adventure = "4.16.0"
adventure-platform = "4.3.2" adventure-platform = "4.3.2"
# bungee # bungee
bungee = "master-SNAPSHOT" bungee = "1.20-R0.3-SNAPSHOT"
# spigot # spigot
paper = "1.20.2-R0.1-SNAPSHOT" 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" } junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
# bungee # 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" } cloud-bungee = { module = "org.incendo:cloud-bungee", version.ref = "cloud" }
# spigot # spigot

View File

@@ -38,10 +38,6 @@ dependencyResolutionManagement {
} }
mavenCentral() mavenCentral()
maven("https://jitpack.io") {
content { includeGroupByRegex("com\\.github\\..*") }
}
} }
} }

View File

@@ -31,7 +31,7 @@ import jakarta.inject.Named;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
@Factory @Factory
public class SpigotPlatformModule { public final class SpigotPlatformModule {
@Bean @Bean
@Named("packetEncoder") @Named("packetEncoder")
@Singleton @Singleton

View File

@@ -40,7 +40,7 @@ import org.incendo.cloud.execution.ExecutionCoordinator;
import org.incendo.cloud.velocity.VelocityCommandManager; import org.incendo.cloud.velocity.VelocityCommandManager;
@Factory @Factory
public class VelocityPlatformModule { public final class VelocityPlatformModule {
@Bean @Bean
@Singleton @Singleton
public CommandManager<UserAudience> commandManager( public CommandManager<UserAudience> commandManager(