liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FCL-Team/main' into pull

This commit is contained in:
legacygamerhd 2023-08-26 12:01:05 +02:00
parent bb38ce6e90 6bbe8795cc
commit a53538cdae
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FCL/build.gradle
View File

@ -11,8 +11,8 @@ android {
applicationId "com.tungsten.fcl" applicationId "com.tungsten.fcl"
minSdk 26 minSdk 26
targetSdk 33 targetSdk 33
versionCode 10 versionCode 11
versionName "1.0.6-patch1" versionName "1.0.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

2
FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java
View File

@ -316,7 +316,7 @@ public class FCLGameRepository extends DefaultGameRepository {
.setProfileName(FCLPath.CONTEXT.getString(R.string.app_name)) .setProfileName(FCLPath.CONTEXT.getString(R.string.app_name))
.setGameArguments(StringUtils.tokenize(vs.getMinecraftArgs())) .setGameArguments(StringUtils.tokenize(vs.getMinecraftArgs()))
.setOverrideJavaArguments(StringUtils.tokenize(vs.getJavaArgs())) .setOverrideJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
.setMaxMemory(vs.isAutoMemory() ? null : (int)(getAllocatedMemory( .setMaxMemory((int)(getAllocatedMemory(
vs.getMaxMemory() * 1024L * 1024L, vs.getMaxMemory() * 1024L * 1024L,
MemoryUtils.getFreeDeviceMemory(FCLPath.CONTEXT), MemoryUtils.getFreeDeviceMemory(FCLPath.CONTEXT),
vs.isAutoMemory() vs.isAutoMemory()

6
FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java
View File

@ -148,9 +148,9 @@ public class DefaultLauncher extends Launcher {
Set<String> classpath = repository.getClasspath(version); Set<String> classpath = repository.getClasspath(version);
File jar = repository.getVersionJar(version); File jar = new File(repository.getVersionRoot(version.getId()), version.getId() + ".jar");
if (!jar.exists() || !jar.isFile()) // if (!jar.exists() || !jar.isFile())
throw new IOException("Minecraft jar does not exist"); // throw new IOException("Minecraft jar does not exist");
classpath.add(jar.getAbsolutePath()); classpath.add(jar.getAbsolutePath());
// Provided Minecraft arguments // Provided Minecraft arguments

2
FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java
View File

@ -233,7 +233,7 @@ public class FCLauncher {
// initialize FCLBridge // initialize FCLBridge
FCLBridge bridge = new 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(() -> { Thread gameThread = new Thread(() -> {
try { try {
logStartInfo(bridge, "Minecraft"); logStartInfo(bridge, "Minecraft");

2
FCLauncher/src/main/java/com/tungsten/fclauncher/utils/FCLPath.java
View File

@ -39,7 +39,7 @@ public class FCLPath {
NATIVE_LIB_DIR = context.getApplicationInfo().nativeLibraryDir; NATIVE_LIB_DIR = context.getApplicationInfo().nativeLibraryDir;
LOG_DIR = context.getExternalFilesDir("log").getAbsolutePath(); LOG_DIR = Environment.getExternalStorageDirectory().getAbsolutePath() + "/FCL/log";
CACHE_DIR = context.getCacheDir() + "/fclauncher"; CACHE_DIR = context.getCacheDir() + "/fclauncher";
RUNTIME_DIR = context.getDir("runtime", 0).getAbsolutePath(); RUNTIME_DIR = context.getDir("runtime", 0).getAbsolutePath();

8
version_map.json
View File

@ -1,9 +1,9 @@
[ [
{ {
"type": "release", "type": "release",
"versionCode": 10, "versionCode": 11,
"versionName": "1.0.6-patch1", "versionName": "1.0.7",
"date": "2023.08.02", "date": "2023.08.20",
"description": [ "description": [
{ {
"lang": "en", "lang": "en",
@ -15,6 +15,6 @@
} }
], ],
"netdiskUrl": "https://www.123pan.com/s/0cC7Vv-7htov.html", "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"
} }
] ]