Fix duplicated methods from stirrin and dasm

Author: NotStirred

build.gradle.kts

@@ -8,7 +8,7 @@ import java.util.*
 buildscript {
     dependencies {
         classpath("com.google.code.gson:gson:2.8.5")
-        classpath("io.github.opencubicchunks:stirrin:1.1.4")
+        classpath("io.github.opencubicchunks:stirrin:1.1.6")
     }
 }
 plugins {
@@ -20,7 +20,7 @@ plugins {
     id("io.github.opencubicchunks.gradle.mcGitVersion")
     id("io.github.opencubicchunks.gradle.mixingen")
     id("io.github.opencubicchunks.gradle.dasm")
-    id("io.github.opencubicchunks.stirrin").version("1.1.3")
+    id("io.github.opencubicchunks.stirrin").version("1.1.6")
 }
 
 stirrin {
@@ -290,7 +290,7 @@ dependencies {
     debugCompile("org.lwjgl:lwjgl-vulkan:$lwjglVersion")
     debugRuntime("org.lwjgl:lwjgl::$lwjglNatives")
 
-    include(implementation("com.github.OpenCubicChunks:dasm:81e0a37")!!)
+    include(implementation("com.github.OpenCubicChunks:dasm:94f5c0c00a")!!)
     include(implementation("io.github.opencubicchunks:regionlib:0.63.0-SNAPSHOT")!!)
     include(implementation("org.spongepowered:noise:2.0.0-SNAPSHOT")!!)
 

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/AnnotationConfigPlugin.java

@@ -2,6 +2,7 @@
 
 import static org.objectweb.asm.Opcodes.*;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -50,5 +51,15 @@ public AnnotationConfigPlugin() {
     }
 
     @Override public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+        // Making any methods annotated as @Public public
+        for (Iterator<MethodNode> it = targetClass.methods.iterator(); it.hasNext(); ) {
+            MethodNode method = it.next();
+            List<AnnotationNode> visibleAnnotations = method.visibleAnnotations;
+            if (visibleAnnotations != null) {
+                if (visibleAnnotations.stream().anyMatch(annotationNode -> annotationNode.desc.equals("Lio/github/opencubicchunks/stirrin/Stub;"))) {
+                    it.remove();
+                }
+            }
+        }
     }
 }