From 3d1fec0491d055badfffd72fc1fd0a58617a4b4e Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Mon, 15 Apr 2024 09:34:38 -0300
Subject: [PATCH] Updated minecraft server

---
 flake.lock                             | 36 +++++++-------------------
 hosts/servers/alexandria/minecraft.nix | 21 +++++----------
 2 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/flake.lock b/flake.lock
index 74b7f0d..f2c26e8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -217,11 +217,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711588575,
-        "narHash": "sha256-9lTwKUcGbxnyQ1Ne2EahRWKZKIywOrcHjpNHPqYuphs=",
+        "lastModified": 1712970252,
+        "narHash": "sha256-3flJKxsxg+V0jHQ9SB4tdRCYgxKsgzF/g8ERhj9BN0E=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "ead5e3e917e43ab000150784c00a479de5502d43",
+        "rev": "017d276fa8bc6a73520564dd6b0bf2469363612d",
         "type": "github"
       },
       "original": {
@@ -268,16 +268,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1624561540,
-        "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
-        "owner": "NixOS",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -298,22 +298,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1711523803,
-        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -323,7 +307,7 @@
         "impermanence": "impermanence",
         "nix-minecraft": "nix-minecraft",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "yousable": "yousable"
       }
diff --git a/hosts/servers/alexandria/minecraft.nix b/hosts/servers/alexandria/minecraft.nix
index 5e90fa9..76a8f1b 100644
--- a/hosts/servers/alexandria/minecraft.nix
+++ b/hosts/servers/alexandria/minecraft.nix
@@ -3,21 +3,12 @@
 let
   modpack = (pkgs.fetchPackwizModpack {
     url =
-      "https://raw.githubusercontent.com/baduhai/FFS/06d253f0cd262b8d4a178d4db8e1a7188051e8d0/pack.toml";
-    packHash = "sha256-UXjUqDLVUIIUoucHLz9qTqZ7wXOVriCuAcSmeevNz+Q=";
-  }).addFiles {
-    "mods/FabricProxy-lite.jar" = pkgs.fetchurl rec {
-      pname = "fabrictailor";
-      version = "2.1.2";
-      url =
-        "https://cdn.modrinth.com/data/g8w1NapE/versions/MNgY2xFj/${pname}-${version}.jar";
-      hash = "sha256-oYM29Mcon9GTTyLcim85CPiWCdyB48nweVA+0Xq3PIY=";
-    };
-  };
+      "https://raw.githubusercontent.com/baduhai/FFS/000a28196d5ec5e90222d69cfadb97311bb6f2c3/pack.toml";
+    packHash = "sha256-EHL/rCkqcRzVvvnDZsP2s7S30ZBsG9r9L4Tn1dzjzWM=";
+  });
   mcVersion = modpack.manifest.versions.minecraft;
   fabricVersion = modpack.manifest.versions.fabric;
-  serverVersion =
-    lib.replaceStrings [ "." ] [ "_" ] "fabric-${mcVersion}-${fabricVersion}";
+  serverVersion = lib.replaceStrings [ "." ] [ "_" ] "fabric-${mcVersion}";
 
 in {
   services.minecraft-servers = {
@@ -26,7 +17,9 @@ in {
     dataDir = "/data/minecraft";
     servers."seridor" = {
       enable = true;
-      package = pkgs.fabricServers.${serverVersion};
+      package = pkgs.fabricServers.${serverVersion}.override {
+        loaderVersion = fabricVersion;
+      };
       openFirewall = true;
       serverProperties = {
         difficulty = "hard";