Remove property for QMJ5 support

QuiltMC · Jul 4, 2023 · 4594f3e · 4594f3e
1 parent e98992c
commit 4594f3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/org/quiltmc/loader/impl/plugin/quilt/StandardQuiltPlugin.java b/src/main/java/org/quiltmc/loader/impl/plugin/quilt/StandardQuiltPlugin.java
@@ -246,8 +246,9 @@ private ModLoadOption[] scan0(Path root, QuiltLoaderIcon fileIcon, ModLocation l
 		Path usedQmj = qmj;
 
 		if (FasterFiles.exists(qmj5)) {
-			boolean enableQmj5 = QuiltLoader.isDevelopmentEnvironment() || Boolean.getBoolean(SystemProperties.ENABLE_QUILT_MOD_JSON5);
-			if (!QuiltLoader.isDevelopmentEnvironment() && !enableQmj5) {
+			if (QuiltLoader.isDevelopmentEnvironment()) {
+				usedQmj = qmj5;
+			} else {
 				QuiltLoaderText title = QuiltLoaderText.translate("gui.text.qmj5_on_production.title");
 				QuiltDisplayedError error = context().reportError(title);
 				String describedPath = context().manager().describePath(usedQmj);
@@ -268,10 +269,6 @@ private ModLoadOption[] scan0(Path root, QuiltLoaderIcon fileIcon, ModLocation l
 				guiNode.addChild(QuiltLoaderText.translate("gui.text.qmj5_on_production"));
 				return null;
 			}
-
-			if (enableQmj5) {
-				usedQmj = qmj5;
-			}
 		}
 
 		if (!FasterFiles.isRegularFile(usedQmj)) {

diff --git a/src/main/java/org/quiltmc/loader/impl/util/SystemProperties.java b/src/main/java/org/quiltmc/loader/impl/util/SystemProperties.java
@@ -75,7 +75,6 @@ public final class SystemProperties {
 	public static final String DISABLE_PRELOAD_TRANSFORM_CACHE = "loader.transform_cache.disable_preload";
 	public static final String LOG_CACHE_KEY_CHANGES = "loader.transform_cache.log_changed_keys";
 	public static final String DISABLE_BEACON = "loader.disable_beacon";
-	public static final String ENABLE_QUILT_MOD_JSON5 = "loader.debug.enable_quilt_mod_json5";
 
 	private SystemProperties() {
 	}