diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix index a54a5bd..652c74c 100644 --- a/systems/palatine-hill/docker/minecraft.nix +++ b/systems/palatine-hill/docker/minecraft.nix @@ -14,7 +14,6 @@ let meits = "meits.alicehuston.xyz"; cobblemon-overclocked = "mco.alicehuston.xyz"; cobblemon-plus = "mcp.alicehuston.xyz"; - cobblemon-essentials = "mce.alicehuston.xyz"; # bcg-plus = "bcg.alicehuston.xyz"; pii = "pii.alicehuston.xyz"; }; @@ -121,29 +120,10 @@ in DIFFICULTY = "peaceful"; ENABLE_COMMAND_BLOCK = "true"; INIT_MEMORY = "4G"; - MAX_MEMORY = "12G"; - }; - extraOptions = defaultOptions; - log-driver = "local"; - environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; - }; - cobblemon-essentials = { - image = "itzg/minecraft-server:java21"; - volumes = [ - "${minecraft_path}/cobblemon-essentials/modpacks:/modpacks:ro" - "${minecraft_path}/cobblemon-essentials/data:/data" - ]; - hostname = "cobblemon-essentials"; - environment = defaultEnv // { - VERSION = "1.21.1"; - CF_SLUG = "cobblemon-essentials"; - CF_FILENAME_MATCHER = "1.11.2"; - USE_AIKAR_FLAGS = "false"; - USE_MEOWICE_FLAGS = "true"; - DIFFICULTY = "peaceful"; - ENABLE_COMMAND_BLOCK = "true"; - INIT_MEMORY = "4G"; - MAX_MEMORY = "12G"; + MAX_MEMORY = "16G"; + # exclude clientside mods that cause crashes when run in a headless environment + CF_EXCLUDE_MODS = "world-host"; + CF_OVERRIDES_EXCLUSIONS = "mods/iris*.jar,mods/sodium*.jar,mods/world-host-*.jar"; }; extraOptions = defaultOptions; log-driver = "local";