Revert "Workaround FabricMC/fabric-loom#587"

This reverts commit 3953aeda52.
This commit is contained in:
Juuz
2022-01-27 19:55:23 +02:00
parent 1ebc8dedd8
commit 3d5f61321b
2 changed files with 1 additions and 16 deletions

View File

@@ -41,7 +41,6 @@ import org.gradle.workers.WorkAction;
import org.gradle.workers.WorkParameters;
import org.gradle.workers.WorkQueue;
import org.gradle.workers.WorkerExecutor;
import org.jetbrains.annotations.ApiStatus;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.util.SourceRemapper;
@@ -63,23 +62,10 @@ public abstract class AbstractRemapJarTask extends Jar {
@Inject
protected abstract WorkerExecutor getWorkerExecutor();
/**
* Whether the remap jar service is reused between different projects, this is defaulted to true on upstream, but
* it is false by default on this fork, as it breaks setups where remap jar services are receiving the same classes.
* This is a temporary workaround until we can figure out a better solution.
*
* @see <a href="https://github.com/FabricMC/fabric-loom/issues/587">Issue 587</a>
* @return Whether the remap jar service is reused between different projects
*/
@ApiStatus.Experimental
@Input
public abstract Property<Boolean> getDoesShareProjectState();
@Inject
public AbstractRemapJarTask() {
getSourceNamespace().convention(MappingsNamespace.NAMED.toString()).finalizeValueOnRead();
getTargetNamespace().convention(SourceRemapper.intermediary(getProject())).finalizeValueOnRead();
getDoesShareProjectState().convention(false);
}
public final <P extends AbstractRemapParams> void submitWork(Class<? extends AbstractRemapAction<P>> workAction, Action<P> action) {