From e062c5be7eeaecff4ba366facf7591b4c4dde129 Mon Sep 17 00:00:00 2001
From: "Jill \"oatmealine\" Monoids" <oatmealine@disroot.org>
Date: Mon, 6 Mar 2023 01:24:25 +0100
Subject: [PATCH] dark-firepit: - gbj mc

---
 hosts/dark-firepit/minecraft.nix | 49 ++++++--------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/hosts/dark-firepit/minecraft.nix b/hosts/dark-firepit/minecraft.nix
index 841dc91..ef56ad4 100644
--- a/hosts/dark-firepit/minecraft.nix
+++ b/hosts/dark-firepit/minecraft.nix
@@ -59,45 +59,6 @@ in {
           package = pkgs.fabricServers.fabric-1_18_2;
           jvmOpts = "-Xmx4G";
         };
-        "gbj" = {
-          enable = true;
-          autoStart = true;
-          openFirewall = true;
-          serverProperties = {
-            server-port = 25585;
-            gamemode = 0;
-            motd = "gay baby jail";
-            max-players = 16;
-            allow-flight = true;
-            enable-command-block = true;
-            enforce-secure-profile = false;
-            snooper-enabled = false;
-            spawn-protection = 0;
-            level-type = "terra:overworld/overworld";
-            white-list = true;
-            view-distance = 32;
-          };
-          whitelist = {
-            UnderSunandSky = "b788f46e-50a2-4af3-a668-15ae393c59d8";
-            PianoBoyBenini = "042d6cef-6194-46b4-9bfc-87b3c4cdf94a";
-            oatmealine =     "241d7103-4c9d-4c45-9464-83b5365ce48e";
-            Starblazerz128 = "d45eb172-8360-42fd-a185-ab2197b71f9a";
-            Chevreau =       "b594ba84-f10c-42ff-83a6-8046f90ad0b8";
-            Yarn01 =         "40fee73f-d4b3-47c6-adf7-fe7c717a1f55";
-            "1C3doggo" =     "48c3a077-9e3b-47a6-b17b-4ed0b1bc33b2";
-            CosmicCats =     "32148b79-12a8-48f1-b158-3c97c45e39e5";
-            m3bo =           "6e33434c-1ec0-4c69-9dad-b32b1197496e";
-            SomewhatSyl =    "d8bac1ef-27d5-4c94-a9e7-e2d079edef22";
-            Nightmare_Tank = "92840daa-823e-4b8e-9741-be296147e823";
-            JDavisBro =      "e8529c4b-701e-46c5-a8d7-0dfb0e0b642d";
-            Ironic_queen =   "443fe20d-77e0-4a4a-8bb7-a4b9ad654550";
-            azurehaiku =     "fd7aba33-4307-4eba-aa63-70bc3e38a2d7";
-            TryHardGamerTV = "8273b84d-a687-49fb-98de-a3e626e26c3b";
-            "_AtlasFox_" =   "0ce1bbe0-ea57-463c-8df3-4c046dc6eff2";
-          };
-          package = pkgs.minecraftServers.fabric-1_19_2;
-          jvmOpts = "-Xmx4G";
-        };
         "wafflecraft" = let
           packURL = "https://oat.zone/f/wafflecraft/pack.toml";
 
@@ -138,6 +99,14 @@ in {
           };
           whitelist = {
             oatmealine =     "241d7103-4c9d-4c45-9464-83b5365ce48e";
+            plightshift =    "de87f3e6-d44f-40af-8bff-48828694b616";
+            mangoafterdawn = "840ad485-1060-4bcf-8730-c552e5c8d62a";
+            drazilspirits =  "1d912f45-978b-4edc-b026-26bd5ed6ce31";
+            segaskullll =    "e6d510e6-a1d3-4801-8a5e-52d2c75b2446";
+            Tetaes =         "4b149260-d56e-4835-b3f6-2dce173a92a5";
+            sorae_ =         "9639d272-4c20-459d-adea-4aa89ee3cdc1";
+            GelloISMello =   "a2883a99-fe5d-454d-98b9-d65e4cec7e7e";
+            triplej2000 =    "8441715c-6aef-497c-9a43-cbcfce887219";
           };
           symlinks = {
             "unsup.ini" = pkgs.writeTextFile {
@@ -147,7 +116,7 @@ in {
           };
           # this is UGLY as FUCK; but unfortunately https://github.com/Infinidoge/nix-minecraft/issues/15
           package = pkgs.jdk17;
-          jvmOpts = "-Xmx4G -javaagent:${unsup} "
+          jvmOpts = "-Xmx6G -javaagent:${unsup} "
             + lib.replaceStrings ["\n"] [" "] (lib.readFile "/srv/minecraft/wafflecraft/libraries/net/minecraftforge/forge/1.18.2-40.2.1/unix_args.txt");
         };
       };