Bugfixes

Author: bensku

building.sk

@@ -1,64 +1,4 @@
 # The blocks whose ID layout hasn't changed for a long time (at least since 1.8).
-unchanged building blocks:
-	# Stones
-	stone [block¦s] = minecraft:stone
-
-	cobble[stone] [block¦s] = minecraft:cobblestone
-	moss[y] cobble[stone] [block¦s] = minecraft:mossy_cobblestone
-	any cobble[stone] [block¦s] = cobblestone, mossy cobblestone
-
-	# Sediments
-	dirt [block¦s] = minecraft:dirt
-	sand [block¦s] = minecraft:sand
-	gravel [block¦s] = minecraft:gravel
-	clay block¦s = minecraft:clay
-	mycelium [block¦s] = minecraft:mycelium
-
-	# Underground
-	gold ore¦s = minecraft:gold_ore
-	iron ore¦s = minecraft:iron_ore
-	coal ore¦s = minecraft:coal_ore
-	lapis [lazuli] ore¦s = minecraft:lapis_ore
-	diamond ore¦s = minecraft:diamond_ore
-	redstone ore¦s = minecraft:redstone_ore
-	emerald ore¦s = minecraft:emerald_ore
-	[nether] quartz ore¦s = minecraft:quartz_ore
-	any ore = gold ore, iron ore, coal ore, lapis ore, diamond ore, redstone ore, emerald ore, nether quartz ore
-
-	obsidian [block¦s] = minecraft:obsidian
-	bedrock [block¦s] = minecraft:bedrock
-
-	# Mineral blocks
-	(gold block¦s|block¦s of gold) = minecraft:gold_block
-	(iron block¦s|block¦s of iron) = minecraft:iron_block
-	(coal block¦s|block¦s of coal) = minecraft:coal_block
-	(lapis [lazuli] block¦s|block¦s of lapis [lazuli]) = minecraft:lapis_block
-	(diamond block¦s|block¦s of diamond) = minecraft:diamond_block
-	(redstone block¦s|block¦s of redstone) = minecraft:redstone_block
-	(emerald block¦s|block¦s of emerald) = minecraft:emerald_block
-	([nether] quartz block¦s|block¦s of [nether] quartz) = minecraft:quartz_block
-
-	# Underwater
-	sponge¦s = minecraft:sponge
-	wet sponge¦s = minecraft:wet_sponge
-
-	# Construction/Decorative
-	[red] brick block¦s = minecraft:brick_block
-	[(plain|unstained|undyed)] glass [block¦s] = minecraft:glass
-	book[ ]shel(f|ves) = minecraft:bookshelf
-
-	# Nether
-	netherrack [block¦s] = minecraft:netherrack
-	soul sand [block¦s] = minecraft:soul_sand
-	glowstone [block¦s] = minecraft:glowstone
-	nether brick block¦s = minecraft:nether_brick
-
-	# Miscellaneous
-	ice [block¦s] = minecraft:ice
-	snow block¦s = minecraft:snow
-	hay [(bale|block)¦s] = minecraft:hay_block
-	packed ice [block¦s] = minecraft:packed_ice
-	end[ ]stone [block¦s] = minecraft:end_stone
 
 # 1.13 changed the IDs of a lot of blocks since they're no longer defined by data value.
 # This section is for blocks that had a different ID prior to 1.13.
@@ -83,6 +23,7 @@ old blocks before flattening:
 	grass [block¦s] = minecraft:grass
 	coarse dirt [block¦s] = minecraft:dirt {Damage:1}
 	podzol [block¦s] = minecraft:dirt {Damage:2}
+	[nether] quartz ore¦s = minecraft:quartz_ore
 
 	# All wood
 	# planks
@@ -253,6 +194,7 @@ building blocks after flattening:
 	grass [block¦s] = minecraft:grass_block
 	coarse dirt [block¦s] = minecraft:coarse_dirt
 	podzol [block¦s] = minecraft:podzol
+	[nether] quartz ore¦s = minecraft:nether_quartz_ore
 
 	# Wood
 	# planks
