diff options
Diffstat (limited to 'src/main/java')
11 files changed, 23 insertions, 23 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java b/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java index bf2c07c8c..b9e557d21 100644 --- a/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java @@ -48,7 +48,7 @@ public class ConfigReloadingScreen extends Screen { @Override public void render(MatrixStack matrices, int int_1, int int_2, float float_1) { - this.renderDirtBackground(0); + this.renderBackgroundTexture(0); if (!RecipeHelper.getInstance().arePluginsLoading()) client.openScreen(parent); this.drawCenteredString(matrices, this.textRenderer, I18n.translate("text.rei.config.is.reloading"), this.width / 2, this.height / 2 - 50, 16777215); diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 3d742bfbb..0aaabfa7a 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -560,7 +560,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds { public void renderTooltip(MatrixStack matrices, List<Text> lines, int mouseX, int mouseY) { if (lines.isEmpty()) return; - tooltipWidth = lines.stream().map(font::getWidth).max(Integer::compareTo).get(); + tooltipWidth = lines.stream().map(font::getStringWidth).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/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java index bdf3bf4e2..593745af7 100644 --- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java @@ -124,11 +124,11 @@ public class PreRecipeViewingScreen extends Screen { } else { this.fillGradient(matrices, 0, 0, this.width, this.height, -16777216, -16777216); } - this.method_27534(matrices, this.textRenderer, this.title, this.width / 2, 20, 16777215); + this.drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 20, 16777215); if (showTips) { int i = 30; for (Text s : this.textRenderer.wrapLines(new TranslatableText("text.rei.recipe_screen_type.selection.sub").formatted(Formatting.GRAY), width - 30)) { - this.method_27534(matrices, this.textRenderer, s, width / 2, i, -1); + this.drawCenteredText(matrices, this.textRenderer, s, width / 2, i, -1); i += 10; } } diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index cdb4eb1cc..41e5f720a 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -441,7 +441,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, bounds.getCenterX() - textRenderer.getWidth(text) / 2f, bounds.getCenterY() - 4.5f, 0xff000000, false, matrix4f, immediate, false, 0, 15728880); + textRenderer.draw(text, bounds.getCenterX() - textRenderer.getStringWidth(text) / 2f, bounds.getCenterY() - 4.5f, 0xff000000, false, matrix4f, immediate, false, 0, 15728880); immediate.draw(); matrices.pop(); } else { diff --git a/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java b/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java index d45c3e24e..50f2ccf23 100644 --- a/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java @@ -130,7 +130,7 @@ public class WarningAndErrorScreen extends Screen { @Override public void render(MatrixStack matrices, int int_1, int int_2, float float_1) { - this.renderDirtBackground(0); + this.renderBackgroundTexture(0); this.listWidget.render(matrices, int_1, int_2, float_1); if (RoughlyEnoughItemsState.getErrors().isEmpty()) { this.drawCenteredString(matrices, this.textRenderer, "Warnings during Roughly Enough Items' initialization", this.width / 2, 16, 16777215); @@ -233,7 +233,7 @@ public class WarningAndErrorScreen extends Screen { @Override public int getWidth() { - return MinecraftClient.getInstance().textRenderer.getWidth(text) + 10; + return MinecraftClient.getInstance().textRenderer.getStringWidth(text) + 10; } } diff --git a/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java b/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java index 96176953c..c85bd902c 100644 --- a/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java +++ b/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java @@ -112,21 +112,21 @@ public class FilteringEntry extends AbstractConfigListEntry<List<EntryStack>> { this.searchField = new OverlaySearchField(0, 0, 0, 0); { Text selectAllText = new TranslatableText("config.roughlyenoughitems.filteredEntries.selectAll"); - this.selectAllButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getWidth(selectAllText) + 10, 20, selectAllText, button -> { + this.selectAllButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getStringWidth(selectAllText) + 10, 20, selectAllText, button -> { this.selectionPoint = new Point(-Integer.MAX_VALUE / 2, -Integer.MAX_VALUE / 2); this.secondPoint = new Point(Integer.MAX_VALUE / 2, Integer.MAX_VALUE / 2); }); } { Text selectNoneText = new TranslatableText("config.roughlyenoughitems.filteredEntries.selectNone"); - this.selectNoneButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getWidth(selectNoneText) + 10, 20, selectNoneText, button -> { + this.selectNoneButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getStringWidth(selectNoneText) + 10, 20, selectNoneText, button -> { this.selectionPoint = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE); this.secondPoint = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE); }); } { Text hideText = new TranslatableText("config.roughlyenoughitems.filteredEntries.hide"); - this.hideButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getWidth(hideText) + 10, 20, hideText, button -> { + this.hideButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getStringWidth(hideText) + 10, 20, hideText, button -> { for (int i = 0; i < entryStacks.size(); i++) { EntryStack stack = entryStacks.get(i); EntryListEntry entry = entries.get(i); @@ -140,7 +140,7 @@ public class FilteringEntry extends AbstractConfigListEntry<List<EntryStack>> { } { Text showText = new TranslatableText("config.roughlyenoughitems.filteredEntries.show"); - this.showButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getWidth(showText) + 10, 20, showText, button -> { + this.showButton = new ButtonWidget(0, 0, MinecraftClient.getInstance().textRenderer.getStringWidth(showText) + 10, 20, showText, button -> { for (int i = 0; i < entryStacks.size(); i++) { EntryStack stack = entryStacks.get(i); EntryListEntry entry = entries.get(i); diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java index bb677a4d2..e182da42e 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java @@ -130,7 +130,7 @@ public class CreditsScreen extends Screen { @Override public void render(MatrixStack matrices, int int_1, int int_2, float float_1) { - this.renderDirtBackground(0); + this.renderBackgroundTexture(0); this.entryListWidget.render(matrices, int_1, int_2, float_1); this.drawCenteredString(matrices, this.textRenderer, I18n.translate("text.rei.credits"), this.width / 2, 16, 16777215); super.render(matrices, int_1, int_2, float_1); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java index 8818b87e9..146b909f8 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java @@ -203,7 +203,7 @@ public class EntryListWidget extends WidgetWithBounds { int size = 0; long time = 0; if (sizeForFavorites > 0) { - method_27535(matrices, font, new TranslatableText("text.rei.favorites"), innerBounds.x + 2, (int) (innerBounds.y + 8 - scrolling.scrollAmount), -1); + drawTextWithShadow(matrices, font, new TranslatableText("text.rei.favorites"), innerBounds.x + 2, (int) (innerBounds.y + 8 - scrolling.scrollAmount), -1); nextIndex += innerBounds.width / entrySize(); back1: for (EntryStack stack : favorites) { @@ -259,7 +259,7 @@ public class EntryListWidget extends WidgetWithBounds { int z = getZ(); setZ(500); Text debugText = new LiteralText(String.format("%d entries, avg. %.0fns, ttl. %.0fms, %s fps", size, time / (double) size, totalTime / 1000000d, minecraft.fpsDebugString.split(" ")[0])); - fillGradient(matrices, bounds.x, bounds.y, bounds.x + font.getWidth(debugText) + 2, bounds.y + font.fontHeight + 2, -16777216, -16777216); + fillGradient(matrices, bounds.x, bounds.y, bounds.x + font.getStringWidth(debugText) + 2, bounds.y + font.fontHeight + 2, -16777216, -16777216); VertexConsumerProvider.Immediate immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer()); matrices.push(); matrices.translate(0.0D, 0.0D, getZ()); @@ -270,7 +270,7 @@ public class EntryListWidget extends WidgetWithBounds { matrices.pop(); } else { if (sizeForFavorites > 0) { - method_27535(matrices, font, new TranslatableText("text.rei.favorites"), innerBounds.x + 2, (int) (innerBounds.y + 8 - scrolling.scrollAmount), -1); + drawTextWithShadow(matrices, font, new TranslatableText("text.rei.favorites"), innerBounds.x + 2, (int) (innerBounds.y + 8 - scrolling.scrollAmount), -1); nextIndex += innerBounds.width / entrySize(); back1: for (EntryStack stack : favorites) { @@ -380,7 +380,7 @@ public class EntryListWidget extends WidgetWithBounds { int z = getZ(); setZ(500); Text debugText = new LiteralText(String.format("%d entries, avg. %.0fns, ttl. %.0fms, %s fps", size, time / (double) size, totalTime / 1000000d, minecraft.fpsDebugString.split(" ")[0])); - int stringWidth = font.getWidth(debugText); + int stringWidth = font.getStringWidth(debugText); fillGradient(matrices, Math.min(bounds.x, minecraft.currentScreen.width - stringWidth - 2), bounds.y, bounds.x + stringWidth + 2, bounds.y + font.fontHeight + 2, -16777216, -16777216); VertexConsumerProvider.Immediate immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer()); matrices.push(); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java index 6e69a5f69..3834aa43a 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java @@ -44,8 +44,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** - * @see Widgets#createLabel(Point, String) - * @see Widgets#createClickableLabel(Point, String, Consumer) + * @see Widgets#createLabel(Point, Text) + * @see Widgets#createClickableLabel(Point, Text, Consumer) */ @Deprecated @ApiStatus.ScheduledForRemoval @@ -157,7 +157,7 @@ public class LabelWidget extends WidgetWithBounds { @NotNull @Override public Rectangle getBounds() { - int width = font.getWidth(text); + int width = font.getStringWidth(text); Point pos = getLocation(); if (isCentered()) return new Rectangle(pos.x - width / 2 - 1, pos.y - 5, width + 2, 14); @@ -171,7 +171,7 @@ public class LabelWidget extends WidgetWithBounds { @Override public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - int width = font.getWidth(text); + int width = font.getStringWidth(text); Point pos = getLocation(); if (isCentered()) { if (hasShadows) diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java index fb9e44635..6eb50ec29 100644 --- a/src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java @@ -211,7 +211,7 @@ public class ButtonWidget extends Button { if (tint != null) fillGradient(matrices, x + 1, y + 1, x + width - 1, y + height - 1, tint, tint); - this.method_27534(matrices, font, getText(), x + width / 2, y + (height - 8) / 2, color); + this.drawCenteredText(matrices, font, getText(), x + width / 2, y + (height - 8) / 2, color); String tooltip = getTooltip(); if (tooltip != null) diff --git a/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java b/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java index b333adc55..d3de15a04 100644 --- a/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java +++ b/src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java @@ -183,7 +183,7 @@ public final class LabelWidget extends Label { @NotNull @Override public final Rectangle getBounds() { - int width = font.getWidth(text); + int width = font.getStringWidth(text); Point point = getPoint(); if (getHorizontalAlignment() == LEFT_ALIGNED) return new Rectangle(point.x - 1, point.y - 5, width + 2, 14); @@ -200,7 +200,7 @@ public final class LabelWidget extends Label { if (isClickable() && isHovered(mouseX, mouseY)) color = getHoveredColor(); Point pos = getPoint(); - int width = font.getWidth(getText()); + int width = font.getStringWidth(getText()); switch (getHorizontalAlignment()) { case LEFT_ALIGNED: if (hasShadow()) |