3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-11-19 14:30:17 +01:00

More development

Dieser Commit ist enthalten in:
Camotoy 2024-05-26 22:20:53 -04:00
Ursprung dedb5920c2
Commit a135d3c4da
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 7EEFB66FE798081F
3 geänderte Dateien mit 36 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -260,6 +260,15 @@ public interface GeyserConfig {
void port(int port); void port(int port);
@Override
@Comment("""
What type of authentication Bedrock players will be checked against when logging into the Java server.
Can be floodgate (see https://wiki.geysermc.org/floodgate/), online, or offline.""")
@NonNull
default AuthType authType() {
return AuthType.ONLINE;
}
@Comment(""" @Comment("""
Whether to enable PROXY protocol or not while connecting to the server. Whether to enable PROXY protocol or not while connecting to the server.
This is useful only when: This is useful only when:
@ -322,6 +331,7 @@ public interface GeyserConfig {
@DefaultNumeric(1400) @DefaultNumeric(1400)
int mtu(); int mtu();
@Comment("Do not change!")
default int version() { default int version() {
return Constants.CONFIG_VERSION; return Constants.CONFIG_VERSION;
} }

Datei anzeigen

@ -57,12 +57,31 @@ public interface GeyserPluginConfig extends GeyserConfig {
return GeyserImpl.getInstance().getBootstrap().getServerBindAddress(); return GeyserImpl.getInstance().getBootstrap().getServerBindAddress();
} }
@Override
default void address(String address) {
throw new IllegalStateException();
}
@Override @Override
@Exclude @Exclude
default int port() { default int port() {
return GeyserImpl.getInstance().getBootstrap().getServerPort(); return GeyserImpl.getInstance().getBootstrap().getServerPort();
} }
@Override
default void port(int port) {
throw new IllegalStateException();
}
// @Nonnull
// @Comment("""
// What type of authentication Bedrock players will be checked against when logging into the Java server.
// Floodgate allows Bedrock players to join without needing a Java account. It's not recommended to change this.""")
// @Override
// default AuthType authType() {
// return AuthType.FLOODGATE;
// }
@Override @Override
@Exclude @Exclude
default boolean forwardHostname() { default boolean forwardHostname() {

Datei anzeigen

@ -25,7 +25,8 @@
package org.geysermc.geyser.configuration; package org.geysermc.geyser.configuration;
import org.spongepowered.configurate.interfaces.meta.Exclude; import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.network.AuthType;
import org.spongepowered.configurate.interfaces.meta.defaults.DefaultNumeric; import org.spongepowered.configurate.interfaces.meta.defaults.DefaultNumeric;
import org.spongepowered.configurate.interfaces.meta.defaults.DefaultString; import org.spongepowered.configurate.interfaces.meta.defaults.DefaultString;
import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.ConfigSerializable;
@ -36,6 +37,8 @@ import org.spongepowered.configurate.objectmapping.meta.Comment;
*/ */
@ConfigSerializable @ConfigSerializable
public interface GeyserRemoteConfig extends GeyserConfig { public interface GeyserRemoteConfig extends GeyserConfig {
// @Override // For config placement
// BedrockConfig bedrock();
@Override @Override
RemoteConfig java(); RemoteConfig java();
@ -52,10 +55,9 @@ public interface GeyserRemoteConfig extends GeyserConfig {
@DefaultNumeric(25565) @DefaultNumeric(25565)
int port(); int port();
@Override @Override // For config placement
@Exclude default @NonNull AuthType authType() {
default int protocolVersion() { return JavaConfig.super.authType();
return JavaConfig.super.protocolVersion();
} }
@Override @Override