Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>

3 files changed, 4 insertions, 6 deletions

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<String> 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");