Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Winter Drop (1.21.4) blocks #78

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
16 changes: 12 additions & 4 deletions overviewer_core/src/block_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ const mc_block_t block_class_stair[] = {
block_cherry_stairs,
block_bamboo_stairs,
block_bamboo_mosaic_stairs,
block_mud_brick_stairs};
block_mud_brick_stairs,
block_pale_oak_stairs,
block_resin_brick_stairs};
const size_t block_class_stair_len = COUNT_OF(block_class_stair);

const mc_block_t block_class_door[] = {
Expand Down Expand Up @@ -201,6 +203,7 @@ const mc_block_t block_class_ancil[] = {
block_dark_oak_stairs,
block_crimson_stairs,
block_warped_stairs,
block_pale_oak_stairs,
block_red_sandstone_stairs,
block_smooth_red_sandstone_stairs,
block_purpur_stairs,
Expand Down Expand Up @@ -278,7 +281,9 @@ const mc_block_t block_class_ancil[] = {
block_bamboo_stairs,
block_bamboo_mosaic_stairs,
block_mud_brick_stairs,
block_mud_brick_wall};
block_mud_brick_wall,
block_resin_brick_stairs,
block_resin_brick_wall};
const size_t block_class_ancil_len = COUNT_OF(block_class_ancil);

const mc_block_t block_class_alt_height[] = {
Expand Down Expand Up @@ -317,7 +322,8 @@ const mc_block_t block_class_alt_height[] = {
block_smooth_sandstone_stairs,
block_blackstone_stairs,
block_polished_blackstone_stairs,
block_polished_blackstone_brick_stairs,
block_polished_blackstone_brick_stairs,
block_pale_oak_stairs,
block_prismarine_slab,
block_dark_prismarine_slab,
block_prismarine_brick_slab,
Expand Down Expand Up @@ -379,7 +385,9 @@ const mc_block_t block_class_alt_height[] = {
block_cherry_stairs,
block_bamboo_stairs,
block_bamboo_mosaic_stairs,
block_mud_brick_stairs};
block_mud_brick_stairs,
block_resin_brick_stairs,
block_resin_brick_slab};
const size_t block_class_alt_height_len = COUNT_OF(block_class_alt_height);

const mc_block_t block_class_nether_roof[] = {
Expand Down
7 changes: 7 additions & 0 deletions overviewer_core/src/mc_id.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ enum mc_block_id {
block_dark_oak_stairs = 164,
block_crimson_stairs = 509,
block_warped_stairs = 510,
block_pale_oak_stairs = 1131,
block_slime = 165,
block_barrier = 166,
block_iron_trapdoor = 167,
Expand Down Expand Up @@ -209,6 +210,8 @@ enum mc_block_id {
block_mangrove_fence = 1195,
block_bamboo_fence = 1215,
block_cherry_fence = 1204,
block_pale_oak_fence = 1134,
block_pale_oak_fence_gate = 1135,
block_spruce_door = 193,
block_birch_door = 194,
block_jungle_door = 195,
Expand Down Expand Up @@ -450,6 +453,7 @@ enum mc_block_id {
block_tuff_wall = 1813,
block_polished_tuff_wall = 1814,
block_tuff_brick_wall = 1815,
block_resin_brick_wall = 1816,
// end of walls

block_prismarine_stairs = 11337,
Expand Down Expand Up @@ -570,6 +574,9 @@ enum mc_block_id {
block_tuff_stairs = 12664,
block_polished_tuff_stairs = 12667,
block_tuff_brick_stairs = 12671,

block_resin_brick_stairs = 1147,
block_resin_brick_slab = 1148
};

typedef uint16_t mc_block_t;
Expand Down
2 changes: 1 addition & 1 deletion overviewer_core/src/overviewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

// increment this value if you've made a change to the c extension
// and want to force users to rebuild
#define OVERVIEWER_EXTENSION_VERSION 120
#define OVERVIEWER_EXTENSION_VERSION 122

#include <stdbool.h>
#include <stdint.h>
Expand Down
132 changes: 67 additions & 65 deletions overviewer_core/src/primitives/biomes.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,82 +42,84 @@ typedef struct {
*/
static Biome biome_table[] = {
/* 0 */
{"The Void", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Plains", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Sunflower Plains", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Snowy Plains", 0.0, 0.5, 255, 255, 255, 64, 118, 228},
{"Ice Spikes", 0.0, 0.5, 255, 255, 255, 64, 118, 228},
{"The Void", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Plains", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Sunflower Plains", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Snowy Plains", 0.0, 0.5, 255, 255, 255, 64, 118, 228},
{"Ice Spikes", 0.0, 0.5, 255, 255, 255, 64, 118, 228},
/* 5 */
{"Desert", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Swamp", 0.8, 0.9, 205, 128, 255, 97, 123, 100},
{"Mangrove Swamp", 0.8, 0.9, 205, 128 , 255, 58, 122, 106},
{"Forest", 0.7, 0.8, 255, 255, 255, 64, 118, 228},
{"Flower Forest", 0.7, 0.8, 255, 255, 255, 64, 118, 228},
{"Desert", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Swamp", 0.8, 0.9, 205, 128, 255, 97, 123, 100},
{"Mangrove Swamp", 0.8, 0.9, 205, 128, 255, 58, 122, 106},
{"Forest", 0.7, 0.8, 255, 255, 255, 64, 118, 228},
{"Flower Forest", 0.7, 0.8, 255, 255, 255, 64, 118, 228},
/* 10 */
{"Birch Forest", 0.6, 0.6, 255, 255, 255, 64, 118, 228},
{"Dark Forest", 0.7, 0.8, 255, 255, 255, 64, 118, 228},
{"Old Growth Birch Forest", 0.6, 0.6, 255, 255, 255, 64, 118, 228},
{"Old Growth Pine Taiga", 0.3, 0.8, 255, 255, 255, 64, 118, 228},
{"Old Growth Spruce Taiga", 0.25, 0.8, 255, 255, 255, 64, 118, 228},
{"Birch Forest", 0.6, 0.6, 255, 255, 255, 64, 118, 228},
{"Dark Forest", 0.7, 0.8, 255, 255, 255, 64, 118, 228},
{"Old Growth Birch Forest", 0.6, 0.6, 255, 255, 255, 64, 118, 228},
{"Old Growth Pine Taiga", 0.3, 0.8, 255, 255, 255, 64, 118, 228},
{"Old Growth Spruce Taiga", 0.25, 0.8, 255, 255, 255, 64, 118, 228},
/* 15 */
{"Taiga", 0.25, 0.8, 255, 255, 255, 64, 118, 228},
{"Snowy Taiga", -0.5, 0.4, 255, 255, 255, 64, 118, 228},
{"Savanna", 1.2, 0.0, 255, 255, 25, 64, 118, 228},
{"Savanna Plateau", 1.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Windswept Hills", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
{"Taiga", 0.25, 0.8, 255, 255, 255, 64, 118, 228},
{"Snowy Taiga", -0.5, 0.4, 255, 255, 255, 64, 118, 228},
{"Savanna", 1.2, 0.0, 255, 255, 25, 64, 118, 228},
{"Savanna Plateau", 1.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Windswept Hills", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
/* 20 */
{"Windswept Gravelly Hills", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
{"Windswept Forest", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
{"Windswept Savanna", 1.1, 0.0, 255, 255, 255, 64, 118, 228},
{"Jungle", 0.95, 0.9, 255, 255, 255, 64, 118, 228},
{"Sparse Jungle", 0.95, 0.8, 255, 255, 255, 64, 118, 228},
{"Windswept Gravelly Hills", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
{"Windswept Forest", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
{"Windswept Savanna", 1.1, 0.0, 255, 255, 255, 64, 118, 228},
{"Jungle", 0.95, 0.9, 255, 255, 255, 64, 118, 228},
{"Sparse Jungle", 0.95, 0.8, 255, 255, 255, 64, 118, 228},
/* 25 */
{"Bamboo Jungle", 0.95, 0.9, 255, 255, 255, 64, 118, 228},
{"Badlands", 2.0, 0.0, 144, 129, 77, 64, 118, 228},
{"Eroded Badlands", 2.0, 0.0, 144, 129, 77, 64, 118, 228},
{"Wooded Badlands", 2.0, 0.0, 144, 129, 77, 64, 118, 228},
{"Meadow", 0.5, 0.8, 255, 255, 255, 64, 118, 228},
{"Bamboo Jungle", 0.95, 0.9, 255, 255, 255, 64, 118, 228},
{"Badlands", 2.0, 0.0, 144, 129, 77, 64, 118, 228},
{"Eroded Badlands", 2.0, 0.0, 144, 129, 77, 64, 118, 228},
{"Wooded Badlands", 2.0, 0.0, 144, 129, 77, 64, 118, 228},
{"Meadow", 0.5, 0.8, 255, 255, 255, 64, 118, 228},
/* 30 */
{"Grove", -0.2, 0.8, 255, 255, 255, 64, 118, 228},
{"Snowy Slopes", -0.3, 0.9, 255, 255, 255, 64, 118, 228},
{"Frozen Peaks", -0.7, 0.9, 255, 255, 255, 64, 118, 228},
{"Jagged Peaks", -0.7, 0.9, 255, 255, 255, 64, 118, 228},
{"Stony Peaks", 1.5, 0.3, 255, 255, 255, 64, 118, 228},
{"Grove", -0.2, 0.8, 255, 255, 255, 64, 118, 228},
{"Snowy Slopes", -0.3, 0.9, 255, 255, 255, 64, 118, 228},
{"Frozen Peaks", -0.7, 0.9, 255, 255, 255, 64, 118, 228},
{"Jagged Peaks", -0.7, 0.9, 255, 255, 255, 64, 118, 228},
{"Stony Peaks", 1.5, 0.3, 255, 255, 255, 64, 118, 228},
/* 35 */
{"River", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Frozen River", 0.0, 0.5, 255, 255, 255, 57, 56, 201},
{"Beach", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Snowy Beach", 0.05, 0.3, 255, 255, 255, 61, 87, 214},
{"Stony Shore", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
{"River", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Frozen River", 0.0, 0.5, 255, 255, 255, 57, 56, 201},
{"Beach", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Snowy Beach", 0.05, 0.3, 255, 255, 255, 61, 87, 214},
{"Stony Shore", 0.2, 0.3, 255, 255, 255, 64, 118, 228},
/* 40 */
{"Warm Ocean", 0.5, 0.5, 255, 255, 255, 67, 213, 238},
{"Lukewarm Ocean", 0.5, 0.5, 255, 255, 255, 69, 173, 242},
{"Deep Lukewarm Ocean", 0.5, 0.5, 255, 255, 255, 69, 173, 242},
{"Ocean", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Deep Ocean", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Warm Ocean", 0.5, 0.5, 255, 255, 255, 67, 213, 238},
{"Lukewarm Ocean", 0.5, 0.5, 255, 255, 255, 69, 173, 242},
{"Deep Lukewarm Ocean", 0.5, 0.5, 255, 255, 255, 69, 173, 242},
{"Ocean", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Deep Ocean", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
/* 45 */
{"Cold Ocean", 0.5, 0.5, 255, 255, 255, 61, 87, 214},
{"Deep Cold Ocean", 0.5, 0.5, 255, 255, 255, 61, 87, 214},
{"Frozen Ocean", 0.0, 0.5, 255, 255, 255, 57, 56, 201},
{"Deep Frozen Ocean", 0.5, 0.5, 255, 255, 255, 57, 56, 201},
{"Mushroom Fields", 0.9, 1.0, 255, 255, 255, 64, 118, 228},
//* 50 */
{"Dripstone Caves", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Lush Caves", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Deep Dark", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Nether Wastes", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Warped Forest", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Cold Ocean", 0.5, 0.5, 255, 255, 255, 61, 87, 214},
{"Deep Cold Ocean", 0.5, 0.5, 255, 255, 255, 61, 87, 214},
{"Frozen Ocean", 0.0, 0.5, 255, 255, 255, 57, 56, 201},
{"Deep Frozen Ocean", 0.5, 0.5, 255, 255, 255, 57, 56, 201},
{"Mushroom Fields", 0.9, 1.0, 255, 255, 255, 64, 118, 228},
/* 50 */
{"Dripstone Caves", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Lush Caves", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Deep Dark", 0.8, 0.4, 255, 255, 255, 64, 118, 228},
{"Nether Wastes", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Warped Forest", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
/* 55 */
{"Crimson Forest", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Soul Sand Valley", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Basalt Deltas", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"The End", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"End Highlands", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Crimson Forest", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Soul Sand Valley", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"Basalt Deltas", 2.0, 0.0, 255, 255, 255, 64, 118, 228},
{"The End", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"End Highlands", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
/* 60 */
{"End Midlands", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Small End Islands", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"End Barrens", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Cherry Grove", 0.7, 0.7, 167, 216, 108, 63, 118, 228},
{"End Midlands", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Small End Islands", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"End Barrens", 0.5, 0.5, 255, 255, 255, 64, 118, 228},
{"Cherry Grove", 0.5, 0.8, 353, 297, 225, 93, 183, 239},
{"Pale Garden", 0.7, 0.8, 119, 130, 114, 63, 118, 228},
/* 65 */
};

#define NUM_BIOMES (sizeof(biome_table) / sizeof(Biome))
Loading
Loading