@@ -351,6 +293,66 @@ building blocks after flattening:
 	(lit pumpkin|jack(-| )o['](-| )lantern)¦s = minecraft:jack_o_lantern
 	melon [block]¦s = minecraft:melon
 
+# These were not changed in 1.13
+unchanged building blocks:
+	# Stones
+	stone [block¦s] = minecraft:stone
+
+	cobble[stone] [block¦s] = minecraft:cobblestone
+	moss[y] cobble[stone] [block¦s] = minecraft:mossy_cobblestone
+	any cobble[stone] [block¦s] = cobblestone, mossy cobblestone
+
+	# Sediments
+	dirt [block¦s] = minecraft:dirt
+	sand [block¦s] = minecraft:sand
+	gravel [block¦s] = minecraft:gravel
+	clay block¦s = minecraft:clay
+	mycelium [block¦s] = minecraft:mycelium
+
+	# Underground
+	gold ore¦s = minecraft:gold_ore
+	iron ore¦s = minecraft:iron_ore
+	coal ore¦s = minecraft:coal_ore
+	lapis [lazuli] ore¦s = minecraft:lapis_ore
+	diamond ore¦s = minecraft:diamond_ore
+	redstone ore¦s = minecraft:redstone_ore
+	emerald ore¦s = minecraft:emerald_ore
+	any ore = gold ore, iron ore, coal ore, lapis ore, diamond ore, redstone ore, emerald ore, nether quartz ore
+
+	obsidian [block¦s] = minecraft:obsidian
+	bedrock [block¦s] = minecraft:bedrock
+
+	# Mineral blocks
+	(gold block¦s|block¦s of gold) = minecraft:gold_block
+	(iron block¦s|block¦s of iron) = minecraft:iron_block
+	(coal block¦s|block¦s of coal) = minecraft:coal_block
+	(lapis [lazuli] block¦s|block¦s of lapis [lazuli]) = minecraft:lapis_block
+	(diamond block¦s|block¦s of diamond) = minecraft:diamond_block
+	(redstone block¦s|block¦s of redstone) = minecraft:redstone_block
+	(emerald block¦s|block¦s of emerald) = minecraft:emerald_block
+	([nether] quartz block¦s|block¦s of [nether] quartz) = minecraft:quartz_block
+
+	# Underwater
+	sponge¦s = minecraft:sponge
+	wet sponge¦s = minecraft:wet_sponge
+
+	# Construction/Decorative
+	[red] brick block¦s = minecraft:brick_block
+	[(plain|unstained|undyed)] glass [block¦s] = minecraft:glass
+	book[ ]shel(f|ves) = minecraft:bookshelf
+
+	# Nether
+	netherrack [block¦s] = minecraft:netherrack
+	soul sand [block¦s] = minecraft:soul_sand
+	glowstone [block¦s] = minecraft:glowstone
+	nether brick block¦s = minecraft:nether_brick
+
+	# Miscellaneous
+	ice [block¦s] = minecraft:ice
+	snow block¦s = minecraft:snow
+	hay [(bale|block)¦s] = minecraft:hay_block
+	packed ice [block¦s] = minecraft:packed_ice
+	end[ ]stone [block¦s] = minecraft:end_stone
 
 #== UPDATE-SPECIFICS
 # Building blocks added in 1.9 whose IDs have never changed. End City stuff, namely.

decoration.sk

@@ -48,14 +48,14 @@ decoratives before flattening:
 	(red flower¦s|popp(y|ies)) = minecraft:red_flower {Damage:0}
 	blue orchid¦s = minecraft:red_flower {Damage:1}
 	allium¦s = minecraft:red_flower {Damage:2}
-	azue bluet¦s = minecraft:red_flower {Damage:3}
+	azure bluet¦s = minecraft:red_flower {Damage:3}
 	red tulip¦s = minecraft:red_flower {Damage:4}
 	orange tulip¦s = minecraft:red_flower {Damage:5}
 	white tulip¦s = minecraft:red_flower {Damage:6}
 	pink tulip¦s = minecraft:red_flower {Damage:7}
 	oxeye dais(y|ies) = minecraft:red_flower {Damage:8}
 	any tulip¦s = red tulip, orange tulip, white tulip, pink tulip
-	any small flower = dandelion, poppy, blue orchid, allium, azue bluet, any tulip, oxeye daisy
+	any small flower = dandelion, poppy, blue orchid, allium, azure bluet, any tulip, oxeye daisy
 
 	# Large flowers
 	sunflower¦s = minecraft:double_plant {Damage:0}
@@ -151,14 +151,14 @@ decoratives after flattening:
 	(red flower¦s|popp(y|ies)) = minecraft:poppy
 	blue orchid¦s = minecraft:blue_orchid
 	allium¦s = minecraft:allium
-	azue bluet¦s = minecraft:azue_bluet
+	azure bluet¦s = minecraft:azure_bluet
 	red tulip¦s = minecraft:red_tulip
 	orange tulip¦s = minecraft:orange_tulip
 	white tulip¦s = minecraft:white_tulip
 	pink tulip¦s = minecraft:pink_tulip
 	oxeye dais(y|ies) = minecraft:oxeye_daisy
 	any tulip¦s = red tulip, orange tulip, white tulip, pink tulip
-	any small flower = dandelion, poppy, blue orchid, allium, azue bluet, any tulip, oxeye daisy
+	any small flower = dandelion, poppy, blue orchid, allium, azure bluet, any tulip, oxeye daisy
 
 	# Large flowers
 	{block half} sunflower¦s = minecraft:sunflower
@@ -176,8 +176,8 @@ decoratives after flattening:
 	{waterloggable} nether brick fence¦s = minecraft:nether_brick_fence
 
 	# Silverfish blocks
-	(infested|silverfish) stone [block¦s] = minecraft:infested_stone
-	(infested|silverfish) cobblestone [block¦s] = minecraft:infested_cobblestone
+	(infested|silverfish) stone [block]¦s = minecraft:infested_stone
+	(infested|silverfish) cobblestone [block]¦s = minecraft:infested_cobblestone
 	(infested|silverfish) stone brick [block]¦s = minecraft:infested_stone_bricks
 	(infested|silverfish) mossy stone brick [block]¦s = minecraft:infested_mossy_stone_bricks
 	(infested|silverfish) cracked stone brick [block]¦s = minecraft:infested_cracked_stone_bricks

other.sk

@@ -88,6 +88,7 @@ update aquatic unlisted blocks:
 	(downwards|whirlpool|dragging) bubble column = minecraft:bubble_column[drag=true]
 	bubble column = upwards bubble column, downwards bubble column
 
-water:
+# Figure out how they work in their fluid form on 1.13
+fluids:
 	[stationary] water = minecraft:water
-	flowing water = minecraft:flowing_water
+	[stationary] lava = minecraft:lava

redstone.sk

@@ -12,18 +12,17 @@ unchanged redstone:
 	(iron|heavy weighted) pressure plate¦s = minecraft:heavy_weighted_pressure_plate
 
 	(normal|uninverted) daylight (detector|sensor)¦s = minecraft:daylight_detector
-	inverted daylight (detector|sensor)¦s = minecraft:daylight_detector_inverted
-	[any] daylight (detector|sensor)¦s = normal daylight detector, inverted daylight detector
 
 	{orientable} dispenser¦s = minecraft:dispenser
 	{orientable} dropper¦s = minecraft:dropper
 	tnt [block¦s] = minecraft:tnt
 	hopper¦s = minecraft:hopper
+	
+	iron trapdoor¦s = minecraft:iron_trapdoor
 
 	{orientable} [(normal|non-sticky)] piston¦s = minecraft:piston
 	{orientable} sticky piston¦s = minecraft:sticky_piston
 	{orientable} piston head¦s = minecraft:piston_head
-	(piston extension|block 36|block moved by piston|moving block¦s) = minecraft:piston_extension
 
 redstone before flattening:
 	minecraft version = 1.12 or older
@@ -52,7 +51,6 @@ redstone before flattening:
 
 	# Trapdoors
 	[oak] wood[en] trapdoor¦s = minecraft:trapdoor
-	iron trapdoor¦s = minecraft:iron_trapdoor
 	[any] trapdoor¦s = wood trapdoor, iron trapdoor
 
 	# Fences and doors
@@ -114,7 +112,7 @@ redstone before flattening:
 	note block¦s = minecraft:noteblock
 	tripwire hook¦s = minecraft:tripwire_hook
 	trapped chest¦s = minecraft:trapped_chest
-
+	(piston extension|block 36|moving piston|moving block¦s) = minecraft:piston_extension
 
 redstone after flattening:
 	minecraft version = 1.13 or newer
@@ -170,6 +168,11 @@ redstone after flattening:
 	note block¦s = minecraft:note_block
 	{directional} {powerable} tripwire hook¦s = minecraft:tripwire_hook
 	{directional} {waterloggable} trapped chest¦s = minecraft:trapped_chest
+	inverted daylight (detector|sensor)¦s = minecraft:daylight_detector[inverted=true]
+	(piston extension|block 36|moving piston|moving block¦s) = minecraft:moving_piston
+	
+categories:
+	[any] daylight (detector|sensor)¦s = normal daylight detector, inverted daylight detector
 
 exploration update:
 	minecraft version = 1.11 or newer