From 3b233ed80761e29409f16b30e8c8082334e07ca6 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 23 Apr 2022 02:00:04 +0800
Subject: Update to 22w16b

---
 .../plugin/autocrafting/recipebook/DefaultRecipeBookHandler.java | 5 ++---
 .../java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java | 7 +++----
 .../rei/plugin/client/categories/DefaultBrewingCategory.java     | 3 +--
 .../rei/plugin/client/categories/DefaultCampfireCategory.java    | 5 ++---
 .../rei/plugin/client/categories/DefaultCompostingCategory.java  | 7 +++----
 .../rei/plugin/client/categories/DefaultFuelCategory.java        | 7 +++----
 .../rei/plugin/client/categories/DefaultInformationCategory.java | 5 ++---
 .../client/categories/DefaultOxidationScrapingCategory.java      | 3 +--
 .../rei/plugin/client/categories/DefaultOxidizingCategory.java   | 3 +--
 .../rei/plugin/client/categories/DefaultPathingCategory.java     | 3 +--
 .../rei/plugin/client/categories/DefaultSmithingCategory.java    | 3 +--
 .../plugin/client/categories/DefaultStoneCuttingCategory.java    | 3 +--
 .../rei/plugin/client/categories/DefaultStrippingCategory.java   | 3 +--
 .../rei/plugin/client/categories/DefaultTillingCategory.java     | 3 +--
 .../rei/plugin/client/categories/DefaultWaxScrapingCategory.java | 3 +--
 .../rei/plugin/client/categories/DefaultWaxingCategory.java      | 3 +--
 .../rei/plugin/client/categories/anvil/DefaultAnvilCategory.java | 3 +--
 .../client/categories/beacon/DefaultBeaconBaseCategory.java      | 3 +--
 .../client/categories/beacon/DefaultBeaconPaymentCategory.java   | 3 +--
 .../plugin/client/categories/cooking/DefaultCookingCategory.java | 5 ++---
 .../client/categories/crafting/DefaultCraftingCategory.java      | 3 +--
 .../rei/plugin/client/favorites/GameModeFavoriteEntry.java       | 9 ++++-----
 .../shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java | 8 ++++----
 .../rei/plugin/client/favorites/WeatherFavoriteEntry.java        | 8 ++++----
 .../plugin/common/displays/brewing/DefaultBrewingDisplay.java    | 8 ++++----
 25 files changed, 47 insertions(+), 69 deletions(-)

(limited to 'default-plugin/src')

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/recipebook/DefaultRecipeBookHandler.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/recipebook/DefaultRecipeBookHandler.java
index f6d23677c..d5cd464f6 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/recipebook/DefaultRecipeBookHandler.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/recipebook/DefaultRecipeBookHandler.java
@@ -31,9 +31,8 @@ import me.shedaniel.rei.plugin.common.displays.cooking.DefaultCookingDisplay;
 import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.recipebook.RecipeUpdateListener;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.CraftingMenu;
 import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.inventory.RecipeBookMenu;
