Cleaned up code

5 files changed, 12 insertions, 20 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
index 1f8e2552..73ad468f 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
@@ -75,7 +75,7 @@ public class RenderUtils {
             return Vec3d.ZERO;
         }
 
-        double tickDelta = (double) MinecraftClient.getInstance().getTickDelta();
+        double tickDelta = MinecraftClient.getInstance().getTickDelta();
         return new Vec3d(
                 e.getX() - MathHelper.lerp(tickDelta, e.lastRenderX, e.getX()),
                 e.getY() - MathHelper.lerp(tickDelta, e.lastRenderY, e.getY()),
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java
index ae490649..7a0ad754 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java
@@ -3,7 +3,7 @@ package me.xmrvizzy.skyblocker.utils;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
@@ -26,7 +26,7 @@ public class ToastBuilder implements Toast {
         RenderSystem.setShaderTexture(0, TEXTURE);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
 
-        manager.drawTexture(matrices, 0, 0, 0, 0, this.getWidth(), this.getHeight());
+        DrawableHelper.drawTexture(matrices, 0, 0, 0, 0, this.getWidth(), this.getHeight());
         manager.getClient().textRenderer.draw(matrices, title, 7.0f, 7.0f, -11534256);
         manager.getClient().textRenderer.draw(matrices, description, 7.0f, 18.0f, -16777216);
         return startTime >= 3000L ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java b/src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java
index 3a8f85f2..9e4b609f 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java
@@ -16,8 +16,8 @@ import java.util.regex.Pattern;
 
 public class UpdateChecker {
     public static boolean shouldUpdate = false;
-    public static Pattern pattern = Pattern.compile("v(\\d+)\\.(\\d+)\\.(\\d+)");
-    public static Pattern localPattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)");
+    public static final Pattern pattern = Pattern.compile("v(\\d+)\\.(\\d+)\\.(\\d+)");
+    public static final Pattern localPattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)");
     public static Matcher matcher;
     public static VersionNumber localVersion = null;
     public static VersionNumber latestVersion = null;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/color/LineColor.java b/src/main/java/me/xmrvizzy/skyblocker/utils/color/LineColor.java
index b22a6602..42cf5926 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/color/LineColor.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/color/LineColor.java
@@ -4,7 +4,7 @@ import com.mojang.datafixers.util.Function4;
 
 public class LineColor extends RenderColor {
 
-    private Function4<Float, Float, Float, Integer, int[]> getColorFunc;
+    private final Function4<Float, Float, Float, Integer, int[]> getColorFunc;
 
     public static LineColor single(float red, float green, float blue, float alpha) {
         return LineColor.single((int) (red * 255f), (int) (green * 255f), (int) (blue * 255f), (int) (alpha * 255f));
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/color/QuadColor.java b/src/main/java/me/xmrvizzy/skyblocker/utils/color/QuadColor.java
index 29a28cb5..cb1ce66e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/color/QuadColor.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/color/QuadColor.java
@@ -42,17 +42,11 @@ public class QuadColor extends RenderColor {
     }
 
     public static QuadColor custom(int red1, int green1, int blue1, int alpha1, int red2, int green2, int blue2, int alpha2, int red3, int green3, int blue3, int alpha3, int red4, int green4, int blue4, int alpha4) {
-        return new QuadColor(curVertex -> {
-            switch (curVertex) {
-                case 0:
-                    return new int[]{red1, green1, blue1, alpha1};
-                case 1:
-                    return new int[]{red2, green2, blue2, alpha2};
-                case 2:
-                    return new int[]{red3, green3, blue3, alpha3};
-                default:
-                    return new int[]{red4, green4, blue4, alpha4};
-            }
+        return new QuadColor(curVertex -> switch (curVertex) {
+            case 0 -> new int[]{red1, green1, blue1, alpha1};
+            case 1 -> new int[]{red2, green2, blue2, alpha2};
+            case 2 -> new int[]{red3, green3, blue3, alpha3};
+            default -> new int[]{red4, green4, blue4, alpha4};
         });
     }
 
@@ -78,9 +72,7 @@ public class QuadColor extends RenderColor {
         for (int i = 0; i < 4; i++) {
             int[] curColor = getColor(i);
 
-            for (int j = 0; j < 4; j++) {
-                outColor[i * 4 + j] = curColor[j];
-            }
+            System.arraycopy(curColor, 0, outColor, i * 4, 4);
         }
 
         return outColor;