Remove old config options

api/src/main/java/org/geysermc/geyser/api/event/lifecycle/SkinApplyEvent.java

@@ -34,6 +34,11 @@ import org.geysermc.geyser.api.skin.SkinGeometry;
 
 import java.util.UUID;
 
+/**
+ * Called when a skin is applied to a player.
+ * <p>
+ * Won't be called when a fake player is spawned for a player skull.
+ */
 public abstract class SkinApplyEvent implements Event {
 
     private final String username;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2024 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
@@ -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 = 4;
+    int CURRENT_CONFIG_VERSION = 5;
 
     IBedrockConfiguration getBedrock();
 
@@ -72,10 +72,6 @@ public interface GeyserConfiguration {
 
     boolean isDebugMode();
 
-    boolean isAllowThirdPartyCapes();
-
-    boolean isAllowThirdPartyEars();
-
     String getShowCooldown();
 
     boolean isShowCoordinates();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2024 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,9 +91,6 @@ 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";
 
@@ -107,9 +104,6 @@ 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
 

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

@@ -61,7 +61,6 @@ import java.util.concurrent.*;
 import java.util.function.Predicate;
 
 public class SkinProvider {
-    private static final boolean ALLOW_THIRD_PARTY_CAPES = GeyserImpl.getInstance().getConfig().isAllowThirdPartyCapes();
     private static ExecutorService EXECUTOR_SERVICE;
 
     static final Skin EMPTY_SKIN;
@@ -130,7 +129,7 @@ public class SkinProvider {
 
     public static ExecutorService getExecutorService() {
         if (EXECUTOR_SERVICE == null) {
-            EXECUTOR_SERVICE = Executors.newFixedThreadPool(ALLOW_THIRD_PARTY_CAPES ? 21 : 14);
+            EXECUTOR_SERVICE = Executors.newFixedThreadPool(14);
         }
         return EXECUTOR_SERVICE;
     }

core/src/main/resources/config.yml

@@ -113,14 +113,6 @@ max-players: 100
 # If debug messages should be sent through console
 debug-mode: false
 
-# Allow third party capes to be visible. Currently allowing:
-# OptiFine capes, LabyMod capes, 5Zig capes and MinecraftCapes
-allow-third-party-capes: false
-
-# Allow third party deadmau5 ears to be visible. Currently allowing:
-# MinecraftCapes
-allow-third-party-ears: false
-
 # Allow a fake cooldown indicator to be sent. Bedrock players otherwise do not see a cooldown as they still use 1.8 combat.
 # Please note: if the cooldown is enabled, some users may see a black box during the cooldown sequence, like below:
 # https://cdn.discordapp.com/attachments/613170125696270357/957075682230419466/Screenshot_from_2022-03-25_20-35-08.png
@@ -228,4 +220,4 @@ use-direct-connection: true
 # This requires use-direct-connection to be true.
 disable-compression: true
 
-config-version: 4
+config-version: 5