Merge branch 'main' into mc1.19.2/main

# Conflicts:
#	gradle.properties
#	src/main/java/com/hlysine/create_connected/compat/CopycatsManager.java

Author: hlysine

CHANGELOG.md

@@ -5,6 +5,13 @@ 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).
 
+## 0.7.3 - 2024-03-16
+
+### Fixed
+
+- Crash due to Copycat Slabs from C:Dreams and Desires interfering with the copycat migration process (#48)
+- Encased Chain Cogwheels not connecting to each other via their cogwheels when they are not in a line (#52)
+
 ## 0.7.2 - 2024-02-13
 
 ### Changed

README.md

@@ -26,10 +26,12 @@ out [Create: Power Loader](https://modrinth.com/mod/create-power-loader)**
 All copycats from Create: Connected, Create: More Copycats and Create: Copies and Cats are merged into the ultimate
 mod - [**Create: Copycats+**](https://modrinth.com/mod/copycats) !
 
-- Forge/**Fabric** 1.20.1/1.19.2/1.18.2
+Copycats+ exclusive features include:
+
+- Forge/**Fabric** 1.20.1/1.19.2/1.18.2 support
 - Even more copycats
 - Improved copycat model quality
-- Toggleable connective textures
+- Toggleable connected textures
 
 ![Copycats+](https://cdn.modrinth.com/data/UT2M39wf/images/e20c128b7c0e000e904584811d20f753d846af80.png)
 

gradle.properties

@@ -62,7 +62,7 @@ mod_name=Create: Connected
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU Affero General Public License v3.0
 # The mod version. See https://semver.org/
-mod_version=0.7.2-mc1.19.2
+mod_version=0.7.3-mc1.19.2
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/hlysine/create_connected/compat/CopycatsManager.java

@@ -41,15 +41,19 @@ public class CopycatsManager {
     }
 
     public static Block convert(Block self) {
-        BlockEntry<?> result = BLOCK_MAP.get(RegisteredObjects.getKeyOrThrow(self).getPath());
+        ResourceLocation key = RegisteredObjects.getKeyOrThrow(self);
+        if (!validateNamespace(key)) return self;
+        BlockEntry<?> result = BLOCK_MAP.get(key.getPath());
         if (result != null) return result.get();
         return self;
     }
 
     public static Item convert(Item self) {
-        ItemEntry<?> result = ITEM_MAP.get(RegisteredObjects.getKeyOrThrow(self).getPath());
+        ResourceLocation key = RegisteredObjects.getKeyOrThrow(self);
+        if (!validateNamespace(key)) return self;
+        ItemEntry<?> result = ITEM_MAP.get(key.getPath());
         if (result != null) return result.get();
-        BlockEntry<?> blockResult = BLOCK_MAP.get(RegisteredObjects.getKeyOrThrow(self).getPath());
+        BlockEntry<?> blockResult = BLOCK_MAP.get(key.getPath());
         if (blockResult != null) return blockResult.get().asItem();
         return self;
     }
@@ -73,24 +77,35 @@ private static <T extends Comparable<T>> BlockState copyProperty(BlockState from
     }
 
     public static Block convertIfEnabled(Block block) {
-        if (isFeatureEnabled(RegisteredObjects.getKeyOrThrow(block)))
+        ResourceLocation key = RegisteredObjects.getKeyOrThrow(block);
+        if (!validateNamespace(key)) return block;
+        if (isFeatureEnabled(key))
             return convert(block);
         return block;
     }
 
     public static BlockState convertIfEnabled(BlockState state) {
-        if (isFeatureEnabled(RegisteredObjects.getKeyOrThrow(state.getBlock())))
+        ResourceLocation key = RegisteredObjects.getKeyOrThrow(state.getBlock());
+        if (!validateNamespace(key)) return state;
+        if (isFeatureEnabled(key))
             return convert(state);
         return state;
     }
 
     public static ItemLike convertIfEnabled(ItemLike item) {
-        if (isFeatureEnabled(RegisteredObjects.getKeyOrThrow(item.asItem())))
+        ResourceLocation key = RegisteredObjects.getKeyOrThrow(item.asItem());
+        if (!validateNamespace(key)) return item;
+        if (isFeatureEnabled(key))
             return convert(item);
         return item;
     }
 
+    private static boolean validateNamespace(ResourceLocation key) {
+        return key.getNamespace().equals(CreateConnected.MODID) || key.getNamespace().equals(Mods.COPYCATS.id());
+    }
+
     public static boolean existsInCopycats(ResourceLocation key) {
+        if (!validateNamespace(key)) return false;
         if (BLOCK_MAP.containsKey(key.getPath())) return true;
         if (ITEM_MAP.containsKey(key.getPath())) return true;
         return false;

src/main/java/com/hlysine/create_connected/mixin/chaincogwheel/RotationPropagatorMixin.java

@@ -0,0 +1,54 @@
+package com.hlysine.create_connected.mixin.chaincogwheel;
+
+import com.hlysine.create_connected.CCBlocks;
+import com.simibubi.create.content.kinetics.RotationPropagator;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.chainDrive.ChainDriveBlock;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+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;
+
+@Mixin(value = RotationPropagator.class, remap = false)
+public class RotationPropagatorMixin {
+    @Inject(
+            method = "getRotationSpeedModifier(Lcom/simibubi/create/content/kinetics/base/KineticBlockEntity;Lcom/simibubi/create/content/kinetics/base/KineticBlockEntity;)F",
+            at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/kinetics/chainDrive/ChainDriveBlock;areBlocksConnected(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z"),
+            cancellable = true
+    )
+    private static void handleChainCogwheels(KineticBlockEntity from,
+                                             KineticBlockEntity to,
+                                             CallbackInfoReturnable<Float> cir) {
+        final BlockState stateFrom = from.getBlockState();
+        final BlockState stateTo = to.getBlockState();
+        Block fromBlock = stateFrom.getBlock();
+        Block toBlock = stateTo.getBlock();
+        final IRotate definitionFrom = (IRotate) fromBlock;
+        final IRotate definitionTo = (IRotate) toBlock;
+        final BlockPos diff = to.getBlockPos()
+                .subtract(from.getBlockPos());
+        final Direction direction = Direction.getNearest(diff.getX(), diff.getY(), diff.getZ());
+
+        if (stateFrom.is(CCBlocks.ENCASED_CHAIN_COGWHEEL.get()) && stateTo.is(CCBlocks.ENCASED_CHAIN_COGWHEEL.get())) {
+            boolean connected = ChainDriveBlock.areBlocksConnected(stateFrom, stateTo, direction);
+            if (!connected) {
+                if (diff.distManhattan(BlockPos.ZERO) != 1) {
+                    cir.setReturnValue(0f);
+                    return;
+                }
+                if (direction.getAxis() == definitionFrom.getRotationAxis(stateFrom)) {
+                    cir.setReturnValue(0f);
+                    return;
+                }
+                if (definitionFrom.getRotationAxis(stateFrom) == definitionTo.getRotationAxis(stateTo)) {
+                    cir.setReturnValue(-1f);
+                }
+            }
+        }
+    }
+}

src/main/resources/create_connected.mixins.json

@@ -9,6 +9,7 @@
     "ItemUseOverridesMixin",
     "KineticBlockAdvancementMixin",
     "ManualApplicationRecipeMixin",
+    "chaincogwheel.RotationPropagatorMixin",
     "compat.CopycatBlockEntityMixin",
     "compat.CopycatBlockMixin",
     "contraption.AbstractContainerMenuMixin",

update.json

@@ -1,8 +1,8 @@
 {
   "homepage": "https://github.com/hlysine/create_connected/",
   "promos": {
-    "1.20.1-recommended": "0.7.2-mc1.20.1",
-    "1.19.2-recommended": "0.7.2-mc1.19.2",
-    "1.18.2-recommended": "0.7.2-mc1.18.2"
+    "1.20.1-recommended": "0.7.3-mc1.20.1",
+    "1.19.2-recommended": "0.7.3-mc1.19.2",
+    "1.18.2-recommended": "0.7.3-mc1.18.2"
   }
 }