From 1764648e4f536b2e6ac1b7d1cb3c3fb60e206b29 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 19 Mar 2020 04:22:55 +0800 Subject: remove old Rectangle Signed-off-by: shedaniel --- .../me/shedaniel/rei/api/AutoTransferHandler.java | 28 +------------- .../me/shedaniel/rei/api/BaseBoundsHandler.java | 6 +-- .../me/shedaniel/rei/api/ButtonAreaSupplier.java | 2 +- .../java/me/shedaniel/rei/api/ConfigManager.java | 13 ------- .../java/me/shedaniel/rei/api/ConfigObject.java | 4 -- .../java/me/shedaniel/rei/api/DisplayHelper.java | 39 +------------------ src/main/java/me/shedaniel/rei/api/EntryStack.java | 17 +-------- .../me/shedaniel/rei/api/OptimalEntryStack.java | 2 +- src/main/java/me/shedaniel/rei/api/REIHelper.java | 11 ------ .../java/me/shedaniel/rei/api/RecipeCategory.java | 44 +--------------------- .../java/me/shedaniel/rei/api/RecipeHelper.java | 3 +- .../shedaniel/rei/api/TransferRecipeCategory.java | 2 +- .../java/me/shedaniel/rei/api/widgets/Button.java | 2 +- .../java/me/shedaniel/rei/api/widgets/Slot.java | 12 +----- .../java/me/shedaniel/rei/api/widgets/Tooltip.java | 4 ++ .../shedaniel/rei/gui/ContainerScreenOverlay.java | 4 +- .../me/shedaniel/rei/gui/OverlaySearchField.java | 2 +- .../shedaniel/rei/gui/PreRecipeViewingScreen.java | 4 +- .../shedaniel/rei/gui/RecipeDisplayExporter.java | 2 +- .../me/shedaniel/rei/gui/RecipeViewingScreen.java | 4 +- .../rei/gui/VillagerRecipeViewingScreen.java | 4 +- .../rei/gui/config/entry/FilteringEntry.java | 4 +- .../me/shedaniel/rei/gui/entries/RecipeEntry.java | 10 ----- .../rei/gui/entries/SimpleRecipeEntry.java | 2 +- .../me/shedaniel/rei/gui/widget/ButtonWidget.java | 4 +- .../rei/gui/widget/CategoryBaseWidget.java | 2 +- .../rei/gui/widget/ClickableLabelWidget.java | 8 +--- .../shedaniel/rei/gui/widget/DraggableWidget.java | 4 +- .../shedaniel/rei/gui/widget/EntryListWidget.java | 4 +- .../me/shedaniel/rei/gui/widget/EntryWidget.java | 4 +- .../rei/gui/widget/FavoritesListWidget.java | 4 +- .../me/shedaniel/rei/gui/widget/LabelWidget.java | 30 ++------------- .../me/shedaniel/rei/gui/widget/PanelWidget.java | 2 +- .../me/shedaniel/rei/gui/widget/QueuedTooltip.java | 23 +---------- .../rei/gui/widget/RecipeArrowWidget.java | 4 +- .../shedaniel/rei/gui/widget/RecipeBaseWidget.java | 2 +- .../rei/gui/widget/RecipeChoosePageWidget.java | 4 +- .../shedaniel/rei/gui/widget/SlotBaseWidget.java | 2 +- .../me/shedaniel/rei/gui/widget/TabWidget.java | 2 +- .../shedaniel/rei/gui/widget/TextFieldWidget.java | 2 +- .../java/me/shedaniel/rei/gui/widget/Widget.java | 9 ++--- .../shedaniel/rei/gui/widget/WidgetWithBounds.java | 2 +- .../shedaniel/rei/impl/BaseBoundsHandlerImpl.java | 2 +- .../me/shedaniel/rei/impl/DisplayHelperImpl.java | 5 +-- .../me/shedaniel/rei/impl/EmptyEntryStack.java | 2 +- .../me/shedaniel/rei/impl/FluidEntryStack.java | 2 +- .../me/shedaniel/rei/impl/InternalWidgets.java | 2 +- .../java/me/shedaniel/rei/impl/ItemEntryStack.java | 2 +- .../me/shedaniel/rei/impl/RecipeHelperImpl.java | 2 +- .../java/me/shedaniel/rei/impl/RenderingEntry.java | 10 ----- .../java/me/shedaniel/rei/impl/ScreenHelper.java | 43 --------------------- .../me/shedaniel/rei/impl/widgets/ArrowWidget.java | 2 +- .../rei/impl/widgets/BurningFireWidget.java | 2 +- .../shedaniel/rei/impl/widgets/ButtonWidget.java | 4 +- .../me/shedaniel/rei/impl/widgets/LabelWidget.java | 2 +- .../me/shedaniel/rei/impl/widgets/PanelWidget.java | 8 ++-- .../me/shedaniel/rei/plugin/DefaultPlugin.java | 2 +- .../plugin/DefaultPotionEffectExclusionZones.java | 2 +- .../plugin/DefaultRecipeBookExclusionZones.java | 2 +- .../plugin/beacon/DefaultBeaconBaseCategory.java | 9 +++-- .../composting/DefaultCompostingCategory.java | 2 +- .../rei/plugin/cooking/DefaultCookingCategory.java | 2 +- .../plugin/crafting/DefaultCraftingCategory.java | 2 +- .../rei/plugin/fuel/DefaultFuelCategory.java | 3 +- .../information/DefaultInformationCategory.java | 11 +++--- .../shedaniel/rei/server/ContainerInfoHandler.java | 3 ++ 66 files changed, 101 insertions(+), 362 deletions(-) (limited to 'src/main/java/me') diff --git a/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java b/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java index 63f1d08a1..e494aae65 100644 --- a/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java +++ b/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(); } } diff --git a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java b/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java index e44e7dd9e..7ba78120b 100644 --- a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java +++ b/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 { - @SuppressWarnings("deprecation") static BaseBoundsHandler getInstance() { - return DisplayHelper.getInstance().getBaseBoundsHandler(); + return ((DisplayHelperImpl) DisplayHelper.getInstance()).getBaseBoundsHandler(); } /** diff --git a/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java b/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java index 33488af45..df6214642 100644 --- a/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java +++ b/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. diff --git a/src/main/java/me/shedaniel/rei/api/ConfigManager.java b/src/main/java/me/shedaniel/rei/api/ConfigManager.java index e171ffc3c..b3da456da 100644 --- a/src/main/java/me/shedaniel/rei/api/ConfigManager.java +++ b/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 getFavorites() { - return ConfigObject.getInstance().getFavorites(); - } - /** * Saves the config. */ diff --git a/src/main/java/me/shedaniel/rei/api/ConfigObject.java b/src/main/java/me/shedaniel/rei/api/ConfigObject.java index 56c57125a..5070d2da0 100644 --- a/src/main/java/me/shedaniel/rei/api/ConfigObject.java +++ b/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(); diff --git a/src/main/java/me/shedaniel/rei/api/DisplayHelper.java b/src/main/java/me/shedaniel/rei/api/DisplayHelper.java index 246850cc7..52936de0e 100644 --- a/src/main/java/me/shedaniel/rei/api/DisplayHelper.java +++ b/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> getSortedBoundsHandlers(Class screenClass); - /** - * Gets all registered bounds handlers - * - * @return the list of registered bounds handlers - * @deprecated see {@link #getAllOverlayDeciders()} - */ - @Deprecated - @ApiStatus.ScheduledForRemoval - default List> 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 extends OverlayDecider { /** * Gets the base supported class for the bounds handler diff --git a/src/main/java/me/shedaniel/rei/api/EntryStack.java b/src/main/java/me/shedaniel/rei/api/EntryStack.java index c2d5241e2..d09054ff5 100644 --- a/src/main/java/me/shedaniel/rei/api/EntryStack.java +++ b/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 get(Settings 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 { diff --git a/src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java b/src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java index 3e65bc723..bade908d8 100644 --- a/src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java +++ b/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 diff --git a/src/main/java/me/shedaniel/rei/api/REIHelper.java b/src/main/java/me/shedaniel/rei/api/REIHelper.java index 5c8c80209..8a6c0461c 100644 --- a/src/main/java/me/shedaniel/rei/api/REIHelper.java +++ b/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 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); } diff --git a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java b/src/main/java/me/shedaniel/rei/api/RecipeCategory.java index d491231b8..50cb7954b 100644 --- a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java +++ b/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 { @@ -75,21 +71,6 @@ public interface RecipeCategory { 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 setupDisplay(Supplier 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 { */ @ApiStatus.OverrideOnly default List 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)); } /** diff --git a/src/main/java/me/shedaniel/rei/api/RecipeHelper.java b/src/main/java/me/shedaniel/rei/api/RecipeHelper.java index 122100fb0..9bec4c656 100644 --- a/src/main/java/me/shedaniel/rei/api/RecipeHelper.java +++ b/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 diff --git a/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java b/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java index d250ca530..a841549ef 100644 --- a/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Button.java b/src/main/java/me/shedaniel/rei/api/widgets/Button.java index fb7e65139..24b3dd287 100644 --- a/src/main/java/me/shedaniel/rei/api/widgets/Button.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Slot.java b/src/main/java/me/shedaniel/rei/api/widgets/Slot.java index adbd0c49a..63194c0ed 100644 --- a/src/main/java/me/shedaniel/rei/api/widgets/Slot.java +++ b/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 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; } } diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java b/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java index 0abc3357f..31f7db2d1 100644 --- a/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java +++ b/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 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 texts) { return QueuedTooltip.create(texts); } + @SuppressWarnings("deprecation") @NotNull static Tooltip create(String... texts) { return QueuedTooltip.create(texts); diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 6081901ce..f4f70a89e 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/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.*; diff --git a/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java b/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java index b33aca3b7..3bbf58a58 100644 --- a/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java index f146e9fef..4b2851449 100644 --- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java b/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java index 4b9a88f0c..a0168796f 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index fd2085f74..756f89868 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index 2fb860279..b6f28ee09 100644 --- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java b/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java index 17494fa2f..f348ce6a1 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/entries/RecipeEntry.java b/src/main/java/me/shedaniel/rei/gui/entries/RecipeEntry.java index dae8c01c4..60d373068 100644 --- a/src/main/java/me/shedaniel/rei/gui/entries/RecipeEntry.java +++ b/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() { diff --git a/src/main/java/me/shedaniel/rei/gui/entries/SimpleRecipeEntry.java b/src/main/java/me/shedaniel/rei/gui/entries/SimpleRecipeEntry.java index 4a16b801d..74da3efb1 100644 --- a/src/main/java/me/shedaniel/rei/gui/entries/SimpleRecipeEntry.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java index e6b5c36bc..9a835af9a 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java index 5b6970881..e8cadf77a 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java +++ b/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; /** diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java index c592cba48..b18ed8f62 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java +++ b/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() { diff --git a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java index d9e4e04d1..a852b253d 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java index 85478a21f..86b1a54b1 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/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.*; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java index 456f371bf..637a188cc 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java index 15883a0c7..4d324a4cb 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java +++ b/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.*; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java index 9a1ebcff1..a2d35006b 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java +++ b/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 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 onClicked) { - return createClickable((Point) point, text, onClicked); - } - public static ClickableLabelWidget createClickable(Point point, String text, Consumer 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); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/PanelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/PanelWidget.java index 7ab24388b..e73b8aa8b 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/PanelWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java b/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java index 1796561b4..fad8e9e19 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java +++ b/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 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 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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java index b0d07b6f3..057eba64b 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java index edfdf53fa..f6244fd86 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java index cab4aaf38..85d59827d 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java index f99a2e375..783dc73be 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index 8579f8510..cef638b1a 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java index 893544a24..8a2dd2f23 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java index 69e5e2f66..4a2320b42 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java +++ b/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 diff --git a/src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java b/src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java index 1d98aac6b..e6035bc75 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java +++ b/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 { diff --git a/src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java b/src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java index e783f8020..679041fa8 100644 --- a/src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java index 319523c82..0744f91f3 100644 --- a/src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java +++ b/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; } diff --git a/src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java b/src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java index a92ced874..d19d2511a 100644 --- a/src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java index 312f6a130..61b604bd2 100644 --- a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java b/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java index 7e72c8364..e43ea2e14 100644 --- a/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java index 7c65fc096..938c3b09c 100644 --- a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java index ebc6fc9fb..08cc5f0a7 100644 --- a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/RenderingEntry.java b/src/main/java/me/shedaniel/rei/impl/RenderingEntry.java index 8a9f92e74..c7745a218 100644 --- a/src/main/java/me/shedaniel/rei/impl/RenderingEntry.java +++ b/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 get(Settings settings) { return settings.getDefaultValue(); } - - @Nullable - @Override - @Deprecated - @ApiStatus.ScheduledForRemoval - public QueuedTooltip getTooltip(int mouseX, int mouseY) { - return EntryStack.super.getTooltip(mouseX, mouseY); - } } diff --git a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java index 73bc758b8..c95153a75 100644 --- a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java +++ b/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 consumer, int width, int height, float delta) { Window window = MinecraftClient.getInstance().getWindow(); drawHoveringWidget(window.getScaledWidth(), window.getScaledHeight(), x, y, consumer, width, height, delta); diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java index c09b67532..afb8576e3 100644 --- a/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java index 3b4b60f56..238162a56 100644 --- a/src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java index 83b90f2c5..8979b52b0 100644 --- a/src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java index 09b31103b..4c9022412 100644 --- a/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java index 833ac6557..cb2047004 100644 --- a/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java +++ b/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; } diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index 112d0a978..e9192ee5c 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java index 216edeb9a..931afa2b0 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java index acc533ba6..21966fa32 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java +++ b/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; diff --git a/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java b/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java index 756eff168..9f7d3d0df 100644 --- a/src/main/java/me/shedaniel/rei/plugin/beacon/DefaultBeaconBaseCategory.java +++ b/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 { @Override @@ -79,7 +80,7 @@ public class DefaultBeaconBaseCategory implements RecipeCategory widgets; private double target; private double scroll; @@ -114,7 +115,7 @@ public class DefaultBeaconBaseCategory implements RecipeCategory 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 widgets, me.shedaniel.math.api.Rectangle bounds, DefaultCookingDisplay display, IntList redSlots) { + public void renderRedSlots(List 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)) { diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java index a3661c9cc..7ba6b3999 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/c