a

4 files changed, 15 insertions, 16 deletions

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 1a39b2382..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
@@ -24,6 +24,7 @@
 package me.shedaniel.rei.api.client.gui;
 
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.client.gui.widgets.TooltipContext;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import org.jetbrains.annotations.ApiStatus;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/DefaultTagCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/DefaultTagCategory.java
index 24296cfaa..e47a155a8 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/DefaultTagCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/DefaultTagCategory.java
@@ -30,7 +30,6 @@ import me.shedaniel.clothconfig2.api.animator.ValueAnimator;
 import me.shedaniel.math.FloatingRectangle;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.api.client.ClientHelper;
 import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.gui.AbstractRenderer;
 import me.shedaniel.rei.api.client.gui.Renderer;
@@ -49,14 +48,11 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.core.Holder;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
 
@@ -68,7 +64,7 @@ public class DefaultTagCategory implements DisplayCategory<DefaultTagDisplay<?,
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.tag");
+        return Component.translatable("category.rei.tag");
     }
     
     @Override
@@ -128,8 +124,8 @@ public class DefaultTagCategory implements DisplayCategory<DefaultTagDisplay<?,
         TagNodes.create(display.getKey(), dataResult -> {
             if (dataResult.error().isPresent()) {
                 delegate[0] = Widgets.withBounds(Widgets.concat(
-                        Widgets.createLabel(new Point(innerBounds.getCenterX(), innerBounds.getCenterY() - 8), new TextComponent("Failed to resolve tags!")),
-                        Widgets.createLabel(new Point(innerBounds.getCenterX(), innerBounds.getCenterY() - 8), new TextComponent(dataResult.error().get().message()))
+                        Widgets.createLabel(new Point(innerBounds.getCenterX(), innerBounds.getCenterY() - 8), Component.literal("Failed to resolve tags!")),
+                        Widgets.createLabel(new Point(innerBounds.getCenterX(), innerBounds.getCenterY() - 8), Component.literal(dataResult.error().get().message()))
                 ), overflowBounds);
             } else {
                 tagNode[0] = dataResult.result().get();
@@ -151,7 +147,7 @@ public class DefaultTagCategory implements DisplayCategory<DefaultTagDisplay<?,
                             @Override
                             @Nullable
                             public Tooltip getTooltip(TooltipContext context) {
-                                return Tooltip.create(context.getPoint(), new TextComponent(holder.unwrapKey().map(key -> key.location().toString()).orElse("null")));
+                                return Tooltip.create(context.getPoint(), Component.literal(holder.unwrapKey().map(key -> key.location().toString()).orElse("null")));
                             }
                         });
                     }
@@ -161,15 +157,15 @@ public class DefaultTagCategory implements DisplayCategory<DefaultTagDisplay<?,
             }
         });
         
-        widgets.add(Widgets.createButton(expandButtonBounds, new TextComponent(""))
+        widgets.add(Widgets.createButton(expandButtonBounds, Component.literal(""))
                 .onRender((poseStack, button) -> {
                     button.setEnabled(tagNode[0] != null);
                 })
                 .onClick(button -> {
                     expanded[0] = !expanded[0];
                 })
-                .tooltipSupplier(button -> new Component[]{new TranslatableComponent(!expanded[0] ? "text.rei.expand.view" : "text.rei.expand.view.close")}));
-        widgets.add(Widgets.createButton(copyButtonBounds, new TextComponent(""))
+                .tooltipSupplier(button -> new Component[]{Component.translatable(!expanded[0] ? "text.rei.expand.view" : "text.rei.expand.view.close")}));
+        widgets.add(Widgets.createButton(copyButtonBounds, Component.literal(""))
                 .onRender((poseStack, button) -> {
                     button.setEnabled(tagNode[0] != null);
                 })
@@ -180,7 +176,7 @@ public class DefaultTagCategory implements DisplayCategory<DefaultTagDisplay<?,
                         Minecraft.getInstance().keyboardHandler.setClipboard(node.asTree());
                     }
                 })
-                .tooltipLine(new TranslatableComponent("text.rei.tag.copy.clipboard")));
+                .tooltipLine(Component.translatable("text.rei.tag.copy.clipboard")));
         widgets.add(Widgets.withTranslate(new DelegateWidget(Widgets.noOp()) {
             @Override
             protected Widget delegate() {
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java
index 75beaf41c..06a8267c3 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java
@@ -35,7 +35,7 @@ import me.shedaniel.rei.plugin.common.displays.tag.TagNode;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.core.Holder;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Collections;
@@ -72,7 +72,7 @@ public class ReferenceTagNodeWidget<S, T> extends TagNodeWidget<S, T> {
         this.slot.getBounds().setLocation(bounds.getCenterX() - this.slot.getBounds().getWidth() / 2, bounds.y + (bounds.height - this.slot.getBounds().getHeight()) / 2 + 1);
         this.slot.render(poses, mouseX, mouseY, delta);
         if (this.containsMouse(mouseX, mouseY)) {
-            Tooltip.create(new TextComponent("#" + this.node.getReference().location().toString())).queue();
+            Tooltip.create(Component.literal("#" + this.node.getReference().location().toString())).queue();
         }
     }
     
diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagBuilder.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagBuilder.java
index 5fbc343e8..169a0df0f 100644
--- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagBuilder.java
+++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagBuilder.java
@@ -29,6 +29,8 @@ import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagBuilder;
+import net.minecraft.tags.TagEntry;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -42,9 +44,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
-@Mixin(Tag.Builder.class)
+@Mixin(TagBuilder.class)
 public class MixinTagBuilder<T> {
-    @Shadow @Final private List<Tag.BuilderEntry> entries;
+    @Shadow @Final private List<TagEntry> entries;
     
     @Inject(method = "build", at = @At("RETURN"))
     private void load(Function<ResourceLocation, Tag<T>> tagResolver, Function<ResourceLocation, T> valueResolver, CallbackInfoReturnable<Either<Collection<Tag.BuilderEntry>, Tag<T>>> cir) {