Fix merge issues

10 files changed, 30 insertions, 18 deletions

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 7dfdb3b90..ab742e54f 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
@@ -109,7 +109,7 @@ public interface ConfigObject {
     
     boolean doesRegisterRecipesInAnotherThread();
     
-    @Deprecated(forRemoval = true)
+    @Deprecated
     @ApiStatus.ScheduledForRemoval
     boolean doesSnapToRows();
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java
index c51309603..012e32ddc 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java
@@ -54,7 +54,8 @@ public interface EntryRenderer<T> extends EntryRendererProvider<T> {
     
     @Nullable
     @Environment(EnvType.CLIENT)
-    @Deprecated(forRemoval = true, since = "8.3")
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
     default Tooltip getTooltip(EntryStack<T> entry, Point mouse) {
         return null;
     }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java
index 8886021c1..7304ddd48 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java
@@ -33,6 +33,7 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 public interface Renderer {
@@ -41,7 +42,8 @@ public interface Renderer {
     
     @Nullable
     @Environment(EnvType.CLIENT)
-    @Deprecated(forRemoval = true)
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
     default Tooltip getTooltip(Point mouse) {
         return null;
     }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitor.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitor.java
index 846e66030..389480e00 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitor.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitor.java
@@ -117,7 +117,7 @@ public interface DraggableStackVisitor<T extends Screen> extends DraggableCompon
     @Override
     default DraggedAcceptorResult acceptDragged(DraggingContext<T> context, DraggableComponent<?> component) {
         return component.<EntryStack<?>>getIf()
-                .map(comp -> acceptDraggedStack(context, DraggableStack.from(comp)))
+                .map(comp -> acceptDraggedStackWithResult(context, DraggableStack.from(comp)))
                 .orElse(DraggedAcceptorResult.PASS);
     }
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitorWidget.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitorWidget.java
index 31d8c768d..eddff5946 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitorWidget.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackVisitorWidget.java
@@ -99,7 +99,7 @@ public interface DraggableStackVisitorWidget extends DraggableComponentVisitorWi
     @Override
     default DraggedAcceptorResult acceptDragged(DraggingContext<Screen> context, DraggableComponent<?> component) {
         return component.<EntryStack<?>>getIf()
-                .map(comp -> acceptDraggedStack(context, DraggableStack.from(comp)))
+                .map(comp -> acceptDraggedStackWithResult(context, DraggableStack.from(comp)))
                 .orElse(DraggedAcceptorResult.PASS);
     }
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/component/DraggableComponentVisitorWidget.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/component/DraggableComponentVisitorWidget.java
index 10b02c1b0..e77616751 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/component/DraggableComponentVisitorWidget.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/component/DraggableComponentVisitorWidget.java
@@ -85,7 +85,7 @@ public interface DraggableComponentVisitorWidget {
     }
     
     static DraggableComponentVisitor<Screen> toVisitor(DraggableComponentVisitorWidget widget, double priority) {
-        return new DraggableComponentVisitor<>() {
+        return new DraggableComponentVisitor<Screen>() {
             @Override
             public DraggedAcceptorResult acceptDragged(DraggingContext<Screen> context, DraggableComponent<?> component) {
                 return widget.acceptDragged(context, component);
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
index 4b808f10d..55ff2997a 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
@@ -52,7 +52,8 @@ import java.util.function.Supplier;
 
 @Environment(EnvType.CLIENT)
 public final class Widgets {
-    private Widgets() {}
+    private Widgets() {
+    }
     
     public static Widget createDrawableWidget(DrawableConsumer drawable) {
         return ClientInternals.getWidgetsProvider().createDrawableWidget(drawable);
@@ -123,15 +124,19 @@ public final class Widgets {
     }
     
     public static WidgetWithBounds wrapRenderer(Rectangle bounds, Renderer renderer) {
+        return wrapRenderer(() -> bounds, renderer);
+    }
+    
+    public static WidgetWithBounds wrapRenderer(Supplier<Rectangle> bounds, Renderer renderer) {
         if (renderer instanceof Widget)
-            return wrapWidgetWithBounds(((Widget) renderer), bounds);
+            return wrapWidgetWithBoundsSupplier((Widget) renderer, bounds);
         return ClientInternals.getWidgetsProvider().wrapRenderer(bounds, renderer);
     }
     
     /**
      * @deprecated Use {@link #withBounds(Widget)} instead.
      */
-    @Deprecated(forRemoval = true)
+    @Deprecated
     @ApiStatus.ScheduledForRemoval
     public static WidgetWithBounds wrapWidgetWithBounds(Widget widget) {
         return withBounds(widget);
@@ -140,7 +145,7 @@ public final class Widgets {
     /**
      * @deprecated Use {@link #withBounds(Widget, Rectangle)} instead.
      */
-    @Deprecated(forRemoval = true)
+    @Deprecated
     @ApiStatus.ScheduledForRemoval
     public static WidgetWithBounds wrapWidgetWithBounds(Widget widget, Rectangle bounds) {
         return withBounds(widget, bounds);
@@ -149,7 +154,7 @@ public final class Widgets {
     /**
      * @deprecated Use {@link #withBounds(Widget, Supplier)} instead.
      */
-    @Deprecated(forRemoval = true)
+    @Deprecated
     @ApiStatus.ScheduledForRemoval
     public static WidgetWithBounds wrapWidgetWithBoundsSupplier(Widget widget, Supplier<Rectangle> bounds) {
         return withBounds(widget, bounds);
@@ -164,8 +169,8 @@ public final class Widgets {
     }
     
     public static WidgetWithBounds withBounds(Widget widget, Supplier<Rectangle> bounds) {
-        if (widget instanceof WidgetWithBounds withBounds)
-            return withBounds;
+        if (widget instanceof WidgetWithBounds)
+            return (WidgetWithBounds) widget;
         if (bounds == null)
             return new DelegateWidget(widget);
         return new DelegateWidgetWithBounds(widget, bounds);
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java
index 7d7052756..16214baa8 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java
@@ -158,7 +158,8 @@ public interface CategoryRegistry extends Reloadable<REIClientPlugin>, Iterable<
         configure(category, config -> config.addWorkstations(stations));
     }
     
-    @Deprecated(forRemoval = true)
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
     default <D extends Display> void removePlusButton(CategoryIdentifier<D> category) {
         configure(category, CategoryConfiguration::removePlusButton);
     }
@@ -187,7 +188,8 @@ public interface CategoryRegistry extends Reloadable<REIClientPlugin>, Iterable<
         /**
          * Removes the plus button.
          */
-        @Deprecated(forRemoval = true)
+        @Deprecated
+        @ApiStatus.ScheduledForRemoval
         default void removePlusButton() {
             setPlusButtonArea(bounds -> null);
         }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java
index e6423d4e3..b914a961d 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java
@@ -138,11 +138,11 @@ public interface ScreenRegistry extends Reloadable<REIClientPlugin> {
     }
     
     @ApiStatus.ScheduledForRemoval
-    @Deprecated(forRemoval = true)
+    @Deprecated
     Iterable<DraggableStackProvider<Screen>> getDraggableProviders();
     
     @ApiStatus.ScheduledForRemoval
-    @Deprecated(forRemoval = true)
+    @Deprecated
     Iterable<DraggableStackVisitor<Screen>> getDraggableVisitors();
     
     Iterable<DraggableComponentProvider<Screen, Object>> getDraggableComponentProviders();
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
index 43ffc068b..f8fd5e37b 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
@@ -33,6 +33,7 @@ import me.shedaniel.rei.api.common.transfer.info.stack.SlotAccessor;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -97,7 +98,8 @@ public interface SimplePlayerInventoryMenuInfo<T extends AbstractContainerMenu,
                 .collect(Collectors.toList());
     }
     
-    @Deprecated(forRemoval = true)
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
     default void populateRecipeFinder(T menu, RecipeFinder finder) {}
     
     default void populateRecipeFinder(MenuInfoContext<T, ?, D> context, RecipeFinder finder) {