Geyser: add ARM compatibility

This commit is contained in:
Greelan 2023-05-08 14:30:13 +10:00 committed by GitHub
parent c699f6d196
commit bfbaeaf70d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions

View File

@ -1,7 +1,8 @@
Meta.DisplayName=Geyser Meta.DisplayName=Geyser
Meta.Description=Geyser Minecraft Proxy Meta.Description=Geyser Minecraft Proxy
Meta.OS=Windows, Linux Meta.OS=Windows, Linux
Meta.Arch=x86_64 Meta.AarchSupport=Native
Meta.Arch=All
Meta.Author=Greelan Meta.Author=Greelan
Meta.URL=https://geysermc.org/ Meta.URL=https://geysermc.org/
Meta.DisplayImageSource=url:https://camo.githubusercontent.com/2c38e59629bbb0f2e632c231416baf222119b55a24803cf548e04c26e2785760/68747470733a2f2f6765797365726d632e6f72672f696d672f6765797365722d313736302d3836302e706e67 Meta.DisplayImageSource=url:https://camo.githubusercontent.com/2c38e59629bbb0f2e632c231416baf222119b55a24803cf548e04c26e2785760/68747470733a2f2f6765797365726d632e6f72672f696d672f6765797365722d313736302d3836302e706e67
@ -9,7 +10,7 @@ Meta.EndpointURIFormat=steam://connect/{0}
Meta.ConfigManifest=geyserconfig.json Meta.ConfigManifest=geyserconfig.json
Meta.MetaConfigManifest= Meta.MetaConfigManifest=
Meta.ConfigRoot=geyser.kvp Meta.ConfigRoot=geyser.kvp
Meta.MinAMPVersion=2.4.0.2 Meta.MinAMPVersion=2.4.3.2
Meta.SpecificDockerImage= Meta.SpecificDockerImage=
Meta.DockerRequired=False Meta.DockerRequired=False
Meta.ContainerPolicy=Supported Meta.ContainerPolicy=Supported

View File

@ -2,7 +2,7 @@
{ {
"DisplayName":"Java Version", "DisplayName":"Java Version",
"Category":"Java Settings", "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", "Keywords":"java,version",
"FieldName":"JavaVersion", "FieldName":"JavaVersion",
"InputType":"number", "InputType":"number",
@ -10,7 +10,7 @@
"IsFlagArgument":false, "IsFlagArgument":false,
"ParamFieldName":"JavaVersion", "ParamFieldName":"JavaVersion",
"IncludeInCommandLine":false, "IncludeInCommandLine":false,
"DefaultValue":"19", "DefaultValue":"17",
"EnumValues":{} "EnumValues":{}
}, },
{ {

View File

@ -30,6 +30,18 @@
"UpdateSourcePlatform":"Linux", "UpdateSourcePlatform":"Linux",
"UpdateSource":"FetchURL", "UpdateSource":"FetchURL",
"UpdateSourceData":"https://download.oracle.com/java/{{JavaVersion}}/latest/jdk-{{JavaVersion}}_linux-x64_bin.tar.gz", "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}}", "UpdateSourceTarget":"{{$FullRootDir}}",
"UnzipUpdateSource":true, "UnzipUpdateSource":true,
"OverwriteExistingFiles":true, "OverwriteExistingFiles":true,
@ -53,7 +65,7 @@
"UpdateSourcePlatform":"Linux", "UpdateSourcePlatform":"Linux",
"UpdateSource":"Executable", "UpdateSource":"Executable",
"UpdateSourceData":"/bin/bash", "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", "UpdateStageName":"Pause Update Stages",
@ -61,12 +73,6 @@
"UpdateSource":"Pause", "UpdateSource":"Pause",
"UpdateSourceArgs":"2" "UpdateSourceArgs":"2"
}, },
{
"UpdateStageName":"Set Executable Flag",
"UpdateSourcePlatform":"Linux",
"UpdateSource":"SetExecutableFlag",
"UpdateSourceArgs":"{{$FullBaseDir}}java/bin/java"
},
{ {
"UpdateStageName":"Start Server", "UpdateStageName":"Start Server",
"UpdateSourcePlatform":"All", "UpdateSourcePlatform":"All",