Fix merge conflicts

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

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/net/fabricmc/loom/util/aw2at/Aw2At.java b/src/main/java/net/fabricmc/loom/util/aw2at/Aw2At.java
index 2574b57a..06fd7e86 100644
--- a/src/main/java/net/fabricmc/loom/util/aw2at/Aw2At.java
+++ b/src/main/java/net/fabricmc/loom/util/aw2at/Aw2At.java
@@ -39,6 +39,7 @@ import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 
 import net.fabricmc.accesswidener.AccessWidenerReader;
+import net.fabricmc.accesswidener.AccessWidenerVisitor;
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.task.RemapJarTask;
 
@@ -82,19 +83,19 @@ public final class Aw2At {
 	public static AccessTransformSet toAccessTransformSet(BufferedReader reader) throws IOException {
 		AccessTransformSet atSet = AccessTransformSet.create();
 
-		new AccessWidenerReader(new AccessWidenerReader.Visitor() {
+		new AccessWidenerReader(new AccessWidenerVisitor() {
 			@Override
-			public void visitClass(String name, AccessWidenerReader.AccessType access) {
+				public void visitClass(String name, AccessWidenerReader.AccessType access, boolean transitive) {
 				atSet.getOrCreateClass(name).merge(toAt(access));
 			}
 
 			@Override
-			public void visitMethod(String owner, String name, String descriptor, AccessWidenerReader.AccessType access) {
+				public void visitMethod(String owner, String name, String descriptor, AccessWidenerReader.AccessType access, boolean transitive) {
 				atSet.getOrCreateClass(owner).mergeMethod(MethodSignature.of(name, descriptor), toAt(access));
 			}
 
 			@Override
-			public void visitField(String owner, String name, String descriptor, AccessWidenerReader.AccessType access) {
+				public void visitField(String owner, String name, String descriptor, AccessWidenerReader.AccessType access, boolean transitive) {
 				atSet.getOrCreateClass(owner).mergeField(name, toAt(access));
 			}
 		}).read(reader);