port to 26.2

5 files changed, 80 insertions, 32 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 83b4747..cdfb3bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,15 @@
 plugins {
-    id("net.fabricmc.fabric-loom-remap") version "1.15-SNAPSHOT"
+    id("net.fabricmc.fabric-loom") version "1.17-SNAPSHOT"
 }
 
 group = "net.girlonthe"
 version = "0.1.0"
 
 dependencies {
-    val minecraftVersion = "1.21.11"
+    val minecraftVersion = "26.2"
     minecraft("com.mojang:minecraft:$minecraftVersion")
-    mappings(loom.officialMojangMappings())
-    modImplementation("net.fabricmc:fabric-loader:0.18.4")
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.141.3+$minecraftVersion")
+    implementation("net.fabricmc:fabric-loader:0.18.4")
+    implementation("net.fabricmc.fabric-api:fabric-api:0.152.2+$minecraftVersion")
 }
 
 tasks {
diff --git a/flake.lock b/flake.lock
index 7889e5a..bc7dbb5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,30 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772963539,
-        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
         "type": "github"
       },
       "original": {
@@ -18,8 +36,24 @@
     },
     "root": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 89cc0e6..070ff36 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,25 +1,40 @@
 {
-  description = "Minecraft dev flake";
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  description = "Minecraft fabric mod dev env";
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  };
+
   outputs =
-    { self, nixpkgs }:
-    let
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
-    in
     {
-      devShells.x86_64-linux.default = pkgs.mkShellNoCC {
-        buildInputs = with pkgs; [
-          libglvnd
-        ];
+      self,
+      flake-utils,
+      nixpkgs,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+	      devShells.default = pkgs.mkShellNoCC rec {
+		      buildInputs = with pkgs; [
+			      flite
+			      libglvnd
+			      libpulseaudio
+			      pipewire
+			      vulkan-loader
+		      ];
 
-        LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ libglvnd ];
-        nativeBuildInputs = with pkgs; [
-          gradle_9
-          jdk21
-          jdt-language-server
-        ];
-      };
+		      LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
+		      nativeBuildInputs = with pkgs; [
+			      gradle_9
+			      jdk25
+			      jdt-language-server
+		      ];
+	      };
 
-      formatter.x86_64-linux = pkgs.nixfmt;
-    };
+        formatter = pkgs.nixfmt;
+      }
+    );
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f78a6..1a70468 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-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/net/girlonthe/chattweaks/mixin/ChatComponentMixin.java b/src/main/java/net/girlonthe/chattweaks/mixin/ChatComponentMixin.java
index bdbc428..a228b10 100644
--- a/src/main/java/net/girlonthe/chattweaks/mixin/ChatComponentMixin.java
+++ b/src/main/java/net/girlonthe/chattweaks/mixin/ChatComponentMixin.java
@@ -2,7 +2,7 @@ package net.girlonthe.chattweaks.mixin;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.ChatComponent;
-import net.minecraft.client.GuiMessage;
+import net.minecraft.client.multiplayer.chat.GuiMessage;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextColor;
@@ -16,8 +16,8 @@ import java.time.format.DateTimeFormatter;
 @Mixin(ChatComponent.class)
 public abstract class ChatComponentMixin {
     @ModifyArg(
-        method = "addMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/GuiMessageTag;)V",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ChatComponent;addMessageToDisplayQueue(Lnet/minecraft/client/GuiMessage;)V")
+        method = "addMessage",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ChatComponent;addMessageToDisplayQueue(Lnet/minecraft/client/multiplayer/chat/GuiMessage;)V")
     )
     private GuiMessage rosasChatTweaks$prependTimestamp(GuiMessage original) {
         Component newComponent = Component.empty()
@@ -26,6 +26,6 @@ public abstract class ChatComponentMixin {
                     .setStyle(Style.EMPTY.withColor(ChatFormatting.GRAY))
             )
             .append(original.content());
-        return new GuiMessage(original.addedTime(), newComponent, original.signature(), original.tag());
+        return new GuiMessage(original.addedTime(), newComponent, original.signature(), original.source(), original.tag());
     }
 }