From ebbb60d2d6bcda3661cea795a9fe4dc10b02d7bd Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Thu, 27 Jun 2024 15:20:19 +0200
Subject: [PATCH] feat(etna): atm9 server woo

---
 systems/etna/minecraft.nix | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/systems/etna/minecraft.nix b/systems/etna/minecraft.nix
index c34e1ba..2aa8544 100644
--- a/systems/etna/minecraft.nix
+++ b/systems/etna/minecraft.nix
@@ -10,18 +10,16 @@
   mkMinecraftServer = name: {
     port,
     remotePort,
+    tag ? "java21",
     dataDir ? "/var/lib/${name}",
     memory ? "4G",
     env ? {},
     extraPorts ? [],
   }: {
     virtualisation.oci-containers.containers.${name} = {
-      image = "itzg/minecraft-server";
+      image = "itzg/minecraft-server:${tag}";
       ports = ["${builtins.toString port}:25565"] ++ extraPorts;
-      volumes = [
-        "${dataDir}:/data"
-        "/data/downloads:/downloads"
-      ];
+      volumes = ["${dataDir}:/data"];
       environmentFiles = [config.age.secrets.minecraftEnv.path];
       environment =
         {
@@ -82,19 +80,18 @@ in
         Unit = "restart-minecraft-servers.service";
       };
     };
-
-    cfTunnels."map.uku.moe" = "http://localhost:8100";
   }
   (mkMinecraftServers {
-    p9 = {
-      port = 25568;
-      extraPorts = ["8100:8100"];
-      remotePort = 6003;
-      memory = "4G";
+    atm9 = {
+      port = 25565;
+      remotePort = 6004;
+      tag = "java17";
+      memory = "8G";
       env = {
         USE_AIKAR_FLAGS = "true";
-        TYPE = "MODRINTH";
-        MODRINTH_MODPACK = "https://modrinth.com/modpack/adrenaserver/version/1.6.0+1.20.6.fabric";
+        MOD_PLATFORM = "AUTO_CURSEFORGE";
+        CF_SLUG = "all-the-mods-9";
+        CF_FILE_ID = "5458414";
       };
     };