diff options
Diffstat (limited to 'runtime/src/main/java')
7 files changed, 22 insertions, 21 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java index eed4c08a0..0e37743d4 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java @@ -36,6 +36,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.api.client.REIRuntime; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; +import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; import me.shedaniel.rei.api.client.registry.entry.EntryRegistry; import me.shedaniel.rei.api.client.search.SearchFilter; import me.shedaniel.rei.api.client.search.SearchProvider; @@ -503,7 +504,7 @@ public class FilteringScreen extends Screen { protected void queueTooltip(PoseStack matrices, int mouseX, int mouseY, float delta) { if (searchField.containsMouse(mouseX, mouseY)) return; - Tooltip tooltip = getCurrentTooltip(new Point(mouseX, mouseY)); + Tooltip tooltip = getCurrentTooltip(TooltipContext.of(new Point(mouseX, mouseY))); if (tooltip != null) { FilteringScreen.this.tooltip = tooltip; } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java index 919a2c1c6..20b0c9a5b 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java @@ -74,7 +74,7 @@ public class RenderingEntryDefinition { @Override @Nullable public Tooltip getTooltip(EntryStack<Renderer> entry, TooltipContext context) { - return entry.getValue().getTooltip(context.getPoint()); + return entry.getValue().getTooltip(context); } } } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java index a62e63373..5122cc9c2 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java @@ -44,6 +44,7 @@ import me.shedaniel.rei.api.client.gui.drag.DraggingContext; import me.shedaniel.rei.api.client.gui.screen.DisplayScreen; 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.TooltipContext; import me.shedaniel.rei.api.client.overlay.ScreenOverlay; import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; import me.shedaniel.rei.api.client.registry.transfer.TransferHandler; @@ -392,7 +393,7 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget { } protected void queueTooltip(PoseStack matrices, int mouseX, int mouseY, float delta) { - Tooltip tooltip = getCurrentTooltip(new Point(mouseX, mouseY)); + Tooltip tooltip = getCurrentTooltip(TooltipContext.of(new Point(mouseX, mouseY))); if (tooltip != null) { if (interactableFavorites && ConfigObject.getInstance().doDisplayFavoritesTooltip() && !ConfigObject.getInstance().getFavoriteKeyCode().isUnknown()) { String name = ConfigObject.getInstance().getFavoriteKeyCode().getLocalizedName().getString(); @@ -414,8 +415,8 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget { @Override @Nullable - public Tooltip getCurrentTooltip(Point point) { - Tooltip tooltip = getCurrentEntry().getTooltip(point); + public Tooltip getCurrentTooltip(TooltipContext context) { + Tooltip tooltip = getCurrentEntry().getTooltip(context); if (tooltip != null && !ClientHelper.getInstance().isCheating() && getTransferHandler() != null && !(Minecraft.getInstance().screen instanceof DisplayScreen)) { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/panel/rows/FavoritesPanelEntriesRow.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/panel/rows/FavoritesPanelEntriesRow.java index 8df9f1b10..8ea3effd8 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/panel/rows/FavoritesPanelEntriesRow.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/panel/rows/FavoritesPanelEntriesRow.java @@ -33,6 +33,7 @@ import me.shedaniel.rei.api.client.config.ConfigObject; import me.shedaniel.rei.api.client.favorites.FavoriteEntry; import me.shedaniel.rei.api.client.gui.drag.DraggableStack; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; +import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; import me.shedaniel.rei.api.client.util.ClientEntryStacks; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.CollectionUtils; @@ -167,10 +168,10 @@ public class FavoritesPanelEntriesRow extends FavoritesPanelRow { @Override @Nullable - public Tooltip getCurrentTooltip(Point point) { - point = PointHelper.ofMouse(); - if (!panel.getInnerBounds().contains(point)) return null; - Tooltip tooltip = super.getCurrentTooltip(point); + public Tooltip getCurrentTooltip(TooltipContext context) { + context = TooltipContext.ofMouse(); + if (!panel.getInnerBounds().contains(context.getPoint())) return null; + Tooltip tooltip = super.getCurrentTooltip(context); if (tooltip != null) { tooltip.add(Component.empty()); tooltip.add(Component.translatable("tooltip.rei.drag_to_add_favorites")); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java index ba13253de..a7137a7b2 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java @@ -194,16 +194,6 @@ public class ScreenRegistryImpl implements ScreenRegistry { } @Override - public Iterable<DraggableStackProvider<Screen>> getDraggableProviders() { - return Iterables.filter(Collections.unmodifiableList(draggableProviders), (Class<DraggableStackProvider<Screen>>) (Class<?>) DraggableStackVisitor.class); - } - - @Override - public Iterable<DraggableStackVisitor<Screen>> getDraggableVisitors() { - return Iterables.filter(Collections.unmodifiableList(draggableVisitors), (Class<DraggableStackVisitor<Screen>>) (Class<?>) DraggableStackVisitor.class); - } - - @Override public Iterable<DraggableComponentProvider<Screen, Object>> getDraggableComponentProviders() { return Collections.unmodifiableList(draggableProviders); } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java index b4456c634..05dc9acba 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java @@ -28,6 +28,7 @@ import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; +import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.type.BuiltinEntryTypes; import me.shedaniel.rei.api.common.entry.type.EntryDefinition; @@ -47,5 +48,11 @@ public class EmptyEntryDefinition { public void render(EntryStack<Unit> entry, PoseStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta) { } + + @Override + @Nullable + public Tooltip getTooltip(EntryStack<Unit> entry, TooltipContext context) { + return null; + } } } diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java index 66e150d1e..5e30527cf 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java @@ -43,6 +43,7 @@ import me.shedaniel.rei.api.client.gui.drag.component.DraggableComponentVisitorW import me.shedaniel.rei.api.client.gui.screen.DisplayScreen; import me.shedaniel.rei.api.client.gui.widgets.Panel; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; +import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import me.shedaniel.rei.api.client.plugins.REIClientPlugin; import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; @@ -108,8 +109,8 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin { @Override @Nullable - public Tooltip getTooltip(Point point) { - return Tooltip.create(Component.literal("Kirby"), ClientHelper.getInstance().getFormattedModFromModId("Dream Land")); + public Tooltip getTooltip(TooltipContext context) { + return Tooltip.create(context.getPoint(), Component.literal("Kirby"), ClientHelper.getInstance().getFormattedModFromModId("Dream Land")); } })); } |