From b7a13e5562c6e5b2124c1331fdf4f0908e49503a Mon Sep 17 00:00:00 2001
From: IMS212 <ims@irisshaders.dev>
Date: Wed, 2 Oct 2024 08:46:21 -0700
Subject: [PATCH] 24w40a

---
 build.gradle.kts                                            | 6 +++---
 common/build.gradle.kts                                     | 2 +-
 .../mixin/features/render/gui/font/BakedGlyphMixin.java     | 5 +++--
 fabric/build.gradle.kts                                     | 2 +-
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6e27a62bd4..745c07dc9b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,12 +1,12 @@
 plugins {
     id("java")
-    id("fabric-loom") version ("1.7.3") apply (false)
+    id("fabric-loom") version ("1.8.2") apply (false)
 }
 
-val MINECRAFT_VERSION by extra { "24w38a" }
+val MINECRAFT_VERSION by extra { "24w40a" }
 val NEOFORGE_VERSION by extra { "21.0.163" }
 val FABRIC_LOADER_VERSION by extra { "0.16.5" }
-val FABRIC_API_VERSION by extra { "0.104.2+1.21.2" }
+val FABRIC_API_VERSION by extra { "0.105.0+1.21.2" }
 
 // This value can be set to null to disable Parchment.
 val PARCHMENT_VERSION by extra { null }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index aba0458673..16aa5ff820 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java")
     id("idea")
-    id("fabric-loom") version ("1.7.3")
+    id("fabric-loom") version ("1.8.2")
 }
 
 repositories {
diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java
index 08e138f1e0..d2196af0f8 100644
--- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java
+++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java
@@ -1,6 +1,7 @@
 package net.caffeinemc.mods.sodium.mixin.features.render.gui.font;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.caffeinemc.mods.sodium.api.util.ColorARGB;
 import net.caffeinemc.mods.sodium.client.render.vertex.VertexConsumerUtils;
 import net.caffeinemc.mods.sodium.api.vertex.format.common.GlyphVertex;
 import net.minecraft.client.gui.font.glyphs.BakedGlyph;
@@ -52,7 +53,7 @@ public class BakedGlyphMixin {
      * @author JellySquid
      */
     @Inject(method = "render", at = @At("HEAD"), cancellable = true)
-    private void drawFast(boolean italic, float x, float y, Matrix4f matrix, VertexConsumer vertexConsumer, float red, float green, float blue, float alpha, int light, CallbackInfo ci) {
+    private void drawFast(boolean italic, float x, float y, Matrix4f matrix, VertexConsumer vertexConsumer, int c, int light, CallbackInfo ci) {
         var writer = VertexConsumerUtils.convertOrLog(vertexConsumer);
 
         if (writer == null) {
@@ -68,7 +69,7 @@ private void drawFast(boolean italic, float x, float y, Matrix4f matrix, VertexC
         float w1 = italic ? 1.0F - 0.25F * this.up : 0.0F;
         float w2 = italic ? 1.0F - 0.25F * this.down : 0.0F;
 
-        int color = ColorABGR.pack(red, green, blue, alpha);
+        int color = ColorARGB.toABGR(c);
 
         try (MemoryStack stack = MemoryStack.stackPush()) {
             long buffer = stack.nmalloc(4 * GlyphVertex.STRIDE);
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
index ce75894c4a..38b98ba429 100644
--- a/fabric/build.gradle.kts
+++ b/fabric/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java")
     id("idea")
-    id("fabric-loom") version ("1.7.3")
+    id("fabric-loom") version ("1.8.2")
 }
 
 val MINECRAFT_VERSION: String by rootProject.extra
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0e54..0aaefbcaf0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME