feat: upgrade to java25 with updated mods and discord config

modules/caddy.nix

@@ -12,8 +12,8 @@ in
       # minecraft.compsigh.club → redirect to git repo
       "${domain}" = {
         extraConfig = ''
-          redir /terms ${gitRepo}/src/branch/main/terms.txt permanent
+          redir /terms ${gitRepo}/raw/branch/main/terms.txt permanent
-          redir /privacy ${gitRepo}/src/branch/main/privacy.txt permanent
+          redir /privacy ${gitRepo}/raw/branch/main/privacy.txt permanent
           redir ${gitRepo} permanent
         '';
       };

modules/discord.nix

@@ -26,9 +26,12 @@ in
     "botToken": "$TOKEN",
     "channelId": "1482486447591391285",
     "consoleLogChannelId": "1482487413153464330",
+    "updateNotificationChannelId": "",
+    "serverStatusVoiceChannelId": "",
+    "playerCountVoiceChannelId": "",
     "useWebhook": true,
     "updateChannelTopic": true,
-    "channelTopicUpdateInterval": 300000,
+    "channelUpdateInterval": 300000,
     "allowedMentions": ["users", "roles"],
     "broadcastPlayerCommandExecution": false,
     "announceServerStartStop": true,

modules/minecraft.nix

@@ -9,10 +9,7 @@ let
     "krypton"
     "ferrite-core"
     "c2me-fabric"
-    "noisium"
+    "vmp-fabric:alpha"
-    "linearly-optimized"
-    "vmp-fabric"
-    "ksyxis"
     "scalablelux"
     "lmd"
     "structure-layout-optimizer"
@@ -30,30 +27,30 @@ let
     "amplified-nether"
     "nullscape"
 
-    # Worldgen — structures (YUNG's suite)
+    # Worldgen — structures (Dungeons and Taverns suite)
-    "yungs-api"
+    "dungeons-and-taverns"
-    "yungs-better-dungeons"
+    "dungeons-and-taverns-stronghold-overhaul"
-    "yungs-better-strongholds"
+    "dungeons-and-taverns-ocean-monument-overhaul"
-    "yungs-better-ocean-monuments"
+    "dungeons-and-taverns-desert-temple-overhaul"
-    "yungs-better-mineshafts"
+    "dungeons-and-taverns-jungle-temple-overhaul"
-    "yungs-better-desert-temples"
+    "dungeons-and-taverns-swamp-hut-overhaul"
-    "yungs-better-jungle-temples"
+    "dungeons-and-taverns-nether-fortress-overhaul"
-    "yungs-better-witch-huts"
+    "dungeons-and-taverns-woodland-mansion-overhaul"
-    "yungs-better-nether-fortresses"
+    "dungeons-and-taverns-pillager-outpost-overhaul"
-    "yungs-better-end-island"
+    "hopo-better-mineshaft"
-    "yungs-extras"
+    "explorify"
-    "yungs-bridges"
+    "structory"
 
     # Client mod compatibility (optional on client side)
     "appleskin"
     "simple-voice-chat"
 
     # QoL
-    "oneplayersleep"
+    "better-serversleep"
     "netherportalfix"
     "blossomlib"
     "blossomtpa"
-    "double-shulker-shell-drops"
+    "shulker-drops-two"
     "afkplus"
 
     # Moderation
@@ -90,7 +87,7 @@ in
 
   virtualisation.oci-containers.backend = "docker";
   virtualisation.oci-containers.containers.minecraft = {
-    image = "itzg/minecraft-server:java21";
+    image = "itzg/minecraft-server:java25";
     ports = [
       "25565:25565"       # Minecraft
       "24454:24454/udp"   # Simple Voice Chat
@@ -99,22 +96,27 @@ in
       "${mcDataDir}:/data"
     ];
     environment = {
+      TZ = "America/Los_Angeles";
       EULA = "TRUE";
       TYPE = "FABRIC";
-      VERSION = "1.21.4";
+      VERSION = "1.21.11";
       MEMORY = "2560M";
       MAX_PLAYERS = "10";
       DIFFICULTY = "hard";
       PVP = "FALSE";
       VIEW_DISTANCE = "10";
       SIMULATION_DISTANCE = "10";
+      SPAWN_PROTECTION = "0";
       ENABLE_WHITELIST = "TRUE";
       ENFORCE_WHITELIST = "TRUE";
       WHITELIST = "jetpham";
       OPS = "jetpham";
       MOTD = "meet cool people \\u00A7e\\u0026\\u0026\\u00A7r build cool things";
       OVERRIDE_ICON = "TRUE";
+      REMOVE_OLD_MODS = "TRUE";
+      MODRINTH_DOWNLOAD_DEPENDENCIES = "required";
       MODRINTH_PROJECTS = modrinthMods;
+      SYNC_CHUNK_WRITES = "false";
       JVM_XX_OPTS = jvmFlags;
     };
     environmentFiles = [ "/run/minecraft-seed.env" ];
@@ -147,6 +149,12 @@ in
         printf 'SEED=%s\n' "$SEED" > /run/minecraft-seed.env
         chmod 600 /run/minecraft-seed.env
 
+        # One-time world reset for 1.21.11 — remove this block after confirming the new world works
+        if [ ! -f ${mcDataDir}/.world-reset-1.21.11 ]; then
+          rm -rf ${mcDataDir}/world
+          touch ${mcDataDir}/.world-reset-1.21.11
+        fi
+
         # Server icon
         cp ${../server-icon.png} ${mcDataDir}/server-icon.png
 

secrets/discord-bot-token.age

@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 nN+I3Q YmpwUlCii+a5JxJ7nYNJHRH/dqgabVrvRG4HAcDv80M
+-> ssh-ed25519 nN+I3Q 7W+Y+0ouVM02UOj7VAR2RYFXuiDV1XPxtAa8EYB77UI
-3G5MM3gJ0RBZQXz3WUetiXSSGEl2y+E1ZgyJ7Xp+bzg
+JqCjlkmXqmQ03G7IM9ltbCQNPgZAhYyFnOgLgI+48Cc
--> ssh-ed25519 Ziw7aw 566UvTX3i6TgwVI+R+4xZMKDk2taODC4eSazhwnXpWs
+-> ssh-ed25519 Ziw7aw ci52v0YuHrK0Z+bqYNzHHBX3SAdtWMD4hlZWwABp8lo
-DlWnZMQuO2UQsji3NqB9hJf3a0U+3m8jrp6YOwyNVdc
+ILqKNzBcpgXZJGG9TfEKjfeDgXGeNnC4/ujFpZixcGY
---- x6e0Gj888fGWJ99j/Vr995EwdilrY+kIFCsq5CKNAkQ
+--- vFCubYhDaqk8DNBcZ6o2tpcIMd37krblDZmUy8738so
-îË)NCõp˜ÓØøÐcñ“và51o\ðœôi©mF<6D>s°­¸µÿÿêü(
)¬Î7@2ÒÞOù®_wé£	[óªEàÕ[7ZåKx,Ør‚IÎ[ndˆmüNû¨þÀ²ìc¶
+¦Èfµþõ“æ2<C3A6>YÓæ‘%g§g(E:–÷o‰8XÕU›<55>nœ4fùì­IÕÉžßÜù‰@³J<C2B3>íëž¿¬<C2BF>µ«Þ}C˜ñB»+ÿâ-Ãpì r_Ÿ즔z5{è´(jG£kÎ[5