@@ -64,7 +63,7 @@ public class DefaultRecipeBookHandler implements TransferHandler {
                     return Result.createNotApplicable();
                 Recipe<?> recipe = craftingDisplay.getOptionalRecipe().get();
                 if (craftingDisplay.getHeight() > h || craftingDisplay.getWidth() > w)
-                    return Result.createFailed(new TranslatableComponent("error.rei.transfer.too_small", h, w));
+                    return Result.createFailed(Component.translatable("error.rei.transfer.too_small", h, w));
                 if (!context.getMinecraft().player.getRecipeBook().contains(recipe))
                     return Result.createNotApplicable();
                 if (!context.isActuallyCrafting())
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
index 0b9b7a7ac..1e55423fe 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
@@ -79,7 +79,6 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
@@ -362,20 +361,20 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin
     @Override
     public void registerFavorites(FavoriteEntryType.Registry registry) {
         registry.register(GameModeFavoriteEntry.ID, GameModeFavoriteEntry.Type.INSTANCE);
-        registry.getOrCrateSection(new TranslatableComponent(GameModeFavoriteEntry.TRANSLATION_KEY))
+        registry.getOrCrateSection(Component.translatable(GameModeFavoriteEntry.TRANSLATION_KEY))
                 .add(Stream.concat(
                         Arrays.stream(GameType.values())
                                 .filter(type -> type.getId() >= 0),
                         Stream.of((GameType) null)
                 ).<FavoriteEntry>map(GameModeFavoriteEntry::new).toArray(FavoriteEntry[]::new));
         registry.register(WeatherFavoriteEntry.ID, WeatherFavoriteEntry.Type.INSTANCE);
-        registry.getOrCrateSection(new TranslatableComponent(WeatherFavoriteEntry.TRANSLATION_KEY))
+        registry.getOrCrateSection(Component.translatable(WeatherFavoriteEntry.TRANSLATION_KEY))
                 .add(Stream.concat(
                         Arrays.stream(WeatherFavoriteEntry.Weather.values()),
                         Stream.of((WeatherFavoriteEntry.Weather) null)
                 ).<FavoriteEntry>map(WeatherFavoriteEntry::new).toArray(FavoriteEntry[]::new));
         registry.register(TimeFavoriteEntry.ID, TimeFavoriteEntry.Type.INSTANCE);
-        registry.getOrCrateSection(new TranslatableComponent(TimeFavoriteEntry.TRANSLATION_KEY))
+        registry.getOrCrateSection(Component.translatable(TimeFavoriteEntry.TRANSLATION_KEY))
                 .add(Stream.concat(
                         Arrays.stream(TimeFavoriteEntry.Time.values()),
                         Stream.of((TimeFavoriteEntry.Time) null)
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java
index 9e020da89..ffbc25f27 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java
@@ -39,7 +39,6 @@ import me.shedaniel.rei.plugin.common.displays.brewing.DefaultBrewingDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Blocks;
@@ -60,7 +59,7 @@ public class DefaultBrewingCategory implements DisplayCategory<DefaultBrewingDis
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.brewing");
+        return Component.translatable("category.rei.brewing");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCampfireCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCampfireCategory.java
index 9b88ec83f..7b00e806e 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCampfireCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCampfireCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultCampfireDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
 
 import java.text.DecimalFormat;
@@ -54,7 +53,7 @@ public class DefaultCampfireCategory implements DisplayCategory<DefaultCampfireD
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.campfire");
+        return Component.translatable("category.rei.campfire");
     }
     
     @Override
@@ -67,7 +66,7 @@ public class DefaultCampfireCategory implements DisplayCategory<DefaultCampfireD
         widgets.add(Widgets.createResultSlotBackground(new Point(startPoint.x + 61, startPoint.y + 9)));
         widgets.add(Widgets.createBurningFire(new Point(startPoint.x + 1, startPoint.y + 20)).animationDurationMS(10000));
         widgets.add(Widgets.createLabel(new Point(bounds.x + bounds.width - 5, bounds.y + 5),
-                new TranslatableComponent("category.rei.campfire.time", df.format(cookingTime / 20d))).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB));
+                Component.translatable("category.rei.campfire.time", df.format(cookingTime / 20d))).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB));
         widgets.add(Widgets.createArrow(new Point(startPoint.x + 24, startPoint.y + 8)).animationDurationTicks(cookingTime));
         widgets.add(Widgets.createSlot(new Point(startPoint.x + 1, startPoint.y + 1)).entries(display.getInputEntries().get(0)).markInput());
         widgets.add(Widgets.createSlot(new Point(startPoint.x + 61, startPoint.y + 9)).entries(display.getOutputEntries().get(0)).disableBackground().markOutput());
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java
index 5b8302ca0..6c59064c1 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java
@@ -43,7 +43,6 @@ import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.ComposterBlock;
@@ -67,13 +66,13 @@ public class DefaultCompostingCategory implements DisplayCategory<DefaultCompost
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.composting");
+        return Component.translatable("category.rei.composting");
     }
     
     @Override
     public DisplayRenderer getDisplayRenderer(DefaultCompostingDisplay display) {
         return new DisplayRenderer() {
-            private Component text = new TranslatableComponent("text.rei.composting.page", display.getPage() + 1);
+            private Component text = Component.translatable("text.rei.composting.page", display.getPage() + 1);
             
             @Override
             public int getHeight() {
@@ -99,7 +98,7 @@ public class DefaultCompostingCategory implements DisplayCategory<DefaultCompost
                 if (!entryStack.isEmpty()) {
                     ComposterBlock.COMPOSTABLES.object2FloatEntrySet().stream().filter(entry -> entry.getKey() != null && Objects.equals(entry.getKey().asItem(), entryStack.get(0).getValue())).findAny().map(Map.Entry::getValue).ifPresent(chance -> {
                         for (EntryStack<?> stack : entryStack) {
-                            stack.tooltip(new TranslatableComponent("text.rei.composting.chance", Mth.fastFloor(chance * 100)).withStyle(ChatFormatting.YELLOW));
+                            stack.tooltip(Component.translatable("text.rei.composting.chance", Mth.fastFloor(chance * 100)).withStyle(ChatFormatting.YELLOW));
                         }
                     });
                 }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
index e2f4b05ad..21355338b 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
@@ -42,7 +42,6 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 import org.jetbrains.annotations.Nullable;
 
@@ -60,7 +59,7 @@ public class DefaultFuelCategory implements DisplayCategory<DefaultFuelDisplay>
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.fuel");
+        return Component.translatable("category.rei.fuel");
     }
     
     @Override
@@ -79,7 +78,7 @@ public class DefaultFuelCategory implements DisplayCategory<DefaultFuelDisplay>
         String burnItems = DECIMAL_FORMAT.format(display.getFuelTime() / 200d);
         List<Widget> widgets = Lists.newArrayList();
         widgets.add(Widgets.createRecipeBase(bounds));
-        widgets.add(Widgets.createLabel(new Point(bounds.x + 26, bounds.getMaxY() - 15), new TranslatableComponent("category.rei.fuel.time.items", burnItems))
+        widgets.add(Widgets.createLabel(new Point(bounds.x + 26, bounds.getMaxY() - 15), Component.translatable("category.rei.fuel.time.items", burnItems))
                 .color(0xFF404040, 0xFFBBBBBB).noShadow().leftAligned());
         widgets.add(Widgets.createBurningFire(new Point(bounds.x + 6, startPoint.y + 1)).animationDurationTicks(display.getFuelTime()));
         widgets.add(Widgets.createSlot(new Point(bounds.x + 6, startPoint.y + 18)).entries(display.getInputEntries().get(0)).markInput());
@@ -91,7 +90,7 @@ public class DefaultFuelCategory implements DisplayCategory<DefaultFuelDisplay>
         Slot slot = Widgets.createSlot(new Point(0, 0)).entries(display.getInputEntries().get(0)).disableBackground().disableHighlight();
         String burnItems = DECIMAL_FORMAT.format(display.getFuelTime() / 200d);
         return new DisplayRenderer() {
-            private TranslatableComponent text = new TranslatableComponent("category.rei.fuel.time_short.items", burnItems);
+            private Component text = Component.translatable("category.rei.fuel.time_short.items", burnItems);
             
             @Override
             public int getHeight() {
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
index 5cb04c7cd..e016bebe1 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
@@ -50,7 +50,6 @@ import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.FormattedText;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.FormattedCharSequence;
 
 import java.util.Collections;
@@ -68,7 +67,7 @@ public class DefaultInformationCategory implements DisplayCategory<DefaultInform
         bufferBuilder.vertex(matrix4f, xEnd, yStart, z).uv(uEnd, vStart).endVertex();
         bufferBuilder.vertex(matrix4f, xStart, yStart, z).uv(uStart, vStart).endVertex();
         bufferBuilder.end();
-        BufferUploader.end(bufferBuilder);
+        BufferUploader.drawWithShader(bufferBuilder);
     }
     
     @Override
@@ -78,7 +77,7 @@ public class DefaultInformationCategory implements DisplayCategory<DefaultInform
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.information");
+        return Component.translatable("category.rei.information");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java
index 4f5d1e849..b63da26c5 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidationScrapingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultOxidationScrapingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -55,7 +54,7 @@ public class DefaultOxidationScrapingCategory implements DisplayCategory<Default
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.oxidation_scraping");
+        return Component.translatable("category.rei.oxidation_scraping");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidizingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidizingCategory.java
index a33ef331c..5ef26da9e 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidizingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultOxidizingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultOxidizingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -55,7 +54,7 @@ public class DefaultOxidizingCategory implements DisplayCategory<DefaultOxidizin
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.oxidizing");
+        return Component.translatable("category.rei.oxidizing");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultPathingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultPathingCategory.java
index e207046ff..ac055cf83 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultPathingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultPathingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultPathingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 
 import java.util.List;
@@ -53,7 +52,7 @@ public class DefaultPathingCategory implements DisplayCategory<DefaultPathingDis
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.pathing");
+        return Component.translatable("category.rei.pathing");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultSmithingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultSmithingCategory.java
index b62dc7f4d..8baade5e1 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultSmithingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultSmithingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultSmithingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
 
 import java.util.List;
@@ -48,7 +47,7 @@ public class DefaultSmithingCategory implements DisplayCategory<DefaultSmithingD
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.smithing");
+        return Component.translatable("category.rei.smithing");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStoneCuttingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStoneCuttingCategory.java
index 0a9ae4aba..1c2eb9d6a 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStoneCuttingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStoneCuttingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultStoneCuttingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
 
 import java.util.List;
@@ -53,7 +52,7 @@ public class DefaultStoneCuttingCategory implements DisplayCategory<DefaultStone
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.stone_cutting");
+        return Component.translatable("category.rei.stone_cutting");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStrippingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStrippingCategory.java
index 8c0c6740f..4e98a7069 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStrippingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultStrippingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultStrippingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 
 import java.util.List;
@@ -53,7 +52,7 @@ public class DefaultStrippingCategory implements DisplayCategory<DefaultStrippin
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.stripping");
+        return Component.translatable("category.rei.stripping");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultTillingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultTillingCategory.java
index be0b862ba..415e4fdaa 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultTillingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultTillingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultTillingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 
 import java.util.List;
@@ -53,7 +52,7 @@ public class DefaultTillingCategory implements DisplayCategory<DefaultTillingDis
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.tilling");
+        return Component.translatable("category.rei.tilling");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxScrapingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxScrapingCategory.java
index 96c487fb2..fa1ef6826 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxScrapingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxScrapingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultWaxScrapingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -55,7 +54,7 @@ public class DefaultWaxScrapingCategory implements DisplayCategory<DefaultWaxScr
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.wax_scraping");
+        return Component.translatable("category.rei.wax_scraping");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxingCategory.java
index fa95d2659..dd8c05cb0 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultWaxingCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.DefaultWaxingDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.Items;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -55,7 +54,7 @@ public class DefaultWaxingCategory implements DisplayCategory<DefaultWaxingDispl
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.waxing");
+        return Component.translatable("category.rei.waxing");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java
index b49249961..02e8b26df 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java
@@ -35,7 +35,6 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import me.shedaniel.rei.plugin.common.displays.anvil.DefaultAnvilDisplay;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
 
 import java.util.List;
@@ -48,7 +47,7 @@ public class DefaultAnvilCategory implements DisplayCategory<DefaultAnvilDisplay
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("block.minecraft.anvil");
+        return Component.translatable("block.minecraft.anvil");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java
index d2dd424cf..049756b68 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java
@@ -46,7 +46,6 @@ import me.shedaniel.rei.plugin.common.displays.beacon.DefaultBeaconBaseDisplay;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.Blocks;
 
@@ -61,7 +60,7 @@ public class DefaultBeaconBaseCategory implements DisplayCategory<DefaultBeaconB
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.beacon_base");
+        return Component.translatable("category.rei.beacon_base");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java
index 71642fc1e..853df98b5 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java
@@ -46,7 +46,6 @@ import me.shedaniel.rei.plugin.common.displays.beacon.DefaultBeaconPaymentDispla
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.Blocks;
 
@@ -61,7 +60,7 @@ public class DefaultBeaconPaymentCategory implements DisplayCategory<DefaultBeac
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.beacon_payment");
+        return Component.translatable("category.rei.beacon_payment");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java
index 5e8b4c0a2..655f07934 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/cooking/DefaultCookingCategory.java
@@ -38,7 +38,6 @@ import me.shedaniel.rei.plugin.common.displays.cooking.DefaultCookingDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 
 import java.text.DecimalFormat;
 import java.util.Collections;
@@ -67,7 +66,7 @@ public class DefaultCookingCategory implements DisplayCategory<DefaultCookingDis
         widgets.add(Widgets.createBurningFire(new Point(startPoint.x + 1, startPoint.y + 20))
                 .animationDurationMS(10000));
         widgets.add(Widgets.createLabel(new Point(bounds.x + bounds.width - 5, bounds.y + 5),
-                new TranslatableComponent("category.rei.cooking.time&xp", df.format(display.getXp()), df.format(cookingTime / 20d))).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB));
+                Component.translatable("category.rei.cooking.time&xp", df.format(display.getXp()), df.format(cookingTime / 20d))).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB));
         widgets.add(Widgets.createArrow(new Point(startPoint.x + 24, startPoint.y + 8))
                 .animationDurationTicks(cookingTime));
         widgets.add(Widgets.createSlot(new Point(startPoint.x + 61, startPoint.y + 9))
@@ -102,6 +101,6 @@ public class DefaultCookingCategory implements DisplayCategory<DefaultCookingDis
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent(categoryName);
+        return Component.translatable(categoryName);
     }
 }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
