Skip to content

Commit a394d66

Browse files
committed
Add warning about third-party config options
1 parent 2c8e4fe commit a394d66

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public interface GeyserConfiguration {
4444
void setAutoconfiguredRemote(boolean autoconfiguredRemote);
4545

4646
// Modify this when you introduce breaking changes into the config
47-
int CURRENT_CONFIG_VERSION = 5;
47+
int CURRENT_CONFIG_VERSION = 4;
4848

4949
IBedrockConfiguration getBedrock();
5050

@@ -72,6 +72,12 @@ public interface GeyserConfiguration {
7272

7373
boolean isDebugMode();
7474

75+
@Deprecated
76+
boolean isAllowThirdPartyCapes();
77+
78+
@Deprecated
79+
boolean isAllowThirdPartyEars();
80+
7581
String getShowCooldown();
7682

7783
boolean isShowCoordinates();

core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
2+
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy
55
* of this software and associated documentation files (the "Software"), to deal
@@ -91,6 +91,9 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
9191
@JsonProperty("debug-mode")
9292
private boolean debugMode = false;
9393

94+
@JsonProperty("allow-third-party-capes")
95+
private boolean allowThirdPartyCapes = true;
96+
9497
@JsonProperty("show-cooldown")
9598
private String showCooldown = "title";
9699

@@ -104,6 +107,9 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
104107
@JsonProperty("emote-offhand-workaround")
105108
private EmoteOffhandWorkaroundOption emoteOffhandWorkaround = EmoteOffhandWorkaroundOption.DISABLED;
106109

110+
@JsonProperty("allow-third-party-ears")
111+
private boolean allowThirdPartyEars = false;
112+
107113
@JsonProperty("default-locale")
108114
private String defaultLocale = null; // is null by default so system language takes priority
109115

core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ public class SkinProvider {
125125
WEARING_CUSTOM_SKULL = new SkinGeometry("{\"geometry\" :{\"default\" :\"geometry.humanoid.wearingCustomSkull\"}}", wearingCustomSkull);
126126
String wearingCustomSkullSlim = new String(FileUtils.readAllBytes("bedrock/skin/geometry.humanoid.wearingCustomSkullSlim.json"), StandardCharsets.UTF_8);
127127
WEARING_CUSTOM_SKULL_SLIM = new SkinGeometry("{\"geometry\" :{\"default\" :\"geometry.humanoid.wearingCustomSkullSlim\"}}", wearingCustomSkullSlim);
128+
129+
GeyserImpl geyser = GeyserImpl.getInstance();
130+
if (geyser.getConfig().isAllowThirdPartyEars()) {
131+
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");
132+
}
133+
if (geyser.getConfig().isAllowThirdPartyCapes()) {
134+
// TODO Update warning once an extension is available
135+
geyser.getLogger().warning("Third-party capes have been removed from Geyser, there is currently no replacement for this functionality");
136+
}
128137
}
129138

130139
public static ExecutorService getExecutorService() {

core/src/main/resources/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,4 +220,4 @@ use-direct-connection: true
220220
# This requires use-direct-connection to be true.
221221
disable-compression: true
222222

223-
config-version: 5
223+
config-version: 4

0 commit comments

Comments
 (0)