diff --git a/modules/nixos/services/gameserver/minecraft-server.nix b/modules/nixos/services/gameserver/minecraft-server.nix index 251a5fa..23b0e53 100644 --- a/modules/nixos/services/gameserver/minecraft-server.nix +++ b/modules/nixos/services/gameserver/minecraft-server.nix @@ -105,7 +105,7 @@ systemd = { targets.multi-user.wants = [ "minecraft@countries.service" - "minecraft@monifactory.service" + "minecraft@divine-journey-2.service" ]; sockets."minecraft@" = { @@ -122,10 +122,11 @@ services."minecraft@" = { description = "Minecraft Java Edition server for %i"; - wants = [ "network-online.target" "velocity.service" ]; - after = [ "network-online.target" "velocity.service" ]; + wants = [ "network.target" "velocity.service" ]; + after = [ "network.target" "velocity.service" ]; environment = { + JAVA_8_PATH = lib.getExe pkgs.jdk8_headless; JAVA_17_PATH = lib.getExe pkgs.graalvmPackages.graalvm-oracle_17; JAVA_21_PATH = lib.getExe inputs.nixpkgs-pin.legacyPackages.${pkgs.stdenv.hostPlatform.system}.graalvm-ce; }; diff --git a/modules/nixos/services/gameserver/velocity.nix b/modules/nixos/services/gameserver/velocity.nix index 7d92093..0405e73 100644 --- a/modules/nixos/services/gameserver/velocity.nix +++ b/modules/nixos/services/gameserver/velocity.nix @@ -37,7 +37,7 @@ prevent-client-proxy-connections = false; - player-info-forwarding-mode = "modern"; + player-info-forwarding-mode = "legacy"; forwarding-secret-file = config.sops.secrets."velocity/forwarding.secret".path; announce-forge = false; @@ -50,17 +50,17 @@ enable-player-address-logging = true; servers = { - monifactory = "127.0.0.1:10001"; + divine-journey-2 = "127.0.0.1:10001"; countries = "127.0.0.1:10002"; try = [ - "monifactory" + "divine-journey-2" "countries" ]; }; forced-hosts = { - "moni.mc.wo2wz.fyi" = [ "monifactory" ]; + "dj2.mc.wo2wz.fyi" = [ "divine-journey-2" ]; "countries.mc.wo2wz.fyi" = [ "countries" ]; }; @@ -108,8 +108,8 @@ systemd.services.velocity = { description = "Velocity proxy for Minecraft servers"; wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; serviceConfig = { User = "velocity";