From 6e57a256c02525c81537e6d45f885e83a6f7ddf5 Mon Sep 17 00:00:00 2001 From: Space Walker Date: Mon, 8 Sep 2025 20:02:17 +0200 Subject: [PATCH 1/3] add required JVM args for Loader to profile json --- .../java/net/ornithemc/meta/web/ProfileHandlerV3.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java b/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java index c55f746..e640fdf 100644 --- a/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java +++ b/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java @@ -167,10 +167,16 @@ private static JsonNode buildProfileJson(int generation, LoaderInfoV3 info, Stri } ObjectNode arguments = OrnitheMeta.MAPPER.createObjectNode(); - + ArrayNode jvmArgs = arguments.putArray("jvm"); // I believe this is required to stop the launcher from complaining arguments.putArray("game"); + if (generation >= 2) { + jvmArgs.add("-Dfabric.fixPackageAccess"); + } + jvmArgs.add("-Dfabric.gameVersion"); + jvmArgs.add(info.getIntermediary().getVersion()); + profile.set("arguments", arguments); profile.put("libraries", libraries); From a50b65eed3d3c703b05caa6ba8e024a101c94903 Mon Sep 17 00:00:00 2001 From: Space Walker Date: Sun, 26 Oct 2025 10:23:02 +0100 Subject: [PATCH 2/3] update JVM args for Quilt Loader --- .../ornithemc/meta/web/ProfileHandlerV3.java | 5 ++- .../ornithemc/meta/web/models/LoaderType.java | 14 ++++++- .../meta/web/models/SystemProperties.java | 38 +++++++++++++++++++ 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 src/main/java/net/ornithemc/meta/web/models/SystemProperties.java diff --git a/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java b/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java index e640fdf..414d259 100644 --- a/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java +++ b/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java @@ -172,9 +172,10 @@ private static JsonNode buildProfileJson(int generation, LoaderInfoV3 info, Stri arguments.putArray("game"); if (generation >= 2) { - jvmArgs.add("-Dfabric.fixPackageAccess"); + jvmArgs.add(info.getLoaderType().getSystemProperties().fixPackageAccess()); + jvmArgs.add("true"); // not needed for FLoader, but QLoader requires the value to be true } - jvmArgs.add("-Dfabric.gameVersion"); + jvmArgs.add(info.getLoaderType().getSystemProperties().gameVersion()); jvmArgs.add(info.getIntermediary().getVersion()); profile.set("arguments", arguments); diff --git a/src/main/java/net/ornithemc/meta/web/models/LoaderType.java b/src/main/java/net/ornithemc/meta/web/models/LoaderType.java index b099419..efdc57f 100644 --- a/src/main/java/net/ornithemc/meta/web/models/LoaderType.java +++ b/src/main/java/net/ornithemc/meta/web/models/LoaderType.java @@ -22,16 +22,22 @@ public enum LoaderType { - FABRIC("fabric", VersionDatabase.FABRIC_MAVEN_URL), - QUILT("quilt", VersionDatabase.QUILT_MAVEN_URL), + FABRIC("fabric", VersionDatabase.FABRIC_MAVEN_URL, new SystemProperties("-Dfabric.fixPackageAccess", "-Dfabric.gameVersion")), + QUILT("quilt", VersionDatabase.QUILT_MAVEN_URL, new SystemProperties("-Dloader.fixPackageAccess", "-Dloader.gameVersion")), ORNITHE("ornithe", VersionDatabase.ORNITHE_MAVEN_URL); private final String name; private final String maven; + private final SystemProperties systemProperties; private LoaderType(String name, String maven) { + this(name, maven, new SystemProperties(null, null)); + } + + private LoaderType(String name, String maven, SystemProperties systemProperties) { this.name = name; this.maven = maven; + this.systemProperties = systemProperties; } public String getName() { @@ -41,4 +47,8 @@ public String getName() { public String getMavenUrl() { return maven; } + + public SystemProperties getSystemProperties() { + return systemProperties; + } } diff --git a/src/main/java/net/ornithemc/meta/web/models/SystemProperties.java b/src/main/java/net/ornithemc/meta/web/models/SystemProperties.java new file mode 100644 index 0000000..512ec75 --- /dev/null +++ b/src/main/java/net/ornithemc/meta/web/models/SystemProperties.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2019 FabricMC + * + * Modifications copyright (c) 2022 OrnitheMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.ornithemc.meta.web.models; + +public class SystemProperties { + + String fixPackageAccess; + String gameVersion; + + public SystemProperties(String fixPackageAccess, String gameVersion) { + this.fixPackageAccess = fixPackageAccess; + this.gameVersion = gameVersion; + } + + public String fixPackageAccess() { + return this.fixPackageAccess; + } + + public String gameVersion() { + return this.gameVersion; + } +} From a36d96d842118ba6b58f8c55a10b906c5be980ab Mon Sep 17 00:00:00 2001 From: Space Walker Date: Mon, 3 Nov 2025 19:36:36 +0100 Subject: [PATCH 3/3] rename SystemProperties -> JvmArguments and refactor --- .../net/ornithemc/meta/web/ProfileHandlerV3.java | 7 +++---- .../{SystemProperties.java => JvmArguments.java} | 12 ++++++------ .../ornithemc/meta/web/models/LoaderType.java | 16 ++++++++-------- 3 files changed, 17 insertions(+), 18 deletions(-) rename src/main/java/net/ornithemc/meta/web/models/{SystemProperties.java => JvmArguments.java} (75%) diff --git a/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java b/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java index 414d259..2d4f9f6 100644 --- a/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java +++ b/src/main/java/net/ornithemc/meta/web/ProfileHandlerV3.java @@ -172,11 +172,10 @@ private static JsonNode buildProfileJson(int generation, LoaderInfoV3 info, Stri arguments.putArray("game"); if (generation >= 2) { - jvmArgs.add(info.getLoaderType().getSystemProperties().fixPackageAccess()); - jvmArgs.add("true"); // not needed for FLoader, but QLoader requires the value to be true + // value not needed for FLoader, but QLoader requires the value to be true + jvmArgs.add(info.getLoaderType().getJvmArguments().fixPackageAccess(true)); } - jvmArgs.add(info.getLoaderType().getSystemProperties().gameVersion()); - jvmArgs.add(info.getIntermediary().getVersion()); + jvmArgs.add(info.getLoaderType().getJvmArguments().gameVersion(info.getGame(side))); profile.set("arguments", arguments); diff --git a/src/main/java/net/ornithemc/meta/web/models/SystemProperties.java b/src/main/java/net/ornithemc/meta/web/models/JvmArguments.java similarity index 75% rename from src/main/java/net/ornithemc/meta/web/models/SystemProperties.java rename to src/main/java/net/ornithemc/meta/web/models/JvmArguments.java index 512ec75..d2ac376 100644 --- a/src/main/java/net/ornithemc/meta/web/models/SystemProperties.java +++ b/src/main/java/net/ornithemc/meta/web/models/JvmArguments.java @@ -18,21 +18,21 @@ package net.ornithemc.meta.web.models; -public class SystemProperties { +public class JvmArguments { String fixPackageAccess; String gameVersion; - public SystemProperties(String fixPackageAccess, String gameVersion) { + public JvmArguments(String fixPackageAccess, String gameVersion) { this.fixPackageAccess = fixPackageAccess; this.gameVersion = gameVersion; } - public String fixPackageAccess() { - return this.fixPackageAccess; + public String fixPackageAccess(boolean value) { + return this.fixPackageAccess + "=" + value; } - public String gameVersion() { - return this.gameVersion; + public String gameVersion(String value) { + return this.gameVersion + "=" + value; } } diff --git a/src/main/java/net/ornithemc/meta/web/models/LoaderType.java b/src/main/java/net/ornithemc/meta/web/models/LoaderType.java index efdc57f..5a19150 100644 --- a/src/main/java/net/ornithemc/meta/web/models/LoaderType.java +++ b/src/main/java/net/ornithemc/meta/web/models/LoaderType.java @@ -22,22 +22,22 @@ public enum LoaderType { - FABRIC("fabric", VersionDatabase.FABRIC_MAVEN_URL, new SystemProperties("-Dfabric.fixPackageAccess", "-Dfabric.gameVersion")), - QUILT("quilt", VersionDatabase.QUILT_MAVEN_URL, new SystemProperties("-Dloader.fixPackageAccess", "-Dloader.gameVersion")), + FABRIC("fabric", VersionDatabase.FABRIC_MAVEN_URL, new JvmArguments("-Dfabric.fixPackageAccess", "-Dfabric.gameVersion")), + QUILT("quilt", VersionDatabase.QUILT_MAVEN_URL, new JvmArguments("-Dloader.fixPackageAccess", "-Dloader.gameVersion")), ORNITHE("ornithe", VersionDatabase.ORNITHE_MAVEN_URL); private final String name; private final String maven; - private final SystemProperties systemProperties; + private final JvmArguments jvmArguments; private LoaderType(String name, String maven) { - this(name, maven, new SystemProperties(null, null)); + this(name, maven, new JvmArguments(null, null)); } - private LoaderType(String name, String maven, SystemProperties systemProperties) { + private LoaderType(String name, String maven, JvmArguments jvmArguments) { this.name = name; this.maven = maven; - this.systemProperties = systemProperties; + this.jvmArguments = jvmArguments; } public String getName() { @@ -48,7 +48,7 @@ public String getMavenUrl() { return maven; } - public SystemProperties getSystemProperties() { - return systemProperties; + public JvmArguments getJvmArguments() { + return jvmArguments; } }