diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java index c426015d4..afb1c9cb7 100644 --- a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java +++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java @@ -36,13 +36,13 @@ import lombok.Getter; import lombok.Setter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import net.raphimc.minecraftauth.step.java.session.StepFullJavaSession; +import net.raphimc.minecraftauth.step.msa.StepMsaToken; import org.bstats.MetricsBase; import org.bstats.charts.AdvancedPie; import org.bstats.charts.DrilldownPie; import org.bstats.charts.SimplePie; import org.bstats.charts.SingleLineChart; -import net.raphimc.minecraftauth.step.java.session.StepFullJavaSession; -import net.raphimc.minecraftauth.step.msa.StepMsaToken; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; @@ -71,8 +71,8 @@ import org.geysermc.geyser.api.network.BedrockListener; import org.geysermc.geyser.api.network.RemoteServer; import org.geysermc.geyser.api.util.MinecraftVersion; import org.geysermc.geyser.api.util.PlatformType; -import org.geysermc.geyser.configuration.GeyserConfig; import org.geysermc.geyser.command.CommandRegistry; +import org.geysermc.geyser.configuration.GeyserConfig; import org.geysermc.geyser.configuration.GeyserPluginConfig; import org.geysermc.geyser.entity.EntityDefinitions; import org.geysermc.geyser.erosion.UnixSocketClientListener; diff --git a/core/src/main/java/org/geysermc/geyser/configuration/AdvancedConfig.java b/core/src/main/java/org/geysermc/geyser/configuration/AdvancedConfig.java index b60c8d986..f586b42ae 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/AdvancedConfig.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/AdvancedConfig.java @@ -56,7 +56,7 @@ public interface AdvancedConfig { int customSkullRenderDistance(); @Comment(""" - Specify how many days images will be cached to disk to save downloading them from the internet. + Specify how many days player skin images will be cached to disk to save downloading them from the internet. A value of 0 is disabled. (Default: 0)""") int cacheImages(); diff --git a/core/src/main/java/org/geysermc/geyser/configuration/ConfigLoader.java b/core/src/main/java/org/geysermc/geyser/configuration/ConfigLoader.java index 2639672af..535be88d6 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/ConfigLoader.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/ConfigLoader.java @@ -138,7 +138,6 @@ public final class ConfigLoader { CommentedConfigurationNode node = loader.load(); boolean originallyEmpty = !configFile.exists() || node.isNull(); - // Note for Tim? Needed or else Configurate breaks. var migrations = ConfigurationTransformation.versionedBuilder() .versionKey("config-version") // Pre-Configurate @@ -192,12 +191,6 @@ public final class ConfigLoader { }) .addAction(path("bedrock", "motd1"), rename("primary-motd")) .addAction(path("bedrock", "motd2"), rename("secondary-motd")) - // Legacy config values - .addAction(path("emote-offhand-workaround"), remove()) - .addAction(path("allow-third-party-capes"), remove()) - .addAction(path("allow-third-party-ears"), remove()) - .addAction(path("general-thread-pool"), remove()) - .addAction(path("cache-chunks"), remove()) .build()) .build();