update cleanroom and fix some checks

Author: Ecdcaeb

build.gradle

@@ -2,8 +2,8 @@ plugins {
     id 'java'
     id 'java-library'
     id 'maven-publish'
-    id 'com.gradleup.shadow' version '9.0.2'
-    id 'xyz.wagyourtail.unimined' version '1.4.1'
+    id 'com.gradleup.shadow' version '9.2.2'
+    id 'xyz.wagyourtail.unimined' version '1.4.9-kappa'
     id 'net.kyori.blossom'  version '2.1.0'
 }
 
@@ -28,7 +28,7 @@ version = propertyString('mod_version')
 group = propertyString('root_package')
 
 base {
-    archivesName.set("+" + propertyString('mod_id'))
+    archivesName.set("+" +propertyString('mod_id'))
 }
 
 
@@ -64,15 +64,14 @@ unimined.minecraft {
 
     cleanroom {
         if (propertyBool('use_access_transformer')) {
-            accessTransformer "${rootProject.projectDir}/src/main/resources/" +  propertyString('access_transformer_locations')
+            accessTransformer "${rootProject.projectDir}/src/main/resources/${propertyString('access_transformer_locations')}"
         }
-        loader "0.3.27-alpha"
+        loader "0.4.2-alpha"
         runs.auth.username = minecraft_username
         runs.all {
-            systemProperty("cleanroom.dev.mixin", "${mod_id}.default.mixin.json,${mod_id}.mod.mixin.json")
             def extraArgs = propertyString('extra_jvm_args')
             if (extraArgs != null && !extraArgs.trim().isEmpty()) {
-                jvmArgs += extraArgs.split("\\s+").toList()
+                jvmArgs += extraArgs.split { "\\s+" }.toList()
             }
             if (propertyBool('enable_foundation_debug')) {
                 systemProperty("foundation.dump", "true")
@@ -107,6 +106,7 @@ unimined.minecraft {
 
     mods {
         remap(configurations.modCompileOnly)
+        remap(configurations.modRuntimeOnly)
     }
 }
 
@@ -181,7 +181,6 @@ jar {
         manifest {
             def attribute_map = [:]
             attribute_map['ModType'] = "CRL"
-            attribute_map['MixinConfigs'] = "${mod_id}.default.mixin.json,${mod_id}.mod.mixin.json"
             if (configurations.contain.size() > 0) {
                 attribute_map['ContainedDeps'] = configurations.contain.collect { it.name }.join(' ')
                 attribute_map['NonModDeps'] = true

gradle/scripts/dependencies.gradle

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.cleanroommc:sponge-mixin:0.20.10+mixin.0.8.7"
+    compileOnly "com.cleanroommc:sponge-mixin:0.20.12+mixin.0.8.7"
     if (propertyBool('enable_lwjglx')) {
         compileOnly "com.cleanroommc:lwjglx:1.0.0"
     }

settings.gradle

@@ -13,6 +13,10 @@ pluginManagement {
         maven {
             url = "https://maven.wagyourtail.xyz/releases"
         }
+        maven {
+            url = "https://maven.outlands.top/releases"
+        }
+
         maven {
             url = "https://maven.wagyourtail.xyz/snapshots"
         }
@@ -26,7 +30,7 @@ pluginManagement {
 
 plugins {
     // Automatic toolchain provisioning
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 // Due to an IntelliJ bug, this has to be done

src/main/java/mods/Hileb/optirefine/core/OptiRefineBlackboard.java

@@ -4,6 +4,7 @@
 import com.google.gson.*;
 import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
+import mods.Hileb.optirefine.library.common.utils.Initializer;
 import mods.Hileb.optirefine.library.common.utils.Lazy;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
@@ -31,9 +32,11 @@ public class OptiRefineBlackboard {
 
     public static boolean IS_INDEV = Boolean.parseBoolean(System.getProperty("optirefine.dev", "false"));
 
-    public static final HashSet<String> TEST_INDEV_CLASS = Sets.newHashSet(
-            System.getProperty("optirefine.dev.classes").split(";")
-    );
+    public static final Set<String> TEST_INDEV_CLASS = Initializer.initializeSystemProperty(
+            "optirefine.dev.classes",
+            str -> Sets.newHashSet(str.split(";")) ,
+            Set.of()
+        );
 
     public static final HashSet<String> INDEV_CLASS = Sets.newHashSet(
             "net.minecraft.client.gui.FontRenderer",

src/main/java/mods/Hileb/optirefine/library/common/utils/Initializer.java

@@ -0,0 +1,28 @@
+package mods.Hileb.optirefine.library.common.utils;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class Initializer {
+    public static <T> T initialize(Supplier<T> t) {
+        return t.get();
+    }
+
+    public static <T> T initializeSystemProperty(String key, Function<String, T> processor) {
+        return processor.apply(System.getProperty(key));
+    }
+
+    public static <T> T initializeSystemProperty(String key, Function<String, T> processor, T defaultVal) {
+        String pr = System.getProperty(key);
+        if (pr != null) {
+            return processor.apply(pr);
+        } else return defaultVal;
+    }
+
+    public static <T> T initializeSystemProperty(String key, Function<String, T> processor, Supplier<T> defaultVal) {
+        String pr = System.getProperty(key);
+        if (pr != null) {
+            return processor.apply(pr);
+        } else return defaultVal.get();
+    }
+}

src/main/java/mods/Hileb/optirefine/library/cursedmixinextensions/CursedMixinExtensions.java

@@ -173,7 +173,9 @@ public static void postApply(ClassNode targetClass) {
                 boolean deobf = Annotations.getValue(accessTransform, "deobf", Boolean.FALSE);
 
                 if ("<class>".equals(name)) {
-                    targetClass.access = access;
+                    if (access >= 0) {
+                        targetClass.access = access;
+                    }
                 } else {
                     String desc = method.desc;
                     if (access == -1) access = method.access;
@@ -461,10 +463,14 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
     }
 
     private static void transformCalls(ClassNode classNode, CallTransformTask... tasks) {
-        for (CallTransformTask task : tasks) {
-            for (MethodNode method : classNode.methods) {
-                for (AbstractInsnNode insn : method.instructions) {
-                    if (insn instanceof MethodInsnNode call) {
+        for (MethodNode method : classNode.methods) {
+            List<MethodInsnNode> calls = new ArrayList<>();
+            for (AbstractInsnNode insn = method.instructions.getFirst(); insn != null; insn = insn.getNext()) {
+                if (insn instanceof MethodInsnNode mi) calls.add(mi);
+            }
+            for (CallTransformTask task : tasks) {
+                for (MethodInsnNode call : calls) {
+                    if (call.getPrevious() != null || call.getNext() != null || method.instructions.getFirst() == call) {
                         task.transform(method.instructions, call);
                     }
                 }

src/main/java/mods/Hileb/optirefine/mixin/defaults/minecraft/block/material/MixinMapColor.java

@@ -1,19 +1,20 @@
 package mods.Hileb.optirefine.mixin.defaults.minecraft.block.material;
 
 import mods.Hileb.optirefine.library.common.utils.Checked;
-import mods.Hileb.optirefine.library.cursedmixinextensions.annotations.AccessTransformer;
 import net.minecraft.block.material.MapColor;
-import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
 
 @Checked
 @Mixin(MapColor.class)
 public abstract class MixinMapColor {
 
-    
-    @SuppressWarnings({"unused", "MissingUnique"})
-    @AccessTransformer(access = Opcodes.ACC_PUBLIC, name = "field_76291_p", deobf = true)
-    public int access_colorValue;
+
+    @Shadow
+    @Mutable
+    public int colorValue;
 
 }
 /*