chore: no longer use deprecated REI methods

Author: Roelymole

src/main/java/dev/galacticraft/mod/compat/rei/client/GalacticraftREIClientPlugin.java

@@ -22,6 +22,7 @@
 
 package dev.galacticraft.mod.compat.rei.client;
 
+import dev.galacticraft.machinelib.api.menu.RecipeMachineMenu;
 import dev.galacticraft.machinelib.client.api.screen.MachineScreen;
 import dev.galacticraft.machinelib.impl.Constant.TextureCoordinate;
 import dev.galacticraft.mod.compat.rei.client.category.DefaultCompressingCategory;
@@ -43,6 +44,7 @@
 import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
 import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
 import me.shedaniel.rei.api.client.registry.transfer.TransferHandlerRegistry;
+import me.shedaniel.rei.api.client.registry.transfer.simple.SimpleTransferHandler;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import net.minecraft.world.level.ItemLike;
@@ -92,5 +94,9 @@ public void registerExclusionZones(ExclusionZones zones) {
 
     @Override
     public void registerTransferHandlers(TransferHandlerRegistry registry) {
+        registry.register(SimpleTransferHandler.create(RecipeMachineMenu.class, GalacticraftREIServerPlugin.COMPRESSING,
+                new SimpleTransferHandler.IntRange(1, 10)));
+        registry.register(SimpleTransferHandler.create(RecipeMachineMenu.class, GalacticraftREIServerPlugin.CIRCUIT_FABRICATION,
+                new SimpleTransferHandler.IntRange(1, 6)));
     }
 }

src/main/java/dev/galacticraft/mod/compat/rei/client/category/DefaultFabricationCategory.java

@@ -85,7 +85,7 @@ public Component getTitle() {
         widgets.add(Widgets.createSlot(new Point(startPoint.x + SILICON_X_1, startPoint.y + SILICON_Y_1)).entries(recipeDisplay.getInputEntries().get(1)));
         widgets.add(Widgets.createSlot(new Point(startPoint.x + SILICON_X_2, startPoint.y + SILICON_Y_2)).entries(recipeDisplay.getInputEntries().get(2)));
         widgets.add(Widgets.createSlot(new Point(startPoint.x + REDSTONE_X, startPoint.y + REDSTONE_Y)).entries(recipeDisplay.getInputEntries().get(3)));
-        widgets.add(Widgets.createSlot(new Point(startPoint.x + INGREDIENT_X, startPoint.y + INGREDIENT_Y)).markOutput().entries(recipeDisplay.getInputEntries().get(4)));
+        widgets.add(Widgets.createSlot(new Point(startPoint.x + INGREDIENT_X, startPoint.y + INGREDIENT_Y)).entries(recipeDisplay.getInputEntries().get(4)));
 
         widgets.add(Widgets.createSlot(new Point(startPoint.x + WAFER_X, startPoint.y + WAFER_Y)).markOutput().entries(recipeDisplay.getOutputEntries().get(0)));
         return widgets;

src/main/java/dev/galacticraft/mod/compat/rei/common/GalacticraftREIServerPlugin.java

@@ -22,31 +22,19 @@
 
 package dev.galacticraft.mod.compat.rei.common;
 
-import dev.galacticraft.machinelib.api.menu.RecipeMachineMenu;
 import dev.galacticraft.mod.Constant;
 import dev.galacticraft.mod.compat.rei.common.display.DefaultCompressingDisplay;
 import dev.galacticraft.mod.compat.rei.common.display.DefaultFabricationDisplay;
-import dev.galacticraft.mod.compat.rei.common.transfer.info.FabricationMenuInfo;
-import dev.galacticraft.mod.compat.rei.common.transfer.info.SimpleMachineMenuInfo;
-import dev.galacticraft.mod.content.block.entity.machine.CompressorBlockEntity;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.DisplaySerializerRegistry;
 import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
 import me.shedaniel.rei.api.common.plugins.REIServerPlugin;
-import me.shedaniel.rei.api.common.transfer.info.MenuInfoRegistry;
-import me.shedaniel.rei.api.common.transfer.info.simple.SimpleMenuInfoProvider;
 
 public class GalacticraftREIServerPlugin implements REIServerPlugin {
     public static final CategoryIdentifier<DefaultFabricationDisplay> CIRCUIT_FABRICATION = CategoryIdentifier.of(Constant.MOD_ID, "plugins/circuit_fabricator");
     public static final CategoryIdentifier<DefaultCompressingDisplay> COMPRESSING = CategoryIdentifier.of(Constant.MOD_ID, "plugins/compressing");
 //    public static final CategoryIdentifier<DefaultCompressingDisplay> COAL_GENERATOR_FUEL = CategoryIdentifier.of(Constant.MOD_ID, "plugins/coal_generator_fuel");
 
-    @Override
-    public void registerMenuInfo(MenuInfoRegistry registry) {
-        registry.register(COMPRESSING, RecipeMachineMenu.class, SimpleMenuInfoProvider.of(d -> new SimpleMachineMenuInfo<>(3, 3, CompressorBlockEntity.OUTPUT_SLOT, d)));
-        registry.register(CIRCUIT_FABRICATION, RecipeMachineMenu.class, SimpleMenuInfoProvider.of(FabricationMenuInfo::new));
-    }
-
     @Override
     public void registerDisplaySerializer(DisplaySerializerRegistry registry) {
         registry.register(CIRCUIT_FABRICATION, BasicDisplay.Serializer.ofSimple(DefaultFabricationDisplay::createRaw));

src/main/java/dev/galacticraft/mod/compat/rei/common/display/DefaultFabricationDisplay.java

@@ -28,6 +28,8 @@
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
+import me.shedaniel.rei.api.common.entry.EntryStack;
+import me.shedaniel.rei.api.common.entry.InputIngredient;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
@@ -74,4 +76,14 @@ private static List<EntryIngredient> getInputs(@Nullable RecipeHolder<Fabricatio
         list.add(EntryIngredients.ofIngredient(recipe.value().getIngredients().get(0)));
         return list;
     }
+
+    public List<InputIngredient<EntryStack<?>>> getInputIngredients() {
+        List<EntryIngredient> inputEntries = getInputEntries();
+        int n = inputEntries.size();
+        List<InputIngredient<EntryStack<?>>> list = new ArrayList<>(n);
+        for (int i = 0; i < n; i++) {
+            list.add(InputIngredient.of(i, inputEntries.get(i)));
+        }
+        return list;
+    }
 }