diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d51b4663..2166db7b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -40,12 +40,17 @@ jobs: local-cache: true link-to-sdk: true - name: Make Gradle wrapper executable and pull LFS +<<<<<<< HEAD run: git lfs pull | chmod +x ./gradlew +======= + run: git lfs pull +>>>>>>> f218378a8cc7fcd40b18c0361aa9ad4926dc9ae4 - name: Build with Gradle uses: gradle/gradle-build-action@v2 with: arguments: build +<<<<<<< HEAD - name: Upload debug uses: actions/upload-artifact@v3 with: @@ -57,3 +62,15 @@ jobs: name: app-debug path: wrapper/launcher/build/outputs/apk/release/* +======= + - name: Upload Debug + uses: actions/upload-artifact@v3 + with: + name: app-debug + path: wrapper/launcher/build/outputs/apk/debug/* + - name: Upload Release + uses: actions/upload-artifact@v3 + with: + name: app-release + path: wrapper/launcher/build/outputs/apk/release/* +>>>>>>> f218378a8cc7fcd40b18c0361aa9ad4926dc9ae4 diff --git a/build.gradle b/build.gradle index e642e80d..f9b6a4ed 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,23 @@ plugins { - id("com.android.library") version("7.1.0") + id("com.android.library") version('7.3.0') } android { ndkVersion = "26.1.10909125" compileSdkVersion = "android-32" defaultConfig { - minSdkVersion(29) + ndk { + abiFilters 'arm64-v8a' + } + minSdk 32 multiDexEnabled true - ndk.stl = "c++_shared" } buildTypes { - release { - ndk.abiFilters.add("arm64-v8a") + bundle { + } + packagingOptions { } debug { ndk.abiFilters.add("arm64-v8a") diff --git a/devmods.json b/devmods.json index af4fc90d..94f4b4e4 100644 --- a/devmods.json +++ b/devmods.json @@ -1,12 +1,66 @@ { "versions": [ + { + "name": "1.21", + "coreMods": [ + { + "slug": "Vivecraft", + "version": "1.0", + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.21.0/Vivecraft.jar" + }, + { + "slug": "Fabric-API", + "version": "0.102.0", + "download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/oGwyXeEI/fabric-api-0.102.0%2B1.21.jar" + } + ], + "defaultMods": [ + { + "slug": "Sodium", + "version": "0.6.0-beta.1", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/oZOSEhyy/sodium-fabric-0.6.0-beta.1%2Bmc1.21.jar" + }, + { + "slug": "ModernFix", + "version": "5.19.1+mc1.21", + "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/i8GSONFm/modernfix-fabric-5.19.1%2Bmc1.21.jar" + } + ] + }, + { + "name": "1.20.6", + "coreMods": [ + { + "slug": "Vivecraft", + "version": "1.0", + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20.6/vivecraft.jar" + }, + { + "slug": "Fabric-API", + "version": "0.100.4", + "download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/GT0R5Mz7/fabric-api-0.100.4%2B1.20.6.jar" + } + ], + "defaultMods": [ + { + "slug": "Sodium", + "version": "0.5.11", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/OwLQelEI/sodium-fabric-0.5.11%2Bmc1.20.6.jar" + }, + { + "slug": "ModernFix", + "version": "5.18.0+mc1.20.6", + "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/dUdr6D7I/modernfix-fabric-5.18.0%2Bmc1.20.6.jar" + } + ] + }, { "name": "1.20.4", "coreMods": [ { "slug": "Vivecraft", "version": "1.0", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.4/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20.4/vivecraft.jar" }, { "slug": "Fabric-API", @@ -18,7 +72,7 @@ { "slug": "Sodium", "version": "0.5.8", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.4-0.5.8/sodium-fabric-0.5.8+mc1.20.4.jar" + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/4GyXKCLd/sodium-fabric-0.5.8%2Bmc1.20.4.jar" }, { "slug": "Cloth-Config", @@ -46,7 +100,7 @@ "download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/B23zGLmw/voicechat-fabric-1.20.4-2.5.12.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.10.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/vxDb5tOq/modernfix-fabric-5.10.0%2Bmc1.20.3.jar" }, @@ -83,7 +137,7 @@ { "slug": "Vivecraft", "version": "1.1.1", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.1/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20/vivecraft.jar" }, { "slug": "Fabric-API", @@ -104,8 +158,8 @@ }, { "slug": "Sodium", - "version": "0.5.8", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.1-0.5.8/sodium-fabric-0.5.8+mc1.20.1.jar" + "version": "0.5.11", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/ygf8cVZg/sodium-fabric-0.5.11%2Bmc1.20.1.jar" }, { "slug": "Cloth-Config", @@ -143,7 +197,7 @@ "download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/gEYXa8hg/voicechat-fabric-1.20.1-2.5.12.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.9.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar" } @@ -155,7 +209,7 @@ { "slug": "Vivecraft", "version": "1.1.1", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.19.4/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.19.4/vivecraft.jar" }, { "slug": "Fabric-API", @@ -187,7 +241,7 @@ { "slug": "Sodium", "version": "0.4.10", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.4-0.4.11/sodium-fabric-mc1.19.4-0.4.11+build.1.jar" + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/b4hTi3mo/sodium-fabric-mc1.19.4-0.4.10%2Bbuild.24.jar" }, { "slug": "Cloth-Config", @@ -235,7 +289,7 @@ "download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/5QKzTtlI/noxesium-0.1.8.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.7.2", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/LXlsO4Vo/modernfix-fabric-5.7.2%2Bmc1.19.4.jar" } @@ -247,7 +301,7 @@ { "slug": "Vivecraft", "version": "1.1.3", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.19.2/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.19/vivecraft.jar" }, { "slug": "Fabric-API", @@ -284,7 +338,7 @@ { "slug": "Sodium", "version": "0.4.4", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.2-0.4.4/Sodium.jar" + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/rAfhHfow/sodium-fabric-mc1.19.2-0.4.4%2Bbuild.18.jar" }, { "slug": "Cloth-Config", @@ -317,7 +371,7 @@ "download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/WhRq6Q4n/noxesium-0.1.4.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.9.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/b1FKKAz8/modernfix-fabric-5.9.0%2Bmc1.19.2.jar" } @@ -329,7 +383,7 @@ { "slug": "Vivecraft", "version": "1.1.3", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.18.2/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.18/vivecraft.jar" }, { "slug": "Fabric-API", @@ -365,8 +419,8 @@ }, { "slug": "Sodium", - "version": "0.5.0", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.18.2-0.4.1/Sodium.jar" + "version": "0.4.1", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/mc1.18.2-0.4.1/sodium-fabric-mc1.18.2-0.4.1%2Bbuild.15.jar" }, { "slug": "Better-Biome-Blend", @@ -404,11 +458,11 @@ "download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.1.9/krypton-0.1.9.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.9.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/qNrVNwfw/modernfix-fabric-5.9.0%2Bmc1.18.2.jar" } ] } ] -} +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fca55f58..d9ddc36b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jun 04 16:34:57 EDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mods.json b/mods.json index af4fc90d..94f4b4e4 100644 --- a/mods.json +++ b/mods.json @@ -1,12 +1,66 @@ { "versions": [ + { + "name": "1.21", + "coreMods": [ + { + "slug": "Vivecraft", + "version": "1.0", + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.21.0/Vivecraft.jar" + }, + { + "slug": "Fabric-API", + "version": "0.102.0", + "download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/oGwyXeEI/fabric-api-0.102.0%2B1.21.jar" + } + ], + "defaultMods": [ + { + "slug": "Sodium", + "version": "0.6.0-beta.1", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/oZOSEhyy/sodium-fabric-0.6.0-beta.1%2Bmc1.21.jar" + }, + { + "slug": "ModernFix", + "version": "5.19.1+mc1.21", + "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/i8GSONFm/modernfix-fabric-5.19.1%2Bmc1.21.jar" + } + ] + }, + { + "name": "1.20.6", + "coreMods": [ + { + "slug": "Vivecraft", + "version": "1.0", + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20.6/vivecraft.jar" + }, + { + "slug": "Fabric-API", + "version": "0.100.4", + "download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/GT0R5Mz7/fabric-api-0.100.4%2B1.20.6.jar" + } + ], + "defaultMods": [ + { + "slug": "Sodium", + "version": "0.5.11", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/OwLQelEI/sodium-fabric-0.5.11%2Bmc1.20.6.jar" + }, + { + "slug": "ModernFix", + "version": "5.18.0+mc1.20.6", + "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/dUdr6D7I/modernfix-fabric-5.18.0%2Bmc1.20.6.jar" + } + ] + }, { "name": "1.20.4", "coreMods": [ { "slug": "Vivecraft", "version": "1.0", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.4/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20.4/vivecraft.jar" }, { "slug": "Fabric-API", @@ -18,7 +72,7 @@ { "slug": "Sodium", "version": "0.5.8", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.4-0.5.8/sodium-fabric-0.5.8+mc1.20.4.jar" + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/4GyXKCLd/sodium-fabric-0.5.8%2Bmc1.20.4.jar" }, { "slug": "Cloth-Config", @@ -46,7 +100,7 @@ "download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/B23zGLmw/voicechat-fabric-1.20.4-2.5.12.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.10.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/vxDb5tOq/modernfix-fabric-5.10.0%2Bmc1.20.3.jar" }, @@ -83,7 +137,7 @@ { "slug": "Vivecraft", "version": "1.1.1", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.1/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20/vivecraft.jar" }, { "slug": "Fabric-API", @@ -104,8 +158,8 @@ }, { "slug": "Sodium", - "version": "0.5.8", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.1-0.5.8/sodium-fabric-0.5.8+mc1.20.1.jar" + "version": "0.5.11", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/ygf8cVZg/sodium-fabric-0.5.11%2Bmc1.20.1.jar" }, { "slug": "Cloth-Config", @@ -143,7 +197,7 @@ "download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/gEYXa8hg/voicechat-fabric-1.20.1-2.5.12.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.9.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar" } @@ -155,7 +209,7 @@ { "slug": "Vivecraft", "version": "1.1.1", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.19.4/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.19.4/vivecraft.jar" }, { "slug": "Fabric-API", @@ -187,7 +241,7 @@ { "slug": "Sodium", "version": "0.4.10", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.4-0.4.11/sodium-fabric-mc1.19.4-0.4.11+build.1.jar" + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/b4hTi3mo/sodium-fabric-mc1.19.4-0.4.10%2Bbuild.24.jar" }, { "slug": "Cloth-Config", @@ -235,7 +289,7 @@ "download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/5QKzTtlI/noxesium-0.1.8.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.7.2", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/LXlsO4Vo/modernfix-fabric-5.7.2%2Bmc1.19.4.jar" } @@ -247,7 +301,7 @@ { "slug": "Vivecraft", "version": "1.1.3", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.19.2/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.19/vivecraft.jar" }, { "slug": "Fabric-API", @@ -284,7 +338,7 @@ { "slug": "Sodium", "version": "0.4.4", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.2-0.4.4/Sodium.jar" + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/rAfhHfow/sodium-fabric-mc1.19.2-0.4.4%2Bbuild.18.jar" }, { "slug": "Cloth-Config", @@ -317,7 +371,7 @@ "download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/WhRq6Q4n/noxesium-0.1.4.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.9.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/b1FKKAz8/modernfix-fabric-5.9.0%2Bmc1.19.2.jar" } @@ -329,7 +383,7 @@ { "slug": "Vivecraft", "version": "1.1.3", - "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.18.2/vivecraft.jar" + "download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.18/vivecraft.jar" }, { "slug": "Fabric-API", @@ -365,8 +419,8 @@ }, { "slug": "Sodium", - "version": "0.5.0", - "download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.18.2-0.4.1/Sodium.jar" + "version": "0.4.1", + "download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/mc1.18.2-0.4.1/sodium-fabric-mc1.18.2-0.4.1%2Bbuild.15.jar" }, { "slug": "Better-Biome-Blend", @@ -404,11 +458,11 @@ "download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.1.9/krypton-0.1.9.jar" }, { - "slug": "Modern-Fix", + "slug": "ModernFix", "version": "5.9.0", "download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/qNrVNwfw/modernfix-fabric-5.9.0%2Bmc1.18.2.jar" } ] } ] -} +} \ No newline at end of file diff --git a/src/main/assets/lwjgl/lwjgl-glfw-classes.jar b/src/main/assets/lwjgl/lwjgl-glfw-classes.jar index dc9c4c67..57bcc320 100644 Binary files a/src/main/assets/lwjgl/lwjgl-glfw-classes.jar and b/src/main/assets/lwjgl/lwjgl-glfw-classes.jar differ diff --git a/src/main/assets/lwjgl/version b/src/main/assets/lwjgl/version index 5e67da72..810b85e0 100644 --- a/src/main/assets/lwjgl/version +++ b/src/main/assets/lwjgl/version @@ -1 +1 @@ -1725980855923 \ No newline at end of file +1725986487354 \ No newline at end of file diff --git a/src/main/java/pojlib/APIHandler.java b/src/main/java/pojlib/APIHandler.java index 73a63ce1..5296a3ee 100644 --- a/src/main/java/pojlib/APIHandler.java +++ b/src/main/java/pojlib/APIHandler.java @@ -107,7 +107,7 @@ public static T postFullUrl(String url, HashMap query, T bod return new Gson().fromJson(postRaw(url + parseQueries(query), body.toString()), tClass); } - public static final String SUPPORTED_VERSIONS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/QuestCraft/supportedVersions.json"; + public static final String SUPPORTED_VERSIONS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/Testing/supportedVersions.json"; public static String[] getQCSupportedVersions() { File versionsJson = new File(Constants.USER_HOME + "/supportedVersions.json"); diff --git a/src/main/java/pojlib/InstanceHandler.java b/src/main/java/pojlib/InstanceHandler.java index cd09213a..5fcddf9a 100644 --- a/src/main/java/pojlib/InstanceHandler.java +++ b/src/main/java/pojlib/InstanceHandler.java @@ -33,8 +33,8 @@ import pojlib.util.json.ModrinthIndexJson; public class InstanceHandler { - public static final String MODS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/QuestCraft/mods.json"; - public static final String DEV_MODS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/QuestCraft/devmods.json"; + public static final String MODS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/Testing/mods.json"; + public static final String DEV_MODS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/Testing/devmods.json"; public static MinecraftInstances.Instance create(Activity activity, MinecraftInstances instances, String instanceName, String userHome, ModLoader modLoader, String mrpackFilePath, String imageURL) { File mrpackJson = new File(Constants.USER_HOME + "/instances/" + instanceName.toLowerCase(Locale.ROOT).replaceAll(" ", "_") + "/setup/modrinth.index.json"); diff --git a/src/main/jni/OpenOVR/OCOVR.a b/src/main/jni/OpenOVR/OCOVR.a index c978f2a0..a1c4673e 100644 Binary files a/src/main/jni/OpenOVR/OCOVR.a and b/src/main/jni/OpenOVR/OCOVR.a differ diff --git a/src/main/jni/OpenOVR/libDrvOpenXR.a b/src/main/jni/OpenOVR/libDrvOpenXR.a index 99f5a8a8..34099336 100644 Binary files a/src/main/jni/OpenOVR/libDrvOpenXR.a and b/src/main/jni/OpenOVR/libDrvOpenXR.a differ diff --git a/src/main/jni/OpenOVR/libOpenXR.a b/src/main/jni/OpenOVR/libOpenXR.a index 0e9e30d9..c1b3e6b0 100644 Binary files a/src/main/jni/OpenOVR/libOpenXR.a and b/src/main/jni/OpenOVR/libOpenXR.a differ diff --git a/src/main/jni/input_bridge_v3.c b/src/main/jni/input_bridge_v3.c index 670f0149..929006be 100644 --- a/src/main/jni/input_bridge_v3.c +++ b/src/main/jni/input_bridge_v3.c @@ -109,7 +109,6 @@ void pojavPumpEvents(void* window) { while (targetIndex != index) { GLFWInputEvent event = pojav_environ->events[index]; - printf("event type: %i\n", event.type); switch (event.type) { case EVENT_TYPE_CHAR: if(pojav_environ->GLFW_invoke_Char) pojav_environ->GLFW_invoke_Char(window, event.i1); diff --git a/supportedVersions.json b/supportedVersions.json index 92598fb7..306ed08f 100644 --- a/supportedVersions.json +++ b/supportedVersions.json @@ -1,5 +1,7 @@ { "supportedVersions": [ + "1.21", + "1.20.6", "1.20.4", "1.20.1", "1.19.4", diff --git a/wrapper b/wrapper index 9f50fa76..6e70df2e 160000 --- a/wrapper +++ b/wrapper @@ -1 +1 @@ -Subproject commit 9f50fa76d6509950a6ea6d5e918706bcd5316947 +Subproject commit 6e70df2e8692551e17882e03aac5c1c462dba694