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

Merge remote-tracking branch 'origin/dev/1.0' into exp/1.1

Browse Source 
# Conflicts:
#	src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
#	src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
This commit is contained in:
modmuss50
2022-12-11 20:31:07 +00:00
parent 34c24cde3c aef884d005
commit 39be6fa6e0
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
View File

@@ -114,7 +114,7 @@ public interface LoomGradleExtensionAPI {
}
default List<RemapConfigurationSettings> getRuntimeRemapConfigurations() {
return getRemapConfigurations().stream().filter(element -> element.getOnCompileClasspath().get()).toList();
return getRemapConfigurations().stream().filter(element -> element.getOnRuntimeClasspath().get()).toList();
}
@ApiStatus.Experimental

7
src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
View File

@@ -94,9 +94,14 @@ public abstract class AnnotationProcessorInvoker<T extends Task> {
try {
LoomGradleExtension loom = LoomGradleExtension.get(project);
String refmapName = Objects.requireNonNull(MixinExtension.getMixinInformationContainer(sourceSet)).refmapNameProvider().get();
final File mixinMappings = getMixinMappingsForSourceSet(project, sourceSet);
task.getOutputs().file(mixinMappings).withPropertyName("mixin-ap-" + sourceSet.getName()).optional();
Map<String, String> args = new HashMap<>() {{
put(Constants.MixinArguments.IN_MAP_FILE_NAMED_INTERMEDIARY, loom.getMappingConfiguration().tinyMappings.toFile().getCanonicalPath());
put(Constants.MixinArguments.OUT_MAP_FILE_NAMED_INTERMEDIARY, getMixinMappingsForSourceSet(project, sourceSet).getCanonicalPath());
put(Constants.MixinArguments.OUT_MAP_FILE_NAMED_INTERMEDIARY, mixinMappings.getCanonicalPath());
put(Constants.MixinArguments.OUT_REFMAP_FILE, getRefmapDestination(task, refmapName));
put(Constants.MixinArguments.DEFAULT_OBFUSCATION_ENV, "named:" + loom.getMixin().getRefmapTargetNamespace().get());
put(Constants.MixinArguments.QUIET, "true");

7
src/main/java/net/fabricmc/loom/decompilers/fernflower/FabricFernFlowerDecompiler.java
View File

@@ -61,6 +61,11 @@ public final class FabricFernFlowerDecompiler implements LoomDecompiler {
}
ff.addSource(compiledJar.toFile());
ff.decompileContext();
try {
ff.decompileContext();
} finally {
ff.clearContext();
}
}
}

7
src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
View File

@@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -99,6 +100,9 @@ public abstract class AbstractRemapJarTask extends Jar {
@Input
public abstract Property<Boolean> getIncludesClientOnlyClasses();
@Input
public abstract ListProperty<String> getAdditionalClientOnlyEntries();
private final Provider<JarManifestService> jarManifestServiceProvider;
@Inject
@@ -128,7 +132,8 @@ public abstract class AbstractRemapJarTask extends Jar {
params.getJarManifestService().set(jarManifestServiceProvider);
if (getIncludesClientOnlyClasses().get()) {
final List<String> clientOnlyEntries = getClientOnlyEntries();
final List<String> clientOnlyEntries = new ArrayList<>(getClientOnlyEntries());
clientOnlyEntries.addAll(getAdditionalClientOnlyEntries().get());
applyClientOnlyManifestAttributes(params, clientOnlyEntries);
params.getClientOnlyEntries().set(clientOnlyEntries.stream().filter(s -> s.endsWith(".class")).toList());
}