From 86c3ecb7ca62a9525defb6156b3363043ee1580b Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sat, 21 May 2022 16:32:22 +0200 Subject: Just enough to allow compiling against 1.19-pre1 Upgrading asm 9.3 because apparently there's Java 19 classes in the MC jar now. Removing the `module` wrapper around dependencies because frankly I don't know why it's a thing in the first place (works fine without on all versions of UniversalCraft) and it prevents you from having two modules differing only in the classifier, which is what MC 1.19 does. Removing the throw when there are no natives, because those come bundled in jars now (this doesn't allow running in a dev env, but it's enough to compile a jar). --- .../configuration/providers/minecraft/MinecraftLibraryProvider.java | 2 +- .../configuration/providers/minecraft/MinecraftNativesProvider.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftLibraryProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftLibraryProvider.java index 53c9412d..617a1571 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftLibraryProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftLibraryProvider.java @@ -42,7 +42,7 @@ public class MinecraftLibraryProvider { for (MinecraftVersionMeta.Library library : versionInfo.libraries()) { if (library.isValidForOS() && !library.hasNatives() && library.artifact() != null) { - project.getDependencies().add(Constants.Configurations.MINECRAFT_DEPENDENCIES, project.getDependencies().module(library.name())); + project.getDependencies().add(Constants.Configurations.MINECRAFT_DEPENDENCIES, library.name()); } } } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java index 03904aa6..779b72ad 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java @@ -112,10 +112,6 @@ public class MinecraftNativesProvider { private boolean requiresExtract() { List natives = getNatives(); - if (natives.isEmpty()) { - throw new IllegalStateException("No natives found for the current system"); - } - for (MinecraftVersionMeta.Download library : natives) { File libJarFile = library.relativeFile(jarStore); File libSha1File = new File(nativesDir, libJarFile.getName() + ".sha1"); -- cgit