port to 26.2HEADmain

5 files changed, 81 insertions, 28 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index dda6391..f5b680d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,15 +1,14 @@
 plugins {
-    id("net.fabricmc.fabric-loom-remap") version "1.15-SNAPSHOT"
+    id("net.fabricmc.fabric-loom") version "1.17-SNAPSHOT"
 }
 
 group = "club.eviltransgenders"
 version = "0.1.0"
 
 dependencies {
-    minecraft("com.mojang:minecraft:1.21.11")
-    mappings(loom.officialMojangMappings())
-    modImplementation("net.fabricmc:fabric-loader:0.17.3")
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.141.4+1.21.11")
+    minecraft("com.mojang:minecraft:26.2")
+    implementation("net.fabricmc:fabric-loader:0.18.4")
+    implementation("net.fabricmc.fabric-api:fabric-api:0.152.2+26.2")
 }
 
 tasks {
diff --git a/flake.lock b/flake.lock
index 08dc0f4..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": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "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 f0b43df..070ff36 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,20 +1,40 @@
 {
   description = "Minecraft fabric mod dev env";
-  inputs.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 rec {
-      buildInputs = with pkgs; [
-	      flite
-        libglvnd
-        libpulseaudio
-      ];
-
-      LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
-      nativeBuildInputs = with pkgs; [
-        gradle_9
-        jdk21
-        jdt-language-server
-      ];
-    };
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
+
+  outputs =
+    {
+      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 = nixpkgs.lib.makeLibraryPath buildInputs;
+		      nativeBuildInputs = with pkgs; [
+			      gradle_9
+			      jdk25
+			      jdt-language-server
+		      ];
+	      };
+
+        formatter = pkgs.nixfmt;
+      }
+    );
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c61a118..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.4.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/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 4be2f64..2376889 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -25,8 +25,8 @@
     },
     "mixins": ["autoreconnect.mixins.json"],
     "depends": {
-        "fabric-api": ">=0.141.4+1.21.11",
-        "fabricloader": ">=0.17.3",
-        "minecraft": ">=1.21.11"
+        "fabric-api": ">=0.152.2+26.2",
+        "fabricloader": ">=0.18.4",
+        "minecraft": ">=26.2"
     }
 }