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

Merge with Fabric 1.1, stage 7

Browse Source
This commit is contained in:
Juuz
2023-02-16 20:59:03 +02:00
parent 1d6d7b5489 7f06b64693
commit 16e1eda2c6
55 changed files with 1114 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,13 +37,11 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.inject.Inject;
import com.google.common.base.Suppliers;
import com.google.gson.JsonObject;
import dev.architectury.loom.extensions.ModBuildExtensions;
import dev.architectury.tinyremapper.OutputConsumerPath;
@@ -136,13 +134,11 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
public abstract Property<Boolean> getUseMixinAP();
private final Provider<BuildSharedServiceManager> serviceManagerProvider;
private final Supplier<TinyRemapperService> tinyRemapperService;
@Inject
public RemapJarTask() {
super();
serviceManagerProvider = BuildSharedServiceManager.createForTask(this, getBuildEventsListenerRegistry());
tinyRemapperService = Suppliers.memoize(() -> TinyRemapperService.getOrCreate(serviceManagerProvider.get().get(), this));
getClasspath().from(getProject().getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
getAddNestedDependencies().convention(true).finalizeValueOnRead();
@@ -200,7 +196,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
}
}
params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(tinyRemapperService.get()));
params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getTinyRemapperService()));
params.getRemapClasspath().from(getClasspath());
params.getMultiProjectOptimisation().set(getLoomExtension().multiProjectOptimisation());
@@ -469,6 +465,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
@Internal
public TinyRemapperService getTinyRemapperService() {
return tinyRemapperService.get();
return TinyRemapperService.getOrCreate(serviceManagerProvider.get().get(), this);
}
}