aboutsummaryrefslogtreecommitdiff
path: root/src/test/resources/projects/java16
diff options
context:
space:
mode:
authormodmuss50 <modmuss50@gmail.com>2021-09-28 10:38:11 +0100
committerGitHub <noreply@github.com>2021-09-28 10:38:11 +0100
commit676a498e0c11c8b5717ce8766dd7b44c35800d68 (patch)
treeddfad99893eb0650fb5a31f006f88d72942d7b75 /src/test/resources/projects/java16
parent7d2dad6e4604c3ff0a8521ae1304ef664ebbfc27 (diff)
downloadarchitectury-loom-676a498e0c11c8b5717ce8766dd7b44c35800d68.tar.gz
architectury-loom-676a498e0c11c8b5717ce8766dd7b44c35800d68.tar.bz2
architectury-loom-676a498e0c11c8b5717ce8766dd7b44c35800d68.zip
Fix record signatures based on data provided by mappings. (#507)
Reads "extras/record_signatures.json" from mappings jar, just works with yarn. Mojmap: ``` mappings loom.layered { officialMojangMappings() signatureFix("net.fabricmc:yarn:21w38a+build.9:v2") } ```
Diffstat (limited to 'src/test/resources/projects/java16')
-rw-r--r--src/test/resources/projects/java16/build.gradle6
-rw-r--r--src/test/resources/projects/java16/gradle.properties6
-rw-r--r--src/test/resources/projects/java16/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java18
-rw-r--r--src/test/resources/projects/java16/src/main/resources/fabric.mod.json3
-rw-r--r--src/test/resources/projects/java16/src/main/resources/modid.accesswidener3
5 files changed, 20 insertions, 16 deletions
diff --git a/src/test/resources/projects/java16/build.gradle b/src/test/resources/projects/java16/build.gradle
index 7372d08b..45acf714 100644
--- a/src/test/resources/projects/java16/build.gradle
+++ b/src/test/resources/projects/java16/build.gradle
@@ -10,12 +10,16 @@ archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group
+loom {
+ accessWidenerPath = file("src/main/resources/modid.accesswidener")
+}
+
dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
- //modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+ modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
}
tasks.withType(JavaCompile).configureEach {
diff --git a/src/test/resources/projects/java16/gradle.properties b/src/test/resources/projects/java16/gradle.properties
index 5c21b1cb..941d7f52 100644
--- a/src/test/resources/projects/java16/gradle.properties
+++ b/src/test/resources/projects/java16/gradle.properties
@@ -1,9 +1,9 @@
org.gradle.jvmargs=-Xmx1G
-minecraft_version=21w37a
-yarn_mappings=21w37a+build.5
+minecraft_version=21w38a
+yarn_mappings=21w38a+build.9
loader_version=0.11.7
-fabric_version=0.37.1+1.17
+fabric_version=0.40.4+1.18
mod_version = 1.0.0
maven_group = com.example
diff --git a/src/test/resources/projects/java16/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java b/src/test/resources/projects/java16/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java
index 83ee1a89..60002d28 100644
--- a/src/test/resources/projects/java16/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java
+++ b/src/test/resources/projects/java16/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java
@@ -1,15 +1,11 @@
package net.fabricmc.example.mixin;
-import net.minecraft.client.gui.screen.TitleScreen;
+import net.minecraft.world.chunk.PalettedContainer;
import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.Shadow;
-@Mixin(TitleScreen.class)
-public class ExampleMixin {
- @Inject(at = @At("HEAD"), method = "init()V")
- private void init(CallbackInfo info) {
- System.out.println("This line is printed by an example mod mixin!");
- }
-}
+@Mixin(PalettedContainer.class)
+public abstract class ExampleMixin<T> {
+ @Shadow
+ private volatile PalettedContainer.Data<T> data;
+} \ No newline at end of file
diff --git a/src/test/resources/projects/java16/src/main/resources/fabric.mod.json b/src/test/resources/projects/java16/src/main/resources/fabric.mod.json
index 9c6ccfa9..27a8bdf7 100644
--- a/src/test/resources/projects/java16/src/main/resources/fabric.mod.json
+++ b/src/test/resources/projects/java16/src/main/resources/fabric.mod.json
@@ -32,5 +32,6 @@
},
"suggests": {
"another-mod": "*"
- }
+ },
+ "accessWidener" : "modid.accesswidener"
}
diff --git a/src/test/resources/projects/java16/src/main/resources/modid.accesswidener b/src/test/resources/projects/java16/src/main/resources/modid.accesswidener
new file mode 100644
index 00000000..0f681e38
--- /dev/null
+++ b/src/test/resources/projects/java16/src/main/resources/modid.accesswidener
@@ -0,0 +1,3 @@
+accessWidener v1 named
+
+accessible class net/minecraft/world/chunk/PalettedContainer$Data