From f99cc860e78ef718eaa99bdb5c8924d46b364f44 Mon Sep 17 00:00:00 2001
From: MatthewTGM <matthewtgm120@gmail.com>
Date: Sat, 11 Sep 2021 07:37:59 +0200
Subject: [PATCH 1/3] Attempt to fix Gradle 7 exception.

---
 .../java/net/minecraftforge/gradle/tasks/ApplyS2STask.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
index e0c03c0e7..606aaf943 100644
--- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
+++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
@@ -23,6 +23,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -373,6 +374,10 @@ public void addSrg(File srg)
         this.srg.add(srg);
     }
 
+    public List<Object> getExc() {
+        return Collections.unmodifiableList(exc);
+    }
+
     public FileCollection getExcs()
     {
         return getProject().files(exc);

From 3d3ab651452c9e91e738f0d0ac58750baaeca954 Mon Sep 17 00:00:00 2001
From: MatthewTGM <matthewtgm120@gmail.com>
Date: Sat, 11 Sep 2021 07:48:34 +0200
Subject: [PATCH 2/3] 2nd attempt to fix Gradle 7 exception.

---
 .../gradle/tasks/ApplyS2STask.java             | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
index 606aaf943..90137fa8b 100644
--- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
+++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -51,8 +50,7 @@
 import com.google.common.collect.Maps;
 import com.google.common.io.Files;
 
-public class ApplyS2STask extends DefaultTask
-{
+public class ApplyS2STask extends DefaultTask {
     @InputFiles
     private final List<Object> srg = new LinkedList<Object>();
 
@@ -68,7 +66,9 @@ public class ApplyS2STask extends DefaultTask
     private Object excModifiers;
 
     // stuff defined on the tasks..
+    @Internal
     private final List<Object> in = new LinkedList<Object>();
+    @Internal
     private Object out;
 
     @TaskAction
@@ -77,8 +77,8 @@ public void doTask() throws IOException
         File out = getOut();
         File rangemap = getRangeMap();
         File rangelog = File.createTempFile("rangelog", ".txt", this.getTemporaryDir());
-        FileCollection srg = getSrgs();
-        FileCollection exc = getExcs();
+        FileCollection srg = getSrg();
+        FileCollection exc = getExc();
 
         InputSupplier inSup;
 
@@ -354,7 +354,7 @@ public void setOut(Object out)
         this.out = out;
     }
 
-    public FileCollection getSrgs()
+    public FileCollection getSrg()
     {
         return getProject().files(srg);
     }
@@ -374,11 +374,7 @@ public void addSrg(File srg)
         this.srg.add(srg);
     }
 
-    public List<Object> getExc() {
-        return Collections.unmodifiableList(exc);
-    }
-
-    public FileCollection getExcs()
+    public FileCollection getExc()
     {
         return getProject().files(exc);
     }

From c00c29154613519b93107b3881b485e6f8284f21 Mon Sep 17 00:00:00 2001
From: MatthewTGM <matthewtgm120@gmail.com>
Date: Sat, 11 Sep 2021 07:52:16 +0200
Subject: [PATCH 3/3] 3rd attempt to fix Gradle 7 exception.

---
 .../java/net/minecraftforge/gradle/tasks/ApplyS2STask.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
index 90137fa8b..0f0eecee4 100644
--- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
+++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
@@ -344,6 +344,10 @@ public FileCollection getOuts()
             return getProject().files(outFile);
     }
 
+    public List<Object> getIn() {
+        return in;
+    }
+
     public File getOut()
     {
         return getProject().file(out);