imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 21:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

MinecraftProvider: Unsplit provide and provideFirst

Browse Source 
Not needed anymore since the patched provider is run separately.
This commit is contained in:
Juuz
2023-04-30 12:53:43 +03:00
parent 915521cd23
commit f96ef6fb06
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
View File

@@ -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);

4
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java
View File

@@ -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();
}