Cleaned up jvm flags

Author: thecoder-001

MineColab.ipynb

@@ -21,7 +21,7 @@
  "colab_type": "text"
  },
  "source": [
- "<a href=\"https://colab.research.google.com/github/thecoder-001/MineColab/blob/master/MineColab.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
+ "<a href=\"https://colab.research.google.com/github/thecoder-001/MineColab/blob/jvm-args-cleanup/MineColab.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
  ]
  },
  {
@@ -87,6 +87,13 @@
  "jar_list = {'paper': 'server.jar', 'fabric': 'fabric-server-launch.jar', 'generic': 'server.jar'}\n",
  "jar_name = jar_list[colabconfig[\"server_type\"]]\n",
  "\n",
+ "# Java arguments.\n",
+ "if colabconfig[\"server_type\"] == \"paper\":\n",
+ " server_flags = \"-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 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true\"\n",
+ "else:\n",
+ " server_flags = \"\" # aiker's flags might negatively impact performance on non-paper servers.\n",
+ "memory_allocation = \"-Xmx6144M -Xms6144M\"\n",
+ "\n",
  "# Chose the tunnle service you want to use\n",
  "# Available options: ngrok, argo\n",
  "tunnel_service = \"argo\"\n",
@@ -110,14 +117,14 @@
  " print('Your server address is ' + ((str(url).split('\"')[1::2])[0]).replace('tcp://', ''))\n",
  "\n",
  " print('Starting server...')\n",
- " !java -Xmx6144M -Xms6144M -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 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true -jar $jar_name nogui\n",
+ " !java $memory_allocation $server_flags -jar $jar_name nogui\n",
  "\n",
  "else:\n",
  " # Download & make argo executable\n",
  " !wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64\n",
  " !chmod +x cloudflared-linux-amd64\n",
  " print('Starting server...')\n",
- " !./cloudflared-linux-amd64 tunnel --url tcp://127.0.0.1:25565 | java -Xmx6144M -Xms6144M -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 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true -jar $jar_name nogui\n"
+ " !./cloudflared-linux-amd64 tunnel --url tcp://127.0.0.1:25565 | java $memory_allocation $server_flags -jar $jar_name nogui\n"
  ],
  "execution_count": null,
  "outputs": []
@@ -314,4 +321,4 @@
  "outputs": []
  }
  ]
-}
+}