Removed deprecated APIs, 1.18-pre1

3 files changed, 11 insertions, 14 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java b/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java
index 1c9703d5e..52385b57f 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java
@@ -61,11 +61,11 @@ public class DefaultCategoryHandler implements TransferHandler {
             return Result.createNotApplicable();
         }
         AbstractContainerMenu menu = context.getMenu();
-        MenuInfo<AbstractContainerMenu, Display> menuInfo = MenuInfoRegistry.getInstance().getClient(display, menu);
+        MenuInfoContext<AbstractContainerMenu, Player, Display> menuInfoContext = ofContext(menu, display);
+        MenuInfo<AbstractContainerMenu, Display> menuInfo = MenuInfoRegistry.getInstance().getClient(display, menuInfoContext, menu);
         if (menuInfo == null) {
             return Result.createNotApplicable();
         }
-        MenuInfoContext<AbstractContainerMenu, Player, Display> menuInfoContext = ofContext(menu, menuInfo, display);
         try {
             menuInfo.validate(menuInfoContext);
         } catch (MenuTransferException e) {
@@ -76,7 +76,7 @@ public class DefaultCategoryHandler implements TransferHandler {
             }
         }
         List<List<ItemStack>> input = menuInfo.getInputs(menuInfoContext);
-        IntList intList = hasItems(menu, menuInfo, display, input);
+        IntList intList = hasItems(menuInfoContext, menu, menuInfo, display, input);
         if (!intList.isEmpty()) {
             return Result.createFailed(new TranslatableComponent("error.rei.not.enough.materials"), intList);
         }
@@ -105,7 +105,7 @@ public class DefaultCategoryHandler implements TransferHandler {
         return -10;
     }
     
-    private static MenuInfoContext<AbstractContainerMenu, Player, Display> ofContext(AbstractContainerMenu menu, MenuInfo<AbstractContainerMenu, Display> info, Display display) {
+    private static MenuInfoContext<AbstractContainerMenu, Player, Display> ofContext(AbstractContainerMenu menu, Display display) {
         return new MenuInfoContext<AbstractContainerMenu, Player, Display>() {
             @Override
             public AbstractContainerMenu getMenu() {
@@ -118,11 +118,6 @@ public class DefaultCategoryHandler implements TransferHandler {
             }
             
             @Override
-            public MenuInfo<AbstractContainerMenu, Display> getContainerInfo() {
-                return info;
-            }
-            
-            @Override
             public CategoryIdentifier<Display> getCategoryIdentifier() {
                 return (CategoryIdentifier<Display>) display.getCategoryIdentifier();
             }
@@ -134,10 +129,10 @@ public class DefaultCategoryHandler implements TransferHandler {
         };
     }
     
-    public IntList hasItems(AbstractContainerMenu menu, MenuInfo<AbstractContainerMenu, Display> info, Display display, List<List<ItemStack>> inputs) {
+    public IntList hasItems(MenuInfoContext<AbstractContainerMenu, Player, Display> menuInfoContext, AbstractContainerMenu menu, MenuInfo<AbstractContainerMenu, Display> info, Display display, List<List<ItemStack>> inputs) {
         // Create a clone of player's inventory, and count
         RecipeFinder recipeFinder = new RecipeFinder();
-        info.getRecipeFinderPopulator().populate(ofContext(menu, info, display), recipeFinder);
+        info.getRecipeFinderPopulator().populate(menuInfoContext, recipeFinder);
         IntList intList = new IntArrayList();
         for (int i = 0; i < inputs.size(); i++) {
             List<ItemStack> possibleStacks = inputs.get(i);
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
index 3a174ffa4..d7c9ed2f8 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
@@ -178,7 +178,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
         }
         
         @Override
-        public DataResult<EntryStackFavoriteEntry> readResult(CompoundTag object) {
+        public DataResult<EntryStackFavoriteEntry> read(CompoundTag object) {
             EntryStack<?> stack;
             try {
                 stack = EntryStack.read(object.getCompound(key));
@@ -189,7 +189,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
         }
         
         @Override
-        public DataResult<EntryStackFavoriteEntry> fromArgsResult(Object... args) {
+        public DataResult<EntryStackFavoriteEntry> fromArgs(Object... args) {
             if (args.length == 0) return DataResult.error("Cannot create EntryStackFavoriteEntry from empty args!");
             if (!(args[0] instanceof EntryStack<?> stack))
                 return DataResult.error("Creation of EntryStackFavoriteEntry from args expected EntryStack as the first argument!");
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
index 28bbe66ca..7a943b273 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
@@ -30,6 +30,8 @@ import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry;
+import me.shedaniel.rei.api.common.plugins.PluginManager;
+import me.shedaniel.rei.api.common.registry.ReloadStage;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -53,7 +55,7 @@ public class REITestPlugin implements REIClientPlugin {
     private Random random = new Random();
     
     @Override
-    public void preRegister() {
+    public void preStage(PluginManager<REIClientPlugin> manager, ReloadStage stage) {
         LogManager.getLogger().error("REI Test Plugin is enabled! If you see this unintentionally, please report this!");
     }