diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java index 98a757d1..65f1d2ed 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java @@ -12,51 +12,63 @@ public class JMinecraftVersionList { public Map latest; public Version[] versions; - public static class Version { - // Since 1.13, so it's one of ways to check - public Arguments arguments; + public static class FileProperties { + public String id, sha1, url; + public long size; + } + + public static class Version extends FileProperties { + // Since 1.13, so it's one of ways to check + public Arguments arguments; public AssetIndex assetIndex; public String assets; - public Map downloads; - public String id; - public String inheritsFrom; - public JavaVersionInfo javaVersion; - public DependentLibrary[] libraries; - public String mainClass; - public String minecraftArguments; - public int minimumLauncherVersion; - public DependentLibrary optifineLib; + public Map downloads; + public String inheritsFrom; + public JavaVersionInfo javaVersion; + public DependentLibrary[] libraries; + public LoggingConfig logging; + public String mainClass; + public String minecraftArguments; + public int minimumLauncherVersion; + public DependentLibrary optifineLib; public String releaseTime; public String time; public String type; - public String url; } public static class JavaVersionInfo { public String component; public int majorVersion; } - // Since 1.13 - public static class Arguments { - public Object[] game; - public Object[] jvm; + public static class LoggingConfig { + public LoggingClientConfig client; - public static class ArgValue { - public ArgRules[] rules; - public String value; + public static class LoggingClientConfig { + public String argument; + public FileProperties file; + public String type; + } + } + // Since 1.13 + public static class Arguments { + public Object[] game; + public Object[] jvm; + + public static class ArgValue { + public ArgRules[] rules; + public String value; // TLauncher styled argument... public String[] values; - public static class ArgRules { - public String action; - public String features; - } - } - } - public static class AssetIndex { - public String id, sha1, url; - public long size, totalSize; + public static class ArgRules { + public String action; + public String features; + } + } + } + public static class AssetIndex extends FileProperties { + public long totalSize; } } diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java index e83e8ac8..607d079f 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java @@ -116,6 +116,13 @@ public class PLaunchApp { e.printStackTrace(); } + if (mVersion.logging != null) { + UIKit.updateProgressSafe(0, "Downloading " + mVersion.logging.client.file.id); + String configPath = Tools.DIR_GAME_NEW + "/" + mVersion.logging.client.file.id; + Tools.downloadFile(mVersion.logging.client.file.url, configPath); + System.setProperty("log4j.configurationFile", configPath); + } + maxProgress = mVersion.libraries.length + 1 + (assets == null ? 0 : assets.objects.size()); File outLib; diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java index 8ffcb57b..e0bc482e 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -101,7 +101,7 @@ public final class Tools final String launchClassPath = generateLaunchClassPath(profile.selectedVersion); List javaArgList = new ArrayList(); - + //javaArgList.add(versionInfo.logging.client.argument.replace("${path}", DIR_GAME_NEW.getAbsolutePath() + "/" + mVersion.logging.client.file.id)); javaArgList.add("-cp"); javaArgList.add(launchClassPath); diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m index 9ac8e2ce..8ce5b4d2 100644 --- a/Natives/SurfaceViewController.m +++ b/Natives/SurfaceViewController.m @@ -351,7 +351,7 @@ const void * _CGDataProviderGetBytePointerCallbackOSMESA(void *info) { } if (touchEvent == self.primaryTouch) { - if ([self isTouchInactive:self.primaryTouch]) return; // FIXME: should be? + if ([self isTouchInactive:self.primaryTouch]) return; // FIXME: should be? ACTION_UP will never be sent [self sendTouchPoint:locationInView withEvent:event]; } diff --git a/Natives/input_bridge_v3.m b/Natives/input_bridge_v3.m index 6bffc26b..467242b9 100644 --- a/Natives/input_bridge_v3.m +++ b/Natives/input_bridge_v3.m @@ -200,7 +200,7 @@ const int hotbarKeys[9] = { GLFW_KEY_4, GLFW_KEY_5, GLFW_KEY_6, GLFW_KEY_7, GLFW_KEY_8, GLFW_KEY_9 }; -int guiScale = 1.0; +int guiScale = 1; int mcscale(CGFloat input) { return (int)((guiScale * input)/resolutionScale); }