Update to upstream 1.6 (#43)

* Update to 1.6

* Update gradle container in workflows

.github/workflows/publish.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: gradle:8.1.0-jdk17
+      image: gradle:8.6.0-jdk17
       options: --user root
     steps:
       - uses: actions/checkout@v3

.github/workflows/test-push.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [8.1.0-jdk17]
+        version: [8.6.0-jdk17]
     runs-on: ubuntu-22.04
     container:
       image: gradle:${{ matrix.version }}
@@ -33,7 +33,7 @@ jobs:
 
     runs-on: ubuntu-22.04
     container:
-      image: gradle:8.1.0-jdk17
+      image: gradle:8.6.0-jdk17
       options: --user root
 
     steps:
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [8.1.0-jdk17]
+        version: [8.6.0-jdk17]
         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
 
     runs-on: ubuntu-22.04
@@ -163,4 +163,4 @@ jobs:
         if: ${{ failure() }}
         with:
           name: Reproducible Build ${{ matrix.os }} (${{ matrix.java }}) Results
-          path: quilt-loom/build/reports/
+          path: quilt-loom/build/reports/

patches/0001-Initial-Quiltification.patch

@@ -13,7 +13,7 @@ This includes:
 - Adding Vineflower and using it by default
 
 diff --git a/build.gradle b/build.gradle
-index de84c29fa40819a31c2e55389d201f86456eda67..eaabc2b3ce2ef925e7deb635dc18894b73dbcc4d 100644
+index 8c426029a312fc3da0b7c9093263f0fc24ceb0e6..3aba7087f6f3309756c754b6a01f79a14744f17a 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -49,7 +49,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
@@ -22,10 +22,10 @@ index de84c29fa40819a31c2e55389d201f86456eda67..eaabc2b3ce2ef925e7deb635dc18894b
 
 -group = 'net.fabricmc'
 +group = 'org.quiltmc'
- def baseVersion = '1.5'
+ def baseVersion = '1.6'
 
  def ENV = System.getenv()
-@@ -252,10 +252,16 @@ codenarc {
+@@ -260,10 +260,16 @@ codenarc {
 
  gradlePlugin {
  	plugins {
@@ -44,7 +44,7 @@ index de84c29fa40819a31c2e55389d201f86456eda67..eaabc2b3ce2ef925e7deb635dc18894b
  	}
  }
 
-@@ -312,8 +318,8 @@ publishing {
+@@ -320,8 +326,8 @@ publishing {
 
  		// Manually crate the plugin marker for snapshot versions
  		snapshotPlugin(MavenPublication) { publication ->
@@ -55,7 +55,7 @@ index de84c29fa40819a31c2e55389d201f86456eda67..eaabc2b3ce2ef925e7deb635dc18894b
  			version baseVersion + '-SNAPSHOT'
 
  			pom.withXml({
-@@ -323,9 +329,9 @@ publishing {
+@@ -331,9 +337,9 @@ publishing {
  				Node dependencies = root.appendChild(document.createElement('dependencies'))
  				Node dependency = dependencies.appendChild(document.createElement('dependency'))
  				Node groupId = dependency.appendChild(document.createElement('groupId'))
@@ -67,15 +67,15 @@ index de84c29fa40819a31c2e55389d201f86456eda67..eaabc2b3ce2ef925e7deb635dc18894b
  				Node version = dependency.appendChild(document.createElement('version'))
  				version.setTextContent(baseVersion + '-SNAPSHOT')
  			})
-@@ -333,6 +339,7 @@ publishing {
+@@ -341,6 +347,7 @@ publishing {
  	}
  	repositories {
  		maven {
 +			name = 'release'
  			if (ENV.MAVEN_URL) {
  				url ENV.MAVEN_URL
  				credentials {
-@@ -341,6 +348,26 @@ publishing {
+@@ -349,6 +356,26 @@ publishing {
  				}
  			}
  		}
@@ -102,6 +102,13 @@ index de84c29fa40819a31c2e55389d201f86456eda67..eaabc2b3ce2ef925e7deb635dc18894b
  	}
  }
 
+@@ -444,4 +471,4 @@ class PrintActionsTestName extends DefaultTask {
+ 	}
+ }
+
+-apply from: rootProject.file('gradle/versions.gradle')
+\ No newline at end of file
++apply from: rootProject.file('gradle/versions.gradle')
 diff --git a/gradle.properties b/gradle.properties
 index 31014b156127886c44921900f480e68d4528da25..ee1d4c3083cdb729df09522e88a41351d332a875 100644
 --- a/gradle.properties
@@ -130,7 +137,7 @@ index 71248d2d72437815aecbee42d01ee4ec62589a65..76a88fc552f9324bb9d56c57a68fd504
 
  		// Apply default plugins
 diff --git a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
-index 29b4a526050a69cb5ccaa2d067fa5ecaa0347bf0..dc4895d24e908cf5d041ae71ef17dac40e6c86bf 100644
+index ef9bd58ef74cc149e7010220c966bb6df2ed475c..4e57a69eacd71f9b6df5dd6566fb14d3066e9760 100644
 --- a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
 +++ b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
 @@ -67,7 +67,10 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> {
@@ -159,7 +166,7 @@ index b41b39bf86c6bfcd8c600eb70d160d801e66f510..d9599c24f9b47d678277f0300b6b6f54
  	}
  }
 diff --git a/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
-index 6965a0bf521d30bf581819f5ceb07a025238abe1..8d2f1807003ada50dce5cbca57005e14bbb343fe 100644
+index e7ffd658d47ac81d677a4eaafc6ce93e467c3bbf..7de9900bab37124728539853c73976d5fa24ec92 100644
 --- a/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
 +++ b/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
 @@ -75,7 +75,7 @@ public class SingleJarDecompileConfiguration extends DecompileConfiguration<Mapp
@@ -172,7 +179,7 @@ index 6965a0bf521d30bf581819f5ceb07a025238abe1..8d2f1807003ada50dce5cbca57005e14
  	}
  }
 diff --git a/src/main/java/net/fabricmc/loom/configuration/decompile/SplitDecompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/decompile/SplitDecompileConfiguration.java
-index 0c8df985145397f23148c9bcf9e3db394a4b278c..8e6e56fe01d235bbb42e017523202234ff99251a 100644
+index 99c6797331142a47a0fbda7a3a936f8977fa850d..33b3403c7581acd7b45e033fbfeedd801ff2206b 100644
 --- a/src/main/java/net/fabricmc/loom/configuration/decompile/SplitDecompileConfiguration.java
 +++ b/src/main/java/net/fabricmc/loom/configuration/decompile/SplitDecompileConfiguration.java
 @@ -114,7 +114,7 @@ public final class SplitDecompileConfiguration extends DecompileConfiguration<Ma
@@ -198,7 +205,7 @@ index 057cde42e019d890d7a9289bde235ff0efc35a7b..c7e91aca57ae87cdff349bde65db7137
  	public static ArtifactMetadata create(ArtifactRef artifact, String currentLoomVersion) throws IOException {
  		boolean isFabricMod;
 diff --git a/src/main/java/net/fabricmc/loom/extension/LoomFilesBaseImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomFilesBaseImpl.java
-index d7f0c469b92b3acfb24a623306f8d63bf44eafbe..12f19648c39d6eec91d8bd09cdd3400aadac3ca3 100644
+index 8b23e4f978d0bcc39de16b7a89a172a54037ee03..758c2feda5ce8515f06b78652bde189070997d10 100644
 --- a/src/main/java/net/fabricmc/loom/extension/LoomFilesBaseImpl.java
 +++ b/src/main/java/net/fabricmc/loom/extension/LoomFilesBaseImpl.java
 @@ -50,22 +50,22 @@ public abstract class LoomFilesBaseImpl implements LoomFiles {
@@ -294,7 +301,7 @@ index b3f5456c1317acc23b903df9451b59683d677dcf..18341c50640d4e42f2391ae46c3d2be7
  		}
 
 diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java
-index 100835711ceb553290db67f79dc503849aeb529d..e4de3dd627a8dd0597dedfb176e8e3ffff5aa2e4 100644
+index c148ccb4fe2a375380b0964a28f7d1207b050f35..efde2a954685de9a611b34d04100f8dd8ccd84f3 100644
 --- a/src/main/java/net/fabricmc/loom/util/Constants.java
 +++ b/src/main/java/net/fabricmc/loom/util/Constants.java
 @@ -32,6 +32,7 @@ public class Constants {
@@ -304,7 +311,7 @@ index 100835711ceb553290db67f79dc503849aeb529d..e4de3dd627a8dd0597dedfb176e8e3ff
 +	public static final String QUILT_REPOSITORY = "https://maven.quiltmc.org/repository/release/";
 
  	public static final int ASM_VERSION = Opcodes.ASM9;
-
+ 	public static final String RELEASE_TIME_1_3 = "2012-07-25T22:00:00+00:00";
 diff --git a/src/main/java/net/fabricmc/loom/util/MirrorUtil.java b/src/main/java/net/fabricmc/loom/util/MirrorUtil.java
 index 3350a985f73e403f086a2a988283cbe4644d0cc2..eef1cd42b1e53497012165e1580c6199600f2f04 100644
 --- a/src/main/java/net/fabricmc/loom/util/MirrorUtil.java
@@ -362,7 +369,7 @@ index 6575611dea711ca1bb284a76132110404cdd95cb..b6f0ed542dc183f5782e300c57dce2c3
  	private SharedServiceManager sharedServiceManager = new BuildSharedServiceManagerImpl();
  	private final AtomicInteger refCount = new AtomicInteger(0);
 diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy
-index 7431aae09931a6e8656dfb801b9005feb0baa823..c755bb6bc8faa028b19392ce391adbb0cf10b05f 100644
+index 120d9e73b50bde3e5ce3775ae9f0df1f18fadbdd..773756633e3c741c67a85bf1be7020a8f9834e66 100644
 --- a/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy
 +++ b/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy
 @@ -46,6 +46,7 @@ class DecompileTest extends Specification implements GradleProjectTestTrait {
@@ -374,7 +381,7 @@ index 7431aae09931a6e8656dfb801b9005feb0baa823..c755bb6bc8faa028b19392ce391adbb0
  		'cfr' 			| "genSourcesWithCfr"				| PRE_RELEASE_GRADLE
  		'vineflower' 	| "genSourcesWithVineflower"		| PRE_RELEASE_GRADLE
 diff --git a/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy
-index 11e2a7070021ebd0fd9005b93151540c7c934b12..0ee3043e1a8429e37dca65e03f6e54498f3182f0 100644
+index 4062cfeb515b76e7e33ced9e0d922e9a95f5c29d..d56f302fa8f9d8f8c3601dcc6935894ace5aa219 100644
 --- a/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy
 +++ b/src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy
 @@ -238,7 +238,7 @@ trait GradleProjectTestTrait {