diff options
| author | Jonas Herzig <jonas@spark-squared.com> | 2022-05-21 16:32:22 +0200 |
|---|---|---|
| committer | Jonas Herzig <jonas@spark-squared.com> | 2022-05-21 16:32:22 +0200 |
| commit | 86c3ecb7ca62a9525defb6156b3363043ee1580b (patch) | |
| tree | 8b4be7aaf6c3cd5d7125a080e8b24fae483cf2d1 /src/main/java | |
| parent | d776a57784daca57b81b0dfd65abd8bf2c98f2ab (diff) | |
| download | architectury-loom-86c3ecb7ca62a9525defb6156b3363043ee1580b.tar.gz architectury-loom-86c3ecb7ca62a9525defb6156b3363043ee1580b.tar.bz2 architectury-loom-86c3ecb7ca62a9525defb6156b3363043ee1580b.zip | |
Just enough to allow compiling against 1.19-pre1HEADdev/0.10.0
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).
Diffstat (limited to 'src/main/java')
2 files changed, 1 insertions, 5 deletions
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<MinecraftVersionMeta.Download> 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"); |