From 575d49c4a9ffd13ec9cffb2be006d316830a1e83 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 15 Jul 2022 23:55:34 +0800
Subject: Remove subsets, clean up code

---
 api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java  | 2 ++
 .../main/java/me/shedaniel/rei/api/client/plugins/REIClientPlugin.java  | 1 +
 .../main/java/me/shedaniel/rei/api/client/subsets/SubsetsRegistry.java  | 1 +
 api/src/main/java/me/shedaniel/rei/api/common/display/Display.java      | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'api/src/main/java/me')

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
index 56a130482..876a27717 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
@@ -316,6 +316,8 @@ public interface ConfigObject {
     @ApiStatus.Experimental
     boolean doDebugSearchTimeRequired();
     
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
     boolean isSubsetsEnabled();
     
     boolean isInventoryHighlightingAllowed();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/plugins/REIClientPlugin.java b/api/src/main/java/me/shedaniel/rei/api/client/plugins/REIClientPlugin.java
index d316994e9..f3ff9408d 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/plugins/REIClientPlugin.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/plugins/REIClientPlugin.java
@@ -121,6 +121,7 @@ public interface REIClientPlugin extends REIPlugin<REIClientPlugin> {
      * @param registry the registry
      */
     @ApiStatus.OverrideOnly
+    @Deprecated(forRemoval = true)
     default void registerSubsets(SubsetsRegistry registry) {
     }
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/subsets/SubsetsRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/subsets/SubsetsRegistry.java
index e80504e77..d7046d494 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/subsets/SubsetsRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/subsets/SubsetsRegistry.java
@@ -37,6 +37,7 @@ import java.util.List;
 import java.util.Set;
 
 @Environment(EnvType.CLIENT)
+@Deprecated(forRemoval = true)
 public interface SubsetsRegistry extends Reloadable<REIClientPlugin> {
     static SubsetsRegistry getInstance() {
         return PluginManager.getClientInstance().get(SubsetsRegistry.class);
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java b/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java
index e13e3c4e2..e6479b587 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java
@@ -55,7 +55,7 @@ public interface Display extends DisplaySpec {
      */
     List<EntryIngredient> getInputEntries();
     
-    @Deprecated
+    @Deprecated(forRemoval = true)
     default List<EntryIngredient> getInputEntries(MenuSerializationContext<?, ?, ?> context, MenuInfo<?, ?> info, boolean fill) {
         return getInputEntries();
     }
-- 
cgit