index 55f0ba48a..30015fb41 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
@@ -41,7 +41,6 @@ import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
 import org.jetbrains.annotations.Nullable;
 
@@ -61,7 +60,7 @@ public class DefaultCraftingCategory implements DisplayCategory<DefaultCraftingD
     
     @Override
     public Component getTitle() {
-        return new TranslatableComponent("category.rei.crafting");
+        return Component.translatable("category.rei.crafting");
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java
index c49985568..b3cc253b2 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java
@@ -45,7 +45,6 @@ import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.GameType;
@@ -80,7 +79,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
                 @Override
                 @Nullable
                 public Tooltip getTooltip(Point mouse) {
-                    return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.dropdown"));
+                    return Tooltip.create(mouse, Component.translatable("text.rei.gamemode_button.tooltip.dropdown"));
                 }
                 
                 @Override
@@ -115,7 +114,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
             }
             
             private void renderGameModeText(PoseStack matrices, GameType type, int centerX, int centerY, int color) {
-                Component s = new TranslatableComponent("text.rei.short_gamemode." + type.getName());
+                Component s = Component.translatable("text.rei.short_gamemode." + type.getName());
                 Font font = Minecraft.getInstance().font;
                 font.draw(matrices, s, centerX - font.width(s) / 2f + 0.5f, centerY - 3.5f, color);
             }
