Fix mixin error with the holder and apply env annotations that were b…

…reaking servers while missing

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).
 
+## 1.3.7 - 2024-06-28
+
+### Fixed
+
+- Fixed crash issue on servers related to BlockColors
+
 ## 1.3.6 - 2024-06-27
 
 ### Fixed

common/src/main/java/com/copycatsplus/copycats/content/copycat/base/functional/IFunctionalCopycatBlock.java

@@ -6,6 +6,8 @@
 import com.simibubi.create.content.decoration.copycat.CopycatBlock;
 import com.simibubi.create.content.decoration.copycat.CopycatModel;
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.core.BlockPos;
@@ -252,10 +254,12 @@ default boolean shouldFaceAlwaysRender(BlockState state, Direction face) {
         return false;
     }
 
+    @Environment(EnvType.CLIENT)
     static BlockColor wrappedColor() {
         return new WrappedBlockColor();
     }
 
+    @Environment(EnvType.CLIENT)
     static class WrappedBlockColor implements BlockColor {
 
         @Override

fabric/src/main/java/com/copycatsplus/copycats/fabric/CCCatVariantsImpl.java

@@ -2,7 +2,7 @@
 
 
 import com.copycatsplus.copycats.CCCatVariants;
-import com.copycatsplus.copycats.fabric.mixin.HolderReferenceInvoker;
+import com.copycatsplus.copycats.fabric.mixin_interfaces.HolderReferenceAccessor;
 import com.simibubi.create.foundation.utility.Pair;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -15,7 +15,7 @@ public static void register() {
         for (Pair<Holder.Reference<CatVariant>, ResourceLocation> entry : ENTRIES) {
             CatVariant value = new CatVariant(entry.getSecond());
             Registry.register(BuiltInRegistries.CAT_VARIANT, entry.getFirst().key().location().toString(), value);
-            ((HolderReferenceInvoker) entry.getFirst()).callBindValue(value);
+            ((HolderReferenceAccessor) entry.getFirst()).copycats$bindValue(value);
         }
     }
 }

fabric/src/main/java/com/copycatsplus/copycats/fabric/mixin/HolderReferenceMixin.java

@@ -0,0 +1,17 @@
+package com.copycatsplus.copycats.fabric.mixin;
+
+import com.copycatsplus.copycats.fabric.mixin_interfaces.HolderReferenceAccessor;
+import net.minecraft.core.Holder;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(Holder.Reference.class)
+public abstract class HolderReferenceMixin implements HolderReferenceAccessor {
+
+    @Shadow abstract <T> void bindValue(T value);
+
+    @Override
+    public <T> void copycats$bindValue(T value) {
+        this.bindValue(value);
+    }
+}

fabric/src/main/java/com/copycatsplus/copycats/fabric/mixin_interfaces/HolderReferenceAccessor.java

@@ -0,0 +1,6 @@
+package com.copycatsplus.copycats.fabric.mixin_interfaces;
+
+public interface HolderReferenceAccessor {
+
+    <T> void copycats$bindValue(T value);
+}

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

@@ -5,7 +5,7 @@
   "plugin": "com.copycatsplus.copycats.mixin.MixinPlugin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "HolderReferenceInvoker",
+    "HolderReferenceMixin",
     "compat.registrate.CreateRegistrateMixin",
     "copycat.base.functional.FunctionalCopycatBlockMixin",
     "copycat.base.multistate.MultiStateCopycatBlockCombinerMixin"

update.json

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