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

Fix unpick remapping classpath (#1350)

Browse Source
This commit is contained in:
modmuss
2025-08-12 08:55:36 +01:00
committed by GitHub
parent 543d47a0f8
commit fd8cc10120
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
View File

@@ -52,6 +52,7 @@ import org.gradle.api.tasks.Optional;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.extension.RemapperExtensionHolder;
import net.fabricmc.loom.task.AbstractRemapJarTask;
import net.fabricmc.loom.util.Constants;
@@ -117,13 +118,10 @@ public class TinyRemapperService extends Service<TinyRemapperService.Options> im
});
}
public static Provider<Options> createSimple(Project project, Provider<String> from, Provider<String> to) {
public static Provider<Options> createSimple(Project project, Provider<String> from, Provider<String> to, ClasspathLibraries classpathLibraries) {
return TYPE.create(project, options -> {
final LoomGradleExtension extension = LoomGradleExtension.get(project);
final ConfigurationContainer configurations = project.getConfigurations();
final FileCollection classpath = configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)
.minus(configurations.getByName(Constants.Configurations.MINECRAFT_COMPILE_LIBRARIES))
.minus(configurations.getByName(Constants.Configurations.MINECRAFT_RUNTIME_LIBRARIES));
final FileCollection classpath = getRemapClasspath(project, from, classpathLibraries);
options.getFrom().set(from);
options.getTo().set(to);
@@ -135,6 +133,41 @@ public class TinyRemapperService extends Service<TinyRemapperService.Options> im
});
}
private static FileCollection getRemapClasspath(Project project, Provider<String> from, ClasspathLibraries classpathLibraries) {
final LoomGradleExtension extension = LoomGradleExtension.get(project);
final ConfigurationContainer configurations = project.getConfigurations();
if (from.get().equals(MappingsNamespace.INTERMEDIARY.toString())) {
ConfigurableFileCollection files = project.files(extension.getMinecraftJars(MappingsNamespace.INTERMEDIARY));
if (classpathLibraries == ClasspathLibraries.INCLUDE) {
files = files.from(configurations.getByName(Constants.Configurations.MINECRAFT_COMPILE_LIBRARIES));
}
return files;
}
if (classpathLibraries == ClasspathLibraries.INCLUDE) {
return configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME);
}
return configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)
.minus(configurations.getByName(Constants.Configurations.MINECRAFT_COMPILE_LIBRARIES))
.minus(configurations.getByName(Constants.Configurations.MINECRAFT_RUNTIME_LIBRARIES));
}
public enum ClasspathLibraries {
/**
* Default, in most cases the Minecraft libraries are not required as they are not obfuscated and do not need to be queried.
*/
EXCLUDE,
/**
* Uses more memory, but provides a complete index of all the classes within the libraries.
*/
INCLUDE
}
private TinyRemapper tinyRemapper;
@Nullable
private KotlinRemapperClassloader kotlinRemapperClassloader;

3
src/main/java/net/fabricmc/loom/task/service/UnpickRemapperService.java
View File

@@ -67,7 +67,8 @@ public class UnpickRemapperService extends Service<UnpickRemapperService.Options
return TYPE.create(project, options -> {
options.getTinyRemapper().set(TinyRemapperService.createSimple(project,
project.provider(metadata::namespace),
project.provider(MappingsNamespace.NAMED::toString)
project.provider(MappingsNamespace.NAMED::toString),
TinyRemapperService.ClasspathLibraries.INCLUDE // Must include the full set of libraries on classpath so fields can be looked up. This does use a lot of memory however...
));
});
}