From 0cd49317d7a30e8ab3152f1ef42029c0c65911f8 Mon Sep 17 00:00:00 2001
From: reidbhuntley <reidbhuntley@gmail.com>
Date: Sun, 23 May 2021 22:42:03 -0400
Subject: [PATCH] Revert "Make gantry carriage brittle"

This reverts commit bfc8c3e3
---
 src/generated/resources/.cache/cache                          | 4 ++--
 .../resources/data/create/advancements/aesthetics.json        | 4 ++--
 src/generated/resources/data/create/tags/blocks/brittle.json  | 1 -
 src/main/java/com/simibubi/create/AllBlocks.java              | 1 -
 .../content/schematics/block/SchematicannonTileEntity.java    | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index 7ed72b4d7..fb6f24a64 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -1652,7 +1652,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear
 a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json
 b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json
 096382a4c025b5ffdde9c496ee9da0d5345fbe17 assets/create/sounds.json
-0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json
+5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json
 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json
 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json
 83c046bd200623933545c9e4326f782fb02c87fa data/create/advancements/arm_blaze_burner.json
@@ -3645,7 +3645,7 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone
 0f3c993eb6dd3f37953f304b8fad15bf60469ef4 data/create/recipes/weathered_limestone_cobblestone_wall_from_weathered_limestone_cobblestone_stonecutting.json
 6eceb25fabbb6b389ca35de3b829ad061c9c456a data/create/recipes/weathered_limestone_pillar.json
 11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data/create/recipes/weathered_limestone_pillar_from_weathered_limestone_stonecutting.json
-d7fe46e7d00e47294f9e0e7c2c0070e86c88a606 data/create/tags/blocks/brittle.json
+20c20a12b0baff2ba493b1405db7d2d8a15b81af data/create/tags/blocks/brittle.json
 330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json
 3bc64e3a1e7980237435b1770a9ba2102d57fcd4 data/create/tags/blocks/fan_transparent.json
 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/non_movable.json
diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json
index d723cbe38..59a86f429 100644
--- a/src/generated/resources/data/create/advancements/aesthetics.json
+++ b/src/generated/resources/data/create/advancements/aesthetics.json
@@ -28,8 +28,8 @@
       "trigger": "create:bracket_apply",
       "conditions": {
         "accepted_entries": [
-          "create:cogwheel",
-          "create:large_cogwheel"
+          "create:large_cogwheel",
+          "create:cogwheel"
         ]
       }
     },
diff --git a/src/generated/resources/data/create/tags/blocks/brittle.json b/src/generated/resources/data/create/tags/blocks/brittle.json
index 217f2fcc8..7970c3bf9 100644
--- a/src/generated/resources/data/create/tags/blocks/brittle.json
+++ b/src/generated/resources/data/create/tags/blocks/brittle.json
@@ -20,7 +20,6 @@
     "create:green_valve_handle",
     "create:red_valve_handle",
     "create:black_valve_handle",
-    "create:gantry_carriage",
     "create:rope",
     "create:pulley_magnet",
     "create:furnace_engine",
diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java
index 5b572ea89..5ea72cd61 100644
--- a/src/main/java/com/simibubi/create/AllBlocks.java
+++ b/src/main/java/com/simibubi/create/AllBlocks.java
@@ -739,7 +739,6 @@ public class AllBlocks {
 	public static final BlockEntry<GantryCarriageBlock> GANTRY_CARRIAGE =
 		REGISTRATE.block("gantry_carriage", GantryCarriageBlock::new)
 			.initialProperties(SharedProperties::stone)
-			.tag(AllBlockTags.BRITTLE.tag)
 			.properties(Block.Properties::nonOpaque)
 			.blockstate(BlockStateGen.directionalAxisBlockProvider())
 			.item()
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
index 0301f23d4..d3a96fc1b 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
+++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
@@ -731,7 +731,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC
 	}
 
 	public static boolean shouldDeferBlock(BlockState state) {
-		return BlockMovementTraits.isBrittle(state);
+		return state.getBlock().is(AllBlocks.GANTRY_CARRIAGE.get()) || BlockMovementTraits.isBrittle(state);
 	}
 
 	public void finishedPrinting() {