mojmap

1 files changed, 14 insertions, 14 deletions

diff --git a/src/client/java/dev/isxander/yacl/gui/utils/GuiUtils.java b/src/client/java/dev/isxander/yacl/gui/utils/GuiUtils.java
index b1f0148..aa8bbaa 100644
--- a/src/client/java/dev/isxander/yacl/gui/utils/GuiUtils.java
+++ b/src/client/java/dev/isxander/yacl/gui/utils/GuiUtils.java
@@ -1,32 +1,32 @@
 package dev.isxander.yacl.gui.utils;
 
+import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.util.Window;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.Language;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.locale.Language;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 
 public class GuiUtils {
-    public static MutableText translatableFallback(String key, Text fallback) {
-        if (Language.getInstance().hasTranslation(key))
-            return Text.translatable(key);
+    public static MutableComponent translatableFallback(String key, Component fallback) {
+        if (Language.getInstance().has(key))
+            return Component.translatable(key);
         return fallback.copy();
     }
 
     public static void enableScissor(int x, int y, int width, int height) {
-        Window window = MinecraftClient.getInstance().getWindow();
-        double d = window.getScaleFactor();
-        RenderSystem.enableScissor((int)(x * d), (int)((window.getScaledHeight() - y - height) * d), (int)(width * d), (int)(height * d));
+        Window window = Minecraft.getInstance().getWindow();
+        double d = window.getGuiScale();
+        RenderSystem.enableScissor((int)(x * d), (int)((window.getGuiScaledHeight() - y - height) * d), (int)(width * d), (int)(height * d));
     }
 
-    public static String shortenString(String string, TextRenderer textRenderer, int maxWidth, String suffix) {
+    public static String shortenString(String string, Font font, int maxWidth, String suffix) {
         if (string.isEmpty())
             return string;
 
         boolean firstIter = true;
-        while (textRenderer.getWidth(string) > maxWidth) {
+        while (font.width(string) > maxWidth) {
             string = string.substring(0, Math.max(string.length() - 1 - (firstIter ? 1 : suffix.length() + 1), 0)).trim();
             string += suffix;