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

Merge branch 'upstream-0.9' into dev/0.9

Browse Source 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
#	src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
This commit is contained in:
shedaniel
2021-07-20 17:44:04 +08:00
parent 3a354be4d7 2259a4efc8
commit 07bc4eab7b
13 changed files with 189 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@@ -39,7 +39,6 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import com.google.gson.JsonObject;
import org.cadixdev.lorenz.MappingSet;
import org.cadixdev.mercury.Mercury;
import org.gradle.api.Action;
@@ -53,6 +52,7 @@ import org.gradle.api.tasks.SourceSet;
import org.jetbrains.annotations.ApiStatus;
import net.fabricmc.loom.api.decompilers.LoomDecompiler;
import net.fabricmc.loom.configuration.InstallerData;
import net.fabricmc.loom.configuration.LoomDependencyManager;
import net.fabricmc.loom.configuration.LoomProjectData;
import net.fabricmc.loom.configuration.ide.RunConfig;
@@ -107,7 +107,7 @@ public class LoomGradleExtension {
private List<String> dataGenMods = new ArrayList<>();
private LoomDependencyManager dependencyManager;
private JarProcessorManager jarProcessorManager;
private JsonObject installerJson;
private InstallerData installerData;
private MappingSet[] srcMappingCache = new MappingSet[2];
private Mercury[] srcMercuryCache = new Mercury[2];
private ModPlatform platform;
@@ -273,12 +273,12 @@ public class LoomGradleExtension {
return unmappedMods;
}
public void setInstallerJson(JsonObject object) {
this.installerJson = object;
public void setInstallerData(InstallerData data) {
this.installerData = data;
}
public JsonObject getInstallerJson() {
return installerJson;
public InstallerData getInstallerData() {
return installerData;
}
public void accessWidener(Object file) {