From 95195247b173215c6bb48654ac97f78b1dd28cd3 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 27 May 2022 18:59:12 +0800 Subject: Refactor Point -> TooltipContext --- .../rei/api/client/entry/renderer/EntryRenderer.java | 12 +----------- .../client/entry/renderer/ForwardingEntryRenderer.java | 7 ------- .../me/shedaniel/rei/api/client/gui/DisplayRenderer.java | 3 +-- .../java/me/shedaniel/rei/api/client/gui/Renderer.java | 9 +-------- .../rei/api/client/gui/SimpleDisplayRenderer.java | 15 ++++++--------- .../me/shedaniel/rei/api/client/gui/widgets/Slot.java | 3 +-- .../rei/api/client/registry/screen/ScreenRegistry.java | 8 -------- .../me/shedaniel/rei/api/common/entry/EntryStack.java | 12 ------------ 8 files changed, 10 insertions(+), 59 deletions(-) (limited to 'api/src/main/java') diff --git a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java index c51309603..aa2ce6db8 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java @@ -24,7 +24,6 @@ package me.shedaniel.rei.api.client.entry.renderer; import com.mojang.blaze3d.vertex.PoseStack; -import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; @@ -54,16 +53,7 @@ public interface EntryRenderer extends EntryRendererProvider { @Nullable @Environment(EnvType.CLIENT) - @Deprecated(forRemoval = true, since = "8.3") - default Tooltip getTooltip(EntryStack entry, Point mouse) { - return null; - } - - @Nullable - @Environment(EnvType.CLIENT) - default Tooltip getTooltip(EntryStack entry, TooltipContext context) { - return getTooltip(entry, context.getPoint()); - } + Tooltip getTooltip(EntryStack entry, TooltipContext context); @ApiStatus.NonExtendable default EntryRenderer cast() { diff --git a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/ForwardingEntryRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/ForwardingEntryRenderer.java index 229020ad4..999a50d4b 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/ForwardingEntryRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/ForwardingEntryRenderer.java @@ -24,7 +24,6 @@ package me.shedaniel.rei.api.client.entry.renderer; import com.mojang.blaze3d.vertex.PoseStack; -import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; @@ -43,12 +42,6 @@ public abstract class ForwardingEntryRenderer implements EntryRenderer { this.next.render(entry, matrices, bounds, mouseX, mouseY, delta); } - @Override - @Nullable - public Tooltip getTooltip(EntryStack entry, Point mouse) { - return this.next.getTooltip(entry, TooltipContext.of(mouse)); - } - @Override @Nullable public Tooltip getTooltip(EntryStack entry, TooltipContext context) { diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/DisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/DisplayRenderer.java index 9540c1ef6..98967729a 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/DisplayRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/DisplayRenderer.java @@ -23,7 +23,6 @@ package me.shedaniel.rei.api.client.gui; -import me.shedaniel.math.Point; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; import net.fabricmc.api.EnvType; @@ -42,7 +41,7 @@ public abstract class DisplayRenderer extends AbstractRenderer { @Override @Nullable - public Tooltip getTooltip(Point mouse) { + public Tooltip getTooltip(TooltipContext mouse) { return null; } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java index c0a40c0ec..317fed296 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java @@ -39,17 +39,10 @@ public interface Renderer { @Environment(EnvType.CLIENT) void render(PoseStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta); - @Nullable - @Environment(EnvType.CLIENT) - @Deprecated(forRemoval = true) - default Tooltip getTooltip(Point mouse) { - return null; - } - @Nullable @Environment(EnvType.CLIENT) default Tooltip getTooltip(TooltipContext context) { - return getTooltip(context.getPoint()); + return null; } @Environment(EnvType.CLIENT) diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java index b0ce0e735..872c66636 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java @@ -30,10 +30,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.client.gui.widgets.Slot; -import me.shedaniel.rei.api.client.gui.widgets.Tooltip; -import me.shedaniel.rei.api.client.gui.widgets.WidgetHolder; -import me.shedaniel.rei.api.client.gui.widgets.Widgets; +import me.shedaniel.rei.api.client.gui.widgets.*; import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.CollectionUtils; @@ -133,14 +130,14 @@ public class SimpleDisplayRenderer extends DisplayRenderer implements WidgetHold @Nullable @Override - public Tooltip getTooltip(Point point) { + public Tooltip getTooltip(TooltipContext context) { for (Slot widget : inputWidgets) { - if (widget.containsMouse(point)) - return widget.getCurrentTooltip(point); + if (widget.containsMouse(context.getPoint())) + return widget.getCurrentTooltip(context); } for (Slot widget : outputWidgets) { - if (widget.containsMouse(point)) - return widget.getCurrentTooltip(point); + if (widget.containsMouse(context.getPoint())) + return widget.getCurrentTooltip(context); } return null; } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Slot.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Slot.java index f0b2842e6..cee90d97c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Slot.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Slot.java @@ -23,7 +23,6 @@ package me.shedaniel.rei.api.client.gui.widgets; -import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.common.entry.EntryStack; import org.jetbrains.annotations.Nullable; @@ -141,7 +140,7 @@ public abstract class Slot extends WidgetWithBounds { public abstract Rectangle getInnerBounds(); @Nullable - public Tooltip getCurrentTooltip(Point point) { + public Tooltip getCurrentTooltip(TooltipContext context) { return null; } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java index e6423d4e3..92da6b563 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java @@ -137,14 +137,6 @@ public interface ScreenRegistry extends Reloadable { registerDraggableComponentProvider(DraggableComponentProviderWidget.toProvider(provider, priority)); } - @ApiStatus.ScheduledForRemoval - @Deprecated(forRemoval = true) - Iterable> getDraggableProviders(); - - @ApiStatus.ScheduledForRemoval - @Deprecated(forRemoval = true) - Iterable> getDraggableVisitors(); - Iterable> getDraggableComponentProviders(); Iterable> getDraggableComponentVisitors(); diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java index 1067ff6d3..bb0dc58c4 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java @@ -96,22 +96,10 @@ public interface EntryStack extends TextRepresentable, Renderer { return serializer != null && serializer.supportSaving(); } - @Nullable - @Environment(EnvType.CLIENT) - default Tooltip getTooltip(Point mouse, boolean appendModName) { - return getTooltip(TooltipContext.of(mouse), appendModName); - } - @Nullable @Environment(EnvType.CLIENT) Tooltip getTooltip(TooltipContext context, boolean appendModName); - @Override - @Nullable - default Tooltip getTooltip(Point mouse) { - return getTooltip(mouse, ConfigObject.getInstance().shouldAppendModNames()); - } - @Override @Nullable default Tooltip getTooltip(TooltipContext context) { -- cgit