Fix merge

hlysine · hlysine · commit 738f07607d7d · 2025-02-05T18:41:10.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -50,7 +50,7 @@ jei_minecraft_version = 1.19.2
 jei_version = 11.2.0.254
 
 copycats_minecraft_version = 1.19.2
-copycats_version = 1.1.0
+copycats_version = 2.2.0
 garnished_minecraft_version = 1.19.2-forge
 garnished_version = 1.8
 dreams_desires_version = 0.1b.Release-Early-Dev
diff --git a/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/empty_fan_catalyst_from_sanding.json b/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/empty_fan_catalyst_from_sanding.json
@@ -33,8 +33,7 @@
           "recipes": [
             "create_connected:crafting/kinetics/empty_fan_catalyst_from_sanding"
           ]
-        },
-        "sends_telemetry_event": false
+        }
       },
       "conditions": [
         {
diff --git a/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/empty_fan_catalyst_from_seething.json b/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/empty_fan_catalyst_from_seething.json
@@ -33,8 +33,7 @@
           "recipes": [
             "create_connected:crafting/kinetics/empty_fan_catalyst_from_seething"
           ]
-        },
-        "sends_telemetry_event": false
+        }
       },
       "conditions": [
         {
diff --git a/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/inventory_access_port.json b/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/inventory_access_port.json
@@ -33,8 +33,7 @@
           "recipes": [
             "create_connected:crafting/kinetics/inventory_access_port"
           ]
-        },
-        "sends_telemetry_event": false
+        }
       },
       "conditions": [
         {
diff --git a/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/inventory_bridge.json b/src/generated/resources/data/create_connected/advancements/recipes/crafting/kinetics/inventory_bridge.json
@@ -33,8 +33,7 @@
           "recipes": [
             "create_connected:crafting/kinetics/inventory_bridge"
           ]
-        },
-        "sends_telemetry_event": false
+        }
       },
       "conditions": [
         {
diff --git a/src/generated/resources/data/create_connected/loot_tables/blocks/fan_sanding_catalyst.json b/src/generated/resources/data/create_connected/loot_tables/blocks/fan_sanding_catalyst.json
@@ -16,6 +16,5 @@
       ],
       "rolls": 1.0
     }
-  ],
-  "random_sequence": "create_connected:blocks/fan_sanding_catalyst"
+  ]
 }
diff --git a/src/generated/resources/data/create_connected/loot_tables/blocks/fan_seething_catalyst.json b/src/generated/resources/data/create_connected/loot_tables/blocks/fan_seething_catalyst.json
@@ -16,6 +16,5 @@
       ],
       "rolls": 1.0
     }
-  ],
-  "random_sequence": "create_connected:blocks/fan_seething_catalyst"
+  ]
 }
diff --git a/src/generated/resources/data/create_connected/loot_tables/blocks/inventory_access_port.json b/src/generated/resources/data/create_connected/loot_tables/blocks/inventory_access_port.json
@@ -16,6 +16,5 @@
       ],
       "rolls": 1.0
     }
-  ],
-  "random_sequence": "create_connected:blocks/inventory_access_port"
+  ]
 }
diff --git a/src/generated/resources/data/create_connected/loot_tables/blocks/inventory_bridge.json b/src/generated/resources/data/create_connected/loot_tables/blocks/inventory_bridge.json
@@ -16,6 +16,5 @@
       ],
       "rolls": 1.0
     }
-  ],
-  "random_sequence": "create_connected:blocks/inventory_bridge"
+  ]
 }
