remove old Rectangle

Signed-off-by: shedaniel <daniel@shedaniel.me>

src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java

@@ -25,8 +25,6 @@ package me.shedaniel.rei.api;
 
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
-import me.shedaniel.rei.gui.ContainerScreenOverlay;
-import me.shedaniel.rei.impl.ScreenHelper;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.screen.ScreenHandler;
@@ -94,34 +92,10 @@ public interface AutoTransferHandler {
         
         HandledScreen<?> getHandledScreen();
         
-        @Deprecated
-        @ApiStatus.ScheduledForRemoval
-        default HandledScreen<?> getScreenWithHandler() {
-            return getHandledScreen();
-        }
-        
-        @Deprecated
-        @ApiStatus.ScheduledForRemoval
-        default HandledScreen<?> getContainerScreen() {
-            return getHandledScreen();
-        }
-        
         RecipeDisplay getRecipe();
         
-        @Deprecated
-        @ApiStatus.ScheduledForRemoval
-        default ScreenHandler getContainer() {
-            return getScreenHandler();
-        }
-        
         default ScreenHandler getScreenHandler() {
-            return getScreenWithHandler().getScreenHandler();
-        }
-        
-        @Deprecated
-        @ApiStatus.ScheduledForRemoval
-        default ContainerScreenOverlay getOverlay() {
-            return ScreenHelper.getLastOverlay();
+            return getHandledScreen().getScreenHandler();
         }
     }
     

src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java

@@ -23,7 +23,8 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
+import me.shedaniel.rei.impl.DisplayHelperImpl;
 import net.minecraft.client.gui.screen.Screen;
 
 import java.util.List;
