imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Simplify RemapJarTask remapRefmap

Browse Source
This commit is contained in:
shedaniel
2021-04-13 16:30:44 +08:00
parent 897806572e
commit 58d1b066bd
5 changed files with 24 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/fabricmc/loom/build/nesting/EmptyNestedJarProvider.java Normal file
View File

@@ -0,0 +1,14 @@
package net.fabricmc.loom.build.nesting;
import java.io.File;
import java.util.Collection;
import java.util.Collections;
public enum EmptyNestedJarProvider implements NestedJarProvider {
INSTANCE;
@Override
public Collection<File> provide() {
return Collections.emptyList();
}
}

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

@@ -99,8 +99,10 @@ public final class CompileConfiguration {
extendsFrom(Constants.Configurations.MINECRAFT_DEPENDENCIES, Constants.Configurations.FORGE_DEPENDENCIES, project);
}
Configuration includeConfig = project.getConfigurations().maybeCreate(Constants.Configurations.INCLUDE);
includeConfig.setTransitive(false); // Dont get transitive deps
if (!project.getExtensions().getByType(LoomGradleExtension.class).isForge()) {
Configuration includeConfig = project.getConfigurations().maybeCreate(Constants.Configurations.INCLUDE);
includeConfig.setTransitive(false); // Dont get transitive deps
}
project.getConfigurations().maybeCreate(Constants.Configurations.MAPPING_CONSTANTS);
extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS, project);

2
src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
View File

@@ -95,7 +95,7 @@ public class RemapConfiguration {
// TODO this might be wrong?
project.getTasks().withType(RemapJarTask.class).forEach(task -> {
if (task.getAddNestedDependencies().getOrElse(false)) {
if (!extension.isForge() && task.getAddNestedDependencies().getOrElse(false)) {
NestedDependencyProvider.getRequiredTasks(project).forEach(task::dependsOn);
}
});

5
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View File

@@ -71,6 +71,7 @@ import org.zeroturnaround.zip.ZipUtil;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.build.JarRemapper;
import net.fabricmc.loom.build.MixinRefmapHelper;
import net.fabricmc.loom.build.nesting.EmptyNestedJarProvider;
import net.fabricmc.loom.build.nesting.NestedJarPathProvider;
import net.fabricmc.loom.build.nesting.JarNester;
import net.fabricmc.loom.build.nesting.MergedNestedJarProvider;
@@ -329,6 +330,10 @@ public class RemapJarTask extends Jar {
}
private NestedJarProvider getNestedJarProvider() {
if (getProject().getExtensions().getByType(LoomGradleExtension.class).isForge()) {
return EmptyNestedJarProvider.INSTANCE;
}
Configuration includeConfiguration = getProject().getConfigurations().getByName(Constants.Configurations.INCLUDE);
if (!addDefaultNestedDependencies.getOrElse(true)) {