From cc0a9d92954de3609ee2b3983630fa8d2cf8ac55 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 5 Nov 2022 19:38:11 +0800 Subject: Fix merge conflicts --- runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin') diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java index 6ed68874e..ff8521cd1 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java @@ -41,7 +41,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -83,7 +83,7 @@ public class REITestPlugin implements REIClientPlugin { for (Item item : Registry.ITEM) { if (i++ % 10 != 0) continue; - registry.group(Registry.ITEM.getKey(item), new TextComponent(Registry.ITEM.getKey(item).toString()), + registry.group(Registry.ITEM.getKey(item), Component.literal(Registry.ITEM.getKey(item).toString()), stack -> stack.getType() == VanillaEntryTypes.ITEM && stack.castValue().is(item)); } } -- cgit