Make refmap work, cleanup warnings

CleanroomMC · Jan 7, 2024 · 83a8695 · 83a8695
1 parent f7b8353
commit 83a8695
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -63,8 +63,12 @@ minecraft {
     }
 }
 
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-mixin {add sourceSets.main, mod_id + "mixins.refmap.json"}
+sourceSets.main.resources { 
+    srcDir 'src/generated/resources' 
+}
+mixin {
+    add sourceSets.main, mod_id + ".mixins.refmap.json"
+}
 repositories {
     maven {
         name 'Cleanroom Maven'
@@ -140,7 +144,15 @@ dependencies {
     //Lag Goggles
     compileOnly(fg.deobf("curse.maven:lag-goggles-283525:4493884"))
     //runtimeOnly(fg.deobf("curse.maven:lag-goggles-283525:4493884"))
+
+
+    // Common:
 
+    annotationProcessor 'org.ow2.asm:asm-debug-all:5.2'
+    annotationProcessor 'com.google.guava:guava:33.0.0-jre'
+    annotationProcessor 'com.google.code.gson:gson:2.10.1'
+
+    annotationProcessor ('com.cleanroommc:sponge-mixin:0.15.3+mixin.0.8.5')
 }
 
 processResources {

diff --git a/src/main/java/com/cleanroommc/FugueLoadingPlugin.java b/src/main/java/com/cleanroommc/FugueLoadingPlugin.java
@@ -43,5 +43,5 @@ public void injectData(Map<String, Object> map) {
     public String getAccessTransformerClass() {
         return null;
     }
-    
+
 }
diff --git a/src/main/java/com/cleanroommc/mixin/codechickenlib/ReflectionManagerMixin.java b/src/main/java/com/cleanroommc/mixin/codechickenlib/ReflectionManagerMixin.java
@@ -8,7 +8,7 @@
 
 import java.lang.reflect.Field;
 
-@Mixin(ReflectionManager.class)
+@Mixin(value = ReflectionManager.class, remap = false)
 public class ReflectionManagerMixin {
     @Redirect(method = "removeFinal", at = @At(value = "INVOKE", target = "Lcodechicken/lib/reflect/ReflectionManager;getField(Lcodechicken/lib/reflect/ObfMapping;)Ljava/lang/reflect/Field;"))
     private static Field getField(ObfMapping e) {

diff --git a/src/main/java/com/cleanroommc/mixin/minecraftmultipartcbe/ASMMixinCompilerMixin.java b/src/main/java/com/cleanroommc/mixin/minecraftmultipartcbe/ASMMixinCompilerMixin.java
@@ -10,7 +10,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(targets = "codechicken.multipart.asm.ASMMixinCompiler$", remap = false)
+@Mixin(value = codechicken.multipart.asm.ASMMixinCompiler$.class, remap = false)
 public class ASMMixinCompilerMixin {
 
     @Shadow

diff --git a/src/main/java/com/cleanroommc/mixin/projectred_core/WirePropagatorMixin.java b/src/main/java/com/cleanroommc/mixin/projectred_core/WirePropagatorMixin.java
@@ -13,7 +13,7 @@
 
 import java.lang.reflect.Field;
 
-@Mixin(targets = "mrtjp.projectred.core.WirePropagator$", remap = false)
+@Mixin(value = mrtjp.projectred.core.WirePropagator$.class, remap = false)
 public class WirePropagatorMixin {
     @Final
     @Shadow
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,5 +43,5 @@ public void injectData(Map<String, Object> map) { @@
         public String getAccessTransformerClass() {
             return null;
         }
     }