Fix curseforge

.gitignore

@@ -13,3 +13,4 @@ app_pojavlauncher/.cxx/
 /jre_lwjgl3glfw/gradle/
 /jre_lwjgl3glfw/**/build/
 /jre_lwjgl3glfw/**/.gradle/
+/app_pojavlauncher/curseforge_key.txt

app_pojavlauncher/build.gradle

@@ -7,7 +7,7 @@ static def getDate() { return new Date().format('yyyyMMdd') }
 def getVersionName = {
     // Get the last version tag, as well as the short head of the last commit
     ByteArrayOutputStream TAG = new ByteArrayOutputStream()
-    String semVer = "1.1.4"
+    String semVer = "1.1.5"
     // Used by the fallback for github actions
     ByteArrayOutputStream TAG_PART_COMMIT = new ByteArrayOutputStream()
     String TAG_STRING
@@ -54,7 +54,7 @@ def getVersionName = {
 def getCFApiKey = {
     String key = System.getenv("CURSEFORGE_API_KEY");
     if(key != null) return key;
-    File curseforgeKeyFile = new File("./curseforge_key.txt");
+    File curseforgeKeyFile = new File("$projectDir/curseforge_key.txt");
     if(curseforgeKeyFile.canRead() && curseforgeKeyFile.isFile()) {
         return curseforgeKeyFile.text;
     }

app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/version

@@ -1 +1 @@
-d562b83d28c54d14bbb2f0366ed428945100310e
+7e958ece157c2208c2a8c715a4f92b684b112cfa

app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/version

@@ -1 +1 @@
-3999dc44bce7e9d269e034e79c7e430f88a50f3e
+80680c59be7562f6efefb301122e421068d6c652

app_pojavlauncher/src/main/assets/components/methods_injector_agent/version

@@ -1 +1 @@
-8fc4f7410f7ff1ebea0d604f69d13531814650ca
+2be860186e97caa614b289022a73b9774adcb85b

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java

@@ -363,6 +363,7 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
         mControlLayout.requestLayout();
         mControlLayout.post(()->{
             // Child of mControlLayout, so refreshing size here is correct
+            Tools.setFullscreen(this, setFullscreen());
             minecraftGLView.refreshSize();
             Tools.updateWindowSize(this);
             mControlLayout.refreshControlButtonPositions();
@@ -418,19 +419,22 @@ private void runCraft(String versionId, JMinecraftVersionList.Version version) t
        } catch (RuntimeException ignored){
             assetVersion = "legacy";
        } // If this fails.. oh well.
-
+
+        // FIXME: Automatic detection should be based on provided hint GLFW_CONTEXT_VERSION_MAJOR and GLFW_CONTEXT_VERSION_MINOR
         // Autoselect renderer
         if (Tools.LOCAL_RENDERER == null) {
             // Preferably we could detect when it is modded and swap to zink however that would also
             // cover optifine and vanilla+ configurations which are relatively common, degrading their
             // experience for no reason. We will compromise with just having users do it themselves.
             Tools.LOCAL_RENDERER = "opengles2";
             // MobileGlues becomes available post 1.17. It has superior compatibility with mods
-            // while having fairly similar performance performance compared to GL4ES-based forks.
+            // while having fairly similar performance compared to GL4ES-based forks.
             if(assetVersion.matches("\\d+") || // Should match all digits, which is the modern assetVersioning
                "1.17".equals(assetVersion) ||
                "1.18".equals(assetVersion) ||
-               "1.19".equals(assetVersion)) Tools.LOCAL_RENDERER = "opengles_mobileglues";
+               "1.19".equals(assetVersion) ||
+                // Angelica gives us GL3.3core on 1.7.10, it's a unique case.
+                hasMods("angelica")) Tools.LOCAL_RENDERER = "opengles_mobileglues";
         }
         if(!Tools.checkRendererCompatible(this, Tools.LOCAL_RENDERER)) {
             Tools.RenderersList renderersList = Tools.getCompatibleRenderers(this);

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java

@@ -147,7 +147,15 @@ public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width,
                 }
 
                 @Override
-                public void surfaceDestroyed(@NonNull SurfaceHolder holder) {}
+                public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
+                    /*
+                    Surface recreation in SurfaceView happens very often. When tabbing back in from
+                    out, when minimizing floating window, when turning into floating window, etc.
+                    Whenever the surface isn't in view, it is destroyed. When going into floating
+                    window, it appears to automatically release the associated ANativeWindow. This
+                    can cause a crash if not handled.
+                     */
+                }
             });
 
             ((ViewGroup)getParent()).addView(surfaceView);
