Fix api sourceSet missing lwjgl classes and live mirror check returni…

…ng http URLs
GTNewHorizons · Jan 11, 2024 · 1b8c702 · 1b8c702
1 parent 620f9d6
commit 1b8c702
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/plugin/src/main/java/com/gtnewhorizons/retrofuturagradle/mcp/MCPTasks.java b/plugin/src/main/java/com/gtnewhorizons/retrofuturagradle/mcp/MCPTasks.java
@@ -334,8 +334,10 @@ public MCPTasks(Project project, MinecraftExtension mcExt, MinecraftTasks mcTask
         final Configuration cfgCompileOnlyApi = project.getConfigurations().getByName("compileOnlyApi");
         final SourceSet apiSet = javaExt.getSourceSets().create("api", set -> {
             set.setCompileClasspath(
-                    set.getCompileClasspath().plus(patchedConfiguration).plus(patchedMcSources.getOutput()));
-            set.setRuntimeClasspath(set.getRuntimeClasspath().plus(patchedConfiguration));
+                    set.getCompileClasspath().plus(patchedConfiguration).plus(patchedMcSources.getOutput())
+                            .plus(mcTasks.getLwjgl2Configuration()));
+            set.setRuntimeClasspath(
+                    set.getRuntimeClasspath().plus(patchedConfiguration).plus(mcTasks.getLwjgl2Configuration()));
         });
         mainSet.setCompileClasspath(mainSet.getCompileClasspath().plus(apiSet.getOutput()));
         mainSet.setRuntimeClasspath(mainSet.getRuntimeClasspath().plus(apiSet.getOutput()));

diff --git a/plugin/src/main/java/com/gtnewhorizons/retrofuturagradle/modutils/ModUtils.java b/plugin/src/main/java/com/gtnewhorizons/retrofuturagradle/modutils/ModUtils.java
@@ -235,12 +235,12 @@ public void run() {
                             int response = connection.getResponseCode();
                             if (response >= 200 && response <= 399) {
                                 synchronized (successUrl) {
-                                    successUrl.set(url);
+                                    successUrl.set(rawUrl);
                                     successUrl.notifyAll();
                                 }
                             }
                         } catch (IOException e) {
-                            project.getLogger().info("RFG mirror {} failed: {}", url, e.getMessage());
+                            project.getLogger().info("RFG mirror {} failed: {}", rawUrl, e.getMessage());
                         }
                     }
                 };