diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-11-05 19:38:11 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-11-05 19:38:11 +0800 |
| commit | cc0a9d92954de3609ee2b3983630fa8d2cf8ac55 (patch) | |
| tree | 7d99cd9b57914b2a747cad7b787b85adc01a1e96 /runtime/src/main/java/me/shedaniel/rei/plugin | |
| parent | da15d82f139e28a9f08b52a8acdf6a27ec612cff (diff) | |
| download | RoughlyEnoughItems-cc0a9d92954de3609ee2b3983630fa8d2cf8ac55.tar.gz RoughlyEnoughItems-cc0a9d92954de3609ee2b3983630fa8d2cf8ac55.tar.bz2 RoughlyEnoughItems-cc0a9d92954de3609ee2b3983630fa8d2cf8ac55.zip | |
Fix merge conflicts
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java | 4 |
1 files changed, 2 insertions, 2 deletions
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.<ItemStack>castValue().is(item)); } } |