diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-02-18 19:31:36 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-05-29 21:22:08 +0800 |
| commit | 5a623c18a71df73e7edb34e2222ed73cbfe307bb (patch) | |
| tree | 9b3933a71e82aa3db586a81a84bddbf0122ea8cf /runtime/src/main/java/me | |
| parent | 11d79bf8f3ff01a35989a96576b831805ab27ebe (diff) | |
| download | RoughlyEnoughItems-5a623c18a71df73e7edb34e2222ed73cbfe307bb.tar.gz RoughlyEnoughItems-5a623c18a71df73e7edb34e2222ed73cbfe307bb.tar.bz2 RoughlyEnoughItems-5a623c18a71df73e7edb34e2222ed73cbfe307bb.zip | |
Fix cherrypick conflicts
Diffstat (limited to 'runtime/src/main/java/me')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java index 901934487..9b0801a0d 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java @@ -411,8 +411,8 @@ public class ConfigManagerImpl implements ConfigManager { } ConfigAddonRegistryImpl addonRegistry = (ConfigAddonRegistryImpl) ConfigAddonRegistry.getInstance(); if (!addonRegistry.getAddons().isEmpty()) { - builder.getOrCreateCategory(Component.translatable("config.roughlyenoughitems.basics")).getEntries().add(0, new EmptyEntry(4)); - builder.getOrCreateCategory(Component.translatable("config.roughlyenoughitems.basics")).getEntries().add(0, new ConfigAddonsEntry(220)); + builder.getOrCreateCategory(new TranslatableComponent("config.roughlyenoughitems.basics")).getEntries().add(0, new EmptyEntry(4)); + builder.getOrCreateCategory(new TranslatableComponent("config.roughlyenoughitems.basics")).getEntries().add(0, new ConfigAddonsEntry(220)); } TextListEntry supportText = ConfigEntryBuilder.create().startTextDescription( new TranslatableComponent("text.rei.support.me.desc", @@ -431,10 +431,10 @@ public class ConfigManagerImpl implements ConfigManager { ) .withStyle(ChatFormatting.GRAY) ).build(); - builder.getOrCreateCategory(Component.translatable("config.roughlyenoughitems.basics")).getEntries().add(0, new EmptyEntry(4)); - builder.getOrCreateCategory(Component.translatable("config.roughlyenoughitems.basics")).getEntries().add(0, supportText); - builder.getOrCreateCategory(Component.translatable("config.roughlyenoughitems.basics")).getEntries().add(0, new TitleTextEntry(new TranslatableComponent("text.rei.support.me"))); - builder.getOrCreateCategory(Component.translatable("config.roughlyenoughitems.basics")).getEntries().add(0, new EmptyEntry(4)); + builder.getOrCreateCategory(new TranslatableComponent("config.roughlyenoughitems.basics")).getEntries().add(0, new EmptyEntry(4)); + builder.getOrCreateCategory(new TranslatableComponent("config.roughlyenoughitems.basics")).getEntries().add(0, supportText); + builder.getOrCreateCategory(new TranslatableComponent("config.roughlyenoughitems.basics")).getEntries().add(0, new TitleTextEntry(new TranslatableComponent("text.rei.support.me"))); + builder.getOrCreateCategory(new TranslatableComponent("config.roughlyenoughitems.basics")).getEntries().add(0, new EmptyEntry(4)); return builder.setAfterInitConsumer(screen -> { ScreenHooks.addButton(screen, new Button(screen.width - 104, 4, 100, 20, new TranslatableComponent("text.rei.credits"), button -> { CreditsScreen creditsScreen = new CreditsScreen(screen); |