From b35753476ced5dc55fd6dbae99d3b75684315753 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 18 Apr 2023 14:27:54 +0100 Subject: [PATCH] Fix applying mods to server libraries. --- .../minecraft/MinecraftLibraryProvider.java | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 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 0373a617..8c1dc700 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 @@ -125,35 +125,28 @@ public class MinecraftLibraryProvider { private void applyClientLibrary(Library library) { switch (library.target()) { - case COMPILE -> { - addLibrary(Constants.Configurations.MINECRAFT_CLIENT_COMPILE_LIBRARIES, library); - } - case RUNTIME -> { - addLibrary(Constants.Configurations.MINECRAFT_CLIENT_RUNTIME_LIBRARIES, library); - } - case NATIVES -> { - addLibrary(Constants.Configurations.MINECRAFT_NATIVES, library); - } - case LOCAL_MOD -> { - ExternalModuleDependency dependency = (ExternalModuleDependency) project.getDependencies().create(library.mavenNotation()); - dependency.setTransitive(false); - project.getDependencies().add("modLocalRuntime", dependency); - } + case COMPILE -> addLibrary(Constants.Configurations.MINECRAFT_CLIENT_COMPILE_LIBRARIES, library); + case RUNTIME -> addLibrary(Constants.Configurations.MINECRAFT_CLIENT_RUNTIME_LIBRARIES, library); + case NATIVES -> addLibrary(Constants.Configurations.MINECRAFT_NATIVES, library); + case LOCAL_MOD -> applyLocalModLibrary(library); } } private void applyServerLibrary(Library library) { switch (library.target()) { - case COMPILE -> { - addLibrary(Constants.Configurations.MINECRAFT_SERVER_COMPILE_LIBRARIES, library); - } - case RUNTIME -> { - addLibrary(Constants.Configurations.MINECRAFT_SERVER_RUNTIME_LIBRARIES, library); - } - default -> throw new IllegalStateException("Target not supported for server library"); + case COMPILE -> addLibrary(Constants.Configurations.MINECRAFT_SERVER_COMPILE_LIBRARIES, library); + case RUNTIME -> addLibrary(Constants.Configurations.MINECRAFT_SERVER_RUNTIME_LIBRARIES, library); + case LOCAL_MOD -> applyLocalModLibrary(library); + default -> throw new IllegalStateException("Target not supported for server library: %s".formatted(library)); } } + private void applyLocalModLibrary(Library library) { + ExternalModuleDependency dependency = (ExternalModuleDependency) project.getDependencies().create(library.mavenNotation()); + dependency.setTransitive(false); + project.getDependencies().add("modLocalRuntime", dependency); + } + private void addLibrary(String configuration, Library library) { addDependency(configuration, library.mavenNotation()); }