diff options
24 files changed, 109 insertions, 110 deletions
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java index df28214c8..afa638e23 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java @@ -28,7 +28,7 @@ import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.gui.widget.WidgetWithBounds; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; -import net.minecraft.text.StringRenderable; +import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -303,13 +303,13 @@ public abstract class Label extends WidgetWithBounds { return new LiteralText(""); } - public abstract StringRenderable getMessage(); + public abstract StringVisitable getMessage(); public final void setText(@NotNull Text text) { setMessage(text); } - public abstract void setMessage(@NotNull StringRenderable message); + public abstract void setMessage(@NotNull StringVisitable message); @NotNull public final Label text(@NotNull Text text) { @@ -318,7 +318,7 @@ public abstract class Label extends WidgetWithBounds { } @NotNull - public final Label message(@NotNull StringRenderable message) { + public final Label message(@NotNull StringVisitable message) { setMessage(message); return this; } diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java index 90a3f0e85..895d748a9 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java @@ -35,7 +35,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; -import net.minecraft.text.StringRenderable; +import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import org.jetbrains.annotations.ApiStatus; @@ -148,7 +148,7 @@ public final class Internals { Panel createPanelWidget(Rectangle bounds); - Label createLabel(Point point, StringRenderable text); + Label createLabel(Point point, StringVisitable text); Arrow createArrow(Rectangle rectangle); diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java index 7b8b58dac..d85fc0afe 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java @@ -76,7 +76,7 @@ public class DefaultCompostingCategory implements RecipeCategory<DefaultComposti @Override public void render(MatrixStack matrices, Rectangle rectangle, int mouseX, int mouseY, float delta) { - MinecraftClient.getInstance().textRenderer.draw(matrices, text.method_30937(), rectangle.x + 5, rectangle.y + 6, -1); + MinecraftClient.getInstance().textRenderer.draw(matrices, text.asOrderedText(), rectangle.x + 5, rectangle.y + 6, -1); } }; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java index 1713e24d2..955479929 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java @@ -110,7 +110,7 @@ public class DefaultFuelCategory implements RecipeCategory<DefaultFuelDisplay> { slot.setZ(getZ() + 50); slot.getBounds().setLocation(bounds.x + 4, bounds.y + 2); slot.render(matrices, mouseX, mouseY, delta); - MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, text.method_30937(), bounds.x + 25, bounds.y + 8, -1); + MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, text.asOrderedText(), bounds.x + 25, bounds.y + 8, -1); } }; } diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java index f1fd95eca..1884503f9 100644 --- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java +++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java @@ -41,7 +41,6 @@ import me.shedaniel.rei.impl.RenderingEntry; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.class_5481; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; import net.minecraft.client.render.BufferBuilder; @@ -50,7 +49,8 @@ import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormats; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.StringRenderable; +import net.minecraft.text.OrderedText; +import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.math.Matrix4f; @@ -86,7 +86,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma @Override public RecipeEntry getSimpleRenderer(DefaultInformationDisplay recipe) { - class_5481 name = recipe.getName().method_30937(); + OrderedText name = recipe.getName().asOrderedText(); return new RecipeEntry() { @Override public int getHeight() { @@ -138,7 +138,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma private static class ScrollableTextWidget extends WidgetWithBounds { private Rectangle bounds; - private List<class_5481> texts; + private List<OrderedText> texts; private final ScrollingContainer scrolling = new ScrollingContainer() { @Override public Rectangle getBounds() { @@ -149,7 +149,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma @Override public int getMaxScrollHeight() { int i = 2; - for (class_5481 entry : texts) { + for (OrderedText entry : texts) { i += entry == null ? 4 : font.fontHeight; } return i; @@ -159,7 +159,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma public ScrollableTextWidget(Rectangle bounds, List<Text> texts) { this.bounds = Objects.requireNonNull(bounds); this.texts = Lists.newArrayList(); - for (StringRenderable text : texts) { + for (StringVisitable text : texts) { if (!this.texts.isEmpty()) this.texts.add(null); this.texts.addAll(MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(text, bounds.width - 11)); @@ -201,7 +201,7 @@ public class DefaultInformationCategory implements RecipeCategory<DefaultInforma Rectangle innerBounds = scrolling.getScissorBounds(); ScissorsHandler.INSTANCE.scissor(innerBounds); int currentY = (int) -scrolling.scrollAmount + innerBounds.y; - for (class_5481 text : texts) { + for (OrderedText text : texts) { if (text != null && currentY + font.fontHeight >= innerBounds.y && currentY <= innerBounds.getMaxY()) { font.draw(matrices, text, innerBounds.x + 2, currentY + 2, REIHelper.getInstance().isDarkThemeEnabled() ? 0xFFBBBBBB : 0xFF090909); } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index fd3304252..2bc92aff8 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -70,7 +70,7 @@ import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeManager; import net.minecraft.screen.slot.Slot; import net.minecraft.text.LiteralText; -import net.minecraft.text.StringRenderable; +import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; @@ -153,7 +153,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer { } @Override - public Label createLabel(Point point, StringRenderable text) { + public Label createLabel(Point point, StringVisitable text) { return new LabelWidget(point, text); } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index adf0d379e..36ef7ecea 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -44,7 +44,6 @@ import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.impl.Weather; import me.shedaniel.rei.utils.CollectionUtils; import net.minecraft.block.Blocks; -import net.minecraft.class_5481; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; @@ -63,6 +62,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; import net.minecraft.sound.SoundEvents; import net.minecraft.text.LiteralText; +import net.minecraft.text.OrderedText; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.ActionResult; @@ -91,7 +91,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl public boolean shouldReInit = false; private int tooltipWidth; private int tooltipHeight; - private List<class_5481> tooltipLines; + private List<OrderedText> tooltipLines; public final TriConsumer<MatrixStack, Point, Float> renderTooltipCallback = (matrices, mouse, aFloat) -> { RenderSystem.disableRescaleNormal(); RenderSystem.disableDepthTest(); @@ -564,14 +564,14 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl public void renderTooltip(MatrixStack matrices, List<Text> lines, int mouseX, int mouseY) { if (lines.isEmpty()) return; - List<class_5481> characterVisitables = CollectionUtils.map(lines, Text::method_30937); - renderTooltipInner(matrices, characterVisitables, mouseX, mouseY); + List<OrderedText> orderedTexts = CollectionUtils.map(lines, Text::asOrderedText); + renderTooltipInner(matrices, orderedTexts, mouseX, mouseY); } - public void renderTooltipInner(MatrixStack matrices, List<class_5481> lines, int mouseX, int mouseY) { + public void renderTooltipInner(MatrixStack matrices, List<OrderedText> lines, int mouseX, int mouseY) { if (lines.isEmpty()) return; - tooltipWidth = lines.stream().map(font::method_30880).max(Integer::compareTo).get(); + tooltipWidth = lines.stream().map(font::getWidth).max(Integer::compareTo).get(); tooltipHeight = lines.size() <= 1 ? 8 : lines.size() * 10; tooltipLines = lines; ScreenHelper.drawHoveringWidget(matrices, mouseX, mouseY, renderTooltipCallback, tooltipWidth, tooltipHeight, 0); diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java index 7762b45d1..dba72bccb 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java @@ -34,13 +34,13 @@ import me.shedaniel.rei.gui.config.RecipeScreenType; import me.shedaniel.rei.gui.widget.Widget; import me.shedaniel.rei.gui.widget.WidgetWithBounds; import me.shedaniel.rei.impl.ScreenHelper; -import net.minecraft.class_5481; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ContainerScreen; import net.minecraft.client.util.NarratorManager; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.OrderedText; import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; @@ -127,8 +127,8 @@ public class PreRecipeViewingScreen extends Screen { drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 20, 16777215); if (showTips) { int i = 30; - for (class_5481 s : this.textRenderer.wrapStringToWidthAsList(new TranslatableText("text.rei.recipe_screen_type.selection.sub").formatted(Formatting.GRAY), width - 30)) { - textRenderer.drawWithShadow(matrices, s, width / 2 - textRenderer.method_30880(s) / 2, i, -1); + for (OrderedText s : this.textRenderer.wrapStringToWidthAsList(new TranslatableText("text.rei.recipe_screen_type.selection.sub").formatted(Formatting.GRAY), width - 30)) { + textRenderer.drawWithShadow(matrices, s, width / 2 - textRenderer.getWidth(s) / 2, i, -1); i += 10; } } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index 62fb8328e..3bc546295 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -442,7 +442,7 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen { matrices.push(); matrices.translate(0.0D, 0.0D, 480); Matrix4f matrix4f = matrices.peek().getModel(); - textRenderer.draw(text.method_30937(), bounds.getCenterX() - textRenderer.getWidth(text) / 2f, bounds.getCenterY() - 4.5f, 0xff000000, false, matrix4f, immediate, false, 0, 15728880); + textRenderer.draw(text.asOrderedText(), bounds.getCenterX() - textRenderer.getWidth(text) / 2f, bounds.getCenterY() - 4.5f, 0xff000000, false, matrix4f, immediate, false, 0, 15728880); immediate.draw(); matrices.pop(); } else { diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java index 74fe653f2..23545dce2 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java @@ -25,7 +25,6 @@ package me.shedaniel.rei.gui; import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget; import me.shedaniel.rei.RoughlyEnoughItemsState; -import net.minecraft.class_5481; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; @@ -36,6 +35,7 @@ import net.minecraft.client.util.NarratorManager; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.sound.SoundEvents; import net.minecraft.text.LiteralText; +import net.minecraft.text.OrderedText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Lazy; @@ -67,13 +67,13 @@ public class WarningAndErrorScreen extends Screen { } private void addText(Text string) { - for (class_5481 s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { + for (OrderedText s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { listWidget.creditsAddEntry(new TextItem(s)); } } private void addLink(Text string, String link) { - for (class_5481 s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { + for (OrderedText s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { listWidget.creditsAddEntry(new LinkItem(s, link)); } } @@ -85,7 +85,7 @@ public class WarningAndErrorScreen extends Screen { listWidget.creditsClearEntries(); listWidget.creditsAddEntry(new EmptyItem()); if (!RoughlyEnoughItemsState.getWarnings().isEmpty()) - listWidget.creditsAddEntry(new TextItem(new LiteralText("Warnings:").formatted(Formatting.RED).method_30937())); + listWidget.creditsAddEntry(new TextItem(new LiteralText("Warnings:").formatted(Formatting.RED).asOrderedText())); for (Pair<String, String> pair : RoughlyEnoughItemsState.getWarnings()) { addText(new LiteralText(pair.getLeft())); if (pair.getRight() != null) @@ -98,7 +98,7 @@ public class WarningAndErrorScreen extends Screen { listWidget.creditsAddEntry(new EmptyItem()); } if (!RoughlyEnoughItemsState.getErrors().isEmpty()) - listWidget.creditsAddEntry(new TextItem(new LiteralText("Errors:").formatted(Formatting.RED).method_30937())); + listWidget.creditsAddEntry(new TextItem(new LiteralText("Errors:").formatted(Formatting.RED).asOrderedText())); for (Pair<String, String> pair : RoughlyEnoughItemsState.getErrors()) { addText(new LiteralText(pair.getLeft())); if (pair.getRight() != null) @@ -211,9 +211,9 @@ public class WarningAndErrorScreen extends Screen { } private static class TextItem extends StringItem { - private class_5481 text; + private OrderedText text; - public TextItem(class_5481 text) { + public TextItem(OrderedText text) { this.text = text; } @@ -234,16 +234,16 @@ public class WarningAndErrorScreen extends Screen { @Override public int getWidth() { - return MinecraftClient.getInstance().textRenderer.method_30880(text) + 10; + return MinecraftClient.getInstance().textRenderer.getWidth(text) + 10; } } private class LinkItem extends StringItem { - private class_5481 text; + private OrderedText text; private String link; private boolean contains; - public LinkItem(class_5481 text, String link) { + public LinkItem(OrderedText text, String link) { this.text = text; this.link = link; } @@ -273,7 +273,7 @@ public class WarningAndErrorScreen extends Screen { @Override public int getWidth() { - return MinecraftClient.getInstance().textRenderer.method_30880(text) + 10; + return MinecraftClient.getInstance().textRenderer.getWidth(text) + 10; } @Override diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringAddRuleScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringAddRuleScreen.java index 19694e33f..03144b355 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringAddRuleScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringAddRuleScreen.java @@ -32,7 +32,7 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; -import net.minecraft.text.StringRenderable; +import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; @@ -75,7 +75,7 @@ public class FilteringAddRuleScreen extends Screen { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.rulesList.render(matrices, mouseX, mouseY, delta); super.render(matrices, mouseX, mouseY, delta); - this.textRenderer.drawWithShadow(matrices, this.title.method_30937(), this.width / 2.0F - this.textRenderer.getWidth(this.title) / 2.0F, 12.0F, -1); + this.textRenderer.drawWithShadow(matrices, this.title.asOrderedText(), this.width / 2.0F - this.textRenderer.getWidth(this.title) / 2.0F, 12.0F, -1); } public static class RulesList extends DynamicElementListWidget<RuleEntry> { @@ -151,7 +151,7 @@ public class FilteringAddRuleScreen extends Screen { public DefaultRuleEntry(Screen parent, FilteringEntry entry, FilteringRule<?> rule, BiFunction<FilteringEntry, Screen, Screen> screenFunction) { super(rule); this.screenFunction = (screenFunction == null ? rule.createEntryScreen().orElse(null) : screenFunction); - addButton = new ButtonWidget(0, 0, 20, 20, Text.method_30163(" + "), button -> { + addButton = new ButtonWidget(0, 0, 20, 20, Text.of(" + "), button -> { entry.edited = true; MinecraftClient.getInstance().openScreen(this.screenFunction.apply(entry, parent)); entry.rules.add(0, rule); @@ -166,20 +166,20 @@ public class FilteringAddRuleScreen extends Screen { Text title = getRule().getTitle(); int i = client.textRenderer.getWidth(title); if (i > entryWidth - 28) { - StringRenderable titleTrimmed = StringRenderable.concat(client.textRenderer.trimToWidth(title, entryWidth - 28 - client.textRenderer.getStringWidth("...")), StringRenderable.plain("...")); - client.textRenderer.drawWithShadow(matrices, Language.getInstance().method_30934(titleTrimmed), x + 2, y + 1, 16777215); + StringVisitable titleTrimmed = StringVisitable.concat(client.textRenderer.trimToWidth(title, entryWidth - 28 - client.textRenderer.getStringWidth("...")), StringVisitable.plain("...")); + client.textRenderer.drawWithShadow(matrices, Language.getInstance().reorder(titleTrimmed), x + 2, y + 1, 16777215); } else { - client.textRenderer.drawWithShadow(matrices, title.method_30937(), x + 2, y + 1, 16777215); + client.textRenderer.drawWithShadow(matrices, title.asOrderedText(), x + 2, y + 1, 16777215); } } { Text subtitle = getRule().getSubtitle(); int i = client.textRenderer.getWidth(subtitle); if (i > entryWidth - 28) { - StringRenderable subtitleTrimmed = StringRenderable.concat(client.textRenderer.trimToWidth(subtitle, entryWidth - 28 - client.textRenderer.getStringWidth("...")), StringRenderable.plain("...")); - client.textRenderer.drawWithShadow(matrices, Language.getInstance().method_30934(subtitleTrimmed), x + 2, y + 12, 8421504); + StringVisitable subtitleTrimmed = StringVisitable.concat(client.textRenderer.trimToWidth(subtitle, entryWidth - 28 - client.textRenderer.getStringWidth("...")), StringVisitable.plain("...")); + client.textRenderer.drawWithShadow(matrices, Language.getInstance().reorder(subtitleTrimmed), x + 2, y + 12, 8421504); } else { - client.textRenderer.drawWithShadow(matrices, subtitle.method_30937(), x + 2, y + 12, 8421504); + client.textRenderer.drawWithShadow(matrices, subtitle.asOrderedText(), x + 2, y + 12, 8421504); } } addButton.x = x + entryWidth - 25; diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRuleOptionsScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRuleOptionsScreen.java index 7fb78429d..2ec5c5677 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRuleOptionsScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRuleOptionsScreen.java @@ -25,14 +25,14 @@ package me.shedaniel.rei.gui.config.entry; import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget; import me.shedaniel.rei.impl.filtering.FilteringRule; -import net.minecraft.class_5481; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.StringRenderable; +import net.minecraft.text.OrderedText; +import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; @@ -75,8 +75,8 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext public abstract void save(); - public void addText(Consumer<RuleEntry> entryConsumer, StringRenderable text) { - for (class_5481 s : textRenderer.wrapStringToWidthAsList(text, width - 80)) { + public void addText(Consumer<RuleEntry> entryConsumer, StringVisitable text) { + for (OrderedText s : textRenderer.wrapStringToWidthAsList(text, width - 80)) { entryConsumer.accept(new TextRuleEntry(rule, s)); } } @@ -89,7 +89,7 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.rulesList.render(matrices, mouseX, mouseY, delta); super.render(matrices, mouseX, mouseY, delta); - this.textRenderer.drawWithShadow(matrices, this.title.method_30937(), this.width / 2.0F - this.textRenderer.getWidth(this.title) / 2.0F, 12.0F, -1); + this.textRenderer.drawWithShadow(matrices, this.title.asOrderedText(), this.width / 2.0F - this.textRenderer.getWidth(this.title) / 2.0F, 12.0F, -1); } public static class RulesList extends DynamicElementListWidget<RuleEntry> { @@ -126,9 +126,9 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext } public static class TextRuleEntry extends RuleEntry { - private final class_5481 text; + private final OrderedText text; - public TextRuleEntry(FilteringRule<?> rule, class_5481 text) { + public TextRuleEntry(FilteringRule<?> rule, OrderedText text) { super(rule); this.text = text; } @@ -177,7 +177,7 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext public TextFieldRuleEntry(int width, FilteringRule<?> rule, Consumer<TextFieldWidget> widgetConsumer) { super(rule); - this.widget = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, 0, 0, width, 18, Text.method_30163("")); + this.widget = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, 0, 0, width, 18, Text.of("")); widgetConsumer.accept(widget); } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRulesScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRulesScreen.java index 3e64eeb35..4958fed7f 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRulesScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRulesScreen.java @@ -26,8 +26,6 @@ package me.shedaniel.rei.gui.config.entry; import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget; import me.shedaniel.rei.impl.filtering.FilteringRule; import me.shedaniel.rei.impl.filtering.rules.ManualFilteringRule; -import net.minecraft.class_5481; -import net.minecraft.class_5491; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; @@ -36,7 +34,7 @@ import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.sound.SoundEvents; import net.minecraft.text.LiteralText; -import net.minecraft.text.StringRenderable; +import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; @@ -94,7 +92,7 @@ public class FilteringRulesScreen extends Screen { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.rulesList.render(matrices, mouseX, mouseY, delta); |