From 0623523b54de12ff4e05a9b9d9bcf60b7e7ab006 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 19 May 2022 20:59:12 +0800 Subject: API Changes for REI 9 Documented Here: https://shedaniel.gitbook.io/roughly-enough-items/api-migration/rei-8-greater-than-rei-9 --- .../rei/impl/client/gui/widget/QueuedTooltip.java | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'runtime') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java index 5c992d197..27cf89f09 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java @@ -77,23 +77,12 @@ public class QueuedTooltip implements Tooltip { return (List) (List) entries; } - @Override - public List components() { - return CollectionUtils.filterAndMap(entries, TooltipEntryImpl::isTooltipComponent, TooltipEntryImpl::getAsTooltipComponent); - } - @Override public Tooltip add(Component text) { entries.add(new TooltipEntryImpl(text)); return this; } - @Override - public Tooltip add(ClientTooltipComponent component) { - entries.add(new TooltipEntryImpl(component)); - return this; - } - @Override public Tooltip add(TooltipComponent component) { entries.add(new TooltipEntryImpl(component)); @@ -124,6 +113,14 @@ public class QueuedTooltip implements Tooltip { } public record TooltipEntryImpl(Object obj) implements Tooltip.Entry { + public TooltipEntryImpl(Object obj) { + this.obj = obj; + + if (!(obj instanceof Component) && !(obj instanceof TooltipComponent)) { + throw new IllegalArgumentException("obj must be a Component or TooltipComponent"); + } + } + @Override public Component getAsText() { return (Component) obj; @@ -146,14 +143,5 @@ public class QueuedTooltip implements Tooltip { public TooltipComponent getAsTooltipComponent() { return (TooltipComponent) obj; } - - @Override - public ClientTooltipComponent getAsComponent() { - if (isTooltipComponent()) { - return ClientTooltipComponent.create((TooltipComponent) obj); - } - - return (ClientTooltipComponent) obj; - } } } -- cgit