diff options
Diffstat (limited to 'runtime/src/main/java')
6 files changed, 13 insertions, 17 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 a183af5ef..1650fc372 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 @@ -144,9 +144,9 @@ public class ConfigManagerImpl implements ConfigManager { setUnsafely(field, config, newValue); }; return REIRuntime.getInstance().getPreviousContainerScreen() == null || Minecraft.getInstance().getConnection() == null || Minecraft.getInstance().getConnection().getRecipeManager() == null ? - Collections.singletonList(new NoFilteringCategoriesEntry(new TranslatableComponent(i13n), value, defaultValue, saveConsumer)) + Collections.singletonList(new NoFilteringCategoriesEntry(Component.translatable(i13n), value, defaultValue, saveConsumer)) : - Collections.singletonList(new FilteringCategoriesEntry(new TranslatableComponent(i13n), value, defaultValue, saveConsumer)); + Collections.singletonList(new FilteringCategoriesEntry(Component.translatable(i13n), value, defaultValue, saveConsumer)); } , (field) -> field.getType() == Map.class, ConfigObjectImpl.UseFilteringCategoriesScreen.class); InternalLogger.getInstance().info("Config loaded"); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java index df6048437..403b125e9 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java @@ -34,7 +34,6 @@ import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import org.jetbrains.annotations.ApiStatus; import java.util.List; @@ -49,7 +48,7 @@ public class FilteringCategoriesEntry extends AbstractConfigListEntry<Map<Catego private Map<CategoryIdentifier<?>, Boolean> configFiltered; final FilteringCategoriesScreen filteringScreen = new FilteringCategoriesScreen(this); boolean edited = false; - private final AbstractWidget buttonWidget = new Button(0, 0, 150, 20, new TranslatableComponent("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure"), button -> { + private final AbstractWidget buttonWidget = new Button(0, 0, 150, 20, Component.translatable("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure"), button -> { filteringScreen.parent = Minecraft.getInstance().screen; Minecraft.getInstance().setScreen(filteringScreen); }); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java index 5bba76725..880e4866d 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java @@ -37,8 +37,6 @@ import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; @@ -51,7 +49,7 @@ public class FilteringCategoriesScreen extends Screen { Screen parent; public FilteringCategoriesScreen(FilteringCategoriesEntry entry) { - super(new TranslatableComponent("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure.title")); + super(Component.translatable("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure.title")); this.entry = entry; } @@ -59,7 +57,7 @@ public class FilteringCategoriesScreen extends Screen { public void init() { super.init(); { - Component backText = new TextComponent("↩ ").append(new TranslatableComponent("gui.back")); + Component backText = Component.literal("↩ ").append(Component.translatable("gui.back")); addRenderableWidget(new Button(4, 4, Minecraft.getInstance().font.width(backText) + 10, 20, backText, button -> { minecraft.setScreen(parent); this.parent = null; @@ -161,7 +159,7 @@ public class FilteringCategoriesScreen extends Screen { public DefaultListEntry(CategoryRegistry.CategoryConfiguration<?> configuration) { this.configuration = configuration; { - Component toggleText = new TranslatableComponent("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure.toggle"); + Component toggleText = Component.translatable("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure.toggle"); toggleButton = new Button(0, 0, Minecraft.getInstance().font.width(toggleText) + 10, 20, toggleText, button -> { boolean quickCraftingEnabledByDefault = configuration.isQuickCraftingEnabledByDefault(); boolean enabled = entry.getValue().getOrDefault(configuration.getCategoryIdentifier(), quickCraftingEnabledByDefault); @@ -209,7 +207,7 @@ public class FilteringCategoriesScreen extends Screen { } } { - Component subtitle = new TranslatableComponent("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure." + entry.getValue().getOrDefault(configuration.getCategoryIdentifier(), configuration.isQuickCraftingEnabledByDefault())) + Component subtitle = Component.translatable("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure." + entry.getValue().getOrDefault(configuration.getCategoryIdentifier(), configuration.isQuickCraftingEnabledByDefault())) .withStyle(ChatFormatting.GRAY); int i = client.font.width(subtitle); if (i > entryWidth - 28) { @@ -220,7 +218,7 @@ public class FilteringCategoriesScreen extends Screen { } } { - Component id = new TextComponent(configuration.getCategoryIdentifier().toString()) + Component id = Component.literal(configuration.getCategoryIdentifier().toString()) .withStyle(ChatFormatting.DARK_GRAY); int i = client.font.width(id); if (i > entryWidth - 28) { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java index 60ce79802..36f46cf08 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java @@ -34,7 +34,6 @@ import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import org.jetbrains.annotations.ApiStatus; import java.util.List; @@ -47,7 +46,7 @@ public class NoFilteringCategoriesEntry extends AbstractConfigListEntry<Map<Cate private Consumer<Map<CategoryIdentifier<?>, Boolean>> saveConsumer; private Map<CategoryIdentifier<?>, Boolean> defaultValue; private Map<CategoryIdentifier<?>, Boolean> configFiltered; - private final AbstractWidget buttonWidget = new Button(0, 0, 150, 20, new TranslatableComponent("config.roughlyenoughitems.filteredEntries.loadWorldFirst"), button -> {}); + private final AbstractWidget buttonWidget = new Button(0, 0, 150, 20, Component.translatable("config.roughlyenoughitems.filteredEntries.loadWorldFirst"), button -> {}); private final List<AbstractWidget> children = ImmutableList.of(buttonWidget); public NoFilteringCategoriesEntry(Component fieldName, Map<CategoryIdentifier<?>, Boolean> configFiltered, Map<CategoryIdentifier<?>, Boolean> defaultValue, Consumer<Map<CategoryIdentifier<?>, Boolean>> saveConsumer) { 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 37bd9d0f0..bfbc4368e 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 @@ -142,8 +142,8 @@ public class DefaultDisplayViewingScreen extends AbstractDisplayViewingScreen { this.widgets.addAll(this.tabs.widgets()); this.page = Mth.clamp(page, 0, getCurrentTotalPages() - 1); - this.widgets.add(categoryBack = Widgets.createButton(new Rectangle(bounds.getX() + 5, bounds.getY() + 5, 12, 12), ImmutableTextComponent.EMPTY) - .onClick(button -> previousCategory()).tooltipLine(new TranslatableComponent("text.rei.previous_category"))); + this.widgets.add(categoryBack = Widgets.createButton(new Rectangle(bounds.getX() + 5, bounds.getY() + 5, 12, 12), Component.empty()) + .onClick(button -> previousCategory()).tooltipLine(Component.translatable("text.rei.previous_category"))); this.widgets.add(Widgets.createClickableLabel(new Point(bounds.getCenterX(), bounds.getY() + 7), getCurrentCategory().getTitle(), clickableLabelWidget -> { ViewSearchBuilder.builder().addAllCategories().open(); }).tooltip(Component.translatable("text.rei.view_all_categories"))); 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)); } } |