From dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 14 May 2021 06:56:18 +0800 Subject: [PATCH] Fix merge conflicts Signed-off-by: shedaniel --- .github/workflows/publish.yml | 1 + build.gradle | 6 ++++-- .../java/net/fabricmc/loom/build/ModCompileRemapper.java | 6 +++--- .../net/fabricmc/loom/configuration/MavenPublication.java | 2 +- .../net/fabricmc/loom/configuration/mods/ModProcessor.java | 1 - .../loom/configuration/providers/MinecraftProvider.java | 2 -- .../configuration/providers/mappings/MappingsProvider.java | 1 - .../providers/minecraft/assets/MinecraftAssetsProvider.java | 2 +- .../java/net/fabricmc/loom/task/GenVsCodeProjectTask.java | 3 +++ src/main/java/net/fabricmc/loom/task/RemapJarTask.java | 1 - src/main/java/net/fabricmc/loom/util/srg/AtRemapper.java | 5 ++--- .../net/fabricmc/loom/util/srg/CoreModClassRemapper.java | 3 +-- src/main/java/net/fabricmc/loom/util/srg/MCPReader.java | 2 +- 13 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 458c9278..a0fdd15a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,6 +5,7 @@ on: branches: - 'dev/0.6-forge' - 'dev/0.7-forge' + - 'dev/0.8' jobs: build: diff --git a/build.gradle b/build.gradle index ed86285e..6dae92e4 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ plugins { id 'jacoco' id 'codenarc' id "org.cadixdev.licenser" version "0.5.0" - id 'com.github.johnrengelman.shadow' version '4.0.4' + id 'com.github.johnrengelman.shadow' version '7.0.0' } sourceCompatibility = 16 @@ -129,6 +129,8 @@ dependencies { } task forgeInjectJar(type: ShadowJar, dependsOn: [compileForgeInjectJava, processForgeInjectResources]) { + relocate 'net.fabricmc.mapping', 'net.fabricmc.loom.mapping' + relocate 'net.fabricmc.mappings', 'net.fabricmc.loom.mappings' configurations = [project.configurations.forgeInjectShadow] classifier = 'forgeinject' from compileForgeInjectJava.outputs @@ -142,7 +144,7 @@ jar { task mainJar(type: Jar, dependsOn: jar) { dependsOn forgeInjectJar - from zipTree(jar.archivePath) + from zipTree(jar.archiveFile) from(forgeInjectJar.outputs) { into "inject" rename { "injection.jar" } diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java index fb4dbe6c..5f72791e 100644 --- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java +++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java @@ -82,7 +82,7 @@ public class ModCompileRemapper { String name = artifact.getModuleVersion().getId().getName(); String version = artifact.getModuleVersion().getId().getVersion(); - if (!shouldRemapMod(logger, artifact, extension.isForge(), sourceConfig.getName())) { + if (!shouldRemapMod(logger, artifact, extension.isForge(), sourceConfig.getName())) { addToRegularCompile(project, regularConfig, artifact); continue; } @@ -95,7 +95,7 @@ public class ModCompileRemapper { modDependencies.add(info); - String remappedLog = group + ":" + name + ":" + version + (artifact.getClassifier() == null ? "" : ":" + artifact.getClassifier()) + " (" + mappingsSuffix + ")" + (info.requiresRemapping() ? " requires remapping" : " already remapped in " + info.getRemappedOutput().getAbsolutePath()); + String remappedLog = group + ":" + name + ":" + version + (artifact.getClassifier() == null ? "" : ":" + artifact.getClassifier()) + " (" + mappingsSuffix + ")" + (info.requiresRemapping() ? " requires remapping" : " already remapped in " + info.getRemappedOutput().getAbsolutePath()); project.getLogger().info(":providing " + remappedLog); File remappedSources = info.getRemappedOutput("sources"); @@ -119,7 +119,7 @@ public class ModCompileRemapper { // Add all of the remapped mods onto the config for (ModDependencyInfo info : modDependencies) { - project.getLogger().info(":adding " + info.toString() + " into " + info.targetConfig.getName()); + project.getLogger().info(":adding " + info.toString() + " into " + info.targetConfig.getName()); project.getDependencies().add(info.targetConfig.getName(), info.getRemappedNotation()); } }); diff --git a/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java b/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java index 8a69feab..ab2176f1 100644 --- a/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java +++ b/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java @@ -62,7 +62,7 @@ public final class MavenPublication { Configuration compileModsConfig = p.getConfigurations().getByName(entry.sourceConfiguration()); - p.getLogger().info("Processing maven publication for project [" + p.getName() + "] of " + entry.getSourceConfiguration()); + p.getLogger().info("Processing maven publication for project [" + p.getName() + "] of " + entry.sourceConfiguration()); processEntry(p.getLogger(), entry, compileModsConfig, mavenPublish); } }); diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java index 533b16bb..b0629d69 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -50,7 +50,6 @@ import com.google.gson.JsonObject; import dev.architectury.tinyremapper.InputTag; import dev.architectury.tinyremapper.OutputConsumerPath; import dev.architectury.tinyremapper.TinyRemapper; -import org.apache.commons.io.IOUtils; import org.gradle.api.Project; import org.objectweb.asm.commons.Remapper; import org.zeroturnaround.zip.ZipUtil; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java index f4c8a117..a35fa92b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java @@ -61,8 +61,6 @@ public class MinecraftProvider extends DependencyProvider { private File versionManifestJson; private String jarSuffix = ""; - Gson gson = new Gson(); - public MinecraftProvider(Project project) { super(project); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java index dfd59411..0d929d79 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java @@ -76,7 +76,6 @@ import net.fabricmc.mapping.tree.TinyTree; import net.fabricmc.stitch.Command; import net.fabricmc.stitch.commands.CommandProposeFieldNames; import net.fabricmc.stitch.commands.tinyv2.CommandMergeTinyV2; -import net.fabricmc.stitch.commands.tinyv2.CommandReorderTinyV2; import net.fabricmc.stitch.commands.tinyv2.TinyFile; import net.fabricmc.stitch.commands.tinyv2.TinyV2Writer; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java index b0198424..af5aee2b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java @@ -97,7 +97,7 @@ public class MinecraftAssetsProvider { try { for (Map.Entry entry : parent.entrySet()) { AssetObject object = entry.getValue(); - String sha1 = object.hash(); + String sha1 = object.hash(); String filename = "objects" + File.separator + sha1.substring(0, 2) + File.separator + sha1; File file = new File(assets, filename); diff --git a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java index c02c1381..d134e343 100644 --- a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java @@ -34,11 +34,14 @@ 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; diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java index c1e5d2a0..129fc991 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java @@ -86,7 +86,6 @@ import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.SourceRemapper; import net.fabricmc.loom.util.TinyRemapperMappingsHelper; import net.fabricmc.loom.util.ZipReprocessorUtil; -import net.fabricmc.loom.util.gradle.GradleSupport; import net.fabricmc.mapping.tree.ClassDef; import net.fabricmc.mapping.tree.FieldDef; import net.fabricmc.mapping.tree.MethodDef; diff --git a/src/main/java/net/fabricmc/loom/util/srg/AtRemapper.java b/src/main/java/net/fabricmc/loom/util/srg/AtRemapper.java index 76b7e87c..699e0daf 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/AtRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/srg/AtRemapper.java @@ -38,7 +38,6 @@ import java.util.List; import java.util.function.UnaryOperator; import com.google.common.collect.ImmutableMap; -import org.apache.logging.log4j.util.Strings; import org.gradle.api.logging.Logger; import net.fabricmc.loom.util.function.CollectionUtil; @@ -55,7 +54,7 @@ public final class AtRemapper { Path atPath = fs.getPath("META-INF/accesstransformer.cfg"); if (Files.exists(atPath)) { - String atContent = new String(Files.readAllBytes(atPath), StandardCharsets.UTF_8); + String atContent = Files.readString(atPath); String[] lines = atContent.split("\n"); List output = new ArrayList<>(lines.length); @@ -63,7 +62,7 @@ public final class AtRemapper { for (int i = 0; i < lines.length; i++) { String line = lines[i].trim(); - if (line.startsWith("#") || Strings.isBlank(line)) { + if (line.startsWith("#") || line.isBlank()) { output.add(i, line); continue; } diff --git a/src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java b/src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java index 9fb93079..1ad1a87b 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java @@ -44,7 +44,6 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.apache.logging.log4j.util.Strings; import org.gradle.api.logging.Logger; import net.fabricmc.loom.util.function.CollectionUtil; @@ -109,7 +108,7 @@ public final class CoreModClassRemapper { if (!lines.equals(output)) { try (Writer writer = Files.newBufferedWriter(js, StandardCharsets.UTF_8, StandardOpenOption.WRITE)) { - writer.write(String.join(Strings.LINE_SEPARATOR, output)); + writer.write(String.join("\n", output)); } } } diff --git a/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java b/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java index 777a9007..bdb22d73 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java +++ b/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java @@ -205,7 +205,7 @@ public class MCPReader { } } - try (FileSystem fs = FileSystems.newFileSystem(mcpJar, null)) { + try (FileSystem fs = FileSystems.newFileSystem(mcpJar, (ClassLoader) null)) { Path fields = fs.getPath("fields.csv"); Path methods = fs.getPath("methods.csv"); Path params = fs.getPath("params.csv");