From f96ef6fb0668ee65c0a6158ae669ae10e9557e32 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sun, 30 Apr 2023 12:53:43 +0300 Subject: [PATCH] MinecraftProvider: Unsplit provide and provideFirst Not needed anymore since the patched provider is run separately. --- .../loom/configuration/CompileConfiguration.java | 10 +--------- .../providers/minecraft/MinecraftProvider.java | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index bad8e21f..5e2fd47d 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -192,20 +192,12 @@ public abstract class CompileConfiguration implements Runnable { } extension.setMinecraftProvider(minecraftProvider); - minecraftProvider.provideFirst(); - - if (!extension.isForge()) { - minecraftProvider.provide(); - } + minecraftProvider.provide(); final DependencyInfo mappingsDep = DependencyInfo.create(getProject(), Configurations.MAPPINGS); final MappingConfiguration mappingConfiguration = MappingConfiguration.create(getProject(), configContext.serviceManager(), mappingsDep, minecraftProvider); extension.setMappingConfiguration(mappingConfiguration); - if (extension.isForge()) { - minecraftProvider.provide(); - } - // This needs to run after MinecraftProvider.initFiles and MinecraftLibraryProvider.provide // but before MinecraftPatchedProvider.provide. setupDependencyProviders(project, extension); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java index 4bc5991e..92207a31 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java @@ -81,7 +81,7 @@ public abstract class MinecraftProvider { return true; } - public void provideFirst() throws Exception { + public void provide() throws Exception { final DependencyInfo dependency = DependencyInfo.create(getProject(), Constants.Configurations.MINECRAFT); minecraftVersion = dependency.getDependency().getVersion(); @@ -102,9 +102,7 @@ public abstract class MinecraftProvider { if (provideServer()) { serverBundleMetadata = BundleMetadata.fromJar(minecraftServerJar.toPath()); } - } - public void provide() throws Exception { libraryProvider = new MinecraftLibraryProvider(this, project); libraryProvider.provide(); }