Add warning about third-party config options

This commit is contained in:
rtm516 2024-03-19 20:34:09 +00:00
parent 2c8e4fefff
commit a394d66235
No known key found for this signature in database
GPG Key ID: 331715B8B007C67A
4 changed files with 24 additions and 3 deletions

View File

@ -44,7 +44,7 @@ public interface GeyserConfiguration {
void setAutoconfiguredRemote(boolean autoconfiguredRemote);
// Modify this when you introduce breaking changes into the config
int CURRENT_CONFIG_VERSION = 5;
int CURRENT_CONFIG_VERSION = 4;
IBedrockConfiguration getBedrock();
@ -72,6 +72,12 @@ public interface GeyserConfiguration {
boolean isDebugMode();
@Deprecated
boolean isAllowThirdPartyCapes();
@Deprecated
boolean isAllowThirdPartyEars();
String getShowCooldown();
boolean isShowCoordinates();

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -91,6 +91,9 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
@JsonProperty("debug-mode")
private boolean debugMode = false;
@JsonProperty("allow-third-party-capes")
private boolean allowThirdPartyCapes = true;
@JsonProperty("show-cooldown")
private String showCooldown = "title";
@ -104,6 +107,9 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
@JsonProperty("emote-offhand-workaround")
private EmoteOffhandWorkaroundOption emoteOffhandWorkaround = EmoteOffhandWorkaroundOption.DISABLED;
@JsonProperty("allow-third-party-ears")
private boolean allowThirdPartyEars = false;
@JsonProperty("default-locale")
private String defaultLocale = null; // is null by default so system language takes priority

View File

@ -125,6 +125,15 @@ public class SkinProvider {
WEARING_CUSTOM_SKULL = new SkinGeometry("{\"geometry\" :{\"default\" :\"geometry.humanoid.wearingCustomSkull\"}}", wearingCustomSkull);
String wearingCustomSkullSlim = new String(FileUtils.readAllBytes("bedrock/skin/geometry.humanoid.wearingCustomSkullSlim.json"), StandardCharsets.UTF_8);
WEARING_CUSTOM_SKULL_SLIM = new SkinGeometry("{\"geometry\" :{\"default\" :\"geometry.humanoid.wearingCustomSkullSlim\"}}", wearingCustomSkullSlim);
GeyserImpl geyser = GeyserImpl.getInstance();
if (geyser.getConfig().isAllowThirdPartyEars()) {
geyser.getLogger().warning("Third-party ears have been removed from Geyser, if you still want this functionality please use the extension: https://github.com/GeyserMC/EarsExtension");
}
if (geyser.getConfig().isAllowThirdPartyCapes()) {
// TODO Update warning once an extension is available
geyser.getLogger().warning("Third-party capes have been removed from Geyser, there is currently no replacement for this functionality");
}
}
public static ExecutorService getExecutorService() {

View File

@ -220,4 +220,4 @@ use-direct-connection: true
# This requires use-direct-connection to be true.
disable-compression: true
config-version: 5
config-version: 4