From 5ae23c931a607e4f48f9eb1230656e6ad9b98a85 Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Tue, 13 Jun 2023 13:00:42 +0200
Subject: [PATCH] feat: change jvm flags order

---
 CHANGELOG.md          |  4 ++++
 src/server/command.rs | 31 +++++++++++++++++++------------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9124e7c..2c02234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * `--dry` flag to inspect command that will be run
 
+### Changed
+
+* JVM flags now narrowely follow Aikar's specifications
+
 ## [0.2.0](https://git.rustybever.be/Chewing_Bever/alex/src/tag/0.2.0)
 
 ### Added
diff --git a/src/server/command.rs b/src/server/command.rs
index f410c88..e725a38 100644
--- a/src/server/command.rs
+++ b/src/server/command.rs
@@ -131,15 +131,6 @@ impl ServerCommand {
                 "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+DisableExplicitGC",
                 "-XX:+AlwaysPreTouch",
-                "-XX:G1HeapWastePercent=5",
-                "-XX:G1MixedGCCountTarget=4",
-                "-XX:G1MixedGCLiveThresholdPercent=90",
-                "-XX:G1RSetUpdatingPauseTimePercent=5",
-                "-XX:SurvivorRatio=32",
-                "-XX:+PerfDisableSharedMem",
-                "-XX:MaxTenuringThreshold=1",
-                "-Dusing.aikars.flags=https://mcflags.emc.gs",
-                "-Daikars.new.flags=true",
             ]);
 
         if self.xms > 12 * 1024 {
@@ -148,18 +139,34 @@ impl ServerCommand {
                 "-XX:G1MaxNewSizePercent=50",
                 "-XX:G1HeapRegionSize=16M",
                 "-XX:G1ReservePercent=15",
-                "-XX:InitiatingHeapOccupancyPercent=20",
             ]);
         } else {
             cmd.args([
                 "-XX:G1NewSizePercent=30",
                 "-XX:G1MaxNewSizePercent=40",
                 "-XX:G1HeapRegionSize=8M",
-                "-XX:G1ReservePercent=15",
-                "-XX:InitiatingHeapOccupancyPercent=15",
+                "-XX:G1ReservePercent=20",
             ]);
         }
 
+        cmd.args(["-XX:G1HeapWastePercent=5", "-XX:G1MixedGCCountTarget=4"]);
+
+        if self.xms > 12 * 1024 {
+            cmd.args(["-XX:InitiatingHeapOccupancyPercent=20"]);
+        } else {
+            cmd.args(["-XX:InitiatingHeapOccupancyPercent=15"]);
+        }
+
+        cmd.args([
+            "-XX:G1MixedGCLiveThresholdPercent=90",
+            "-XX:G1RSetUpdatingPauseTimePercent=5",
+            "-XX:SurvivorRatio=32",
+            "-XX:+PerfDisableSharedMem",
+            "-XX:MaxTenuringThreshold=1",
+            "-Dusing.aikars.flags=https://mcflags.emc.gs",
+            "-Daikars.new.flags=true",
+        ]);
+
         cmd.current_dir(&self.config_dir)
             .arg("-jar")
             .arg(&self.jar)