diff --git a/src/generated/resources/data/create_connected/recipes/crafting/kinetics/empty_fan_catalyst_from_sanding.json b/src/generated/resources/data/create_connected/recipes/crafting/kinetics/empty_fan_catalyst_from_sanding.json
@@ -10,7 +10,6 @@
       ],
       "recipe": {
         "type": "minecraft:crafting_shapeless",
-        "category": "misc",
         "ingredients": [
           {
             "item": "create_connected:fan_sanding_catalyst"
diff --git a/src/generated/resources/data/create_connected/recipes/crafting/kinetics/empty_fan_catalyst_from_seething.json b/src/generated/resources/data/create_connected/recipes/crafting/kinetics/empty_fan_catalyst_from_seething.json
@@ -10,7 +10,6 @@
       ],
       "recipe": {
         "type": "minecraft:crafting_shapeless",
-        "category": "misc",
         "ingredients": [
           {
             "item": "create_connected:fan_seething_catalyst"
diff --git a/src/generated/resources/data/create_connected/recipes/crafting/kinetics/inventory_access_port.json b/src/generated/resources/data/create_connected/recipes/crafting/kinetics/inventory_access_port.json
@@ -10,7 +10,6 @@
       ],
       "recipe": {
         "type": "minecraft:crafting_shaped",
-        "category": "misc",
         "key": {
           "B": {
             "item": "create:brass_casing"
@@ -30,8 +29,7 @@
         "result": {
           "count": 2,
           "item": "create_connected:inventory_access_port"
-        },
-        "show_notification": true
+        }
       }
     }
   ]
diff --git a/src/generated/resources/data/create_connected/recipes/crafting/kinetics/inventory_bridge.json b/src/generated/resources/data/create_connected/recipes/crafting/kinetics/inventory_bridge.json
@@ -10,7 +10,6 @@
       ],
       "recipe": {
         "type": "minecraft:crafting_shapeless",
-        "category": "misc",
         "ingredients": [
           {
             "item": "create_connected:inventory_access_port"
diff --git a/src/main/java/com/hlysine/create_connected/CCBlocks.java b/src/main/java/com/hlysine/create_connected/CCBlocks.java
@@ -483,7 +483,7 @@ public class CCBlocks {
     public static final BlockEntry<WrenchableBlock> FAN_SEETHING_CATALYST = REGISTRATE.block("fan_seething_catalyst", WrenchableBlock::new)
             .initialProperties(() -> Blocks.IRON_BLOCK)
             .properties(p -> p
-                    .mapColor(MapColor.TERRACOTTA_YELLOW)
+                    .color(MaterialColor.TERRACOTTA_YELLOW)
                     .requiresCorrectToolForDrops()
                     .noOcclusion()
                     .lightLevel(s -> 12)
@@ -502,7 +502,7 @@ public class CCBlocks {
     public static final BlockEntry<WrenchableBlock> FAN_SANDING_CATALYST = REGISTRATE.block("fan_sanding_catalyst", WrenchableBlock::new)
             .initialProperties(() -> Blocks.IRON_BLOCK)
             .properties(p -> p
-                    .mapColor(MapColor.TERRACOTTA_YELLOW)
+                    .color(MaterialColor.TERRACOTTA_YELLOW)
                     .requiresCorrectToolForDrops()
                     .noOcclusion()
                     .isRedstoneConductor((state, level, pos) -> false)
@@ -572,7 +572,7 @@ public class CCBlocks {
     public static final BlockEntry<InventoryAccessPortBlock> INVENTORY_ACCESS_PORT =
             REGISTRATE.block("inventory_access_port", InventoryAccessPortBlock::new)
                     .initialProperties(SharedProperties::stone)
-                    .properties(p -> p.mapColor(MapColor.TERRACOTTA_BROWN).noOcclusion())
+                    .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN).noOcclusion())
                     .transform(axeOrPickaxe())
                     .transform(FeatureToggle.register(FeatureCategory.LOGISTICS))
                     .blockstate(new InventoryAccessPortGenerator()::generate)
@@ -583,7 +583,7 @@ public class CCBlocks {
     public static final BlockEntry<InventoryBridgeBlock> INVENTORY_BRIDGE =
             REGISTRATE.block("inventory_bridge", InventoryBridgeBlock::new)
                     .initialProperties(SharedProperties::stone)
-                    .properties(p -> p.mapColor(MapColor.TERRACOTTA_BROWN).noOcclusion())
+                    .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN).noOcclusion())
                     .transform(axeOrPickaxe())
                     .transform(FeatureToggle.register(FeatureCategory.LOGISTICS))
                     .blockstate((c, p) -> BlockStateGen.axisBlock(c, p, state -> {
diff --git a/src/main/java/com/hlysine/create_connected/compat/CopycatsManager.java b/src/main/java/com/hlysine/create_connected/compat/CopycatsManager.java
@@ -74,7 +74,11 @@ public static BlockState convert(BlockState state) {
     }
 
     private static <T extends Comparable<T>> BlockState copyProperty(BlockState from, BlockState to, Property<T> property) {
-        return from.getOptionalValue(property).map(value -> to.trySetValue(property, value)).orElse(to);
+        return from.getOptionalValue(property).map(value -> {
+            if (to.hasProperty(property))
+                return to.setValue(property, value);
+            return to;
+        }).orElse(to);
     }
 
     public static Block convertIfEnabled(Block block) {
diff --git a/src/main/java/com/hlysine/create_connected/datagen/recipes/CCStandardRecipes.java b/src/main/java/com/hlysine/create_connected/datagen/recipes/CCStandardRecipes.java
@@ -203,9 +203,9 @@ public class CCStandardRecipes extends CreateRecipeProvider {
             .requiresResultFeature()
             .returns(2)
             .viaShaped(b -> b
-                    .define('B', AllBlocks.BRASS_CASING)
-                    .define('C', AllBlocks.CHUTE)
-                    .define('E', AllItems.ELECTRON_TUBE)
+                    .define('B', AllBlocks.BRASS_CASING.get())
+                    .define('C', AllBlocks.CHUTE.get())
+                    .define('E', AllItems.ELECTRON_TUBE.get())
                     .pattern("B")
                     .pattern("C")
                     .pattern("E")
@@ -214,8 +214,8 @@ public class CCStandardRecipes extends CreateRecipeProvider {
     GeneratedRecipe INVENTORY_BRIDGE = create(CCBlocks.INVENTORY_BRIDGE).unlockedBy(AllItems.ELECTRON_TUBE::get)
             .requiresResultFeature()
             .viaShapeless(b -> b
-                    .requires(CCBlocks.INVENTORY_ACCESS_PORT)
-                    .requires(CCBlocks.INVENTORY_ACCESS_PORT)
+                    .requires(CCBlocks.INVENTORY_ACCESS_PORT.get())
+                    .requires(CCBlocks.INVENTORY_ACCESS_PORT.get())
             );
 
     GeneratedRecipe EMPTY_FAN_CATALYST = create(CCBlocks.EMPTY_FAN_CATALYST).unlockedBy(AllBlocks.BRASS_BLOCK::get)
diff --git a/src/main/java/com/hlysine/create_connected/datagen/recipes/ItemApplicationRecipeGen.java b/src/main/java/com/hlysine/create_connected/datagen/recipes/ItemApplicationRecipeGen.java
@@ -26,9 +26,9 @@ public class ItemApplicationRecipeGen extends ProcessingRecipeGen {
     GeneratedRecipe FREEZING_CATALYST = fanCatalystFromEmpty(
             "freezing_catalyst", Items.POWDER_SNOW_BUCKET::asItem, CCBlocks.FAN_FREEZING_CATALYST.get()::asItem);
     GeneratedRecipe SEETHING_CATALYST = fanCatalystFromEmpty(
-            "seething_catalyst", AllItems.BLAZE_CAKE, CCBlocks.FAN_SEETHING_CATALYST::asItem);
+            "seething_catalyst", AllItems.BLAZE_CAKE.get(), CCBlocks.FAN_SEETHING_CATALYST.get()::asItem);
     GeneratedRecipe SANDING_CATALYST = fanCatalystFromEmpty(
-            "sanding_catalyst", Blocks.SAND, CCBlocks.FAN_SANDING_CATALYST::asItem);
+            "sanding_catalyst", Blocks.SAND, CCBlocks.FAN_SANDING_CATALYST.get()::asItem);
 
     protected GeneratedRecipe fanCatalystFromEmpty(String type, ItemLike ingredient, Supplier<ItemLike> output) {
         return fanCatalystFromEmpty(type, Ingredient.of(ingredient), output);
@@ -42,7 +42,7 @@ protected GeneratedRecipe fanCatalystFromEmpty(String type, Ingredient ingredien
     }
 
     protected GeneratedRecipe fanCatalystFromEmpty(String type, Ingredient ingredient, Supplier<ItemLike> output, ICondition condition) {
-        return create(type + "_from_empty", b -> b.require(CCBlocks.EMPTY_FAN_CATALYST)
+        return create(type + "_from_empty", b -> b.require(CCBlocks.EMPTY_FAN_CATALYST.get())
                 .require(ingredient)
                 .withCondition(new FeatureEnabledCondition(CCBlocks.EMPTY_FAN_CATALYST.getId()))
                 .withCondition(condition)
diff --git a/src/main/java/com/hlysine/create_connected/mixin/chaincogwheel/RotationPropagatorMixin.java b/src/main/java/com/hlysine/create_connected/mixin/chaincogwheel/RotationPropagatorMixin.java
@@ -14,6 +14,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import static com.hlysine.create_connected.content.MathHelper.DirectionFromDelta;
+
 @Mixin(value = RotationPropagator.class, remap = false)
 public class RotationPropagatorMixin {
     @Inject(
@@ -32,7 +34,7 @@ private static void handleChainCogwheels(KineticBlockEntity from,
         final IRotate definitionTo = (IRotate) toBlock;
         final BlockPos diff = to.getBlockPos()
                 .subtract(from.getBlockPos());
-        final Direction direction = Direction.fromDelta(diff.getX(), diff.getY(), diff.getZ());
+        final Direction direction = DirectionFromDelta(diff.getX(), diff.getY(), diff.getZ());
 
         if (stateFrom.is(CCBlocks.ENCASED_CHAIN_COGWHEEL.get()) && stateTo.is(CCBlocks.ENCASED_CHAIN_COGWHEEL.get())) {
             if (direction == null) {
diff --git a/src/main/java/com/hlysine/create_connected/mixin/itemsilo/ContraptionMixin.java b/src/main/java/com/hlysine/create_connected/mixin/itemsilo/ContraptionMixin.java
@@ -58,16 +58,16 @@ private void fixNBT(Level world, CompoundTag nbt, boolean spawnData, CallbackInf
         List<Map.Entry<BlockPos, StructureTemplate.StructureBlockInfo>> toBeReplaced = new ArrayList<>();
         for (Iterator<Map.Entry<BlockPos, StructureTemplate.StructureBlockInfo>> iterator = blocks.entrySet().iterator(); iterator.hasNext(); ) {
             Map.Entry<BlockPos, StructureTemplate.StructureBlockInfo> entry = iterator.next();
-            if (!(entry.getValue().state().getBlock() instanceof ItemSiloBlock))
+            if (!(entry.getValue().state.getBlock() instanceof ItemSiloBlock))
                 continue;
-            if (!entry.getValue().nbt().contains("Length") && (
-                    blocks.get(NbtUtils.readBlockPos(entry.getValue().nbt().getCompound("Controller"))) == null ||
-                            !(blocks.get(NbtUtils.readBlockPos(entry.getValue().nbt().getCompound("Controller"))).state().getBlock() instanceof ItemSiloBlock))) {
-                entry.getValue().nbt().put("Controller", NbtUtils.writeBlockPos(entry.getKey()));
-                entry.getValue().nbt().putInt("Length", 1);
-                entry.getValue().nbt().putInt("Size", 1);
+            if (!entry.getValue().nbt.contains("Length") && (
+                    blocks.get(NbtUtils.readBlockPos(entry.getValue().nbt.getCompound("Controller"))) == null ||
+                            !(blocks.get(NbtUtils.readBlockPos(entry.getValue().nbt.getCompound("Controller"))).state.getBlock() instanceof ItemSiloBlock))) {
+                entry.getValue().nbt.put("Controller", NbtUtils.writeBlockPos(entry.getKey()));
+                entry.getValue().nbt.putInt("Length", 1);
+                entry.getValue().nbt.putInt("Size", 1);
                 iterator.remove();
-                toBeReplaced.add(new AbstractMap.SimpleEntry<>(entry.getKey(), new StructureTemplate.StructureBlockInfo(entry.getKey(), entry.getValue().state().setValue(ItemSiloBlock.LARGE, false), entry.getValue().nbt())));
+                toBeReplaced.add(new AbstractMap.SimpleEntry<>(entry.getKey(), new StructureTemplate.StructureBlockInfo(entry.getKey(), entry.getValue().state.setValue(ItemSiloBlock.LARGE, false), entry.getValue().nbt)));
             }
         }
         for (Map.Entry<BlockPos, StructureTemplate.StructureBlockInfo> entry : toBeReplaced) {
@@ -76,12 +76,12 @@ private void fixNBT(Level world, CompoundTag nbt, boolean spawnData, CallbackInf
         toBeReplaced.clear();
         for (Iterator<Map.Entry<BlockPos, StructureTemplate.StructureBlockInfo>> iterator = capturedMultiblocks.entries().iterator(); iterator.hasNext(); ) {
             Map.Entry<BlockPos, StructureTemplate.StructureBlockInfo> entry = iterator.next();
-            if (!(entry.getValue().state().getBlock() instanceof ItemSiloBlock))
+            if (!(entry.getValue().state.getBlock() instanceof ItemSiloBlock))
                 continue;
-            if (!blocks.containsKey(entry.getKey()) || !(blocks.get(entry.getKey()).state().getBlock() instanceof ItemSiloBlock)) {
-                if (entry.getValue().nbt().contains("Controller")) {
+            if (!blocks.containsKey(entry.getKey()) || !(blocks.get(entry.getKey()).state.getBlock() instanceof ItemSiloBlock)) {
+                if (entry.getValue().nbt.contains("Controller")) {
                     iterator.remove();
-                    toBeReplaced.add(new AbstractMap.SimpleEntry<>(NbtUtils.readBlockPos(entry.getValue().nbt().getCompound("Controller")), entry.getValue()));
+                    toBeReplaced.add(new AbstractMap.SimpleEntry<>(NbtUtils.readBlockPos(entry.getValue().nbt.getCompound("Controller")), entry.getValue()));
                 }
             }
         }
@@ -92,23 +92,23 @@ private void fixNBT(Level world, CompoundTag nbt, boolean spawnData, CallbackInf
         for (BlockPos blockPos : capturedMultiblocks.keySet()) {
             if (!blocks.containsKey(blockPos))
                 continue;
-            if (!(blocks.get(blockPos).state().getBlock() instanceof ItemSiloBlock))
+            if (!(blocks.get(blockPos).state.getBlock() instanceof ItemSiloBlock))
                 continue;
             Collection<StructureTemplate.StructureBlockInfo> parts = capturedMultiblocks.get(blockPos);
 
             if (parts.size() == 1) {
                 StructureTemplate.StructureBlockInfo part = parts.iterator().next();
-                if (part.nbt().contains("Length") && part.nbt().getInt("Length") > 1) {
-                    part.nbt().putInt("Length", 1);
-                    part.nbt().putInt("Size", 1);
-                    toBeReplaced.add(new AbstractMap.SimpleEntry<>(blockPos, new StructureTemplate.StructureBlockInfo(part.pos(), part.state().setValue(ItemSiloBlock.LARGE, false), part.nbt())));
+                if (part.nbt.contains("Length") && part.nbt.getInt("Length") > 1) {
+                    part.nbt.putInt("Length", 1);
+                    part.nbt.putInt("Size", 1);
+                    toBeReplaced.add(new AbstractMap.SimpleEntry<>(blockPos, new StructureTemplate.StructureBlockInfo(part.pos, part.state.setValue(ItemSiloBlock.LARGE, false), part.nbt)));
                 }
             }
         }
         for (Map.Entry<BlockPos, StructureTemplate.StructureBlockInfo> entry : toBeReplaced) {
             capturedMultiblocks.removeAll(entry.getKey());
             capturedMultiblocks.put(entry.getKey(), entry.getValue());
-            blocks.put(entry.getValue().pos(), entry.getValue());
+            blocks.put(entry.getValue().pos, entry.getValue());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@`
`33`	`33`	`"recipes": [`
`34`	`34`	`"create_connected:crafting/kinetics/empty_fan_catalyst_from_sanding"`
`35`	`35`	`]`
`36`		`- },`
`37`		`- "sends_telemetry_event": false`
	`36`	`+ }`
`38`	`37`	`},`
`39`	`38`	`"conditions": [`
`40`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,5 @@`
`16`	`16`	`],`
`17`	`17`	`"rolls": 1.0`
`18`	`18`	`}`
`19`		`- ],`
`20`		`- "random_sequence": "create_connected:blocks/fan_sanding_catalyst"`
	`19`	`+ ]`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`],`
`11`	`11`	`"recipe": {`
`12`	`12`	`"type": "minecraft:crafting_shapeless",`
`13`		`- "category": "misc",`
`14`	`13`	`"ingredients": [`
`15`	`14`	`{`
`16`	`15`	`"item": "create_connected:fan_sanding_catalyst"`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,11 @@ public static BlockState convert(BlockState state) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`private static <T extends Comparable<T>> BlockState copyProperty(BlockState from, BlockState to, Property<T> property) {`
`77`		`- return from.getOptionalValue(property).map(value -> to.trySetValue(property, value)).orElse(to);`
	`77`	`+ return from.getOptionalValue(property).map(value -> {`
	`78`	`+ if (to.hasProperty(property))`
	`79`	`+ return to.setValue(property, value);`
	`80`	`+ return to;`
	`81`	`+ }).orElse(to);`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`public static Block convertIfEnabled(Block block) {`