diff options
Diffstat (limited to 'api/src/main')
20 files changed, 33 insertions, 399 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/ClientHelper.java b/api/src/main/java/me/shedaniel/rei/api/client/ClientHelper.java index d9f0eae23..706a5c7eb 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/ClientHelper.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/ClientHelper.java @@ -35,7 +35,6 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.gui.chat.NarratorChatListener; import net.minecraft.core.Registry; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; @@ -101,7 +100,7 @@ public interface ClientHelper { String mod = getModFromItem(item); if (mod.isEmpty()) return NarratorChatListener.NO_TITLE; - return new TextComponent(mod).withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC); + return Component.literal(mod).withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC); } /** @@ -114,7 +113,7 @@ public interface ClientHelper { String mod = getModFromIdentifier(identifier); if (mod.isEmpty()) return NarratorChatListener.NO_TITLE; - return new TextComponent(mod).withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC); + return Component.literal(mod).withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC); } /** @@ -127,7 +126,7 @@ public interface ClientHelper { String mod = getModFromModId(modid); if (mod.isEmpty()) return NarratorChatListener.NO_TITLE; - return new TextComponent(mod).withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC); + return Component.literal(mod).withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC); } default List<Component> appendModIdToTooltips(List<Component> components, String modId) { 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<T> extends EntryRendererProvider<T> { @Nullable @Environment(EnvType.CLIENT) - @Deprecated(forRemoval = true, since = "8.3") - default Tooltip getTooltip(EntryStack<T> entry, Point mouse) { - return null; - } - - @Nullable - @Environment(EnvType.CLIENT) - default Tooltip getTooltip(EntryStack<T> entry, TooltipContext context) { - return getTooltip(entry, context.getPoint()); - } + Tooltip getTooltip(EntryStack<T> entry, TooltipContext context); @ApiStatus.NonExtendable default <O> EntryRenderer<O> 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; @@ -45,12 +44,6 @@ public abstract class ForwardingEntryRenderer<T> implements EntryRenderer<T> { @Override @Nullable - public Tooltip getTooltip(EntryStack<T> entry, Point mouse) { - return this.next.getTooltip(entry, TooltipContext.of(mouse)); - } - - @Override - @Nullable public Tooltip getTooltip(EntryStack<T> entry, TooltipContext context) { return this.next.getTooltip(entry, 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 @@ -41,15 +41,8 @@ public interface Renderer { @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/Label.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Label.java index 0533988d2..b1d3c0bd9 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Label.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Label.java @@ -28,7 +28,6 @@ import me.shedaniel.math.Point; import me.shedaniel.rei.api.client.REIRuntime; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; -import net.minecraft.network.chat.TextComponent; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; @@ -147,53 +146,17 @@ public abstract class Label extends WidgetWithBounds { /** * @return the tooltip from the current tooltip function, null if no tooltip. - * @deprecated use {@link #getTooltipLines} - */ - @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval - public String getTooltip() { - Component[] lines = getTooltipLines(); - String tooltip = null; - if(lines != null) { - StringBuilder tooltipBuilder = new StringBuilder(); - for (Component line:lines) { - tooltipBuilder.append(line.getContents()).append("\n"); - } - tooltip = tooltipBuilder.toString(); - } - return tooltip; - } - - /** - * @return the tooltip from the current tooltip function, null if no tooltip. */ @Nullable public abstract Component[] getTooltipLines(); - - /** - * Sets the tooltip function used to get the tooltip. - * - * @param tooltip the tooltip function used to get the tooltip. - * @deprecated use {@link #setTooltipFunction(Function)} - */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public void setTooltip(@Nullable Function<Label, @Nullable String> tooltip) { - if(tooltip != null) setTooltipFunction((label) -> { - String text = tooltip.apply(label); - if(text != null) return Stream.of(text.split("\n")).map(TextComponent::new).toArray(Component[]::new); - return null; - }); - } - + /** * Sets the tooltip function used to get the tooltip. * * @param tooltip the tooltip function used to get the tooltip. */ public abstract void setTooltipFunction(@Nullable Function<Label, @Nullable Component[]> tooltip); - + /** * Sets the tooltip. * @@ -202,76 +165,17 @@ public abstract class Label extends WidgetWithBounds { public void setTooltip(Component... tooltip) { setTooltipFunction((label) -> tooltip); } - - /** - * Sets the tooltip. - * - * @param tooltip the tooltip. - */ - public void setTooltip(String... tooltip) { - setTooltipFunction((label) -> Stream.of(tooltip).map(TextComponent::new).toArray(Component[]::new)); - } /** * Sets the tooltip. * * @param tooltip the lines of tooltip. * @return the label itself. - * @deprecated use {@link #tooltip(String...)} - */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public final Label tooltipLines(String... tooltip) { - return tooltip(tooltip); - } - - /** - * Sets the tooltip. - * - * @param tooltip the line of tooltip. - * @return the label itself. - * @deprecated use {@link #tooltip(String...)} - */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public final Label tooltipLine(String tooltip) { - return tooltip(tooltip); - } - - /** - * Sets the tooltip. - * - * @param tooltip the lines of tooltip. - * @return the label itself. - */ - public final Label tooltip(String... tooltip) { - return tooltipFunction(label -> Stream.of(tooltip).map(TextComponent::new).toArray(Component[]::new)); - } - - /** - * Sets the tooltip. - * - * @param tooltip the lines of tooltip. - * @return the label itself. */ public final Label tooltip(Component... tooltip) { return tooltipFunction(label -> tooltip); } - - /** - * Sets the tooltip function. - * - * @param tooltip the tooltip function used to get the tooltip. - * @return the label itself. - * @deprecated use {@link #tooltipFunction} - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "8.0.0") - public final Label tooltipSupplier(@Nullable Function<Label, @Nullable String> tooltip) { - setTooltip(tooltip); - return this; - } - + /** * Sets the tooltip function. * 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/gui/widgets/Tooltip.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java index 0a5c1062d..a9caf9577 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java @@ -48,14 +48,6 @@ public interface Tooltip { return ClientInternals.createTooltipEntry(text); } - @Deprecated - @ApiStatus.ScheduledForRemoval - static Tooltip.Entry entry(ClientTooltipComponent text) { - return ClientInternals.createTooltipEntry(text); - } - - @Deprecated - @ApiStatus.ScheduledForRemoval static Tooltip.Entry entry(TooltipComponent text) { return ClientInternals.createTooltipEntry(text); } @@ -98,14 +90,6 @@ public interface Tooltip { List<Entry> entries(); - @Deprecated - @ApiStatus.ScheduledForRemoval - List<TooltipComponent> components(); - - @Deprecated - @ApiStatus.ScheduledForRemoval - Tooltip add(ClientTooltipComponent component); - Tooltip add(Component text); Tooltip add(TooltipComponent component); @@ -117,15 +101,6 @@ public interface Tooltip { return this; } - @Deprecated - @ApiStatus.ScheduledForRemoval - default Tooltip addAll(ClientTooltipComponent... components) { - for (ClientTooltipComponent component : components) { - add(component); - } - return this; - } - default Tooltip addAll(Component... text) { for (Component component : text) { add(component); @@ -140,15 +115,6 @@ public interface Tooltip { return this; } - @Deprecated - @ApiStatus.ScheduledForRemoval - default Tooltip addAllComponents(Iterable<ClientTooltipComponent> text) { - for (ClientTooltipComponent component : text) { - add(component); - } - return this; - } - default Tooltip addAllTexts(Iterable<Component> text) { for (Component component : text) { add(component); @@ -175,9 +141,5 @@ public interface Tooltip { Component getAsText(); TooltipComponent getAsTooltipComponent(); - - @Deprecated - @ApiStatus.ScheduledForRemoval - ClientTooltipComponent getAsComponent(); } } 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<REIClientPlugin> { registerDraggableComponentProvider(DraggableComponentProviderWidget.toProvider(provider, priority)); } - @ApiStatus.ScheduledForRemoval - @Deprecated(forRemoval = true) - Iterable<DraggableStackProvider<Screen>> getDraggableProviders(); - - @ApiStatus.ScheduledForRemoval - @Deprecated(forRemoval = true) - Iterable<DraggableStackVisitor<Screen>> getDraggableVisitors(); - Iterable<DraggableComponentProvider<Screen, Object>> getDraggableComponentProviders(); Iterable<DraggableComponentVisitor<Screen>> getDraggableComponentVisitors(); diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java index d379c381c..55f50e2b3 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java @@ -66,14 +66,6 @@ public interface TransferHandler extends Comparable<TransferHandler> { return Double.compare(getPriority(), o.getPriority()); } - @Deprecated - @Environment(EnvType.CLIENT) - @Nullable - @ApiStatus.ScheduledForRemoval - default TransferHandlerErrorRenderer provideErrorRenderer(Context context, Object data) { - return null; - } - @ApiStatus.NonExtendable interface Result { /** @@ -133,12 +125,6 @@ public interface TransferHandler extends Comparable<TransferHandler> { */ Result color(int color); - /** - * Sets the error data, to be passed to {@link TransferHandler#provideErrorRenderer(Context, Object)}. - */ - @Deprecated - Result errorRenderer(Object data); - Result renderer(TransferHandlerRenderer renderer); @ApiStatus.Experimental @@ -194,12 +180,6 @@ public interface TransferHandler extends Comparable<TransferHandler> { @ApiStatus.NonExtendable interface Context { - @Deprecated - @ApiStatus.ScheduledForRemoval - static Context create(boolean actuallyCrafting, @Nullable AbstractContainerScreen<?> containerScreen, Display display) { - return create(actuallyCrafting, Screen.hasShiftDown(), containerScreen, display); - } - static Context create(boolean actuallyCrafting, boolean stackedCrafting, @Nullable AbstractContainerScreen<?> containerScreen, Display display) { return new ContextImpl(actuallyCrafting, stackedCrafting, containerScreen, () -> display); } @@ -233,7 +213,7 @@ public interface TransferHandler extends Comparable<TransferHandler> { private boolean successful, applicable, returningToScreen, blocking; private Component error; private List<Component> tooltips = new ArrayList<>(); - private Object errorRenderer; + private TransferHandlerRenderer renderer; private BiConsumer<Point, TooltipSink> tooltipRenderer; private int color; @@ -276,14 +256,8 @@ public interface TransferHandler extends Comparable<TransferHandler> { } @Override - public Result errorRenderer(Object data) { - this.errorRenderer = data; - return this; - } - - @Override public Result renderer(TransferHandlerRenderer renderer) { - this.errorRenderer = renderer; + this.renderer = renderer; return this; } @@ -326,11 +300,7 @@ public interface TransferHandler extends Comparable<TransferHandler> { @Override public TransferHandlerRenderer getRenderer(TransferHandler handler, Context context) { - if (errorRenderer == null) return null; - if (errorRenderer instanceof TransferHandlerRenderer) return (TransferHandlerRenderer) errorRenderer; - if (isSuccessful()) return null; - TransferHandlerErrorRenderer renderer = handler.provideErrorRenderer(context, this.errorRenderer); - return renderer == null ? null : renderer.asNew(); + return renderer; } @Override diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandlerErrorRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandlerErrorRenderer.java deleted file mode 100644 index 6c890f8fc..000000000 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandlerErrorRenderer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package me.shedaniel.rei.api.client.registry.transfer; - -import com.mojang.blaze3d.vertex.PoseStack; -import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.client.gui.widgets.Widget; -import me.shedaniel.rei.api.common.display.Display; -import org.jetbrains.annotations.ApiStatus; - -import java.util.List; - -@ApiStatus.Experimental -@FunctionalInterface -@Deprecated -@ApiStatus.ScheduledForRemoval -public interface TransferHandlerErrorRenderer { - void render(PoseStack matrices, int mouseX, int mouseY, float delta, List<Widget> widgets, Rectangle bounds, Display display); - - default TransferHandlerRenderer asNew() { - return this::render; - } -} diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java index a6e333921..198104f1f 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java @@ -23,12 +23,12 @@ package me.shedaniel.rei.api.common.display.basic; -import dev.architectury.utils.NbtType; import me.shedaniel.rei.api.common.display.Display; import me.shedaniel.rei.api.common.display.SimpleDisplaySerializer; import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.util.EntryIngredients; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.Nullable; @@ -131,10 +131,10 @@ public abstract class BasicDisplay implements Display { @Override public P read(CompoundTag tag) { - List<EntryIngredient> input = EntryIngredients.read(tag.getList("input", NbtType.LIST)); - List<EntryIngredient> output = EntryIngredients.read(tag.getList("output", NbtType.LIST)); + List<EntryIngredient> input = EntryIngredients.read(tag.getList("input", Tag.TAG_LIST)); + List<EntryIngredient> output = EntryIngredients.read(tag.getList("output", Tag.TAG_LIST)); ResourceLocation location; - if (tag.contains("location", NbtType.STRING)) { + if (tag.contains("location", Tag.TAG_STRING)) { location = new ResourceLocation(tag.getString("location")); } else { location = null; 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 5119140aa..919228d16 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 @@ -98,22 +98,10 @@ public interface EntryStack<T> extends TextRepresentable, Renderer { @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) { return getTooltip(context, ConfigObject.getInstance().shouldAppendModNames()); } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java b/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java index cf9e671cf..53c622901 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java @@ -23,10 +23,10 @@ package me.shedaniel.rei.api.common.registry; -import dev.architectury.utils.NbtType; import me.shedaniel.rei.api.common.plugins.PluginManager; import me.shedaniel.rei.api.common.plugins.REIPlugin; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeManager; @@ -51,7 +51,7 @@ public interface RecipeManagerContext<P extends REIPlugin<?>> extends Reloadable RecipeManager getRecipeManager(); default Recipe<?> byId(CompoundTag tag, String key) { - if (tag.contains(key, NbtType.STRING)) { + if (tag.contains(key, Tag.TAG_STRING)) { return getRecipeManager().byKey(new ResourceLocation(tag.getString(key))).orElse(null); } return null; diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuTransferException.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuTransferException.java index a3cf46f2b..d2219af7e 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuTransferException.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuTransferException.java |