Change how we disable copycats from being diagonalized so that it now…

… covers all the types with one simple mixin

build.gradle

@@ -118,7 +118,7 @@ allprojects {
             content { includeGroup("com.jamieswhiteshirt") }
         }
         maven {
-            //Forge Config Api Port
+            //Forge Config Api Port, DiagonalBlocks
             url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
         }
         maven { // for Porting Lib: Mixin Extras, Fabric ASM

common/build.gradle

@@ -22,5 +22,8 @@ dependencies {
     modCompileOnly("curse.maven:selene-499980:${moonlight_curse_fabric_id}")
     modCompileOnly("curse.maven:vertical-slabs-compat-724387:${vertical_slabs_curse_fabric_id}")
 
+    //Used for all diagonal mods as they all shadow a common library we can mixin
+    modCompileOnly("fuzs.diagonalblocks:diagonalblocks-common:${diagonal_mods_version}")
+
     annotationProcessor(implementation("io.github.llamalad7:mixinextras-common:${mixin_extras_version}"))
 }

common/src/main/java/com/copycatsplus/copycats/compat/Mods.java

@@ -28,6 +28,7 @@ public enum Mods {
     ADDITIONAL_PLACEMENTS("additionalplacements"),
     DIAGONAL_FENCES("diagonalfences"),
     DIAGONAL_WALLS("diagonalwalls"),
+    DIAGONAL_WINDOWS("diagonalwindows"),
     FLYWHEEL("flywheel"),
     SODIUM("sodium"),
     RUBIDIUM("rubidium"),

common/src/main/java/com/copycatsplus/copycats/mixin/compat/diagonalblocks/DiagonalBlockTypeImplMixin.java

@@ -0,0 +1,22 @@
+package com.copycatsplus.copycats.mixin.compat.diagonalblocks;
+
+import com.copycatsplus.copycats.compat.Mods;
+import com.copycatsplus.copycats.foundation.annotation.ModMixin;
+import com.copycatsplus.copycats.foundation.copycat.ICopycatBlock;
+import fuzs.diagonalblocks.api.v2.impl.DiagonalBlockTypeImpl;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+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.CallbackInfoReturnable;
+
+@ModMixin(requiredMods = {Mods.DIAGONAL_WALLS, Mods.DIAGONAL_FENCES, Mods.DIAGONAL_WINDOWS})
+@Mixin(DiagonalBlockTypeImpl.class)
+public class DiagonalBlockTypeImplMixin {
+
+    @Inject(method = "isTarget", at = @At("HEAD"), cancellable = true)
+    private void copycats$disableDiagonalCopycats(ResourceLocation resourceLocation, Block block, CallbackInfoReturnable<Boolean> cir) {
+        if (block instanceof ICopycatBlock) cir.setReturnValue(false);
+    }
+}

common/src/main/resources/copycats-common.mixins.json

@@ -5,7 +5,7 @@
   "plugin": "com.copycatsplus.copycats.mixin.MixinPlugin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "compat.diagonalfences.FenceBlockMixin",
+    "compat.diagonalblocks.DiagonalBlockTypeImplMixin",
     "compat.radium.PathNodeDefaultsMixin",
     "compat.rubidium.BlockOcclusionCacheMixin",
     "compat.rubidium.BlockRendererMixin",

gradle.properties

@@ -27,6 +27,7 @@ doDryRun=false
 mixin_extras_version=0.3.2
 jei_common_version=15.20.0.106
 embeddium_curse_id=5522040
+diagonal_mods_version=8.0.5
 
 #Forge Properties
 create_forge_version=0.5.1.j-55