Update to 1.20.4

ICY105 · Dec 21, 2023 · c740ad7 · c740ad7
1 parent 75e99c2
commit c740ad7
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 20 deletions.
diff --git a/Mechanization_v4.2.3.zip b/Mechanization_v4.2.3.zip
diff --git a/data/block_utils/tags/blocks/v1.2/transparent.json b/data/block_utils/tags/blocks/v1.2/transparent.json
@@ -28,7 +28,6 @@
 		"minecraft:melon_stem",
 		"minecraft:pumpkin_stem",
 		"minecraft:cocoa",
-		"minecraft:grass",
 		"minecraft:fern",
 		"minecraft:dead_bush",
 		"minecraft:brown_mushroom",
@@ -163,6 +162,14 @@
 		"minecraft:brown_stained_glass_pane",
 		"minecraft:green_stained_glass_pane",
 		"minecraft:red_stained_glass_pane",
-		"minecraft:black_stained_glass_pane"
+		"minecraft:black_stained_glass_pane",
+		{
+			"id": "minecraft:grass",
+			"required": false
+		},
+		{
+			"id": "minecraft:short_grass",
+			"required": false
+		}
 	]
 }
diff --git a/data/mechanization/functions/load.mcfunction b/data/mechanization/functions/load.mcfunction
@@ -49,7 +49,7 @@ scoreboard players set #cons.rng_a mechanization.data 1103515245
 # mark version
 scoreboard players set #mech.ver.major load.status 4
 scoreboard players set #mech.ver.minor load.status 2
-scoreboard players set #mech.ver.fix load.status 2
+scoreboard players set #mech.ver.fix load.status 3
 
 # configure storage
 data merge storage mechanization:temp {obj:{}, list:[], var:""}

diff --git a/data/mechanization/functions/machines/blocks/quarry/mine_block.mcfunction b/data/mechanization/functions/machines/blocks/quarry/mine_block.mcfunction
@@ -1,5 +1,5 @@
 
-execute unless loaded ~ ~ ~ run return
+execute unless loaded ~ ~ ~ run return fail
 
 data remove block -30000000 0 3201 Items
 

diff --git a/data/mechanization/loot_tables/base/manual/assembly.json b/data/mechanization/loot_tables/base/manual/assembly.json
diff --git a/data/mechanization/loot_tables/base/manual/base.json b/data/mechanization/loot_tables/base/manual/base.json
diff --git a/data/mechanization/loot_tables/base/manual/compat.json b/data/mechanization/loot_tables/base/manual/compat.json
diff --git a/data/mechanization/loot_tables/base/manual/gadgets.json b/data/mechanization/loot_tables/base/manual/gadgets.json
diff --git a/data/mechanization/loot_tables/base/manual/machines.json b/data/mechanization/loot_tables/base/manual/machines.json
diff --git a/data/mechanization/loot_tables/base/manual/nuclear.json b/data/mechanization/loot_tables/base/manual/nuclear.json
diff --git a/data/mechanization/loot_tables/base/manual/start.json b/data/mechanization/loot_tables/base/manual/start.json
diff --git a/data/mechanization/tags/blocks/drill/empty.json b/data/mechanization/tags/blocks/drill/empty.json
@@ -11,7 +11,6 @@
 		"#minecraft:candles",
 		"#minecraft:buttons",
 
-		"minecraft:grass",
 		"minecraft:fern",
 		"minecraft:dead_bush",
 		"minecraft:seagrass",
@@ -46,6 +45,14 @@
 		"minecraft:comparator",
 		"minecraft:vine",
 		"minecraft:glow_lichen",
-		"minecraft:moving_piston"
+		"minecraft:moving_piston",
+		{
+			"id": "minecraft:grass",
+			"required": false
+		},
+		{
+      "id": "minecraft:short_grass",
+      "required": false
+    }
 	]
 }
diff --git a/data/mechanization/tags/blocks/non-solid.json b/data/mechanization/tags/blocks/non-solid.json
@@ -51,7 +51,6 @@
 		"minecraft:stone_pressure_plate",
 		"minecraft:light_weighted_pressure_plate",
 		"minecraft:heavy_weighted_pressure_plate",
-		"minecraft:grass",
 		"minecraft:fern",
 		"minecraft:dead_bush",
 		"minecraft:brown_mushroom",
@@ -124,6 +123,14 @@
 		"minecraft:pumpkin_stem",
 		"minecraft:cocoa",
 		"minecraft:moving_piston",
-		"minecraft:conduit"
+		"minecraft:conduit",
+		{
+			"id": "minecraft:grass",
+			"required": false
+		},
+		{
+			"id": "minecraft:short_grass",
+			"required": false
+		}
 	]
 }
diff --git a/data/mechanization/tags/blocks/raytrace_bullets.json b/data/mechanization/tags/blocks/raytrace_bullets.json
@@ -22,7 +22,6 @@
 		"minecraft:light",
 
 		"#minecraft:flowers",
-		"minecraft:grass",
 		"minecraft:fern",
 		"minecraft:dead_bush",
 		"minecraft:brown_mushroom",
@@ -57,6 +56,14 @@
 		"minecraft:potatoes",
 		"minecraft:melon_stem",
 		"minecraft:pumpkin_stem",
-		"minecraft:cocoa"
+		"minecraft:cocoa",
+		{
+			"id": "minecraft:grass",
+			"required": false
+		},
+		{
+			"id": "minecraft:short_grass",
+			"required": false
+		}
 	]
 }
diff --git a/data/smithed.crafter/tags/items/all.json b/data/smithed.crafter/tags/items/all.json
@@ -497,7 +497,6 @@
       "minecraft:granite_slab",
       "minecraft:granite_stairs",
       "minecraft:granite_wall",
-      "minecraft:grass",
       "minecraft:grass_block",
       "minecraft:gravel",
       "minecraft:gray_banner",
@@ -1254,6 +1253,14 @@
       "minecraft:zombie_horse_spawn_egg",
       "minecraft:zombie_spawn_egg",
       "minecraft:zombie_villager_spawn_egg",
-      "minecraft:zombified_piglin_spawn_egg"
+      "minecraft:zombified_piglin_spawn_egg",
+      {
+			"id": "minecraft:grass",
+			"required": false
+		},
+      {
+			"id": "minecraft:short_grass",
+			"required": false
+		}
    ]
 }
diff --git a/pack.mcmeta b/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 18,
+    "pack_format": 26,
     "description": "Mechanization, by ImCoolYeah105"
   }
 }