Merge remote-tracking branch 'origin/1.16' into 1.18

Author: embeddedt

.gitignore

@@ -4,6 +4,8 @@ libs
 media
 classes/
 .architectury-transformer/
+fabric/fabricloader.log
+fabric/test_run
 
 # Changelog
 CHANGELOG.md

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
     id "maven-publish"
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
     id 'com.palantir.git-version' version '1.0.0'
@@ -93,7 +93,7 @@ allprojects {
     }
 }
 
-subprojects {
+configure(subprojects.findAll {it.name == "common" || it.name == "forge" || it.name == "fabric"}) {
     apply plugin: "dev.architectury.loom"
 
     loom {

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java

@@ -25,6 +25,11 @@ public void clearCache() {
         cacheInvalid = true;
     }
 
+    @Override
+    public boolean isCacheInvalid() {
+        return cacheInvalid;
+    }
+
     private BlockBehaviour.BlockStateBase.Cache generateCache(BlockBehaviour.BlockStateBase base) {
         if(cacheInvalid) {
             // Ensure that only one block's cache is built at a time

common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -311,19 +311,21 @@ public Option getEffectiveOptionForMixin(String mixinClassName) {
     public static ModernFixEarlyConfig load(File file) {
         ModernFixEarlyConfig config = new ModernFixEarlyConfig(file);
         Properties props = new Properties();
-        if(file.exists()) {
-            try (FileInputStream fin = new FileInputStream(file)){
-                props.load(fin);
-            } catch (IOException e) {
-                throw new RuntimeException("Could not load config file", e);
+        if(!Boolean.getBoolean("modernfix.ignoreConfigForTesting")) {
+            if(file.exists()) {
+                try (FileInputStream fin = new FileInputStream(file)){
+                    props.load(fin);
+                } catch (IOException e) {
+                    throw new RuntimeException("Could not load config file", e);
+                }
+                config.readProperties(props);
             }
-            config.readProperties(props);
-        }
 
-        try {
-            config.save();
-        } catch (IOException e) {
-            LOGGER.warn("Could not write configuration file", e);
+            try {
+                config.save();
+            } catch (IOException e) {
+                LOGGER.warn("Could not write configuration file", e);
+            }
         }
 
         return config;

common/src/main/java/org/embeddedt/modernfix/duck/IBlockState.java

@@ -3,4 +3,5 @@
 
 public interface IBlockState {
     void clearCache();
+    boolean isCacheInvalid();
 }

common/src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java

@@ -49,6 +49,8 @@ private static void doClear() {
                 if(entry.getKey().equals("java/lang/Object"))
                     return false;
                 ClassInfo mixinClz = entry.getValue();
+                if(mixinClz == null)
+                    return true;
                 try {
                     if(mixinClz.isMixin()) {
                         // clear classNode in MixinInfo.State

fabric/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
+    id 'com.adarshr.test-logger' version '3.2.0'
 }
 
 architectury {
@@ -22,10 +23,16 @@ configurations {
 
     include.extendsFrom modIncludeImplementation
     modImplementation.extendsFrom modIncludeImplementation
+
+    testAgent {
+        canBeConsumed = false
+    }
 }
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
+
     modIncludeImplementation(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modIncludeImplementation(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
@@ -40,7 +47,33 @@ dependencies {
     // modApi "me.shedaniel:architectury-fabric:${rootProject.architectury_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+    testImplementation(shadowCommon(project(path: ":common", configuration: "transformProductionFabric"))) { transitive false }
+
+    testImplementation(platform("org.junit:junit-bom:${project.junit_version}"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testImplementation("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.assertj:assertj-core:3.19.0")
+    testImplementation("com.google.guava:guava-testlib:21.0")
+    testImplementation("org.mockito:mockito-junit-jupiter:5.3.1")
+
+    testAgent(project("path": ":test_agent", "configuration": "agentJar"))
+}
+
+test {
+    useJUnitPlatform()
+    def runDir = file('test_run')
+    doFirst() {
+        runDir.mkdir()
+    }
+    workingDir = runDir
+    systemProperty 'modernfix.ignoreConfigForTesting', 'true'
+
+    // inject our custom agent to fix #817
+    FileCollection agentFile = configurations.getByName("testAgent")
+    jvmArgs "-javaagent:${agentFile.singleFile.absolutePath}"
+    dependsOn(agentFile)
 }
 
 processResources {
@@ -55,18 +88,18 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier.set("dev-shadow")
 }
 
 remapJar {
     injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    archiveClassifier.set(null)
 }
 
 jar {
-    classifier "dev"
+    archiveClassifier.set("dev")
 }
 
 components.java {

fabric/src/main/java/org/embeddedt/modernfix/ModernFixPreLaunchFabric.java

@@ -9,6 +9,10 @@
 public class ModernFixPreLaunchFabric implements PreLaunchEntrypoint {
     @Override
     public void onPreLaunch() {
+        if(ModernFixMixinPlugin.instance == null) {
+            System.err.println("Mixin plugin not loaded yet");
+            return;
+        }
         if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.spark_profile_launch.OnFabric")) {
             CommonModUtil.runWithoutCrash(() -> SparkLaunchProfiler.start("launch"), "Failed to start profiler");
         }

fabric/src/test/java/net/minecraft/world/level/block/state/BlockStateCacheTest.java

@@ -0,0 +1,58 @@
+package net.minecraft.world.level.block.state;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.EmptyBlockGetter;
+import net.minecraft.world.level.block.Blocks;
+import org.embeddedt.modernfix.duck.IBlockState;
+import org.embeddedt.modernfix.testing.util.BootstrapMinecraft;
+import org.junit.jupiter.api.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@BootstrapMinecraft
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class BlockStateCacheTest {
+    @BeforeEach
+    public void rebuildCache() {
+        Blocks.rebuildCache();
+    }
+
+    /**
+     * Initially, the cache should be invalid, and null.
+     */
+    @Test
+    @Order(1)
+    public void testCacheNullInitially() {
+        BlockState stoneBlock = Blocks.STONE.defaultBlockState();
+        assertTrue(((IBlockState)stoneBlock).isCacheInvalid());
+        assertNull(stoneBlock.cache);
+    }
+
+    /**
+     * When an API that needs the cache is called, it should be built and the invalid flag
+     * becomes false.
+     */
+    @Test
+    @Order(2)
+    public void testCacheBuiltByRequest() {
+        BlockState stoneBlock = Blocks.STONE.defaultBlockState();
+        stoneBlock.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+        assertFalse(((IBlockState)stoneBlock).isCacheInvalid());
+        assertNotNull(stoneBlock.cache);
+    }
+
+    /**
+     * When a second rebuild occurs, the invalid flag should be set to true, but the old cache
+     * is not set to null, in order to prevent NPEs if a second thread is accessing the cache
+     * when this takes place.
+     */
+    @Test
+    @Order(3)
+    public void testCacheInvalidatedByLateRebuild() {
+        BlockState stoneBlock = Blocks.STONE.defaultBlockState();
+        stoneBlock.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+        Blocks.rebuildCache();
+        assertTrue(((IBlockState)stoneBlock).isCacheInvalid());
+        assertNotNull(stoneBlock.cache);
+    }
+}

fabric/src/test/java/org/embeddedt/modernfix/testing/util/BootstrapMinecraft.java

@@ -0,0 +1,14 @@
+package org.embeddedt.modernfix.testing.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@ExtendWith({ BootstrapMinecraftExtension.class })
+public @interface BootstrapMinecraft {
+}