From 5b28156c2da133502b1226db9356bcad9812a63d Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Sun, 20 Aug 2023 09:13:44 +0800 Subject: [PATCH 1/5] 1.0.7 --- FCL/build.gradle | 2 +- version_map.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FCL/build.gradle b/FCL/build.gradle index d7c941f1..1970ed37 100644 --- a/FCL/build.gradle +++ b/FCL/build.gradle @@ -12,7 +12,7 @@ android { minSdk 26 targetSdk 33 versionCode 10 - versionName "1.0.6-patch1" + versionName "1.0.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/version_map.json b/version_map.json index 54e3614a..07d32540 100644 --- a/version_map.json +++ b/version_map.json @@ -2,8 +2,8 @@ { "type": "release", "versionCode": 10, - "versionName": "1.0.6-patch1", - "date": "2023.08.02", + "versionName": "1.0.7", + "date": "2023.08.20", "description": [ { "lang": "en", @@ -15,6 +15,6 @@ } ], "netdiskUrl": "https://www.123pan.com/s/0cC7Vv-7htov.html", - "url": "https://github.com/FCL-Team/FoldCraftLauncher/releases/download/1.0.6-patch1/FCL-release-1.0.6-patch1.apk" + "url": "https://github.com/FCL-Team/FoldCraftLauncher/releases/download/1.0.7/FCL-release-1.0.7.apk" } ] From 60754725fdf709e40c265d9cf9ca93aa6674a56f Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Sun, 20 Aug 2023 09:19:15 +0800 Subject: [PATCH 2/5] update version code --- FCL/build.gradle | 2 +- version_map.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FCL/build.gradle b/FCL/build.gradle index 1970ed37..401591d0 100644 --- a/FCL/build.gradle +++ b/FCL/build.gradle @@ -11,7 +11,7 @@ android { applicationId "com.tungsten.fcl" minSdk 26 targetSdk 33 - versionCode 10 + versionCode 11 versionName "1.0.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/version_map.json b/version_map.json index 07d32540..5c69acff 100644 --- a/version_map.json +++ b/version_map.json @@ -1,7 +1,7 @@ [ { "type": "release", - "versionCode": 10, + "versionCode": 11, "versionName": "1.0.7", "date": "2023.08.20", "description": [ From 1b569269300c1888a46a4ea4abe671f0e6ae45d8 Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Sat, 26 Aug 2023 14:02:00 +0800 Subject: [PATCH 3/5] fix auto memory --- FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java b/FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java index ac24ee67..cdc382eb 100644 --- a/FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java +++ b/FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java @@ -316,7 +316,7 @@ public class FCLGameRepository extends DefaultGameRepository { .setProfileName(FCLPath.CONTEXT.getString(R.string.app_name)) .setGameArguments(StringUtils.tokenize(vs.getMinecraftArgs())) .setOverrideJavaArguments(StringUtils.tokenize(vs.getJavaArgs())) - .setMaxMemory(vs.isAutoMemory() ? null : (int)(getAllocatedMemory( + .setMaxMemory((int)(getAllocatedMemory( vs.getMaxMemory() * 1024L * 1024L, MemoryUtils.getFreeDeviceMemory(FCLPath.CONTEXT), vs.isAutoMemory() From f62661f8cb85d15c2723eadec5d35796342f8ef3 Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Sat, 26 Aug 2023 14:12:39 +0800 Subject: [PATCH 4/5] fix neoforge crash --- .../java/com/tungsten/fclcore/launch/DefaultLauncher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java b/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java index 02c04269..b380bb23 100644 --- a/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java +++ b/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java @@ -148,9 +148,9 @@ public class DefaultLauncher extends Launcher { Set classpath = repository.getClasspath(version); - File jar = repository.getVersionJar(version); - if (!jar.exists() || !jar.isFile()) - throw new IOException("Minecraft jar does not exist"); + File jar = new File(repository.getVersionRoot(version.getId()), version.getId() + ".jar"); +// if (!jar.exists() || !jar.isFile()) +// throw new IOException("Minecraft jar does not exist"); classpath.add(jar.getAbsolutePath()); // Provided Minecraft arguments From 6bbe8795cca47a48742b4ef237c97f59216d80a0 Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Sat, 26 Aug 2023 14:48:45 +0800 Subject: [PATCH 5/5] change logdir --- .../src/main/java/com/tungsten/fclauncher/FCLauncher.java | 2 +- .../src/main/java/com/tungsten/fclauncher/utils/FCLPath.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java b/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java index bd5e6e7f..ac10be2d 100644 --- a/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java +++ b/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java @@ -233,7 +233,7 @@ public class FCLauncher { // initialize FCLBridge FCLBridge bridge = new FCLBridge(); - bridge.setLogPath(new File(FCLPath.SHARED_COMMON_DIR).getParent() + "/latest_game.log"); + bridge.setLogPath(config.getLogDir() + "/latest_game.log"); Thread gameThread = new Thread(() -> { try { logStartInfo(bridge, "Minecraft"); diff --git a/FCLauncher/src/main/java/com/tungsten/fclauncher/utils/FCLPath.java b/FCLauncher/src/main/java/com/tungsten/fclauncher/utils/FCLPath.java index 83098468..1972f710 100644 --- a/FCLauncher/src/main/java/com/tungsten/fclauncher/utils/FCLPath.java +++ b/FCLauncher/src/main/java/com/tungsten/fclauncher/utils/FCLPath.java @@ -39,7 +39,7 @@ public class FCLPath { NATIVE_LIB_DIR = context.getApplicationInfo().nativeLibraryDir; - LOG_DIR = context.getExternalFilesDir("log").getAbsolutePath(); + LOG_DIR = Environment.getExternalStorageDirectory().getAbsolutePath() + "/FCL/log"; CACHE_DIR = context.getCacheDir() + "/fclauncher"; RUNTIME_DIR = context.getDir("runtime", 0).getAbsolutePath();