Fix compile errors

17 files changed, 70 insertions, 47 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
index 14ded37f7..80d868c28 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -30,6 +30,7 @@ import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.impl.common.transfer.InputSlotCrafter;
 import net.minecraft.ChatFormatting;
+import net.minecraft.Util;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
index 27f9878a7..7b09548c7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
@@ -57,7 +57,7 @@ public class ReloadPluginsEntry extends AbstractConfigListEntry<Unit> {
         public void render(PoseStack matrices, int mouseX, int mouseY, float delta) {
             if (PluginManager.areAnyReloading()) {
                 Screen screen = Minecraft.getInstance().screen;
-                Minecraft.getInstance().setScreen(new ConfigReloadingScreen(Component.translatable("text.rei.config.is.reloading"), PluginManager::areAnyReloading, () -> Minecraft.getInstance().setScreen(screen)));
+                Minecraft.getInstance().setScreen(new ConfigReloadingScreen(new TranslatableComponent("text.rei.config.is.reloading"), PluginManager::areAnyReloading, () -> Minecraft.getInstance().setScreen(screen)));
             } else {
                 super.render(matrices, mouseX, mouseY, delta);
             }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
index 48324d465..c84292c04 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
@@ -71,6 +71,8 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.ApiStatus;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java
index 519460d03..e9c71f7cd 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java
@@ -38,8 +38,10 @@ import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.RoughlyEnoughItemsCoreClient;
+import me.shedaniel.rei.api.client.ClientHelper;
 import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.config.ConfigManager;
+import me.shedaniel.rei.api.client.config.ConfigObject;
 import me.shedaniel.rei.api.client.gui.config.DisplayScreenType;
 import me.shedaniel.rei.api.client.gui.widgets.Button;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
@@ -64,6 +66,7 @@ import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @ApiStatus.Internal
 public class UncertainDisplayViewingScreen extends Screen {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ConfigButtonWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ConfigButtonWidget.java
index 14cd14d84..5ce1e3270 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ConfigButtonWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ConfigButtonWidget.java
@@ -48,7 +48,7 @@ import me.shedaniel.rei.impl.client.gui.modules.entries.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 
 import java.util.Collection;
 import java.util.List;
@@ -91,37 +91,37 @@ public class ConfigButtonWidget {
     private static Collection<MenuEntry> menuEntries() {
         ConfigObjectImpl config = ConfigManagerImpl.getInstance().getConfig();
         return List.of(
-                ToggleMenuEntry.of(Component.translatable("text.rei.cheating"),
+                ToggleMenuEntry.of(new TranslatableComponent("text.rei.cheating"),
                         config::isCheating,
                         config::setCheating
                 ),
                 new EmptyMenuEntry(4),
                 new TextMenuEntry(() -> {
                     if (!ClientHelper.getInstance().isCheating())
-                        return Component.translatable("text.rei.cheating_disabled");
+                        return new TranslatableComponent("text.rei.cheating_disabled");
                     else if (!ClientHelperImpl.getInstance().hasOperatorPermission()) {
                         if (Minecraft.getInstance().gameMode.hasInfiniteItems())
-                            return Component.translatable("text.rei.cheating_limited_creative_enabled");
-                        else return Component.translatable("text.rei.cheating_enabled_no_perms");
+                            return new TranslatableComponent("text.rei.cheating_limited_creative_enabled");
+                        else return new TranslatableComponent("text.rei.cheating_enabled_no_perms");
                     } else if (ClientHelperImpl.getInstance().hasPermissionToUsePackets())
-                        return Component.translatable("text.rei.cheating_enabled");
+                        return new TranslatableComponent("text.rei.cheating_enabled");
                     else
-                        return Component.translatable("text.rei.cheating_limited_enabled");
+                        return new TranslatableComponent("text.rei.cheating_limited_enabled");
                 }),
                 new SeparatorMenuEntry(),
-                ToggleMenuEntry.ofDeciding(Component.translatable("text.rei.config.menu.dark_theme"),
+                ToggleMenuEntry.ofDeciding(new TranslatableComponent("text.rei.config.menu.dark_theme"),
                         config::isUsingDarkTheme,
                         dark -> {
                             config.setUsingDarkTheme(dark);
                             return false;
                         }
                 ),
-                ToggleMenuEntry.of(Component.translatable("text.rei.config.menu.craftable_filter"),
+                ToggleMenuEntry.of(new TranslatableComponent("text.rei.config.menu.craftable_filter"),
                         config::isCraftableFilterEnabled,
                         config::setCraftableFilterEnabled
                 ),
-                new SubMenuEntry(Component.translatable("text.rei.config.menu.display"), List.of(
-                        ToggleMenuEntry.of(Component.translatable("text.rei.config.menu.display.remove_recipe_book"),
+                new SubMenuEntry(new TranslatableComponent("text.rei.config.menu.display"), List.of(
+                        ToggleMenuEntry.of(new TranslatableComponent("text.rei.config.menu.display.remove_recipe_book"),
                                 config::doesDisableRecipeBook,
                                 disableRecipeBook -> {
                                     config.setDisableRecipeBook(disableRecipeBook);
@@ -132,7 +132,7 @@ public class ConfigButtonWidget {
                                     }
                                 }
                         ),
-                        ToggleMenuEntry.of(Component.translatable("text.rei.config.menu.display.left_side_mob_effects"),
+                        ToggleMenuEntry.of(new TranslatableComponent("text.rei.config.menu.display.left_side_mob_effects"),
                                 config::isLeftSideMobEffects,
                                 disableRecipeBook -> {
                                     config.setLeftSideMobEffects(disableRecipeBook);
@@ -143,27 +143,27 @@ public class ConfigButtonWidget {
                                     }
                                 }
                         ),
-                        ToggleMenuEntry.of(Component.translatable("text.rei.config.menu.display.left_side_panel"),
+                        ToggleMenuEntry.of(new TranslatableComponent("text.rei.config.menu.display.left_side_panel"),
                                 config::isLeftHandSidePanel,
                                 bool -> config.setDisplayPanelLocation(bool ? DisplayPanelLocation.LEFT : DisplayPanelLocation.RIGHT)
                         ),
-                        ToggleMenuEntry.of(Component.translatable("text.rei.config.menu.display.scrolling_side_panel"),
+                        ToggleMenuEntry.of(new TranslatableComponent("text.rei.config.menu.display.scrolling_side_panel"),
                                 config::isEntryListWidgetScrolled,
                                 config::setEntryListWidgetScrolled
                         ),
                         new SeparatorMenuEntry(),
-                        ToggleMenuEntry.of(Component.translatable("text.rei.config.menu.display.caching_entry_rendering"),
+                        ToggleMenuEntry.of(new TranslatableComponent("text.rei.config.menu.display.caching_entry_rendering"),
                                 config::doesCacheEntryRendering,
                                 config::setDoesCacheEntryRendering
                         ),
                         new SeparatorMenuEntry(),
-                        ToggleMenuEntry.of(Component.translatable("text.rei.config.menu.display.syntax_highlighting"),
+                        ToggleMenuEntry.of(new TranslatableComponent("text.rei.config.menu.display.syntax_highlighting"),
                                 () -> config.getSyntaxHighlightingMode() == SyntaxHighlightingMode.COLORFUL || config.getSyntaxHighlightingMode() == SyntaxHighlightingMode.COLORFUL_UNDERSCORED,
                                 bool -> config.setSyntaxHighlightingMode(bool ? SyntaxHighlightingMode.COLORFUL : SyntaxHighlightingMode.PLAIN_UNDERSCORED)
                         )
                 )),
                 new SeparatorMenuEntry(),
-                ToggleMenuEntry.ofDeciding(Component.translatable("text.rei.config.menu.config"),
+                ToggleMenuEntry.ofDeciding(new TranslatableComponent("text.rei.config.menu.config"),
                         () -> false,
                         $ -> {
                             ConfigManager.getInstance().openConfigScreen(REIRuntime.getInstance().getPreviousScreen());
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java
index fa4e01c52..afd0654c1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java
@@ -48,7 +48,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.entity.ItemRenderer;
-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.ItemStack;
 import net.minecraft.world.level.block.Blocks;
@@ -78,7 +79,7 @@ public class CraftableFilterButtonWidget {
                     access.openOrClose(FILTER_MENU_UUID, button.getBounds(), CraftableFilterButtonWidget::menuEntries);
                 })
                 .containsMousePredicate((button, point) -> button.getBounds().contains(point) && overlay.isNotInExclusionZones(point.x, point.y))
-                .tooltipLineSupplier(button -> Component.translatable(ConfigManager.getInstance().isCraftableOnlyEnabled() ? "text.rei.showing_craftable" : "text.rei.showing_all"));
+                .tooltipLineSupplier(button -> new TranslatableComponent(ConfigManager.getInstance().isCraftableOnlyEnabled() ? "text.rei.showing_craftable" : "text.rei.showing_all"));
         Widget overlayWidget = Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> {
             Vector4f vector = new Vector4f(bounds.x + 2, bounds.y + 2, helper.getBlitOffset() - 10, 1.0F);
             vector.transform(matrices.last().pose());
@@ -92,8 +93,8 @@ public class CraftableFilterButtonWidget {
     private static Collection<MenuEntry> menuEntries() {
         ConfigObjectImpl config = ConfigManagerImpl.getInstance().getConfig();
         ArrayList<MenuEntry> entries = new ArrayList<>(List.of(
-                new SubMenuEntry(Component.translatable("text.rei.config.menu.search_field.position"), Arrays.stream(SearchFieldLocation.values())
-                        .<MenuEntry>map(location -> ToggleMenuEntry.of(Component.literal(location.toString()),
+                new SubMenuEntry(new TranslatableComponent("text.rei.config.menu.search_field.position"), Arrays.stream(SearchFieldLocation.values())
+                        .<MenuEntry>map(location -> ToggleMenuEntry.of(new TextComponent(location.toString()),
                                         () -> config.getSearchFieldLocation() == location,
                                         bool -> config.setSearchFieldLocation(location))
                                 .withActive(() -> config.getSearchFieldLocation() != location)
@@ -103,7 +104,7 @@ public class CraftableFilterButtonWidget {
         
         List<Map.Entry<ResourceLocation, InputMethod<?>>> applicableInputMethods = getApplicableInputMethods();
         if (applicableInputMethods.size() > 1) {
-            entries.add(new SubMenuEntry(Component.translatable("text.rei.config.menu.search_field.input_method"), createInputMethodEntries(applicableInputMethods)));
+            entries.add(new SubMenuEntry(new TranslatableComponent("text.rei.config.menu.search_field.input_method"), createInputMethodEntries(applicableInputMethods)));
         }
         
         return entries;
@@ -140,7 +141,7 @@ public class CraftableFilterButtonWidget {
                                         }
                                     });
                                     Screen screen = Minecraft.getInstance().screen;
-                                    Minecraft.getInstance().setScreen(new ConfigReloadingScreen(Component.translatable("text.rei.input.methods.initializing"),
+                                    Minecraft.getInstance().setScreen(new ConfigReloadingScreen(new TranslatableComponent("text.rei.input.methods.initializing"),
                                             () -> !future.isDone(), () -> {
                                         Minecraft.getInstance().setScreen(screen);
                                     }));
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 3dc466e63..0639bdcca 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
@@ -473,7 +473,7 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
                     InputMethod<?> active = InputMethod.active();
                     String suggested = active.suggestInputString(name);
                     if (suggested != null) {
-                        tooltip.entries().add(1, Tooltip.entry(Component.literal(suggested).withStyle(ChatFormatting.GRAY)));
+                        tooltip.entries().add(1, Tooltip.entry(new TextComponent(suggested).withStyle(ChatFormatting.GRAY)));
                     }
                 }
             }
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 0331a18a6..59fe6f55a 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
@@ -29,8 +29,10 @@ import me.shedaniel.math.Point;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
 import me.shedaniel.rei.api.common.entry.EntryStack;
+import me.shedaniel.rei.api.common.util.CollectionUtils;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
 import org.jetbrains.annotations.ApiStatus;
@@ -153,5 +155,9 @@ public class QueuedTooltip implements Tooltip {
             
             return (ClientTooltipComponent) obj;
         }
+        
+        public boolean isClientComponent() {
+            return obj instanceof ClientTooltipComponent;
+        }
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java
index eee5c08b3..d239a772d 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java
@@ -49,7 +49,8 @@ import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsedStack;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 
 import java.util.ArrayList;
@@ -184,7 +185,7 @@ public class PaginatedEntryListWidget extends CollapsingEntryListWidget {
     public void init(ScreenOverlayImpl overlay) {
         Rectangle overlayBounds = overlay.getBounds();
         this.additionalWidgets = new ArrayList<>();
-        this.leftButton = Widgets.createButton(new Rectangle(overlayBounds.x, overlayBounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), Component.literal(""))
+        this.leftButton = Widgets.createButton(new Rectangle(overlayBounds.x, overlayBounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), new TextComponent(""))
                 .onClick(button -> {
                     setPage(getPage() - 1);
                     if (getPage() < 0)
@@ -192,7 +193,7 @@ public class PaginatedEntryListWidget extends CollapsingEntryListWidget {
                     updateEntriesPosition();
                 })
                 .containsMousePredicate((button, point) -> button.getBounds().contains(point) && overlay.isNotInExclusionZones(point.x, point.y))
-                .tooltipLine(Component.translatable("text.rei.previous_page"))
+                .tooltipLine(new TranslatableComponent("text.rei.previous_page"))
                 .focusable(false);
         this.additionalWidgets.add(leftButton);
         this.additionalWidgets.add(Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> {
@@ -204,12 +205,12 @@ public class PaginatedEntryListWidget extends CollapsingEntryListWidget {
             matrices.popPose();
             helper.setBlitOffset(helper.getBlitOffset() - 1);
         }));
-        this.changelogButton = Widgets.createButton(new Rectangle(overlayBounds.getMaxX() - 18 - 18, overlayBounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), Component.translatable(""))
+        this.changelogButton = Widgets.createButton(new Rectangle(overlayBounds.getMaxX() - 18 - 18, overlayBounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), new TextComponent(""))
                 .onClick(button -> {
                     ChangelogLoader.show();
                 })
                 .containsMousePredicate((button, point) -> button.getBounds().contains(point) && overlay.isNotInExclusionZones(point.x, point.y))
-                .tooltipLine(Component.translatable("text.rei.changelog.title"))
+                .tooltipLine(new TranslatableComponent("text.rei.changelog.title"))
                 .focusable(false);
         this.additionalWidgets.add(changelogButton);
         this.additionalWidgets.add(Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> {
@@ -222,7 +223,7 @@ public class PaginatedEntryListWidget extends CollapsingEntryListWidget {
             matrices.popPose();
             helper.setBlitOffset(helper.getBlitOffset() - 1);
         }));
-        this.rightButton = Widgets.createButton(new Rectangle(overlayBounds.getMaxX() - 18, overlayBounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), Component.literal(""))
+        this.rightButton = Widgets.createButton(new Rectangle(overlayBounds.getMaxX() - 18, overlayBounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), new TextComponent(""))
                 .onClick(button -> {
                     setPage(getPage() + 1);
                     if (getPage() >= getTotalPages())
@@ -230,7 +231,7 @@ public class PaginatedEntryListWidget extends CollapsingEntryListWidget {
                     updateEntriesPosition();
                 })
                 .containsMousePredicate((button, point) -> button.getBounds().contains(point) && overlay.isNotInExclusionZones(point.x, point.y))
-                .tooltipLine(Component.translatable("text.rei.next_page"))
+                .tooltipLine(new TranslatableComponent("text.rei.next_page"))
                 .focusable(false);
         this.additionalWidgets.add(rightButton);
         this.additionalWidgets.add(Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> {
@@ -252,9 +253,9 @@ public class PaginatedEntryListWidget extends CollapsingEntryListWidget {
                     updateEntriesPosition();
                 }, getPage(), getTotalPages());
             }
-        }).tooltip(Component.translatable("text.rei.go_back_first_page"), Component.literal(" "), Component.translatable("text.rei.shift_click_to", Component.translatable("text.rei.choose_page")).withStyle(ChatFormatting.GRAY)).focusable(false).onRender((matrices, label) -> {
+        }).tooltip(new TranslatableComponent("text.rei.go_back_first_page"), new TextComponent(" "), new TranslatableComponent("text.rei.shift_click_to", new TranslatableComponent("text.rei.choose_page")).withStyle(ChatFormatting.GRAY)).focusable(false).onRender((matrices, label) -> {
             label.setClickable(getTotalPages() > 1);
-            label.setMessage(Component.literal(String.format("%s/%s", getPage() + 1, Math.max(getTotalPages(), 1))));
+            label.setMessage(new TextComponent(String.format("%s/%s", getPage() + 1, Math.max(getTotalPages(), 1))));
         }).rainbow(new Random().nextFloat() < 1.0E-4D || ClientHelperImpl.getInstance().isAprilFools.get()));
     }
     
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 c3f977944..9f68a8d72 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
@@ -29,6 +29,7 @@ import me.shedaniel.clothconfig2.api.animator.ValueAnimator;
 import me.shedaniel.math.FloatingPoint;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
+import me.shedaniel.math.impl.PointHelper;
 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;
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 9754851cd..89b3cfe67 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
@@ -24,6 +24,7 @@
 package me.shedaniel.rei.impl.client.registry.screen;
 
 import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimap;
 import com.mojang.blaze3d.platform.Window;
 import dev.architectury.event.CompoundEventResult;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/DefaultInputMethod.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/DefaultInputMethod.java
index 0147ffd42..944c0b8d6 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/DefaultInputMethod.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/DefaultInputMethod.java
@@ -25,6 +25,7 @@ package me.shedaniel.rei.impl.client.search.method;
 
 import me.shedaniel.rei.api.client.search.method.InputMethod;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -65,11 +66,11 @@ public enum DefaultInputMethod implements InputMethod<String> {
     
     @Override
     public Component getName() {
-        return Component.translatable("text.rei.input.methods.default");
+        return new TranslatableComponent("text.rei.input.methods.default");
     }
     
     @Override
     public Component getDescription() {
-        return Component.translatable("text.rei.input.methods.default.description");
+        return new TranslatableComponent("text.rei.input.methods.default.description");
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/BomopofoInputMethod.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/BomopofoInputMethod.java
index 24f4ab80c..0054c2bc7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/BomopofoInputMethod.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/BomopofoInputMethod.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.impl.client.search.method.unihan;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -80,12 +81,12 @@ public class BomopofoInputMethod extends PinyinInputMethod {
     
     @Override
     public Component getName() {
-        return Component.translatable("text.rei.input.methods.bopomofo");
+        return new TranslatableComponent("text.rei.input.methods.bopomofo");
     }
     
     @Override
     public Component getDescription() {
-        return Component.translatable("text.rei.input.methods.bopomofo.description");
+        return new TranslatableComponent("text.rei.input.methods.bopomofo.description");
     }
     
     @Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/JyutpingInputMethod.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/JyutpingInputMethod.java
index 5678131f7..5a48d55f6 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/JyutpingInputMethod.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/JyutpingInputMethod.java
@@ -28,6 +28,7 @@ import me.shedaniel.rei.api.client.search.method.CharacterUnpackingInputMethod;
 import me.shedaniel.rei.api.client.search.method.InputMethod;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 
 import java.util.Collections;
 import java.util.List;
@@ -66,11 +67,11 @@ public class JyutpingInputMethod extends UniHanInputMethod implements CharacterU
     
     @Override
     public Component getName() {
-        return Component.translatable("text.rei.input.methods.jyutping");
+        return new TranslatableComponent("text.rei.input.methods.jyutping");
     }
     
     @Override
     public Component getDescription() {
-        return Component.translatable("text.rei.input.methods.jyutping.description");
+        return new TranslatableComponent("text.rei.input.methods.jyutping.description");
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java
index b6cd7af64..6c317e0dd 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java
@@ -30,6 +30,7 @@ import me.shedaniel.rei.api.client.search.method.CharacterUnpackingInputMethod;
 import me.shedaniel.rei.api.client.search.method.InputMethod;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -102,12 +103,12 @@ public class PinyinInputMethod extends UniHanInputMethod implements CharacterUnp
     
     @Override
     public Component getName() {
-        return Component.translatable("text.rei.input.methods.pinyin");
+        return new TranslatableComponent("text.rei.input.methods.pinyin");
     }