Merge branch 'dev/1.8' into dev/1.9

babric · Dec 1, 2024 · 735d409 · 735d409
2 parents 68ae297 + 88bc429
commit 735d409
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/babric/BabricLoomPlugin.java b/src/main/java/babric/BabricLoomPlugin.java
@@ -11,6 +11,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.plugins.PluginAware;
 import org.gradle.api.provider.ListProperty;
+import org.gradle.internal.os.OperatingSystem;
 
 import java.util.Map;
 import java.util.Objects;
@@ -41,10 +42,20 @@ private void applyProject(Project project) {
         extension.getVersionsManifests().add("babric-manifest", "https://babric.github.io/manifest-polyfill/version_manifest_v2.json", -10);
 
         extension.setIntermediateMappingsProvider(BabricIntermediaryProvider.class, provider -> {
-            provider.getIntermediaryUrl().set("https://maven.glass-launcher.net/babric/babric/intermediary/%1$s/intermediary-%1$s-v2.jar");
+            provider.getIntermediaryUrl().set("https://maven.glass-launcher.net/babric/babric/intermediary-upstream/%1$s/intermediary-upstream-%1$s-v2.jar");
             provider.getRefreshDeps().set(project.provider(() -> LoomGradleExtension.get(project).refreshDeps()));
         });
 
         extension.addMinecraftJarProcessor(NestFixingJarProcessor.class);
+
+        project.afterEvaluate(p -> {
+            if (OperatingSystem.current().isMacOsX()) {
+                extension.getRunConfigs().configureEach(runConfig -> {
+                    if (runConfig.getName().equals("client")) {
+                        runConfig.getVmArgs().add("-Dapple.awt.application.appearance=system");
+                    }
+                });
+            }
+        });
     }
 }
diff --git a/src/main/java/babric/processor/LWJGL2LibraryProcessor.java b/src/main/java/babric/processor/LWJGL2LibraryProcessor.java
@@ -14,7 +14,7 @@
 import java.util.function.Predicate;
 
 public class LWJGL2LibraryProcessor extends LibraryProcessor {
-    public static final String VERSION = "2.9.4+legacyfabric.8";
+    public static final String VERSION = "2.9.4+legacyfabric.9";
     private boolean applied = false;
     public LWJGL2LibraryProcessor(Platform platform, LibraryContext context) {
         super(platform, context);