@@ -31,9 +32,8 @@ import java.util.function.Supplier;
 
 public interface BaseBoundsHandler extends DisplayHelper.DisplayBoundsHandler<Screen> {
     
-    @SuppressWarnings("deprecation")
     static BaseBoundsHandler getInstance() {
-        return DisplayHelper.getInstance().getBaseBoundsHandler();
+        return ((DisplayHelperImpl) DisplayHelper.getInstance()).getBaseBoundsHandler();
     }
     
     /**

src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 
 /**
  * The supplier for the + button area.

src/main/java/me/shedaniel/rei/api/ConfigManager.java

@@ -26,9 +26,6 @@ package me.shedaniel.rei.api;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-import org.jetbrains.annotations.ApiStatus;
-
-import java.util.List;
 
 public interface ConfigManager {
     
@@ -39,16 +36,6 @@ public interface ConfigManager {
         return RoughlyEnoughItemsCore.getConfigManager();
     }
     
-    /**
-     * @return the list of favourites
-     * @deprecated {@link ConfigObject#getFavorites()}
-     */
-    @ApiStatus.ScheduledForRemoval
-    @Deprecated
-    default List<EntryStack> getFavorites() {
-        return ConfigObject.getInstance().getFavorites();
-    }
-    
     /**
      * Saves the config.
      */

src/main/java/me/shedaniel/rei/api/ConfigObject.java

@@ -93,10 +93,6 @@ public interface ConfigObject {
     
     boolean areClickableRecipeArrowsEnabled();
     
-    @ApiStatus.ScheduledForRemoval
-    @Deprecated
-    boolean isUsingLightGrayRecipeBorder();
-    
     RecipeBorderType getRecipeBorderType();
     
     boolean doesVillagerScreenHavePermanentScrollBar();

src/main/java/me/shedaniel/rei/api/DisplayHelper.java

@@ -23,12 +23,10 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.gui.config.SearchFieldLocation;
-import me.shedaniel.rei.utils.CollectionUtils;
 import net.minecraft.util.ActionResult;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
 import java.util.function.Supplier;
@@ -53,18 +51,6 @@ public interface DisplayHelper {
      */
     List<DisplayBoundsHandler<?>> getSortedBoundsHandlers(Class<?> screenClass);
     
-    /**
-     * Gets all registered bounds handlers
-     *
-     * @return the list of registered bounds handlers
-     * @deprecated see {@link #getAllOverlayDeciders()}
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default List<DisplayBoundsHandler<?>> getAllBoundsHandlers() {
-        return (List) CollectionUtils.castAndMap(getAllOverlayDeciders(), DisplayBoundsHandler.class);
-    }
-    
     /**
      * Gets all registered overlay deciders
      *
@@ -81,18 +67,6 @@ public interface DisplayHelper {
      */
     DisplayBoundsHandler<?> getResponsibleBoundsHandler(Class<?> screenClass);
     
-    /**
-     * Registers a bounds handler
-     *
-     * @param handler the handler to register
-     * @deprecated see {@link #registerHandler(OverlayDecider)}
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default void registerBoundsHandler(DisplayBoundsHandler<?> handler) {
-        registerHandler(handler);
-    }
-    
     /**
      * Registers a bounds decider
      *
@@ -100,17 +74,6 @@ public interface DisplayHelper {
      */
     void registerHandler(OverlayDecider decider);
     
-    /**
-     * Gets the base bounds handler api for exclusion zones
-     *
-     * @return the base bounds handler
-     * @deprecated {@link BaseBoundsHandler#getInstance()}
-     */
-    @ApiStatus.Internal
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    BaseBoundsHandler getBaseBoundsHandler();
-    
     interface DisplayBoundsHandler<T> extends OverlayDecider {
         /**
          * Gets the base supported class for the bounds handler

src/main/java/me/shedaniel/rei/api/EntryStack.java

@@ -26,9 +26,8 @@ package me.shedaniel.rei.api;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.widgets.Tooltip;
-import me.shedaniel.rei.gui.widget.QueuedTooltip;
 import me.shedaniel.rei.impl.EmptyEntryStack;
 import me.shedaniel.rei.impl.FluidEntryStack;
 import me.shedaniel.rei.impl.ItemEntryStack;
@@ -231,23 +230,11 @@ public interface EntryStack {
     
     <T> T get(Settings<T> settings);
     
-    /**
-     * @deprecated Use {@link #getTooltip(Point)}
-     */
     @Nullable
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default QueuedTooltip getTooltip(int mouseX, int mouseY) {
+    default Tooltip getTooltip(Point mouse) {
         return null;
     }
     
-    @Nullable
-    default Tooltip getTooltip(Point point) {
-        QueuedTooltip tooltip = getTooltip(point.x, point.y);
-        if (tooltip == null) return null;
-        return Tooltip.create(new Point(tooltip.getX(), tooltip.getY()), tooltip.getText());
-    }
-    
     void render(Rectangle bounds, int mouseX, int mouseY, float delta);
     
     enum Type {

src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.Internal

src/main/java/me/shedaniel/rei/api/REIHelper.java

@@ -24,11 +24,9 @@
 package me.shedaniel.rei.api;
 
 import me.shedaniel.rei.api.widgets.Tooltip;
-import me.shedaniel.rei.gui.widget.QueuedTooltip;
 import me.shedaniel.rei.gui.widget.TextFieldWidget;
 import me.shedaniel.rei.impl.ScreenHelper;
 import net.minecraft.item.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -48,15 +46,6 @@ public interface REIHelper {
     
     List<ItemStack> getInventoryStacks();
     
-    /**
-     * @deprecated Use {@link #queueTooltip(Tooltip)} or {@link Tooltip#queue()}
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default void addTooltip(@Nullable QueuedTooltip tooltip) {
-        queueTooltip(tooltip);
-    }
-    
     void queueTooltip(@Nullable Tooltip tooltip);
     
 }

src/main/java/me/shedaniel/rei/api/RecipeCategory.java

@@ -25,18 +25,14 @@ package me.shedaniel.rei.api;
 
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.widgets.Widgets;
-import me.shedaniel.rei.gui.RecipeViewingScreen;
 import me.shedaniel.rei.gui.entries.RecipeEntry;
 import me.shedaniel.rei.gui.entries.SimpleRecipeEntry;
 import me.shedaniel.rei.gui.widget.Widget;
-import me.shedaniel.rei.impl.widgets.PanelWidget;
-import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Supplier;
 
 
 public interface RecipeCategory<T extends RecipeDisplay> {
@@ -75,21 +71,6 @@ public interface RecipeCategory<T extends RecipeDisplay> {
         return SimpleRecipeEntry.create(recipe::getInputEntries, recipe::getOutputEntries);
     }
     
-    /**
-     * Setup the widgets for displaying the recipe
-     *
-     * @param recipeDisplaySupplier the supplier for getting the recipe
-     * @param bounds                the bounds of the display, configurable with overriding the width, height methods.
-     * @return the list of widgets
-     * @deprecated use {@link #setupDisplay(RecipeDisplay, me.shedaniel.math.Rectangle)}
-     */
-    @ApiStatus.OverrideOnly
-    @ApiStatus.ScheduledForRemoval
-    @Deprecated
-    default List<Widget> setupDisplay(Supplier<T> recipeDisplaySupplier, me.shedaniel.math.api.Rectangle bounds) {
-        return Collections.singletonList(Widgets.createCategoryBase(bounds));
-    }
-    
     /**
      * Setup the widgets for displaying the recipe
      *
@@ -99,30 +80,7 @@ public interface RecipeCategory<T extends RecipeDisplay> {
      */
     @ApiStatus.OverrideOnly
     default List<Widget> setupDisplay(T recipeDisplay, Rectangle bounds) {
-        return setupDisplay(() -> recipeDisplay, new me.shedaniel.math.api.Rectangle(bounds));
-    }
-    
-    /**
-     * Draws the category background, used in {@link RecipeViewingScreen}
-     *
-     * @param bounds the bounds of the whole recipe viewing screen
-     * @param mouseX the x coordinates for the mouse
-     * @param mouseY the y coordinates for the mouse
-     * @param delta  the delta
-     * @deprecated there is no replacement for this as this is just a dumb idea, please contact me if you want to change my mind
-     */
-    @ApiStatus.OverrideOnly
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default void drawCategoryBackground(me.shedaniel.math.api.Rectangle bounds, int mouseX, int mouseY, float delta) {
-        PanelWidget.render(bounds, -1);
-        if (REIHelper.getInstance().isDarkThemeEnabled()) {
-            DrawableHelper.fill(bounds.x + 17, bounds.y + 5, bounds.x + bounds.width - 17, bounds.y + 17, 0xFF404040);
-            DrawableHelper.fill(bounds.x + 17, bounds.y + 19, bounds.x + bounds.width - 17, bounds.y + 31, 0xFF404040);
-        } else {
-            DrawableHelper.fill(bounds.x + 17, bounds.y + 5, bounds.x + bounds.width - 17, bounds.y + 17, 0xFF9E9E9E);
-            DrawableHelper.fill(bounds.x + 17, bounds.y + 19, bounds.x + bounds.width - 17, bounds.y + 31, 0xFF9E9E9E);
-        }
+        return Collections.singletonList(Widgets.createCategoryBase(bounds));
     }
     
     /**

src/main/java/me/shedaniel/rei/api/RecipeHelper.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.recipe.Recipe;
@@ -107,6 +107,7 @@ public interface RecipeHelper {
      *
      * @param categoryIdentifier the category to display in
      * @param display            the recipe display
+     * @deprecated Use {@link RecipeHelper#registerDisplay(RecipeDisplay)}
      */
     @ApiStatus.Internal
     @ApiStatus.ScheduledForRemoval

src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.api;
 
 import it.unimi.dsi.fastutil.ints.IntList;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.gui.widget.Widget;
 import org.jetbrains.annotations.ApiStatus;
 

src/main/java/me/shedaniel/rei/api/widgets/Button.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.api.widgets;
 
-import me.shedaniel.math.api.Point;
+import me.shedaniel.math.Point;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/me/shedaniel/rei/api/widgets/Slot.java

@@ -25,7 +25,6 @@ package me.shedaniel.rei.api.widgets;
 
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.EntryStack;
-import me.shedaniel.rei.gui.widget.QueuedTooltip;
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -153,17 +152,8 @@ public abstract class Slot extends WidgetWithBounds {
     @NotNull
     public abstract List<EntryStack> getEntries();
     
-    /**
-     * @deprecated use {@link #getCurrentTooltip(Point)}
-     */
-    @Nullable
-    @Deprecated
-    public QueuedTooltip getCurrentTooltip(int mouseX, int mouseY) {
-        return null;
-    }
-    
     @Nullable
     public Tooltip getCurrentTooltip(Point point) {
-        return getCurrentTooltip(point.x, point.y);
+        return null;
     }
 }

src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java

@@ -32,21 +32,25 @@ import java.util.Collection;
 import java.util.List;
 
 public interface Tooltip {
+    @SuppressWarnings("deprecation")
     @NotNull
     static Tooltip create(Point point, Collection<String> texts) {
         return QueuedTooltip.create(point, texts);
     }
     
+    @SuppressWarnings("deprecation")
     @NotNull
     static Tooltip create(Point point, String... texts) {
         return QueuedTooltip.create(point, texts);
     }
     
+    @SuppressWarnings("deprecation")
     @NotNull
     static Tooltip create(Collection<String> texts) {
         return QueuedTooltip.create(texts);
     }
     
+    @SuppressWarnings("deprecation")
     @NotNull
     static Tooltip create(String... texts) {
         return QueuedTooltip.create(texts);

src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java

@@ -25,8 +25,8 @@ package me.shedaniel.rei.gui;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;

src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java

@@ -25,7 +25,7 @@ package me.shedaniel.rei.gui;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Point;
+import me.shedaniel.math.Point;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.gui.widget.TextFieldWidget;

src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java

@@ -27,8 +27,8 @@ import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget;
 import me.shedaniel.clothconfig2.impl.EasingMethod;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.widgets.Widgets;
 import me.shedaniel.rei.gui.config.RecipeScreenType;
 import me.shedaniel.rei.gui.widget.Widget;

src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java

@@ -25,7 +25,7 @@ package me.shedaniel.rei.gui;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.Framebuffer;

src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java

@@ -27,8 +27,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.clothconfig2.api.ModifierKeyCode;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.api.widgets.Button;

src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java

@@ -27,8 +27,8 @@ import com.google.common.collect.Lists;
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.clothconfig2.ClothConfigInitializer;
 import me.shedaniel.clothconfig2.api.ScissorsHandler;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.api.widgets.Button;

src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java

@@ -30,8 +30,8 @@ import me.shedaniel.clothconfig2.ClothConfigInitializer;
 import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
 import me.shedaniel.clothconfig2.gui.ClothConfigScreen;
 import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.ConfigObject;
 import me.shedaniel.rei.api.EntryRegistry;

src/main/java/me/shedaniel/rei/gui/entries/RecipeEntry.java

@@ -23,21 +23,11 @@
 
 package me.shedaniel.rei.gui.entries;
 
-import me.shedaniel.rei.gui.widget.QueuedTooltip;
 import me.shedaniel.rei.impl.RenderingEntry;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 @ApiStatus.OverrideOnly
 public abstract class RecipeEntry extends RenderingEntry {
-    @Nullable
-    @Override
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public QueuedTooltip getTooltip(int mouseX, int mouseY) {
-        return super.getTooltip(mouseX, mouseY);
-    }
-    
     public abstract int getHeight();
     
     public final int getWidth() {

src/main/java/me/shedaniel/rei/gui/entries/SimpleRecipeEntry.java

@@ -25,7 +25,7 @@ package me.shedaniel.rei.gui.entries;
 
 import com.google.common.collect.Lists;
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.api.widgets.Slot;
 import me.shedaniel.rei.api.widgets.Tooltip;

src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java

@@ -24,8 +24,8 @@
 package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.api.widgets.Tooltip;
 import net.minecraft.client.gui.Element;

src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import org.jetbrains.annotations.ApiStatus;
 
 /**

src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java

@@ -48,12 +48,6 @@ public abstract class ClickableLabelWidget extends LabelWidget {
         this.hoveredColor = REIHelper.getInstance().isDarkThemeEnabled() ? -1 : 0xFF66FFCC;
     }
     
-    @ApiStatus.Internal
-    protected ClickableLabelWidget(me.shedaniel.math.api.Point point, String text) {
-        super(point, text);
-        this.hoveredColor = REIHelper.getInstance().isDarkThemeEnabled() ? -1 : 0xFF66FFCC;
-    }
-    
     public LabelWidget hoveredColor(int hoveredColor) {
         this.hoveredColor = hoveredColor;
         return this;
@@ -95,7 +89,7 @@ public abstract class ClickableLabelWidget extends LabelWidget {
             if (!focused && containsMouse(mouseX, mouseY))
                 Tooltip.create(getTooltips().get().split("\n")).queue();
             else if (focused)
-                Tooltip.create(getPosition(), getTooltips().get().split("\n")).queue();
+                Tooltip.create(getLocation(), getTooltips().get().split("\n")).queue();
     }
     
     public int getHoveredColor() {

src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java

@@ -23,8 +23,8 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;

src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java

@@ -28,8 +28,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.clothconfig2.ClothConfigInitializer;
 import me.shedaniel.clothconfig2.api.ScissorsHandler;
 import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;

src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java

@@ -25,8 +25,8 @@ package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.clothconfig2.api.ModifierKeyCode;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.api.widgets.Slot;

src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java

@@ -28,8 +28,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.clothconfig2.ClothConfigInitializer;
 import me.shedaniel.clothconfig2.api.ScissorsHandler;
 import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;

src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.gui.widget;
 
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.api.widgets.Tooltip;
 import me.shedaniel.rei.api.widgets.Widgets;
@@ -53,11 +53,6 @@ public class LabelWidget extends WidgetWithBounds {
     private boolean centered = true;
     private Supplier<String> tooltipSupplier;
     
-    @ApiStatus.Internal
-    public LabelWidget(me.shedaniel.math.api.Point point, String text) {
-        this((Point) point, text);
-    }
-    
     @ApiStatus.Internal
     public LabelWidget(Point point, String text) {
         this.pos = point;
@@ -69,14 +64,6 @@ public class LabelWidget extends WidgetWithBounds {
         return new LabelWidget(point, text);
     }
     
-    public static LabelWidget create(me.shedaniel.math.api.Point point, String text) {
-        return new LabelWidget(point, text);
-    }
-    
-    public static ClickableLabelWidget createClickable(me.shedaniel.math.api.Point point, String text, Consumer<ClickableLabelWidget> onClicked) {
-        return createClickable((Point) point, text, onClicked);
-    }
-    
     public static ClickableLabelWidget createClickable(Point point, String text, Consumer<ClickableLabelWidget> onClicked) {
         ClickableLabelWidget[] widget = {null};
         widget[0] = new ClickableLabelWidget(point, text) {
@@ -134,22 +121,11 @@ public class LabelWidget extends WidgetWithBounds {
     
     /**
      * @return the position of this label
-     * @deprecated Use {@link #getLocation()}
      */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public me.shedaniel.math.api.Point getPosition() {
-        return new me.shedaniel.math.api.Point(getLocation());
-    }
-    
     public Point getLocation() {
         return pos;
     }
     
-    public LabelWidget setPosition(me.shedaniel.math.api.Point position) {
-        return setLocation(position);
-    }
-    
     public LabelWidget setLocation(Point position) {
         this.pos = position;
         return this;
@@ -177,7 +153,7 @@ public class LabelWidget extends WidgetWithBounds {
     @Override
     public Rectangle getBounds() {
         int width = font.getStringWidth(text);
-        Point pos = getPosition();
+        Point pos = getLocation();
         if (isCentered())
             return new Rectangle(pos.x - width / 2 - 1, pos.y - 5, width + 2, 14);
         return new Rectangle(pos.x - 1, pos.y - 5, width + 2, 14);
@@ -191,7 +167,7 @@ public class LabelWidget extends WidgetWithBounds {
     @Override
     public void render(int mouseX, int mouseY, float delta) {
         int width = font.getStringWidth(text);
-        Point pos = getPosition();
+        Point pos = getLocation();
         if (isCentered()) {
             if (hasShadows)
                 font.drawWithShadow(text, pos.x - width / 2f, pos.y, defaultColor);

src/main/java/me/shedaniel/rei/gui/widget/PanelWidget.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.ConfigObject;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.gui.config.RecipeBorderType;

src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java

@@ -38,6 +38,8 @@ import java.util.List;
  * @see Tooltip
  */
 @ApiStatus.Internal
+@Deprecated
+@ApiStatus.ScheduledForRemoval
 public class QueuedTooltip implements Tooltip {
     
     private Point location;
@@ -48,16 +50,6 @@ public class QueuedTooltip implements Tooltip {
         this.text = Lists.newArrayList(text);
     }
     
-    @NotNull
-    public static QueuedTooltip create(me.shedaniel.math.api.Point location, List<String> text) {
-        return new QueuedTooltip(location, text);
-    }
-    
-    @NotNull
-    public static QueuedTooltip create(me.shedaniel.math.api.Point location, String... text) {
-        return QueuedTooltip.create(location, Lists.newArrayList(text));
-    }
-    
     @NotNull
     public static QueuedTooltip create(Point location, List<String> text) {
         return new QueuedTooltip(location, text);
@@ -88,17 +80,6 @@ public class QueuedTooltip implements Tooltip {
         return QueuedTooltip.create(PointHelper.ofMouse(), text);
     }
     
-    /**
-     * @return the absolute location of the tooltip.
-     * @deprecated Use {@link #getX()} and {@link #getY()} instead.
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    @NotNull
-    public me.shedaniel.math.api.Point getLocation() {
-        return new me.shedaniel.math.api.Point(location);
-    }
-    
     @Override
     public int getX() {
         return location.x;

src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java

@@ -23,8 +23,8 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.plugin.DefaultPlugin;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;

src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.ConfigObject;
 import org.jetbrains.annotations.ApiStatus;
 

src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java

@@ -25,8 +25,8 @@ package me.shedaniel.rei.gui.widget;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.api.widgets.Button;
 import me.shedaniel.rei.api.widgets.Panel;

src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
 import org.jetbrains.annotations.ApiStatus;
 

src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.ClientHelper;
 import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.api.REIHelper;

src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.REIHelper;
 import net.minecraft.SharedConstants;

src/main/java/me/shedaniel/rei/gui/widget/Widget.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Point;
+import me.shedaniel.math.Point;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.AbstractParentElement;
@@ -62,12 +62,9 @@ public abstract class Widget extends AbstractParentElement implements Drawable {
         return containsMouse((double) mouseX, (double) mouseY);
     }
     
+    @SuppressWarnings("RedundantCast")
     public final boolean containsMouse(Point point) {
-        return containsMouse(point.x, point.y);
-    }
-    
-    public final boolean containsMouse(me.shedaniel.math.Point point) {
-        return containsMouse(point.x, point.y);
+        return containsMouse((double) point.x, (double) point.y);
     }
     
     @Override

src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class WidgetWithBounds extends Widget {

src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.impl;
 
 import com.google.common.collect.Lists;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.BaseBoundsHandler;
 import me.shedaniel.rei.api.DisplayHelper;
 import net.minecraft.client.MinecraftClient;

src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java

@@ -25,7 +25,7 @@ package me.shedaniel.rei.impl;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.BaseBoundsHandler;
 import me.shedaniel.rei.api.DisplayHelper;
 import me.shedaniel.rei.api.OverlayDecider;
@@ -110,8 +110,7 @@ public class DisplayHelperImpl implements DisplayHelper {
         screenDisplayBoundsHandlers.sort(BOUNDS_HANDLER_COMPARATOR);
     }
     
-    @Deprecated
-    @Override
+    @ApiStatus.Internal
     public BaseBoundsHandler getBaseBoundsHandler() {
         return baseBoundsHandler;
     }

src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.impl;
 
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.api.widgets.Tooltip;
 import net.minecraft.util.Identifier;

src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java

@@ -25,7 +25,7 @@ package me.shedaniel.rei.impl;
 
 import com.google.common.collect.Lists;
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.ClientHelper;
 import me.shedaniel.rei.api.ConfigObject;
 import me.shedaniel.rei.api.EntryStack;

src/main/java/me/shedaniel/rei/impl/InternalWidgets.java

@@ -25,7 +25,7 @@ package me.shedaniel.rei.impl;
 
 import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.ints.IntList;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.api.widgets.Button;

src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java

@@ -26,7 +26,7 @@ package me.shedaniel.rei.impl;
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.api.widgets.Tooltip;
 import net.minecraft.client.MinecraftClient;

src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java

@@ -26,7 +26,7 @@ package me.shedaniel.rei.impl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.api.plugins.REIPluginV0;

src/main/java/me/shedaniel/rei/impl/RenderingEntry.java

@@ -24,11 +24,9 @@
 package me.shedaniel.rei.impl;
 
 import me.shedaniel.rei.api.EntryStack;
-import me.shedaniel.rei.gui.widget.QueuedTooltip;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 
@@ -128,12 +126,4 @@ public abstract class RenderingEntry extends DrawableHelper implements EntryStac
     public <T> T get(Settings<T> settings) {
         return settings.getDefaultValue();
     }
-    
-    @Nullable
-    @Override
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public QueuedTooltip getTooltip(int mouseX, int mouseY) {
-        return EntryStack.super.getTooltip(mouseX, mouseY);
-    }
 }

src/main/java/me/shedaniel/rei/impl/ScreenHelper.java

@@ -35,7 +35,6 @@ import me.shedaniel.rei.gui.ContainerScreenOverlay;
 import me.shedaniel.rei.gui.OverlaySearchField;
 import me.shedaniel.rei.gui.RecipeScreen;
 import me.shedaniel.rei.gui.widget.TextFieldWidget;
-import me.shedaniel.rei.listeners.ContainerScreenHooks;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.event.client.ClientTickCallback;
 import net.minecraft.client.MinecraftClient;
@@ -146,56 +145,14 @@ public class ScreenHelper implements ClientModInitializer, REIHelper {
         return getLastOverlay(false, false);
     }
     
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public static HandledScreen<?> getLastContainerScreen() {
-        return getLastHandledScreen();
-    }
-    
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public static HandledScreen<?> getLastScreenWithHandler() {
-        return getLastHandledScreen();
-    }
-    
     public static HandledScreen<?> getLastHandledScreen() {
         return lastHandledScreen;
     }
     
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public static void setLastContainerScreen(HandledScreen<?> lastScreenWithHandler) {
-        setLastHandledScreen(lastScreenWithHandler);
-    }
-    
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public static void setLastScreenWithHandler(HandledScreen<?> lastScreenWithHandler) {
-        setLastHandledScreen(lastScreenWithHandler);
-    }
-    
     public static void setLastHandledScreen(HandledScreen<?> lastScreenWithHandler) {
         ScreenHelper.lastHandledScreen = lastScreenWithHandler;
     }
     
-    /**
-     * @deprecated Please create your own mixin hooks
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public static ContainerScreenHooks getLastContainerScreenHooks() {
-        return getLastScreenWithHandlerHooks();
-    }
-    
-    /**
-     * @deprecated Please create your own mixin hooks
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    public static ContainerScreenHooks getLastScreenWithHandlerHooks() {
-        return (ContainerScreenHooks) lastHandledScreen;
-    }
-    
     public static void drawHoveringWidget(int x, int y, TriConsumer<Integer, Integer, Float> consumer, int width, int height, float delta) {
         Window window = MinecraftClient.getInstance().getWindow();
         drawHoveringWidget(window.getScaledWidth(), window.getScaledHeight(), x, y, consumer, width, height, delta);

src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.impl.widgets;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.widgets.Arrow;
 import me.shedaniel.rei.plugin.DefaultPlugin;
 import net.minecraft.client.MinecraftClient;

src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java

@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.impl.widgets;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.widgets.BurningFire;
 import me.shedaniel.rei.plugin.DefaultPlugin;
 import net.minecraft.client.MinecraftClient;

src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java

@@ -24,8 +24,8 @@
 package me.shedaniel.rei.impl.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.math.api.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.api.widgets.Button;
 import me.shedaniel.rei.api.widgets.Tooltip;

src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.impl.widgets;
 
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.api.widgets.Label;
 import me.shedaniel.rei.api.widgets.Tooltip;

src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java

@@ -44,7 +44,7 @@ public final class PanelWidget extends Panel {
     private static final Identifier CHEST_GUI_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png");
     
     private static final PanelWidget TEMP = new PanelWidget(new Rectangle());
-    private me.shedaniel.math.api.Rectangle bounds;
+    private Rectangle bounds;
     private int color = -1;
     private int innerColor = REIHelper.getInstance().isDarkThemeEnabled() ? -13750738 : -3750202;
     private int xTextureOffset = 0;
@@ -57,11 +57,11 @@ public final class PanelWidget extends Panel {
     }
     
     public PanelWidget(@NotNull Rectangle bounds) {
-        this.bounds = new me.shedaniel.math.api.Rectangle(bounds);
+        this.bounds = Objects.requireNonNull(bounds);
     }
     
     public static void render(@NotNull Rectangle bounds, int color) {
-        TEMP.bounds.setBounds(bounds);
+        TEMP.bounds.setBounds(Objects.requireNonNull(bounds));
         TEMP.color = color;
         TEMP.render(0, 0, 0);
     }
@@ -118,7 +118,7 @@ public final class PanelWidget extends Panel {
     
     @NotNull
     @Override
-    public me.shedaniel.math.api.Rectangle getBounds() {
+    public Rectangle getBounds() {
         return bounds;
     }
     

src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java

@@ -27,7 +27,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import it.unimi.dsi.fastutil.objects.Object2FloatMap;
 import me.shedaniel.math.Point;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.api.plugins.REIPluginV0;

src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.plugin;
 
 import com.google.common.collect.Ordering;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.impl.ScreenHelper;
 import me.shedaniel.rei.listeners.AbstractInventoryScreenHooks;
 import me.shedaniel.rei.listeners.ContainerScreenHooks;

src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java

@@ -24,7 +24,7 @@
 package me.shedaniel.rei.plugin;
 
 import com.google.common.collect.Lists;
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.impl.ScreenHelper;
 import me.shedaniel.rei.listeners.ContainerScreenHooks;
 import net.minecraft.client.MinecraftClient;

src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java

@@ -52,6 +52,7 @@ import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Objects;
 
 public class DefaultBeaconBaseCategory implements RecipeCategory<DefaultBeaconBaseDisplay> {
     @Override
@@ -79,7 +80,7 @@ public class DefaultBeaconBaseCategory implements RecipeCategory<DefaultBeaconBa
             }
             
             @Override
-            public void render(me.shedaniel.math.api.Rectangle rectangle, int mouseX, int mouseY, float delta) {
+            public void render(Rectangle rectangle, int mouseX, int mouseY, float delta) {
                 MinecraftClient.getInstance().textRenderer.draw(name, rectangle.x + 5, rectangle.y + 6, -1);
             }
         };
@@ -106,7 +107,7 @@ public class DefaultBeaconBaseCategory implements RecipeCategory<DefaultBeaconBa
     }
     
     private static class ScrollableSlotsWidget extends WidgetWithBounds {
-        private me.shedaniel.math.api.Rectangle bounds;
+        private Rectangle bounds;
         private List<Slot> widgets;
         private double target;
         private double scroll;
@@ -114,7 +115,7 @@ public class DefaultBeaconBaseCategory implements RecipeCategory<DefaultBeaconBa
         private long duration;
         
         public ScrollableSlotsWidget(Rectangle bounds, List<Slot> widgets) {
-            this.bounds = new me.shedaniel.math.api.Rectangle(bounds);
+            this.bounds = Objects.requireNonNull(bounds);
             this.widgets = Lists.newArrayList(widgets);
         }
         
@@ -163,7 +164,7 @@ public class DefaultBeaconBaseCategory implements RecipeCategory<DefaultBeaconBa
         
         @NotNull
         @Override
-        public me.shedaniel.math.api.Rectangle getBounds() {
+        public Rectangle getBounds() {
             return bounds;
         }
         

src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java

@@ -71,7 +71,7 @@ public class DefaultCompostingCategory implements RecipeCategory<DefaultComposti
             }
             
             @Override
-            public void render(me.shedaniel.math.api.Rectangle rectangle, int mouseX, int mouseY, float delta) {
+            public void render(Rectangle rectangle, int mouseX, int mouseY, float delta) {
                 MinecraftClient.getInstance().textRenderer.draw(I18n.translate("text.rei.composting.page", recipe.getPage() + 1), rectangle.x + 5, rectangle.y + 6, -1);
             }
         };

src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java

@@ -54,7 +54,7 @@ public class DefaultCookingCategory implements TransferRecipeCategory<DefaultCoo
     }
     
     @Override
-    public void renderRedSlots(List<Widget> widgets, me.shedaniel.math.api.Rectangle bounds, DefaultCookingDisplay display, IntList redSlots) {
+    public void renderRedSlots(List<Widget> widgets, Rectangle bounds, DefaultCookingDisplay display, IntList redSlots) {
         Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27);
         RenderSystem.translatef(0, 0, 400);
         if (redSlots.contains(0)) {

src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java

@@ -94,7 +94,7 @@ public class DefaultCraftingCategory implements TransferRecipeCategory<DefaultCr
     }
     
     @Override
-    public void renderRedSlots(List<Widget> widgets, me.shedaniel.math.api.Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) {
+    public void renderRedSlots(List<Widget> widgets, Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) {
         ContainerInfo<ScreenHandler> info = (ContainerInfo<ScreenHandler>) ContainerInfoHandler.getContainerInfo(getIdentifier(), ScreenHelper.getLastHandledScreen().getScreenHandler().getClass());
         if (info == null)
             return;

src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java

@@ -25,6 +25,7 @@ package me.shedaniel.rei.plugin.fuel;
 
 import com.google.common.collect.Lists;
 import me.shedaniel.math.Point;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.api.RecipeCategory;
 import me.shedaniel.rei.api.widgets.Slot;
@@ -98,7 +99,7 @@ public class DefaultFuelCategory implements RecipeCategory<DefaultFuelDisplay> {
             }
             
             @Override
-            public void render(me.shedaniel.math.api.Rectangle bounds, int mouseX, int mouseY, float delta) {
+            public void render(Rectangle bounds, int mouseX, int mouseY, float delta) {
                 slot.setZ(getZ() + 50);
                 slot.getBounds().setLocation(bounds.x + 4, bounds.y + 2);
                 slot.render(mouseX, mouseY, delta);

src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java

@@ -56,6 +56,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 public class DefaultInformationCategory implements RecipeCategory<DefaultInformationDisplay> {
     protected static void innerBlit(Matrix4f matrix4f, int xStart, int xEnd, int yStart, int yEnd, int z, float uStart, float uEnd, float vStart, float vEnd) {
@@ -90,7 +91,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma
             }
             
             @Override
-            public void render(me.shedaniel.math.api.Rectangle rectangle, int mouseX, int mouseY, float delta) {
+            public void render(Rectangle rectangle, int mouseX, int mouseY, float delta) {
                 MinecraftClient.getInstance().textRenderer.draw(name.asFormattedString(), rectangle.x + 5, rectangle.y + 6, -1);
             }
         };
@@ -100,7 +101,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma
     public EntryStack getLogo() {
         return new RenderingEntry() {
             @Override
-            public void render(me.shedaniel.math.api.Rectangle bounds, int mouseX, int mouseY, float delta) {
+            public void render(Rectangle bounds, int mouseX, int mouseY, float delta) {
                 MinecraftClient.getInstance().getTextureManager().bindTexture(DefaultPlugin.getDisplayTexture());
                 Matrix4f matrix4f = Matrix4f.translate(-1.2f, -1, 0);
                 DefaultInformationCategory.innerBlit(matrix4f, bounds.getCenterX() - 8, bounds.getCenterX() + 8, bounds.getCenterY() - 8, bounds.getCenterY() + 8, 0, 116f / 256f, (116f + 16f) / 256f, 0f, 16f / 256f);
@@ -130,7 +131,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma
     }
     
     private static class ScrollableTextWidget extends WidgetWithBounds {
-        private me.shedaniel.math.api.Rectangle bounds;
+        private Rectangle bounds;
         private List<Text> texts;
         private double target;
         private double scroll;
@@ -138,7 +139,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma
         private long duration;
         
         public ScrollableTextWidget(Rectangle bounds, List<Text> texts) {
-            this.bounds = new me.shedaniel.math.api.Rectangle(bounds);
+            this.bounds = Objects.requireNonNull(bounds);
             this.texts = Lists.newArrayList();
             for (Text text : texts) {
                 if (!this.texts.isEmpty())
@@ -196,7 +197,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma
         
         @NotNull
         @Override
-        public me.shedaniel.math.api.Rectangle getBounds() {
+        public Rectangle getBounds() {
             return bounds;
         }
         

src/main/java/me/shedaniel/rei/server/ContainerInfoHandler.java

@@ -33,6 +33,9 @@ import java.util.Map;
 public class ContainerInfoHandler {
     private static final Map<String, Map<Class<? extends ScreenHandler>, ContainerInfo<? extends ScreenHandler>>> containerInfoMap = Maps.newLinkedHashMap();
     
+    /**
+     * @deprecated Use {@link #registerScreenWithHandlerInfo(Identifier, ContainerInfo)}
+     */
     @Deprecated
     @ApiStatus.ScheduledForRemoval
     public static void registerContainerInfo(Identifier category, ContainerInfo<? extends ScreenHandler> containerInfo) {