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

Author: embeddedt

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

@@ -4,14 +4,15 @@
 import org.embeddedt.modernfix.blockstate.BlockStateCacheHandler;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 
-@Mixin(Blocks.class)
+import java.util.function.Consumer;
+
+@Mixin(value = Blocks.class, priority = 1100)
 public class BlocksMixin {
-    @Inject(method = "rebuildCache", at = @At("HEAD"), cancellable = true)
-    private static void rebuildParallel(CallbackInfo ci) {
-        ci.cancel();
+    @ModifyArg(method = "rebuildCache", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/IdMapper;forEach(Ljava/util/function/Consumer;)V"), index = 0)
+    private static Consumer getEmptyConsumer(Consumer original) {
         BlockStateCacheHandler.rebuildParallel(true);
+        return o -> {};
     }
 }