Merge branch '6.x-1.17' into 7.x-1.18

# Conflicts:
#	gradle.properties

2 files changed, 15 insertions, 11 deletions

diff --git a/default-plugin/build.gradle b/default-plugin/build.gradle
index c22da8b91..3daaef18c 100644
--- a/default-plugin/build.gradle
+++ b/default-plugin/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     modCompileOnly("net.fabricmc:fabric-loader:${project.fabricloader_version}")
     modApi("me.shedaniel.cloth:cloth-config:${cloth_config_version}")
     modApi("dev.architectury:architectury:${architectury_version}")
-    compileClasspath(project(path: ":api", configuration: "dev"))
+    compileClasspath(project(path: ":api", configuration: "namedElements"))
 }
 
 architectury {
@@ -19,10 +19,6 @@ remapJar {
     remapAccessWidener = false
 }
 
-configurations {
-    dev
-}
-
 remapJar {
     classifier "raw"
 }
@@ -36,7 +32,6 @@ task fakeJar(type: Jar, dependsOn: remapJar) {
 }
 
 artifacts {
-    dev(jar)
     apiElements(fakeJar)
     runtimeElements(fakeJar)
 }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
index 32bec42b1..fdedcff29 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
@@ -32,8 +32,10 @@ import me.shedaniel.rei.api.client.gui.Renderer;
 import me.shedaniel.rei.api.client.gui.widgets.Slot;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
 import me.shedaniel.rei.api.client.gui.widgets.Widgets;
+import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.client.registry.display.TransferDisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
+import me.shedaniel.rei.api.common.display.DisplayMerger;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
@@ -44,13 +46,14 @@ import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 @Environment(EnvType.CLIENT)
-public class DefaultCraftingCategory implements TransferDisplayCategory<DefaultCraftingDisplay> {
+public class DefaultCraftingCategory implements TransferDisplayCategory<DefaultCraftingDisplay<?>> {
     @Override
-    public CategoryIdentifier<? extends DefaultCraftingDisplay> getCategoryIdentifier() {
+    public CategoryIdentifier<? extends DefaultCraftingDisplay<?>> getCategoryIdentifier() {
         return BuiltinPlugin.CRAFTING;
     }
     
@@ -65,7 +68,7 @@ public class DefaultCraftingCategory implements TransferDisplayCategory<DefaultC
     }
     
     @Override
-    public List<Widget> setupDisplay(DefaultCraftingDisplay display, Rectangle bounds) {
+    public List<Widget> setupDisplay(DefaultCraftingDisplay<?> display, Rectangle bounds) {
         Point startPoint = new Point(bounds.getCenterX() - 58, bounds.getCenterY() - 27);
         List<Widget> widgets = Lists.newArrayList();
         widgets.add(Widgets.createRecipeBase(bounds));
@@ -89,9 +92,9 @@ public class DefaultCraftingCategory implements TransferDisplayCategory<DefaultC
     }
     
     @Override
-    public void renderRedSlots(PoseStack matrices, List<Widget> widgets, Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) {
+    public void renderRedSlots(PoseStack matrices, List<Widget> widgets, Rectangle bounds, DefaultCraftingDisplay<?> display, IntList redSlots) {
 //        @Nullable
-//        Screen previousScreen = REIHelper.getInstance().getPreviousScreen();
+//        Screen previousScreen = REIRuntime.getInstance().getPreviousScreen();
 //        if (!(previousScreen instanceof AbstractContainerScreen)) return;
 //        AbstractContainerMenu containerMenu = ((AbstractContainerScreen<?>) previousScreen).getMenu();
 //        MenuInfo<AbstractContainerMenu, DefaultCraftingDisplay> info = (MenuInfo<AbstractContainerMenu, DefaultCraftingDisplay>) MenuInfoRegistry.getInstance().get(getCategoryIdentifier(), containerMenu.getClass());
@@ -109,4 +112,10 @@ public class DefaultCraftingCategory implements TransferDisplayCategory<DefaultC
 //        }
 //        matrices.popPose();
     }
+    
+    @Override
+    @Nullable
+    public DisplayMerger<DefaultCraftingDisplay<?>> getDisplayMerger() {
+        return DisplayCategory.getContentMerger();
+    }
 }