@@ -178,6 +186,11 @@ public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surface, int wid
 
                 @Override
                 public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surface) {
+                    /*
+                    Surface recreation in TextureView can only really happen once, when turning
+                    into a floating window. Subsequent turns to floating window no longer trigger
+                    recreation. Tabbing out and in does not trigger recreation.
+                     */
                     return true;
                 }
 

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java

@@ -696,21 +696,44 @@ public static void getCacioJavaArgs(List<String> javaArgList, boolean isJava8, A
 
     public static String[] getMinecraftJVMArgs(String versionName, File gameDir) {
         JMinecraftVersionList.Version versionInfo = Tools.getVersionInfo(versionName, true);
-        // Parse Forge 1.17+ additional JVM Arguments
-        if (versionInfo.inheritsFrom == null || versionInfo.arguments == null || versionInfo.arguments.jvm == null) {
-            return new String[0];
-        }
 
         Map<String, String> varArgMap = new ArrayMap<>();
         varArgMap.put("classpath_separator", ":");
         varArgMap.put("library_directory", DIR_HOME_LIBRARY);
         varArgMap.put("version_name", versionInfo.id);
-        varArgMap.put("natives_directory", Tools.NATIVE_LIB_DIR);
+        varArgMap.put("natives_directory", Tools.DIR_CACHE.getAbsolutePath());
 
         List<String> minecraftArgs = new ArrayList<>();
-        if (versionInfo.arguments != null) {
+        if (versionInfo.arguments.jvm != null) {
             for (Object arg : versionInfo.arguments.jvm) {
                 if (arg instanceof String) {
+                    // These are defined later on
+                    if (((String) arg).contains("java.library.path")) {
+                        continue;
+                    }
+                    if (arg.equals("-cp")) {
+                        continue;
+                    }
+                    if (arg.equals("${classpath}")){
+                        continue;
+                    }
+                    // Should fix Forge 1.17.1-37.0.12 and older from crashing
+                    // Fixed in forge on https://github.com/MinecraftForge/MinecraftForge/pull/7919
+                    // Released as Forge 1.17.1-37.0.13 in https://maven.minecraftforge.net/net/minecraftforge/forge/1.17.1-37.0.13/forge-1.17.1-37.0.13-changelog.txt
+                    // yes this duplicates it, it's fine.
+                    // FIXME: Workaround old bootstraplauncher <0.1.17 buggy behaviour. See FCL workaround
+                    //  https://github.com/FCL-Team/FoldCraftLauncher/blob/00e96bcf8ddc8a550e9aba6091a73d5bee973b54/FCLCore/src/main/java/com/tungsten/fclcore/download/MaintainTask.java#L198-L200
+                    if (((String) arg).startsWith("-DignoreList=")){
+                        minecraftArgs.add(arg+",${version_name}.jar");
+                        continue;
+                    }
+
+                    // TODO: Implement adding launcher brand and version
+                    if (((String) arg).contains("minecraft.launcher.brand") ||
+                        ((String) arg).contains("minecraft.launcher.version")) {
+                        continue;
+                    }
+
                     minecraftArgs.add((String) arg);
                 } //TODO: implement (?maybe?)
             }
@@ -800,7 +823,7 @@ public static String artifactToPath(DependentLibrary library) {
             library.downloads.artifact.path != null)
             return library.downloads.artifact.path;
         String[] libInfos = library.name.split(":");
-        return libInfos[0].replaceAll("\\.", "/") + "/" + libInfos[1] + "/" + libInfos[2] + "/" + libInfos[1] + "-" + libInfos[2] + ".jar";
+        return libInfos[0].replaceAll("\\.", "/") + "/" + libInfos[1] + "/" + libInfos[2] + "/" + libInfos[1] + "-" + libInfos[2] + (libInfos.length == 4 ? "-" + libInfos[3] : "") + ".jar";
     }
 
     private static String getLibClasspath(JMinecraftVersionList.Version info){
@@ -823,9 +846,13 @@ public static String generateLaunchClasspath(JMinecraftVersionList.Version info,
         String internalLwjglVersion = iLwjglVersion >= 341 ? "3.4.1" : "3.3.3";
         File lwjgl3Folder = new File(Tools.DIR_GAME_HOME, "lwjgl3/"+internalLwjglVersion);
         String lwjglCore = lwjgl3Folder.getAbsolutePath() + "/lwjgl.jar";
+        String lwjglMerged = lwjgl3Folder.getAbsolutePath() + "/lwjgl-"+internalLwjglVersion+"-merged-modules";
         String lwjglxFile = lwjgl3Folder + "/lwjgl-lwjglx.jar";
 
+
         launchClasspath.append(lwjglCore).append(":");
+        // 2nd in priority in case we need to merge lwjgl.jar again for testing
+        launchClasspath.append(lwjglMerged).append(":");
 
         File[] lwjglModules = lwjgl3Folder.listFiles(pathname ->
                 pathname.getName().endsWith(".jar") &&

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ModsSearchFragment.java

@@ -35,6 +35,7 @@
 import net.kdt.pojavlaunch.modloaders.modpacks.models.ModDetail;
 import net.kdt.pojavlaunch.modloaders.modpacks.models.ModItem;
 import net.kdt.pojavlaunch.modloaders.modpacks.models.SearchFilters;
+import net.kdt.pojavlaunch.modloaders.modpacks.models.Constants;
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
 import net.kdt.pojavlaunch.progresskeeper.ProgressKeeper;
 import net.kdt.pojavlaunch.profiles.VersionSelectorDialog;
@@ -231,6 +232,27 @@ public void handleInstallation(Context context, ModDetail modDetail, int selecte
             }
 
             String url = modDetail.versionUrls[selectedVersion];
+
+            // Check if this is a CF-restricted mod using the flag set during search
+            boolean isCfRestricted = modDetail.apiSource == Constants.SOURCE_CURSEFORGE
+                    && (modDetail.isRestricted || url == null || url.isEmpty());
+
+            if (isCfRestricted) {
+                // Show dialog directing user to download from CurseForge website
+                String cfUrl = "https://www.curseforge.com/minecraft/mc-mods/" + modDetail.id;
+                Context dialogCtx = mActivityContext != null ? mActivityContext : context;
+                mMainHandler.post(() ->
+                    new AlertDialog.Builder(dialogCtx)
+                        .setTitle(modDetail.title)
+                        .setMessage("This mod restricts third-party downloads.\n\nDownload it manually from CurseForge and place it in your mods folder:\n\n" + cfUrl)
+                        .setPositiveButton("Open CurseForge", (d, w) ->
+                            Tools.openURL((android.app.Activity) dialogCtx, cfUrl))
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .show()
+                );
+                return;
+            }
+
             if (url == null || url.isEmpty()) {
                 Tools.showErrorRemote(context, R.string.modpack_install_download_failed,
                         new IOException("No download URL available for this mod"));

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CurseforgeApi.java

@@ -78,16 +78,17 @@ public SearchResult searchMod(SearchFilters searchFilters, SearchResult previous
             JsonElement allowModDistribution = dataElement.get("allowModDistribution");
             // Gson automatically casts null to false, which leans to issues
             // So, only check the distribution flag if it is non-null
-            if(!allowModDistribution.isJsonNull() && !allowModDistribution.getAsBoolean()) {
-                Log.i("CurseforgeApi", "Skipping modpack "+dataElement.get("name").getAsString() + " because curseforge sucks");
-                continue;
-            }
+            boolean restricted = !allowModDistribution.isJsonNull() && !allowModDistribution.getAsBoolean();
+            JsonObject logo = dataElement.getAsJsonObject("logo");
+            String thumbnailUrl = (logo != null && logo.has("thumbnailUrl") && !logo.get("thumbnailUrl").isJsonNull())
+                    ? logo.get("thumbnailUrl").getAsString() : "";
             ModItem modItem = new ModItem(Constants.SOURCE_CURSEFORGE,
                     searchFilters.isModpack,
                     dataElement.get("id").getAsString(),
                     dataElement.get("name").getAsString(),
                     dataElement.get("summary").getAsString(),
-                    dataElement.getAsJsonObject("logo").get("thumbnailUrl").getAsString());
+                    thumbnailUrl);
+            modItem.isRestricted = restricted;
             modItemList.add(modItem);
         }
         if(curseforgeSearchResult == null) curseforgeSearchResult = new CurseforgeSearchResult();
@@ -100,6 +101,14 @@ public SearchResult searchMod(SearchFilters searchFilters, SearchResult previous
 
     @Override
     public ModDetail getModDetails(ModItem item) {
+        // Short-circuit for restricted mods — no point fetching versions
+        if (item.isRestricted) {
+            return new ModDetail(item,
+                    new String[]{"Blocked by the author!"},
+                    new String[]{null},
+                    new String[]{null},
+                    new String[]{null});
+        }
         ArrayList<JsonObject> allModDetails = new ArrayList<>();
         int index = 0;
         while(index != CURSEFORGE_PAGINATION_END_REACHED &&
@@ -108,6 +117,26 @@ public ModDetail getModDetails(ModItem item) {
         }
         if(index == CURSEFORGE_PAGINATION_ERROR) return null;
         int length = allModDetails.size();
+
+        // Check if ALL versions have null downloadUrl (fully restricted mod)
+        boolean allRestricted = length > 0;
+        for (int i = 0; i < length; i++) {
+            JsonElement url = allModDetails.get(i).get("downloadUrl");
+            if (url != null && !url.isJsonNull()) {
+                allRestricted = false;
+                break;
+            }
+        }
+        if (allRestricted || length == 0) {
+            // All versions restricted - return a ModDetail with one entry that signals this.
+            // The version name shown in spinner makes it clear, tapping Install shows CF dialog.
+            return new ModDetail(item,
+                    new String[]{"Blocked by the author! By clicking the install button it will open the CurseForge page."},
+                    new String[]{null},
+                    new String[]{null},
+                    new String[]{null});
+        }
+
         String[] versionNames = new String[length];
         String[] mcVersionNames = new String[length];
         String[] versionUrls = new String[length];
@@ -118,11 +147,7 @@ public ModDetail getModDetails(ModItem item) {
 
             JsonElement downloadUrl = modDetail.get("downloadUrl");
             if (downloadUrl == null || downloadUrl.isJsonNull()) {
-                // CF restricts direct download for some mods — build edge CDN URL instead
-                int fileId = modDetail.get("id").getAsInt();
-                String fileName = modDetail.get("fileName").getAsString();
-                versionUrls[i] = String.format("https://edge.forgecdn.net/files/%s/%s/%s",
-                        fileId / 1000, fileId % 1000, fileName);
+                versionUrls[i] = null;
             } else {
                 versionUrls[i] = downloadUrl.getAsString();
             }
@@ -290,4 +315,4 @@ private boolean verifyManifest(CurseManifest manifest) {
     static class CurseforgeSearchResult extends SearchResult {
         int previousOffset;
     }
-}
+}

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java

@@ -33,7 +33,7 @@ public ModDetail(ModItem item, String[] versionNames, String[] mcVersionNames, S
 
         // Add the mc version to the version model
         for (int i=0; i<versionNames.length; i++){
-            if (!versionNames[i].contains(mcVersionNames[i]))
+            if (mcVersionNames[i] != null && !versionNames[i].contains(mcVersionNames[i]))
                 versionNames[i] += " - " + mcVersionNames[i];
         }
     }
@@ -44,7 +44,7 @@ public String toString() {
         return "ModDetail{" +
                 "versionNames=" + Arrays.toString(versionNames) +
                 ", mcVersionNames=" + Arrays.toString(mcVersionNames) +
-                ", versionIds=" + Arrays.toString(versionUrls) +
+                ", versionUrls=" + Arrays.toString(versionUrls) +
                 ", id='" + id + '\'' +
                 ", title='" + title + '\'' +
                 ", description='" + description + '\'' +
@@ -53,4 +53,4 @@ public String toString() {
                 ", isModpack=" + isModpack +
                 '}';
     }
-}
+}

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModItem.java

@@ -8,6 +8,8 @@ public class ModItem extends ModSource {
     public String title;
     public String description;
     public String imageUrl;
+    /** True if the mod author blocked third-party distribution (CF allowModDistribution=false) */
+    public boolean isRestricted;
 
     public ModItem(int apiSource, boolean isModpack, String id, String title, String description, String imageUrl) {
         this.apiSource = apiSource;
@@ -34,4 +36,4 @@ public String toString() {
     public String getIconCacheTag() {
         return apiSource+"_"+id;
     }
-}
+}

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java

@@ -227,6 +227,18 @@ public static void setJavaEnvironment(Activity activity, String jreHome) throws
                 envMap.put("MG_DIR_PATH", Tools.DIR_DATA + "/MobileGlues");
                 envMap.put("POJAVEXEC_EGL","libmobileglues.so");
             }
+            if(LOCAL_RENDERER.equals("opengles2")){
+                envMap.put("LIBGL_ES", "2"); // Krypton Wrapper crashes with 1
+            }
+            if (LOCAL_RENDERER.equals("opengles3_desktopgl_zink_kopper")){
+                envMap.put("POJAVEXEC_EGL","libEGL_mesa.so"); // Use Mesa EGL
+                if (Tools.shouldUseUBWC()) envMap.put("FD_DEV_FEATURES", "enable_tp_ubwc_flag_hint=1"); // Turnip fix for OneUI rendering issues
+            }
+            if (LOCAL_RENDERER.toLowerCase().contains("zink")){
+                // This is sketch but it fixes a lot of things, if it causes problems we can just undo it.
+                envMap.put("MESA_GL_VERSION_OVERRIDE","4.6COMPAT");
+                envMap.put("MESA_GLSL_VERSION_OVERRIDE","460");
+            }
         }
         if(LauncherPreferences.PREF_BIG_CORE_AFFINITY) envMap.put("POJAV_BIG_CORE_AFFINITY", "1");
         envMap.put("AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth > 0 ? CallbackBridge.windowWidth : CallbackBridge.physicalWidth));