From 1d1e1b71835fb8b405c4ce033d2c57ef18b3afb1 Mon Sep 17 00:00:00 2001 From: Matthew Periut Date: Tue, 15 Oct 2024 16:12:57 -0400 Subject: [PATCH 1/4] Macos theming (#7) * Use system theme when on macOS * Remove sout --- src/main/java/babric/BabricLoomPlugin.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/babric/BabricLoomPlugin.java b/src/main/java/babric/BabricLoomPlugin.java index 51b8fa1..14c7021 100644 --- 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; @@ -46,5 +47,15 @@ private void applyProject(Project project) { }); 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"); + } + }); + } + }); } } From 1667a8164f5ed4319b1951fd116f380446b094c2 Mon Sep 17 00:00:00 2001 From: Cat Core <34719527+thecatcore@users.noreply.github.com> Date: Sat, 19 Oct 2024 12:05:36 +0200 Subject: [PATCH 2/4] Update LWJGL2 --- src/main/java/babric/processor/LWJGL2LibraryProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/babric/processor/LWJGL2LibraryProcessor.java b/src/main/java/babric/processor/LWJGL2LibraryProcessor.java index 94e58a3..b952a8d 100644 --- 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); From 9cba2f771c4b6ee8f3eeac953b52142be603b4bd Mon Sep 17 00:00:00 2001 From: Cat Core <34719527+thecatcore@users.noreply.github.com> Date: Sat, 19 Oct 2024 12:07:04 +0200 Subject: [PATCH 3/4] Update to fixed intermediary --- src/main/java/babric/BabricLoomPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/babric/BabricLoomPlugin.java b/src/main/java/babric/BabricLoomPlugin.java index 14c7021..790a5c2 100644 --- a/src/main/java/babric/BabricLoomPlugin.java +++ b/src/main/java/babric/BabricLoomPlugin.java @@ -42,7 +42,7 @@ 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())); }); From 854208ad76fdb58439e68633ae66785614676460 Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Sun, 10 Nov 2024 00:42:16 +0000 Subject: [PATCH 4/4] Fix Legacyfabric Maven URL (#9) --- src/main/java/babric/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/babric/Constants.java b/src/main/java/babric/Constants.java index 31db6e7..39de089 100644 --- a/src/main/java/babric/Constants.java +++ b/src/main/java/babric/Constants.java @@ -1,7 +1,7 @@ package babric; public class Constants { - public static final String LEGACYFABRIC_MAVEN = "https://repo.legacyfabric.net/repository/legacyfabric/"; + public static final String LEGACYFABRIC_MAVEN = "https://maven.legacyfabric.net/"; public static final String BABRIC_MAVEN = "https://maven.glass-launcher.net/babric/"; public static final String GLASS_MAVEN = "https://maven.glass-launcher.net/releases/"; }