From bfbaeaf70d04883787150a07e05635a98d393ce6 Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Mon, 8 May 2023 14:30:13 +1000
Subject: [PATCH] Geyser: add ARM compatibility

---
 geyser.kvp         |  5 +++--
 geyserconfig.json  |  4 ++--
 geyserupdates.json | 20 +++++++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/geyser.kvp b/geyser.kvp
index 339a6e1..54a2c6c 100644
--- a/geyser.kvp
+++ b/geyser.kvp
@@ -1,7 +1,8 @@
 Meta.DisplayName=Geyser
 Meta.Description=Geyser Minecraft Proxy
 Meta.OS=Windows, Linux
-Meta.Arch=x86_64
+Meta.AarchSupport=Native
+Meta.Arch=All
 Meta.Author=Greelan
 Meta.URL=https://geysermc.org/
 Meta.DisplayImageSource=url:https://camo.githubusercontent.com/2c38e59629bbb0f2e632c231416baf222119b55a24803cf548e04c26e2785760/68747470733a2f2f6765797365726d632e6f72672f696d672f6765797365722d313736302d3836302e706e67
@@ -9,7 +10,7 @@ Meta.EndpointURIFormat=steam://connect/{0}
 Meta.ConfigManifest=geyserconfig.json
 Meta.MetaConfigManifest=
 Meta.ConfigRoot=geyser.kvp
-Meta.MinAMPVersion=2.4.0.2
+Meta.MinAMPVersion=2.4.3.2
 Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.ContainerPolicy=Supported
diff --git a/geyserconfig.json b/geyserconfig.json
index 2fa5f16..f8ac8da 100644
--- a/geyserconfig.json
+++ b/geyserconfig.json
@@ -2,7 +2,7 @@
     {
         "DisplayName":"Java Version",
         "Category":"Java Settings",
-        "Description":"Sets the Java version to install. Must be a major version number only such as 17 or 19, not a subversion. Check the [Geyser wiki](https://wiki.geysermc.org/geyser/setup/) for versions compatible with Geyser, and the [Oracle website](https://www.oracle.com/java/technologies/downloads/) for available downloads. Server must be updated after changing this setting",
+        "Description":"Sets the Java version to install. Must be a major version number only such as 17 or 20, not a subversion. Check the [Geyser wiki](https://wiki.geysermc.org/geyser/setup/) for versions compatible with Geyser, and the [Oracle website](https://www.oracle.com/java/technologies/downloads/) for available downloads. Server must be updated after changing this setting",
         "Keywords":"java,version",
         "FieldName":"JavaVersion",
         "InputType":"number",
@@ -10,7 +10,7 @@
         "IsFlagArgument":false,
         "ParamFieldName":"JavaVersion",
         "IncludeInCommandLine":false,
-        "DefaultValue":"19",
+        "DefaultValue":"17",
         "EnumValues":{}
     },
     {
diff --git a/geyserupdates.json b/geyserupdates.json
index 20cd936..2b59df4 100644
--- a/geyserupdates.json
+++ b/geyserupdates.json
@@ -30,6 +30,18 @@
         "UpdateSourcePlatform":"Linux",
         "UpdateSource":"FetchURL",
         "UpdateSourceData":"https://download.oracle.com/java/{{JavaVersion}}/latest/jdk-{{JavaVersion}}_linux-x64_bin.tar.gz",
+        "UpdateSourceArch":"x86_64",
+        "UpdateSourceTarget":"{{$FullRootDir}}",
+        "UnzipUpdateSource":true,
+        "OverwriteExistingFiles":true,
+        "DeleteAfterExtract":true
+    },
+    {
+        "UpdateStageName":"Java Download",
+        "UpdateSourcePlatform":"Linux",
+        "UpdateSource":"FetchURL",
+        "UpdateSourceData":"https://download.oracle.com/java/{{JavaVersion}}/latest/jdk-{{JavaVersion}}_linux-aarch64_bin.tar.gz",
+        "UpdateSourceArch":"aarch64",
         "UpdateSourceTarget":"{{$FullRootDir}}",
         "UnzipUpdateSource":true,
         "OverwriteExistingFiles":true,
@@ -53,7 +65,7 @@
         "UpdateSourcePlatform":"Linux",
         "UpdateSource":"Executable",
         "UpdateSourceData":"/bin/bash",
-        "UpdateSourceArgs":"-c 'rm -rf ./geyser/java ; mv ./geyser/jdk* ./geyser/java'"
+        "UpdateSourceArgs":"-c 'rm -rf ./geyser/java ; mv ./geyser/jdk* ./geyser/java ; chmod +x ./geyser/java/bin/java'"
     },
     {
         "UpdateStageName":"Pause Update Stages",
@@ -61,12 +73,6 @@
         "UpdateSource":"Pause",
         "UpdateSourceArgs":"2"
     },
-    {
-        "UpdateStageName":"Set Executable Flag",
-        "UpdateSourcePlatform":"Linux",
-        "UpdateSource":"SetExecutableFlag",
-        "UpdateSourceArgs":"{{$FullBaseDir}}java/bin/java"
-    },
     {
         "UpdateStageName":"Start Server",
         "UpdateSourcePlatform":"All",