Merge 1.20 into 1.20.2

Author: embeddedt

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

@@ -3,6 +3,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import org.embeddedt.modernfix.blockstate.BlockStateCacheHandler;
+import org.embeddedt.modernfix.duck.IBlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
@@ -21,6 +22,7 @@ private static Consumer getEmptyConsumer(Consumer original) {
     // require = 0 due to Forge removing the BLOCK_STATE_REGISTRY init here
     @Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;initCache()V"), require = 0)
     private static void skipCacheInit(BlockState state) {
-        /* no-op, our dynamic logic handles everything properly (including the 1.19.4+ fluidState, etc. caching) */
+        // Mark the cache as invalid
+        ((IBlockState)state).clearCache();
     }
 }