@@ -123,7 +122,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
             @Override
             @Nullable
             public Tooltip getTooltip(Point mouse) {
-                return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.entry", type.getLongDisplayName().getString()));
+                return Tooltip.create(mouse, Component.translatable("text.rei.gamemode_button.tooltip.entry", type.getLongDisplayName().getString()));
             }
             
             @Override
@@ -262,7 +261,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
                 fill(matrices, x, y, x + width, y + 12, -12237499);
             }
             if (!disabled && selected && containsMouse) {
-                REIRuntime.getInstance().queueTooltip(Tooltip.create(new TranslatableComponent("text.rei.gamemode_button.tooltip.entry", text)));
+                REIRuntime.getInstance().queueTooltip(Tooltip.create(Component.translatable("text.rei.gamemode_button.tooltip.entry", text)));
             }
             String s = text;
             if (disabled) {
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java
index 69d8abfc1..f8cabd35f 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java
@@ -45,7 +45,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import org.jetbrains.annotations.Nullable;
@@ -98,7 +98,7 @@ public class TimeFavoriteEntry extends FavoriteEntry {
                 @Override
                 @Nullable
                 public Tooltip getTooltip(Point mouse) {
-                    return Tooltip.create(mouse, new TranslatableComponent("text.rei.time_button.tooltip.dropdown"));
+                    return Tooltip.create(mouse, Component.translatable("text.rei.time_button.tooltip.dropdown"));
                 }
                 
                 @Override
@@ -156,7 +156,7 @@ public class TimeFavoriteEntry extends FavoriteEntry {
             @Override
             @Nullable
             public Tooltip getTooltip(Point mouse) {
-                return Tooltip.create(mouse, new TranslatableComponent("text.rei.time_button.tooltip.entry", new TranslatableComponent("text.rei.time_button.name." + time.name().toLowerCase(Locale.ROOT))));
+                return Tooltip.create(mouse, Component.translatable("text.rei.time_button.tooltip.entry", Component.translatable("text.rei.time_button.name." + time.name().toLowerCase(Locale.ROOT))));
             }
             
             @Override
@@ -294,7 +294,7 @@ public class TimeFavoriteEntry extends FavoriteEntry {
                 fill(matrices, x, y, x + width, y + 12, -12237499);
             }
             if (selected && containsMouse) {
-                REIRuntime.getInstance().queueTooltip(Tooltip.create(new TranslatableComponent("text.rei.time_button.tooltip.entry", text)));
+                REIRuntime.getInstance().queueTooltip(Tooltip.create(Component.translatable("text.rei.time_button.tooltip.entry", text)));
             }
             font.draw(matrices, text, x + 2, y + 2, selected ? 16777215 : 8947848);
         }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java
index e8f3a1a31..fd46efba7 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java
@@ -45,7 +45,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import org.jetbrains.annotations.ApiStatus;
@@ -81,7 +81,7 @@ public class WeatherFavoriteEntry extends FavoriteEntry {
                 @Override
                 @Nullable
                 public Tooltip getTooltip(Point mouse) {
-                    return Tooltip.create(mouse, new TranslatableComponent("text.rei.weather_button.tooltip.dropdown"));
+                    return Tooltip.create(mouse, Component.translatable("text.rei.weather_button.tooltip.dropdown"));
                 }
                 
                 @Override
@@ -132,7 +132,7 @@ public class WeatherFavoriteEntry extends FavoriteEntry {
             @Override
             @Nullable
             public Tooltip getTooltip(Point mouse) {
-                return Tooltip.create(mouse, new TranslatableComponent("text.rei.weather_button.tooltip.entry", new TranslatableComponent(weather.getTranslateKey())));
+                return Tooltip.create(mouse, Component.translatable("text.rei.weather_button.tooltip.entry", Component.translatable(weather.getTranslateKey())));
             }
             
             @Override
@@ -303,7 +303,7 @@ public class WeatherFavoriteEntry extends FavoriteEntry {
                 fill(matrices, x, y, x + width, y + 12, -12237499);
             }
             if (selected && containsMouse) {
-                REIRuntime.getInstance().queueTooltip(Tooltip.create(new TranslatableComponent("text.rei.weather_button.tooltip.entry", text)));
+                REIRuntime.getInstance().queueTooltip(Tooltip.create(Component.translatable("text.rei.weather_button.tooltip.entry", text)));
             }
             font.draw(matrices, text, x + 2, y + 2, selected ? 16777215 : 8947848);
         }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java
index dda76169c..99c8722d8 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java
@@ -35,7 +35,7 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import net.minecraft.ChatFormatting;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 import org.jetbrains.annotations.ApiStatus;
@@ -63,9 +63,9 @@ public class DefaultBrewingDisplay implements Display {
     }
     
     public DefaultBrewingDisplay(EntryIngredient input, EntryIngredient reactant, EntryStack<?> output) {
-        this.input = input.map(stack -> stack.copy().tooltip(new TranslatableComponent("category.rei.brewing.input").withStyle(ChatFormatting.YELLOW)));
-        this.reactant = reactant.map(stack -> stack.copy().tooltip(new TranslatableComponent("category.rei.brewing.reactant").withStyle(ChatFormatting.YELLOW)));
-        this.output = output.copy().tooltip(new TranslatableComponent("category.rei.brewing.result").withStyle(ChatFormatting.YELLOW));
+        this.input = input.map(stack -> stack.copy().tooltip(Component.translatable("category.rei.brewing.input").withStyle(ChatFormatting.YELLOW)));
+        this.reactant = reactant.map(stack -> stack.copy().tooltip(Component.translatable("category.rei.brewing.reactant").withStyle(ChatFormatting.YELLOW)));
+        this.output = output.copy().tooltip(Component.translatable("category.rei.brewing.result").withStyle(ChatFormatting.YELLOW));
     }
     
     @Override
-- 
cgit