Add try-catch and mark as todo

A cleaner fix would be to use our own copycat base block state, but that would require a lot more work
copycats-plus · Sep 15, 2024 · dcbe5a6 · dcbe5a6
1 parent bfc9eb8
commit dcbe5a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/...ain/java/com/copycatsplus/copycats/mixin/foundation/copycat/BlockStateBaseCacheMixin.java b/...ain/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;

diff --git a/...src/main/java/com/copycatsplus/copycats/mixin/foundation/copycat/BlockStateBaseMixin.java b/...src/main/java/com/copycatsplus/copycats/mixin/foundation/copycat/BlockStateBaseMixin.java
@@ -1,5 +1,6 @@
 package com.copycatsplus.copycats.mixin.foundation.copycat;
 
+import com.copycatsplus.copycats.compat.Mods;
 import com.simibubi.create.content.decoration.bracket.BracketBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import org.spongepowered.asm.mixin.Mixin;
@@ -16,8 +17,12 @@ public class BlockStateBaseMixin {
     )
     private void customOcclusion(CallbackInfoReturnable<Boolean> cir) {
         BlockBehaviour.BlockStateBase instance = (BlockBehaviour.BlockStateBase) (Object) this;
-        if (instance.getBlock().getClass().toString().equals("com.copycatsplus.copycats.foundation.copycat.CopycatBaseBlock.class")) {
-            cir.setReturnValue(false);
+        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);