From 3ab6f974fb63b9f9232f8507e156cfc53cdf0250 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 6 Feb 2020 11:55:23 +0800 Subject: 4.0-unstable Signed-off-by: shedaniel --- src/main/java/me/shedaniel/rei/api/ConfigObject.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/api/ConfigObject.java') diff --git a/src/main/java/me/shedaniel/rei/api/ConfigObject.java b/src/main/java/me/shedaniel/rei/api/ConfigObject.java index fb2ca2650..c45ae56c9 100644 --- a/src/main/java/me/shedaniel/rei/api/ConfigObject.java +++ b/src/main/java/me/shedaniel/rei/api/ConfigObject.java @@ -9,8 +9,8 @@ import me.shedaniel.clothconfig2.api.ModifierKeyCode; import me.shedaniel.rei.gui.config.ItemListOrdering; import me.shedaniel.rei.gui.config.RecipeScreenType; import me.shedaniel.rei.gui.config.SearchFieldLocation; +import me.shedaniel.rei.impl.ConfigManagerImpl; import me.shedaniel.rei.impl.ConfigObjectImpl; -import net.minecraft.client.util.InputUtil; import org.jetbrains.annotations.ApiStatus; import java.lang.annotation.ElementType; @@ -20,15 +20,10 @@ import java.lang.annotation.Target; public interface ConfigObject { - @SuppressWarnings("deprecation") static ConfigObject getInstance() { - return ConfigManager.getInstance().getConfig(); + return ((ConfigManagerImpl) ConfigManager.getInstance()).getConfig(); } - @Deprecated - @ApiStatus.ScheduledForRemoval - boolean isLighterButtonHover(); - boolean isOverlayVisible(); void setOverlayVisible(boolean overlayVisible); @@ -45,11 +40,6 @@ public interface ConfigObject { boolean isToastDisplayedOnCopyIdentifier(); - @Deprecated - default boolean doesRenderEntryExtraOverlay() { - return doesRenderEntryEnchantmentGlint(); - } - boolean doesRenderEntryEnchantmentGlint(); boolean isEntryListWidgetScrolled(); @@ -104,11 +94,6 @@ public interface ConfigObject { boolean doSearchFavorites(); - @Deprecated - default InputUtil.KeyCode getFavoriteKeybind() { - return getFavoriteKeyCode().getKeyCode(); - } - ModifierKeyCode getFavoriteKeyCode(); ModifierKeyCode getRecipeKeybind(); -- cgit