BlockType: replace list of booleans with flags bitfield

resource/blocks.json

@@ -209,8 +209,8 @@
 	"brown_wall_banner": null,
 	"brown_wool": {},
 	"bubble_column": {
-		"blue": true,
-		"texture": "water_still"
+		"texture": "water_still",
+		"water": true
 	},
 	"bubble_coral": null,
 	"bubble_coral_block": {},
@@ -1428,8 +1428,8 @@
 	"warped_wall_sign": null,
 	"warped_wart_block": {},
 	"water": {
-		"blue": true,
-		"texture": "water_still"
+		"texture": "water_still",
+		"water": true
 	},
 	"weeping_vines": {},
 	"weeping_vines_plant": {},

resource/extract.py

@@ -42,7 +42,7 @@ for name, info in blocks.items():
 		'opaque': False,
 		'grass': False,
 		'foliage': False,
-		'blue': False,
+		'water': False,
 	}
 
 	if info is None:
@@ -54,7 +54,7 @@ for name, info in blocks.items():
 		output[id]['opaque'] = True
 		output[id]['grass'] = info.get('grass', False)
 		output[id]['foliage'] = info.get('foliage', False)
-		output[id]['blue'] = info.get('blue', False)
+		output[id]['water'] = info.get('water', False)
 
 with open(sys.argv[3], 'w') as f:
 	json.dump(output, f)

resource/generate.py

@@ -15,12 +15,23 @@ output = {}
 
 with open(sys.argv[2], 'w') as f:
 	for name, info in colors.items():
-		print('{"%s", {%s, %s, %s, %s, {%u, %u, %u}}},' % (
+		flags = []
+		if info['opaque']:
+			flags.append('BLOCK_OPAQUE')
+		if info['grass']:
+			flags.append('BLOCK_GRASS')
+		if info['foliage']:
+			flags.append('BLOCK_FOLIAGE')
+		if info['water']:
+			flags.append('BLOCK_WATER')
+		if flags:
+			flags = '|'.join(flags)
+		else:
+			flags = '0'
+
+		print('{"%s", {%s, {%u, %u, %u}}},' % (
 			name,
-			['false', 'true'][info['opaque']],
-			['false', 'true'][info['grass']],
-			['false', 'true'][info['foliage']],
-			['false', 'true'][info['blue']],
+			flags,
 			info['color']['r'],
 			info['color']['g'],
 			info['color']['b'],