added a second minecraft server

1 files changed, 41 insertions, 3 deletions

diff --git a/modules/nixos/minecraft-server.nix b/modules/nixos/minecraft-server.nix
index c365af6..f2e45fc 100644
--- a/modules/nixos/minecraft-server.nix
+++ b/modules/nixos/minecraft-server.nix
@@ -5,12 +5,14 @@ let
   # Leave empty to disable
   rsyncSSHKeys = config.users.users.defin.openssh.authorizedKeys.keys;
   jre17 = pkgs.temurin-bin-17;
+  jre21 = pkgs.temurin-bin-21;
 
   defaults = {
     # 5 minutes tick timeout, for heavy packs
     max-tick-time = 5 * 60 * 1000;
     # It just ain't modded minecraft without flying around
     allow-flight = true;
+    max-players = 10;
   };
 
   jvmOpts = concatStringsSep " " [
@@ -39,7 +41,32 @@ in {
   # minecraft server is closed source
   # nixpkgs.config.allowUnfree = true;
 
-  imports = [ inputs.modded-minecraft-servers.module ];
+  imports = [ 
+    inputs.modded-minecraft-servers.module
+    # inputs.nix-minecraft.nixosModules.minecraft-servers
+  ];
+  # services.minecraft-servers = {
+  #   enable = true;
+  #   eula = true;
+  #   openFirewall = true;
+  #   servers.deceasedcraft-beta = {
+  #     enable = true;
+  #     package = pkgs.neoforgeServers.neoforge-1_20_1;
+  #     serverProperties = defaults // {
+  #       server-port = 25567;
+  #       rcon-port = 25568;
+  #       motd = "Welcome to DeceasedCraft Beta";
+  #       allow-nether = false;
+  #       spawn-protection = 12;
+  #     };
+  #     symlinks = {
+  #       "mods" = /var/lib/mc-deceasedcraft-beta/mods;
+  #       # "mods" = pkgs.linkFarmFromDrvs "mods" builtins.attrValues {
+  #       #   DeceasedCraftBeta = fetchurl { url = "https://mediafilez.forgecdn.net/files/7623/211/DeceasedCraft_Beta-5.10.16.zip"};
+  #       # };
+  #     };
+  #   };
+  # };
   services.modded-minecraft-servers = {
     # This is mandatory for legal reasons.
     eula = true;
@@ -64,10 +91,21 @@ in {
         server-port = 25565;
         rcon-port = 25566;
         motd = "Welcome to DeceasedCraft";
-        max-players = 10;
         allow-nether = false;
         spawn-protection=12;
-        max-tick-time=600000;
+      };
+    };
+    instances.deceasedcraft-beta = {
+      enable = true;
+      inherit rsyncSSHKeys jvmOpts;
+      jvmPackage = jre21;
+
+      serverConfig = defaults // {
+        server-port = 25567;
+        rcon-port = 25568;
+        motd = "Welcome to DeceasedCraft Beta";
+        allow-nether = false;
+        spawn-protection = 12;
       };
     };
   };