From 9020b4f2f8a0c374b9f724f9584fb38cc5aa0bcd Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sat, 17 Jan 2026 16:19:56 -0500
Subject: [PATCH] add stoneblock-4, submerged-2

---
 systems/palatine-hill/docker/minecraft.nix | 87 ++++++++++++++--------
 1 file changed, 57 insertions(+), 30 deletions(-)

diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix
index dcbeaed..ffddae8 100644
--- a/systems/palatine-hill/docker/minecraft.nix
+++ b/systems/palatine-hill/docker/minecraft.nix
@@ -4,6 +4,8 @@ let
   servers = {
     atm6 = "atm6.alicehuston.xyz";
     stoneblock3 = "sb3.alicehuston.xyz";
+    stoneblock-4 = "sb4.alicehuston.xyz";
+    submerged-2 = "sm4.alicehuston.xyz";
     RAD2 = "rad.alicehuston.xyz";
     skyfactory = "sf.alicehuston.xyz";
     divinejourney = "dj.alicehuston.xyz";
@@ -77,50 +79,75 @@ in
     #  log-driver = "local";
     #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     #};
-    prominence-ii = {
+    #prominence-ii = {
+    #  image = "itzg/minecraft-server:java25-graalvm";
+    #  volumes = [
+    #    "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
+    #    "${minecraft_path}/prominence-ii/data:/data"
+    #  ];
+    #  hostname = "pii";
+    #  environment = defaultEnv // {
+    #    VERSION = "1.20.1";
+    #    CF_SLUG = "prominence-2-hasturian-era";
+    #    CF_FILENAME_MATCHER = "3.9.14hf";
+    #    USE_AIKAR_FLAGS = "false";
+    #    USE_MEOWICE_FLAGS = "true";
+    #    USE_MEOWICE_GRAALVM_FLAGS = "true";
+    #    DIFFICULTY = "hard";
+    #    ENABLE_COMMAND_BLOCK = "true";
+    #    CF_FORCE_INCLUDE_FILES = ''
+    #      emi
+    #    '';
+    #  };
+    #  extraOptions = defaultOptions;
+    #  log-driver = "local";
+    #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    #};
+    #stoneblock-4 = {
+    #  image = "itzg/minecraft-server:java25-graalvm";
+    #  volumes = [
+    #    "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
+    #    "${minecraft_path}/stoneblock-4/data:/data"
+    #  ];
+    #  hostname = "stoneblock-4";
+    #  environment = defaultEnv // {
+    #    VERSION = "1.21.1";
+    #    CF_SLUG = "prominence-2-hasturian-era";
+    #    CF_FILENAME_MATCHER = "3.9.14hf";
+    #    USE_AIKAR_FLAGS = "false";
+    #    USE_MEOWICE_FLAGS = "true";
+    #    USE_MEOWICE_GRAALVM_FLAGS = "true";
+    #    DIFFICULTY = "hard";
+    #    ENABLE_COMMAND_BLOCK = "true";
+    #    CF_FORCE_INCLUDE_FILES = ''
+    #      emi
+    #    '';
+    #  };
+    #  extraOptions = defaultOptions;
+    #  log-driver = "local";
+    #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    #};
+    submerged-2 = {
       image = "itzg/minecraft-server:java25-graalvm";
       volumes = [
-        "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
-        "${minecraft_path}/prominence-ii/data:/data"
+        "${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
+        "${minecraft_path}/submerged-2/data:/data"
       ];
-      hostname = "pii";
+      hostname = "submerged-2";
       environment = defaultEnv // {
-        VERSION = "1.20.1";
-        CF_SLUG = "prominence-2-hasturian-era";
-        CF_FILENAME_MATCHER = "3.9.14hf";
+        VERSION = "1.21.1";
+        CF_SLUG = "submerged-2";
+        CF_FILENAME_MATCHER = "B6.1";
         USE_AIKAR_FLAGS = "false";
         USE_MEOWICE_FLAGS = "true";
         USE_MEOWICE_GRAALVM_FLAGS = "true";
         DIFFICULTY = "hard";
         ENABLE_COMMAND_BLOCK = "true";
-        CF_FORCE_INCLUDE_FILES = ''
-          emi
-        '';
       };
       extraOptions = defaultOptions;
       log-driver = "local";
       environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     };
-    #stop_signal: SIGTERM
-    #stop_grace_period: 5m
-    # bcg-plus = {
-    #   image = "itzg/minecraft-server:java17";
-    #   volumes = [
-    #     "${minecraft_path}/bcg-plus/modpacks:/modpacks:ro"
-    #     "${minecraft_path}/bcg-plus/data:/data"
-    #   ];
-    #   hostname = "bcg-plus";
-    #   environment = defaultEnv // {
-    #     VERSION = "1.17";
-    #     CF_SLUG = "bcg";
-    #     DIFFICULTY = "normal";
-    #     DEBUG = "true";
-    #     # ENABLE_COMMAND_BLOCK = "true";
-    #   };
-    #   extraOptions = defaultOptions;
-    #   log-driver = "local";
-    #   environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
-    # };
   };
 
   sops = {