Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8

# Conflicts:
#	README.md
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
#	src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
#	src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
This commit is contained in:
shedaniel
2021-05-14 06:43:07 +08:00
43 changed files with 335 additions and 436 deletions

View File

@@ -34,14 +34,12 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.commons.io.FileUtils;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.gradle.api.Project;
import org.gradle.api.tasks.TaskAction;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.LoomGradlePlugin;
import net.fabricmc.loom.configuration.ide.RunConfig;
import net.fabricmc.loom.configuration.ide.RunConfigSettings;
@@ -104,7 +102,7 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
settings.makeRunDir();
}
String json = gson.toJson(launch);
String json = LoomGradlePlugin.GSON.toJson(launch);
try {
FileUtils.writeStringToFile(launchJson, json, StandardCharsets.UTF_8);