From 0292c61c52a24aedd9105b4661927591003fc3d8 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 30 Nov 2025 19:45:21 +0100 Subject: [PATCH] Remove deprecated `CarpetExtension.customSettingsManager` All extensions I've found using a custom manager have migrated --- src/main/java/carpet/CarpetExtension.java | 8 +------- src/main/java/carpet/CarpetServer.java | 9 --------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/carpet/CarpetExtension.java b/src/main/java/carpet/CarpetExtension.java index e7a742cd..a22333ef 100644 --- a/src/main/java/carpet/CarpetExtension.java +++ b/src/main/java/carpet/CarpetExtension.java @@ -84,13 +84,7 @@ public interface CarpetExtension * */ default SettingsManager extensionSettingsManager() { - // Warn extensions overriding the other (deprecated) method, go ahead and override this if you want to provide a custom SettingsManager - SettingsManager deprecatedManager = customSettingsManager(); - if (deprecatedManager != null) { - // Extension is providing a manager via the old method (and also hasn't overriden this) - CarpetServer.warnOutdatedManager(this); - } - return customSettingsManager(); + return null; } /** diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java index ed85b9c8..41327dbe 100644 --- a/src/main/java/carpet/CarpetServer.java +++ b/src/main/java/carpet/CarpetServer.java @@ -226,14 +226,5 @@ public class CarpetServer // static for now - easier to handle all around the co scriptServer.reload(server); extensions.forEach(e -> e.onReload(server)); } - - private static final Set warnedOutdatedManagerProviders = new HashSet<>(); - static void warnOutdatedManager(CarpetExtension ext) - { - if (warnedOutdatedManagerProviders.add(ext)) - CarpetSettings.LOG.warn(""" - %s is providing a SettingsManager from an outdated method in CarpetExtension! - This behaviour will not work in later Carpet versions and the manager won't be registered!""".formatted(ext.getClass().getName())); - } }