From dd7a895a8d473575bdc50428e0ba55a478f83219 Mon Sep 17 00:00:00 2001 From: Gloorf Date: Wed, 19 Jul 2017 17:02:16 +0200 Subject: [PATCH 1/3] Added missing blocks from 1.10/1.11/1.12 --- src/main/js/modules/blocks.js | 65 +++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/src/main/js/modules/blocks.js b/src/main/js/modules/blocks.js index 920c69a7c..1384c3b14 100644 --- a/src/main/js/modules/blocks.js +++ b/src/main/js/modules/blocks.js @@ -197,7 +197,7 @@ var blocks = { cake: 92, redstone_repeater: 93, redstone_repeater_active: 94, - stained_glass: { + stained_glass: { white: 95 // all other colors added below }, trapdoor: 96, @@ -207,7 +207,8 @@ var blocks = { mossy: '98:1', cracked: '98:2', chiseled: '98:3', - red: 45 + red: 45, + end: 206 }, mushroom_brown_huge: 99, mushroom_red_huge: 100, @@ -246,7 +247,7 @@ var blocks = { potatoes: 142, beetroot: 207, button_wood: 143, - skull: 144, mobhead: 144, + skull: 144, mobhead: 144, anvil: 145, chest_trapped: 146, pressure_plate_weighted_light: 147, @@ -258,7 +259,7 @@ var blocks = { quartzore: 153, netherquartzore: 153, hopper: 154, quartz: 155, - quartz_chiseled: '155:1', + quartz_chiseled: '155:1', quartz_pillar_vertical: '155:2', quartz_pillar_horizontal: '155:3', quartz_pillar_cap: '155:4', @@ -285,7 +286,7 @@ var blocks = { hardened_clay: 172, coal_block: 173, packed_ice: 174, - double_plant: 175, + double_plant: 175, sunflower: 175, purpur: 201, purpur_pillar: 202, @@ -308,7 +309,8 @@ var blocks = { orange_tulip: '38:5', white_tulip: '38:6', pink_tulip: '38:7', - oxeye_daisy: '38:8' + oxeye_daisy: '38:8', + chorus: 200, }, bonemeal: '351:15', banner: { @@ -329,23 +331,58 @@ var blocks = { jungle: 190, oak: 191, acacia: 192 - } + }, + end_rod: 198, + chorus_plant: 199, + chorus_flower: 200, + grass_path: 208, + magma: 213, + nether_wart_block: 214, + red_nether_brick: 215, + bone_block: 216, + // Cannot use regular colorized blocks because glazed terracota are differents blocks + glazed_terracota: { + white: 235, + orange: 236, + magenta: 237, + light_blue: 238, + yellow: 239, + lime: 240, + pink: 241, + gray: 242, + light_gray: 243, + cyan: 244, + purple: 245, + blue: 246, + brown: 247, + green: 248, + red: 249, + black: 250 + }, + concrete: { + white: 251 + }, + concrete_powder: { + white: 252 + }, }; // Add all available colors to colorized block collections var colorized_blocks = [ - 'wool', - 'stained_clay', - 'carpet', - 'stained_glass', - 'stained_glass_pane' + 'wool', + 'stained_clay', + 'carpet', + 'stained_glass', + 'stained_glass_pane', + 'concrete', + 'concrete_powder' ]; for (var i = 0, len = colorized_blocks.length; i < len; i++) { var block = colorized_blocks[i], - data_value = blocks[block].white; - + data_value = blocks[block].white; + for (var color in colors) { blocks[block][color] = data_value + ':' + colors[color]; } From adbf6118bcb034bdf329a0e3e8857a074242c4f8 Mon Sep 17 00:00:00 2001 From: Gloorf Date: Sat, 23 Sep 2017 22:35:14 +0200 Subject: [PATCH 2/3] Removed duplicates --- src/main/js/modules/blocks.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/js/modules/blocks.js b/src/main/js/modules/blocks.js index 1384c3b14..59913478d 100644 --- a/src/main/js/modules/blocks.js +++ b/src/main/js/modules/blocks.js @@ -124,7 +124,6 @@ var blocks = { dark_oak: '126:13' }, snow: 78, - stone: 44, oak: 126, spruce: '126:1', birch: '126:2', @@ -187,7 +186,6 @@ var blocks = { clay: 82, sugar_cane: 83, jukebox: 84, - fence: 85, pumpkin: 86, netherrack: 87, soulsand: 88, From 025a861718c2d90713387d3637b09d0af0456f85 Mon Sep 17 00:00:00 2001 From: Gloorf Date: Sun, 1 Oct 2017 09:27:34 +0200 Subject: [PATCH 3/3] Fix fence object with proper values --- src/main/js/modules/blocks.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/js/modules/blocks.js b/src/main/js/modules/blocks.js index 59913478d..c70ca1d5b 100644 --- a/src/main/js/modules/blocks.js +++ b/src/main/js/modules/blocks.js @@ -324,10 +324,12 @@ var blocks = { acacia: 187 }, fence: { + oak: 85, + nether_brick: 113, spruce: 188, birch: 189, jungle: 190, - oak: 191, + dark_oak: 191, acacia: 192 }, end_rod: 198,