diff --git a/FCL/src/main/assets/map.json b/FCL/src/main/assets/map.json index a6dca7a3..62894c01 100644 --- a/FCL/src/main/assets/map.json +++ b/FCL/src/main/assets/map.json @@ -1,5 +1,61 @@ { "maps": [ + { + "id": "1.0", + "argument": { + "vanilla": "false:azd:A:t:a", + "forge": "false:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", + "fabric": null + } + }, + { + "id": "1.1", + "argument": { + "vanilla": "false:azd:A:t:a", + "forge": "false:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", + "fabric": null + } + }, + { + "id": "1.2.1", + "argument": { + "vanilla": "false:azd:A:t:a", + "forge": "false:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", + "fabric": null + } + }, + { + "id": "1.2.2", + "argument": { + "vanilla": "false:azd:A:t:a", + "forge": "false:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", + "fabric": null + } + }, + { + "id": "1.2.3", + "argument": { + "vanilla": "false:azd:A:t:a", + "forge": "false:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", + "fabric": null + } + }, + { + "id": "1.2.4", + "argument": { + "vanilla": "false:azd:A:t:a", + "forge": "false:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", + "fabric": null + } + }, + { + "id": "1.2.5", + "argument": { + "vanilla": "false:false:net.minecraft.client.Minecraft:A:z:a", + "forge": "false:net.minecraft.client.Minecraft:func_71410_x:field_6305_x:field_1167_a", + "fabric": null + } + }, { "id": "1.3.1", "argument": { @@ -96,22 +152,6 @@ "fabric": null } }, - { - "id": "1.7.3", - "argument": { - "vanilla": null, - "forge": "true:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", - "fabric": null - } - }, - { - "id": "1.7.4", - "argument": { - "vanilla": null, - "forge": "true:net.minecraft.client.Minecraft:func_71410_x:field_71476_x:field_72313_a", - "fabric": null - } - }, { "id": "1.7.10", "argument": { diff --git a/FCL/src/main/res/layout/activity_shell.xml b/FCL/src/main/res/layout/activity_shell.xml index 2a395e21..535d43d5 100644 --- a/FCL/src/main/res/layout/activity_shell.xml +++ b/FCL/src/main/res/layout/activity_shell.xml @@ -1,6 +1,5 @@ diff --git a/FCL/src/main/res/values/strings.xml b/FCL/src/main/res/values/strings.xml index 0607600d..837b6ff5 100644 --- a/FCL/src/main/res/values/strings.xml +++ b/FCL/src/main/res/values/strings.xml @@ -324,7 +324,7 @@ Holy GL4ES (OpenGL 2.1) VirGLRenderer (OpenGL 4.3) ANGLE (OpenGL 4.6, only support 1.17+) - VGPU (OpenGL 2.1+,only support 1.17-) + VGPU (OpenGL 2.1+, only support 1.17-) Game Settings Resolution diff --git a/FCLauncher/src/main/jni/lwjgl3/org_lwjgl_system_fcl_DynamicLinkLoader.c b/FCLauncher/src/main/jni/lwjgl3/org_lwjgl_system_fcl_DynamicLinkLoader.c index a3bf7f77..7916cfdc 100644 --- a/FCLauncher/src/main/jni/lwjgl3/org_lwjgl_system_fcl_DynamicLinkLoader.c +++ b/FCLauncher/src/main/jni/lwjgl3/org_lwjgl_system_fcl_DynamicLinkLoader.c @@ -18,7 +18,7 @@ JNIEXPORT jlong JNICALL Java_org_lwjgl_system_fcl_DynamicLinkLoader_ndlopen(JNIE if (!glesHandle) { glesHandle = dlopen("libGLESv2.so", RTLD_LAZY | RTLD_GLOBAL); } - if (strstr(filename,"glfw")!=0){ + if (strstr(filename, "glfw") != 0) { return (jlong)(intptr_t)by_dlopen(filename, RTLD_LAZY | RTLD_GLOBAL); } return (jlong)(intptr_t)dlopen(filename, RTLD_LAZY | RTLD_GLOBAL); @@ -33,7 +33,7 @@ JNIEXPORT jlong JNICALL Java_org_lwjgl_system_fcl_DynamicLinkLoader_ndlsym(JNIEn void *handle = (void *)(intptr_t)handleAddress; char const *name = (char const *)(intptr_t)nameAddress; UNUSED_PARAMS(__env, clazz) - if (strstr(name,"glfw")!=0){ + if (strstr(name,"glfw") != 0) { return (jlong)(intptr_t)by_dlsym(handle, name); } jlong retval = (jlong)(intptr_t)dlsym(handle, name);