diff options
5 files changed, 14 insertions, 16 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java index e76f9f022..e71e3fffe 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java @@ -151,14 +151,14 @@ public class CraftableFilterButtonWidget { () -> !future.isDone(), () -> { Minecraft.getInstance().setScreen(screen); }); - reloadingScreen.setSubtitle(() -> new TranslatableComponent("text.rei.input.methods.reload.progress", String.format("%.2f", progress[0] * 100))); + reloadingScreen.setSubtitle(() -> Component.translatable("text.rei.input.methods.reload.progress", String.format("%.2f", progress[0] * 100))); Minecraft.getInstance().setScreen(reloadingScreen); access.close(); future.whenComplete((unused, throwable) -> { service.shutdown(); }); ScreenOverlayImpl.getInstance().getHintsContainer().addHint(12, () -> new Point(getCraftableFilterBounds().getCenterX(), getCraftableFilterBounds().getCenterY()), - "text.rei.hint.input.methods", List.of(new TranslatableComponent("text.rei.hint.input.methods"))); + "text.rei.hint.input.methods", List.of(Component.translatable("text.rei.hint.input.methods"))); }) .withActive(() -> !Objects.equals(config.getInputMethodId(), pair.getKey())) .withTooltip(() -> Tooltip.create(Widget.mouse(), pair.getValue().getDescription())) @@ -167,7 +167,7 @@ public class CraftableFilterButtonWidget { InputMethod<?> active = InputMethod.active(); if (!(active instanceof DefaultInputMethod)) { entries.add(0, new SeparatorMenuEntry()); - entries.add(0, FavoriteMenuEntry.createToggle(new TranslatableComponent("text.rei.input.methods.tooltip.hints"), new BooleanValue() { + entries.add(0, FavoriteMenuEntry.createToggle(Component.translatable("text.rei.input.methods.tooltip.hints"), new BooleanValue() { @Override public void accept(boolean t) { ConfigManagerImpl.getInstance().getConfig().setDoDisplayIMEHints(!getAsBoolean()); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java index 8dfd0b076..70183df6b 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java @@ -32,7 +32,7 @@ import me.shedaniel.rei.api.common.util.CollectionUtils; import me.shedaniel.rei.impl.client.config.ConfigManagerImpl; import me.shedaniel.rei.impl.client.config.ConfigObjectImpl; import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.network.chat.Component; import java.util.AbstractList; import java.util.ArrayList; @@ -72,7 +72,7 @@ public class FavoritesEntriesManager { if (widget != null) { Supplier<Rectangle> buttonBounds = widget.togglePanelButton::getBounds; ScreenOverlayImpl.getInstance().getHintsContainer().addHint(12, () -> new Point(buttonBounds.get().getCenterX(), buttonBounds.get().getCenterY()), - "text.rei.hint.favorites.discover", List.of(new TranslatableComponent("text.rei.hint.favorites.discover"))); + "text.rei.hint.favorites.discover", List.of(Component.translatable("text.rei.hint.favorites.discover"))); } } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/hint/HintWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/hint/HintWidget.java index b5ee60e8e..d2f2e0d62 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/hint/HintWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/hint/HintWidget.java @@ -41,9 +41,9 @@ import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl; import net.minecraft.ChatFormatting; 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.MutableComponent; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.Mth; @@ -139,8 +139,7 @@ public class HintWidget extends WidgetWithBounds { fillGradient(pose, bufferBuilder, x + width - 1, y + 1, x + width, y + height - 1, 400, color1, color2); fillGradient(pose, bufferBuilder, x, y, x + width, y + 1, 400, color1, color1); fillGradient(pose, bufferBuilder, x, y + height - 1, x + width, y + height, 400, color2, color2); - bufferBuilder.end(); - BufferUploader.end(bufferBuilder); + BufferUploader.drawWithShader(bufferBuilder.end()); int lineY = y + 4; try (CloseableScissors scissors = Widget.scissor(pose, new Rectangle(x + 4, y + 4, width - 8, height - 8 - 9 - 2))) { @@ -154,7 +153,7 @@ public class HintWidget extends WidgetWithBounds { } } - MutableComponent okay = new TranslatableComponent("gui.ok"); + MutableComponent okay = Component.translatable("gui.ok"); int okayWidth = font.width(okay); int midPoint = x + 4 + (width - 4) / 2; this.okayBounds.setBounds(midPoint - okayWidth / 2, lineY, okayWidth, 9); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/DoublePinyinInputMethod.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/DoublePinyinInputMethod.java index fad453252..3dc0e3bf5 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/DoublePinyinInputMethod.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/DoublePinyinInputMethod.java @@ -33,7 +33,6 @@ import it.unimi.dsi.fastutil.objects.Object2IntMaps; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import me.shedaniel.rei.api.client.favorites.FavoriteMenuEntry; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import java.io.IOException; import java.io.InputStream; @@ -87,19 +86,19 @@ public class DoublePinyinInputMethod extends PinyinInputMethod { @Override public Component getName() { - return new TranslatableComponent("text.rei.input.methods.pinyin.double"); + return Component.translatable("text.rei.input.methods.pinyin.double"); } @Override public Component getDescription() { - return new TranslatableComponent("text.rei.input.methods.pinyin.double.description"); + return Component.translatable("text.rei.input.methods.pinyin.double.description"); } @Override public List<FavoriteMenuEntry> getOptionsMenuEntries() { List<FavoriteMenuEntry> innerEntries = new ArrayList<>(); for (Map.Entry<String, Converter> entry : Converters.CONVERTERS.entrySet()) { - innerEntries.add(FavoriteMenuEntry.createToggle(new TranslatableComponent("text.rei.input.methods.pinyin.double.scheme." + entry.getKey()), + innerEntries.add(FavoriteMenuEntry.createToggle(Component.translatable("text.rei.input.methods.pinyin.double.scheme." + entry.getKey()), new BooleanValue() { @Override public void accept(boolean t) { @@ -115,7 +114,7 @@ public class DoublePinyinInputMethod extends PinyinInputMethod { } })); } - return List.of(FavoriteMenuEntry.createSubMenu(new TranslatableComponent("text.rei.input.methods.pinyin.double.scheme"), + return List.of(FavoriteMenuEntry.createSubMenu(Component.translatable("text.rei.input.methods.pinyin.double.scheme"), innerEntries)); } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java index 03a73bec4..098cc48d3 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/unihan/PinyinInputMethod.java @@ -180,7 +180,7 @@ public class PinyinInputMethod extends UniHanInputMethod implements CharacterUnp public List<FavoriteMenuEntry> getOptionsMenuEntries() { List<FavoriteMenuEntry> innerEntries = new ArrayList<>(); this.fuzzyMap.forEach((from, to) -> { - innerEntries.add(FavoriteMenuEntry.createToggle(new TextComponent("%s -> %s".formatted(new String(from.toIntArray(), 0, from.size()), new String(to.toIntArray(), 0, to.size()))), + innerEntries.add(FavoriteMenuEntry.createToggle(Component.literal("%s -> %s".formatted(new String(from.toIntArray(), 0, from.size()), new String(to.toIntArray(), 0, to.size()))), new BooleanValue() { @Override public boolean getAsBoolean() { @@ -200,7 +200,7 @@ public class PinyinInputMethod extends UniHanInputMethod implements CharacterUnp } })); }); - return List.of(FavoriteMenuEntry.createSubMenu(new TranslatableComponent("text.rei.input.methods.pinyin.fuzzy.matching"), + return List.of(FavoriteMenuEntry.createSubMenu(Component.translatable("text.rei.input.methods.pinyin.fuzzy.matching"), innerEntries)); } |