waterlogged -> waterloggable

Author: bensku

+global-variations.sk

@@ -165,8 +165,8 @@ block states:
 	# (stairs), or that has top and bottom halves (double plants, doors, etc.)
 	{block half}:
 		{default} = -[half=bottom]
-		(right[( |-)]side up|bottom) = -[half=bottom]
-		(up[( |-)]side( |-)down|top) = -[half=top]
+		bottom = -[half=bottom]
+		top = -[half=top]
 
 	# For anything that can be rotated along the three axes like pillars and logs, i.e. for
 	# things where "pointing east" and "pointing west" would look the same.

decoration.sk

@@ -256,16 +256,16 @@ decoratives after flattening:
 	{directional} {lightable} furnace¦s = minecraft:furnace
 	[any] furnace¦s = lit furnace, unlit furnace
 	snow layer¦s = minecraft:snow
-	{waterlogged} iron bar¦s = minecraft:iron_bars
-	{waterlogged} [plain] glass pane¦s = minecraft:glass_pane
+	{waterloggable} iron bar¦s = minecraft:iron_bars
+	{waterloggable} [plain] glass pane¦s = minecraft:glass_pane
 	(water[ ]lil(y|ies)|lily pad¦s) = minecraft:lily_pad
 	slime block¦s = minecraft:slime_block
 
 	# State dependent - aliases we can easily make more detailed than the old aliases thanks to states
 	dead chorus flower¦s = minecraft:chorus_flower[age=5]
-	{waterlogged} {directional} chest¦s = minecraft:chest
-	{waterlogged} {directional} ladder¦s = minecraft:ladder
-	{waterlogged} {directional} ender chest¦s = minecraft:ender_chest
+	{waterloggable} {directional} chest¦s = minecraft:chest
+	{waterloggable} {directional} ladder¦s = minecraft:ladder
+	{waterloggable} {directional} ender chest¦s = minecraft:ender_chest
 	{directional} (regular|complete) anvil¦s = minecraft:anvil
 	{directional} chipped anvil¦s = minecraft:chipped_anvil
 	{directional} damaged anvil¦s = minecraft:damaged_anvil
@@ -322,7 +322,7 @@ update aquatic:
 		(pair of|[bundle of] two) = -[pickles=2]
 		(trio of|[bundle of] three) = -[pickles=3]
 		[bundle of] four = -[pickles=4]
-	({waterlogged} {pickle count}|{pickle count} {waterlogged}) sea pickle¦s = minecraft:sea_pickle
+	({waterloggable} {pickle count}|{pickle count} {waterloggable}) sea pickle¦s = minecraft:sea_pickle
 
 unchanged orientations:
 	{skull floor orientations}:

misc.sk

@@ -320,3 +320,4 @@ bountiful update spawn eggs:
 	(zombie[ spawn] egg¦s|spawn zombie) = minecraft:spawn_egg {Damage:54}
 	((zombi(e|fied) pig[man])[ spawn] egg¦s|spawn (zombi(e|fied) pig[man])) = minecraft:spawn_egg {Damage:57}
 	any spawn egg = spawn bat, spawn blaze, spawn cave spider, spawn chicken, spawn cow, spawn creeper, spawn enderman, spawn endermite, spawn ghast, spawn guardian, spawn horse, spawn magma cube, spawn mooshroom, ocelot, spawn pig, spawn rabbit, spawn sheep, spawn silverfish, spawn skeleton, spawn slime, spawn spider, spawn squid, spawn villager, spawn witch, spawn wolf, spawn zombie
+

other.sk

@@ -87,3 +87,7 @@ update aquatic unlisted blocks:
 	(upwards|pushing) bubble column = minecraft:bubble_column[drag=false]
 	(downwards|whirlpool|dragging) bubble column = minecraft:bubble_column[drag=true]
 	bubble column = upwards bubble column, downwards bubble column
+
+water:
+	[stationary] water = minecraft:water
+	flowing water = minecraft:flowing_water