From 0894041f4edd8a011b9ff8d2cf65a89d38c31e7c Mon Sep 17 00:00:00 2001
From: "Jill \"oatmealine\" Monoids" <oatmealine@disroot.org>
Date: Mon, 18 Dec 2023 06:56:27 +0100
Subject: [PATCH] minecraft refactors woo woo

---
 hosts/lucent-firepit/minecraft/aikar-flags.nix | 1 -
 hosts/lucent-firepit/minecraft/default.nix     | 8 ++------
 hosts/lucent-firepit/minecraft/mc-flags.nix    | 1 +
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 hosts/lucent-firepit/minecraft/aikar-flags.nix
 create mode 100644 hosts/lucent-firepit/minecraft/mc-flags.nix

diff --git a/hosts/lucent-firepit/minecraft/aikar-flags.nix b/hosts/lucent-firepit/minecraft/aikar-flags.nix
deleted file mode 100644
index a3d58a4..0000000
--- a/hosts/lucent-firepit/minecraft/aikar-flags.nix
+++ /dev/null
@@ -1 +0,0 @@
-memory: "-Xms${memory} -Xmx${memory} -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1"
diff --git a/hosts/lucent-firepit/minecraft/default.nix b/hosts/lucent-firepit/minecraft/default.nix
index 9aa842c..f425d5a 100644
--- a/hosts/lucent-firepit/minecraft/default.nix
+++ b/hosts/lucent-firepit/minecraft/default.nix
@@ -93,7 +93,7 @@ in {
       "modfest-build" = let
         modpack = (pkgs.fetchPackwizModpack rec {
           url = "https://raw.githubusercontent.com/ModFest/modfest-skyandsea/main/pack/pack.toml";
-          packHash = "sha256-I+Pqs3q4lI7Qzuot/9RejZhDgaltBxqMfwWsNfLkEVQ=";
+          packHash = "sha256:7c9nTOZ8ZFQIvgZPWiRvF1N1nP0E6zTAZbPllRAaFTs=";
           manifestHash = "sha256:0w4b3y95s0jqhjfbzagbilw6fv6zlgzbqnl15kmsgcgb7kxzrzyy";
         });
 
@@ -102,7 +102,7 @@ in {
       in {
         enable = true;
         package = pkgs.fabricServers.${serverVersion};
-        jvmOpts = (import ./aikar-flags.nix) "4G";
+        jvmOpts = (import ./mc-flags.nix) "4G";
         
         openFirewall = true;
         
@@ -118,10 +118,6 @@ in {
           snooper-enabled = false;
           spawn-protection = 0;
         };
-
-        whitelist = {
-          oatmealine = "241d7103-4c9d-4c45-9464-83b5365ce48e";
-        };
         
         symlinks = {
           "mods" = "${modpack}/mods";
diff --git a/hosts/lucent-firepit/minecraft/mc-flags.nix b/hosts/lucent-firepit/minecraft/mc-flags.nix
new file mode 100644
index 0000000..35e8349
--- /dev/null
+++ b/hosts/lucent-firepit/minecraft/mc-flags.nix
@@ -0,0 +1 @@
+memory: "-Xms${memory} -Xmx${memory} -XX:+UseShenandoahGC"