From 24990ba089275309d7cbc390cde1bd812f87a7e9 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sat, 7 Jan 2023 13:43:39 -0500
Subject: [PATCH] Enable blockstate cache rebuild as it should be completely
 safe

---
 .../modernfix/core/config/ModernFixEarlyConfig.java         | 1 +
 .../BlockCallbacksMixin.java                                | 2 +-
 .../parallel_blockstate_cache_rebuild/BlocksMixin.java      | 2 +-
 .../parallel_blockstate_cache_rebuild/ShapeCacheMixin.java  | 2 +-
 src/main/resources/modernfix.mixins.json                    | 6 +++---
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename src/main/java/org/embeddedt/modernfix/mixin/perf/{parallel_potentially_unsafe => }/parallel_blockstate_cache_rebuild/BlockCallbacksMixin.java (92%)
 rename src/main/java/org/embeddedt/modernfix/mixin/perf/{parallel_potentially_unsafe => }/parallel_blockstate_cache_rebuild/BlocksMixin.java (84%)
 rename src/main/java/org/embeddedt/modernfix/mixin/perf/{parallel_potentially_unsafe => }/parallel_blockstate_cache_rebuild/ShapeCacheMixin.java (89%)

diff --git a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
index 9777a897..5acc963c 100644
--- a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
+++ b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -31,6 +31,7 @@ public class ModernFixEarlyConfig {
         this.addMixinRule("perf.thread_priorities", true);
         this.addMixinRule("perf.preload_block_classes", true);
         this.addMixinRule("perf.parallel_potentially_unsafe", false);
+        this.addMixinRule("perf.parallel_blockstate_cache_rebuild", true);
 
         /* Mod compat */
         if(FMLLoader.getLoadingModList().getModFileById("smoothboot") != null) {
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/BlockCallbacksMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/BlockCallbacksMixin.java
similarity index 92%
rename from src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/BlockCallbacksMixin.java
rename to src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/BlockCallbacksMixin.java
index efc612d7..12c3367a 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/BlockCallbacksMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/BlockCallbacksMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.parallel_potentially_unsafe.parallel_blockstate_cache_rebuild;
+package org.embeddedt.modernfix.mixin.perf.parallel_blockstate_cache_rebuild;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/BlocksMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/BlocksMixin.java
similarity index 84%
rename from src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/BlocksMixin.java
rename to src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/BlocksMixin.java
index a078460b..462c7351 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/BlocksMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/BlocksMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.parallel_potentially_unsafe.parallel_blockstate_cache_rebuild;
+package org.embeddedt.modernfix.mixin.perf.parallel_blockstate_cache_rebuild;
 
 import net.minecraft.block.Blocks;
 import org.embeddedt.modernfix.blockstate.BlockStateCacheHandler;
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/ShapeCacheMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/ShapeCacheMixin.java
similarity index 89%
rename from src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/ShapeCacheMixin.java
rename to src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/ShapeCacheMixin.java
index 54898be1..0ae932b7 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_potentially_unsafe/parallel_blockstate_cache_rebuild/ShapeCacheMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallel_blockstate_cache_rebuild/ShapeCacheMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.parallel_potentially_unsafe.parallel_blockstate_cache_rebuild;
+package org.embeddedt.modernfix.mixin.perf.parallel_blockstate_cache_rebuild;
 
 import com.refinedmods.refinedstorage.block.shape.ShapeCache;
 import net.minecraft.block.BlockState;
diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json
index d63cdc06..c13f303d 100644
--- a/src/main/resources/modernfix.mixins.json
+++ b/src/main/resources/modernfix.mixins.json
@@ -21,9 +21,9 @@
     "perf.preload_block_classes.GameDataMixin",
     "perf.parallel_potentially_unsafe.parallel_deferred_suppliers.DeferredRegisterMixin",
     "perf.parallel_potentially_unsafe.parallel_deferred_suppliers.EventDispatcherMixin",
-    "perf.parallel_potentially_unsafe.parallel_blockstate_cache_rebuild.BlocksMixin",
-    "perf.parallel_potentially_unsafe.parallel_blockstate_cache_rebuild.BlockCallbacksMixin",
-    "perf.parallel_potentially_unsafe.parallel_blockstate_cache_rebuild.ShapeCacheMixin",
+    "perf.parallel_blockstate_cache_rebuild.BlocksMixin",
+    "perf.parallel_blockstate_cache_rebuild.BlockCallbacksMixin",
+    "perf.parallel_blockstate_cache_rebuild.ShapeCacheMixin",
     "perf.parallel_potentially_unsafe.parallel_deferred_suppliers.DispenserBlockMixin"
   ],
   "client": [