Merge branch 'refs/heads/multiloader' into 1.19.2/multiloader

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.1.4 - 2024-09-15
+
+### Fixed
+
+- Fixed an incompatibility with Immersive Engineering due to block states being initialized before the block registry
+
 ## 2.1.3 - 2024-09-15
 
 ## Changed

common/src/main/java/com/copycatsplus/copycats/mixin/foundation/copycat/BlockStateBaseCacheMixin.java

@@ -20,8 +20,12 @@ public class BlockStateBaseCacheMixin {
     )
     private boolean canCopycatOcclude(BlockState instance,
                                       Operation<Boolean> original) {
-        if (instance.getBlockHolder().is(Mods.CREATE.rl("copycat_base"))) {
-            return false;
+        try {
+            if (instance.getBlockHolder().is(Mods.CREATE.rl("copycat_base"))) {
+                return false;
+            }
+        } catch (IllegalStateException e) {
+            // todo: illegal access if resource location is accessed before registry is initialized
         }
         if (instance.getBlock() instanceof BracketBlock) {
             return false;

common/src/main/java/com/copycatsplus/copycats/mixin/foundation/copycat/BlockStateBaseMixin.java

@@ -2,7 +2,7 @@
 
 import com.copycatsplus.copycats.compat.Mods;
 import com.simibubi.create.content.decoration.bracket.BracketBlock;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,9 +16,13 @@ public class BlockStateBaseMixin {
             cancellable = true
     )
     private void customOcclusion(CallbackInfoReturnable<Boolean> cir) {
-        BlockState instance = (BlockState) (Object) this;
-        if (instance.getBlockHolder().is(Mods.CREATE.rl("copycat_base"))) {
-            cir.setReturnValue(false);
+        BlockBehaviour.BlockStateBase instance = (BlockBehaviour.BlockStateBase) (Object) this;
+        try {
+            if (instance.getBlockHolder().is(Mods.CREATE.rl("copycat_base"))) {
+                cir.setReturnValue(false);
+            }
+        } catch (IllegalStateException e) {
+            // todo: illegal access if resource location is accessed before registry is initialized
         }
         if (instance.getBlock() instanceof BracketBlock) {
             cir.setReturnValue(false);

update.json

@@ -1,8 +1,8 @@
 {
   "homepage": "https://github.com/copycats-plus/copycats/",
   "promos": {
-    "1.20.1-recommended": "1.20.1-2.1.3",
-    "1.19.2-recommended": "1.19.2-2.1.3",
-    "1.18.2-recommended": "1.18.2-2.1.3"
+    "1.20.1-recommended": "1.20.1-2.1.4",
+    "1.19.2-recommended": "1.19.2-2.1.4",
+    "1.18.2-recommended": "1.18.2-2.1.4"
   }
 }