Fix aw2at tests, add Yarn 1.16 test (#45)

* Fix aw2at tests

* Clean up the code anyway because it was messy

* Normalise everything to LF

* ...really, another typo?

* Import ordering

* Add Yarn aw2at test

* wow bad os

11 files changed, 118 insertions, 4 deletions

diff --git a/src/test/resources/projects/forge/aw2At/src/main/resources/my.accesswidener b/src/test/resources/projects/forge/aw2At/src/main/resources/my.accesswidener
index 2f88fa59..a9babdd7 100644
--- a/src/test/resources/projects/forge/aw2At/src/main/resources/my.accesswidener
+++ b/src/test/resources/projects/forge/aw2At/src/main/resources/my.accesswidener
@@ -1,3 +1,3 @@
 accessWidener v1 named
-accessible method net/minecraft/world/level/GameRules$BooleanValue create (Z)Lnet/minecraft/world/GameRules$Type;
-extendable method net/minecraft/world/level/block/IronBarsBlock attchsTo (Lnet/minecraft/world/level/block/state/BlockState;Z)Z
+accessible method net/minecraft/world/level/GameRules$BooleanValue create (Z)Lnet/minecraft/world/level/GameRules$Type;
+extendable method net/minecraft/world/level/block/IronBarsBlock attachsTo (Lnet/minecraft/world/level/block/state/BlockState;Z)Z
diff --git a/src/test/resources/projects/forge/legacyAw2At/build.gradle b/src/test/resources/projects/forge/legacyAw2AtMojmap/build.gradle
index 1b319a1b..1b319a1b 100644
--- a/src/test/resources/projects/forge/legacyAw2At/build.gradle
+++ b/src/test/resources/projects/forge/legacyAw2AtMojmap/build.gradle
diff --git a/src/test/resources/projects/forge/legacyAw2At/expected.accesstransformer.cfg b/src/test/resources/projects/forge/legacyAw2AtMojmap/expected.accesstransformer.cfg
index f04789ab..f04789ab 100644
--- a/src/test/resources/projects/forge/legacyAw2At/expected.accesstransformer.cfg
+++ b/src/test/resources/projects/forge/legacyAw2AtMojmap/expected.accesstransformer.cfg
diff --git a/src/test/resources/projects/forge/legacyAw2At/gradle.properties b/src/test/resources/projects/forge/legacyAw2AtMojmap/gradle.properties
index f3b2ac32..f3b2ac32 100644
--- a/src/test/resources/projects/forge/legacyAw2At/gradle.properties
+++ b/src/test/resources/projects/forge/legacyAw2AtMojmap/gradle.properties
diff --git a/src/test/resources/projects/forge/legacyAw2At/settings.gradle b/src/test/resources/projects/forge/legacyAw2AtMojmap/settings.gradle
index c162c363..c162c363 100644
--- a/src/test/resources/projects/forge/legacyAw2At/settings.gradle
+++ b/src/test/resources/projects/forge/legacyAw2AtMojmap/settings.gradle
diff --git a/src/test/resources/projects/forge/legacyAw2At/src/main/resources/my.accesswidener b/src/test/resources/projects/forge/legacyAw2AtMojmap/src/main/resources/my.accesswidener
index 2f88fa59..a9babdd7 100644
--- a/src/test/resources/projects/forge/legacyAw2At/src/main/resources/my.accesswidener
+++ b/src/test/resources/projects/forge/legacyAw2AtMojmap/src/main/resources/my.accesswidener
@@ -1,3 +1,3 @@
 accessWidener v1 named
-accessible method net/minecraft/world/level/GameRules$BooleanValue create (Z)Lnet/minecraft/world/GameRules$Type;
-extendable method net/minecraft/world/level/block/IronBarsBlock attchsTo (Lnet/minecraft/world/level/block/state/BlockState;Z)Z
+accessible method net/minecraft/world/level/GameRules$BooleanValue create (Z)Lnet/minecraft/world/level/GameRules$Type;
+extendable method net/minecraft/world/level/block/IronBarsBlock attachsTo (Lnet/minecraft/world/level/block/state/BlockState;Z)Z
diff --git a/src/test/resources/projects/forge/legacyAw2AtYarn/build.gradle b/src/test/resources/projects/forge/legacyAw2AtYarn/build.gradle
new file mode 100644
index 00000000..3e532cb5
--- /dev/null
+++ b/src/test/resources/projects/forge/legacyAw2AtYarn/build.gradle
@@ -0,0 +1,89 @@
+plugins {
+	id 'dev.architectury.loom'
+	id 'maven-publish'
+}
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
+def mcVersion = '1.16.5'
+def forgeVersion = '36.2.2'
+
+loom {
+	accessWidenerPath = file('src/main/resources/my.accesswidener')
+
+	forge {
+		convertAccessWideners = true
+	}
+}
+
+repositories {
+	// Add repositories to retrieve artifacts from in here.
+	// You should only use this when depending on other mods because
+	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+	// for more information about repositories.
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:$mcVersion"
+	mappings "net.fabricmc:yarn:$project.yarn_mappings:v2"
+	forge "net.minecraftforge:forge:$mcVersion-$forgeVersion"
+}
+
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+	// We'll use that if it's available, but otherwise we'll use the older option.
+	def targetVersion = 8
+	if (JavaVersion.current().isJava9Compatible()) {
+		it.options.release = targetVersion
+	}
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			// add all the jars that should be included when publishing to maven
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
+			}
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}
diff --git a/src/test/resources/projects/forge/legacyAw2AtYarn/expected.accesstransformer.cfg b/src/test/resources/projects/forge/legacyAw2AtYarn/expected.accesstransformer.cfg
new file mode 100644
index 00000000..f04789ab
--- /dev/null
+++ b/src/test/resources/projects/forge/legacyAw2AtYarn/expected.accesstransformer.cfg
@@ -0,0 +1,2 @@
+public net.minecraft.world.GameRules$BooleanValue func_223568_b(Z)Lnet/minecraft/world/GameRules$RuleType;
+public-f net.minecraft.block.PaneBlock func_220112_a(Lnet/minecraft/block/BlockState;Z)Z
diff --git a/src/test/resources/projects/forge/legacyAw2AtYarn/gradle.properties b/src/test/resources/projects/forge/legacyAw2AtYarn/gradle.properties
new file mode 100644
index 00000000..472d96f6
--- /dev/null
+++ b/src/test/resources/projects/forge/legacyAw2AtYarn/gradle.properties
@@ -0,0 +1,18 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+
+# Fabric Properties
+# check these on https://fabricmc.net/use
+loader_version=0.11.2
+yarn_mappings=1.16.5+build.5
+
+# Mod Properties
+mod_version = 1.0.0
+maven_group = com.example
+archives_base_name = fabric-example-mod
+
+# Dependencies
+# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+fabric_version=0.31.0+1.16
+
+loom.platform=forge
diff --git a/src/test/resources/projects/forge/legacyAw2AtYarn/settings.gradle b/src/test/resources/projects/forge/legacyAw2AtYarn/settings.gradle
new file mode 100644
index 00000000..c162c363
--- /dev/null
+++ b/src/test/resources/projects/forge/legacyAw2AtYarn/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = "fabric-example-mod"
+
diff --git a/src/test/resources/projects/forge/legacyAw2AtYarn/src/main/resources/my.accesswidener b/src/test/resources/projects/forge/legacyAw2AtYarn/src/main/resources/my.accesswidener
new file mode 100644
index 00000000..2f8e9761
--- /dev/null
+++ b/src/test/resources/projects/forge/legacyAw2AtYarn/src/main/resources/my.accesswidener
@@ -0,0 +1,3 @@
+accessWidener v1 named
+accessible method net/minecraft/world/GameRules$BooleanRule create (Z)Lnet/minecraft/world/GameRules$Type;
+extendable method net/minecraft/block/PaneBlock connectsTo (Lnet/minecraft/block/BlockState;Z)Z