mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Clean up jar file classes a bit
This commit is contained in:
parent
7474d2c745
commit
323394d2b5
4 changed files with 38 additions and 3 deletions
|
@ -66,6 +66,22 @@ tasks {
|
|||
relocate("org.yaml", "org.geysermc.relocate.yaml") // https://github.com/CardboardPowered/cardboard/issues/139
|
||||
relocate("com.fasterxml.jackson", "org.geysermc.relocate.jackson")
|
||||
relocate("net.kyori", "org.geysermc.relocate.kyori")
|
||||
|
||||
dependencies {
|
||||
// Exclude everything EXCEPT KQueue and some DNS stuff required for HAProxyc
|
||||
exclude(dependency("io.netty:netty-transport-classes-epoll:.*"))
|
||||
exclude(dependency("io.netty:netty-transport-native-epoll:.*"))
|
||||
exclude(dependency("io.netty:netty-transport-native-unix-common:.*"))
|
||||
exclude(dependency("io.netty:netty-transport-native-kqueue:.*"))
|
||||
exclude(dependency("io.netty:netty-handler:.*"))
|
||||
exclude(dependency("io.netty:netty-common:.*"))
|
||||
exclude(dependency("io.netty:netty-buffer:.*"))
|
||||
exclude(dependency("io.netty:netty-resolver:.*"))
|
||||
exclude(dependency("io.netty:netty-transport:.*"))
|
||||
exclude(dependency("io.netty:netty-codec:.*"))
|
||||
exclude(dependency("io.netty:netty-resolver-dns:.*"))
|
||||
exclude(dependency("io.netty:netty-resolver-dns-native-macos:.*"))
|
||||
}
|
||||
}
|
||||
|
||||
remapJar {
|
||||
|
|
|
@ -44,6 +44,7 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
|
|||
|
||||
// We cannot shade Netty, or else native libraries will not load
|
||||
// Needed because older Spigot builds do not provide the haproxy module
|
||||
exclude(dependency("io.netty:netty-transport-classes-epoll:.*"))
|
||||
exclude(dependency("io.netty:netty-transport-native-epoll:.*"))
|
||||
exclude(dependency("io.netty:netty-transport-native-unix-common:.*"))
|
||||
exclude(dependency("io.netty:netty-transport-native-kqueue:.*"))
|
||||
|
|
|
@ -24,6 +24,11 @@ tasks {
|
|||
exclude(dependency(string))
|
||||
}
|
||||
}
|
||||
|
||||
sJar.dependencies {
|
||||
exclude(dependency("org.checkerframework:checker-qual:.*"))
|
||||
exclude(dependency("org.jetbrains:annotations:.*"))
|
||||
}
|
||||
}
|
||||
}
|
||||
named("build") {
|
||||
|
|
|
@ -732,7 +732,11 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
|||
return;
|
||||
}
|
||||
|
||||
connectDownstream();
|
||||
try {
|
||||
connectDownstream();
|
||||
} catch (Throwable t) {
|
||||
t.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -776,7 +780,11 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
|||
return;
|
||||
}
|
||||
|
||||
connectDownstream();
|
||||
try {
|
||||
connectDownstream();
|
||||
} catch (Throwable t) {
|
||||
t.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -850,7 +858,12 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
|||
selectedProfile,
|
||||
service.getAccessToken()
|
||||
);
|
||||
connectDownstream();
|
||||
try {
|
||||
connectDownstream();
|
||||
} catch (Throwable t) {
|
||||
t.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
|
||||
// Save our refresh token for later use
|
||||
geyser.saveRefreshToken(bedrockUsername(), service.getRefreshToken());
|
||||
|
|
Loading…
Reference in a new issue