0

Added crimson and warped wood

This commit is contained in:
Lieuwe Westra
2020-08-14 14:53:59 +02:00
parent 629b43370e
commit 113a3a6f09
6 changed files with 120 additions and 25 deletions

View File

@@ -74,6 +74,8 @@ const mc_block_t block_class_stair[] = {
block_spruce_stairs,
block_birch_stairs,
block_jungle_stairs,
block_crimson_stairs,
block_warped_stairs,
block_quartz_stairs,
block_acacia_stairs,
block_dark_oak_stairs,
@@ -109,7 +111,9 @@ const mc_block_t block_class_door[] = {
block_birch_door,
block_jungle_door,
block_acacia_door,
block_dark_oak_door};
block_dark_oak_door,
block_crimson_door,
block_warped_door};
const size_t block_class_door_len = COUNT_OF(block_class_door);
const mc_block_t block_class_fence[] = {
@@ -119,6 +123,8 @@ const mc_block_t block_class_fence[] = {
block_birch_fence,
block_jungle_fence,
block_dark_oak_fence,
block_crimson_fence,
block_warped_fence,
block_acacia_fence};
const size_t block_class_fence_len = COUNT_OF(block_class_fence);
@@ -128,7 +134,9 @@ const mc_block_t block_class_fence_gate[] = {
block_birch_fence_gate,
block_jungle_fence_gate,
block_dark_oak_fence_gate,
block_acacia_fence_gate};
block_acacia_fence_gate,
block_crimson_fence_gate,
block_warped_fence_gate};
const size_t block_class_fence_gate_len = COUNT_OF(block_class_fence_gate);
const mc_block_t block_class_ancil[] = {
@@ -139,6 +147,8 @@ const mc_block_t block_class_ancil[] = {
block_jungle_door,
block_acacia_door,
block_dark_oak_door,
block_dark_oak_door,
block_crimson_door,
block_oak_stairs,
block_brick_stairs,
block_stone_brick_stairs,
@@ -150,6 +160,8 @@ const mc_block_t block_class_ancil[] = {
block_quartz_stairs,
block_acacia_stairs,
block_dark_oak_stairs,
block_crimson_stairs,
block_warped_stairs,
block_red_sandstone_stairs,
block_smooth_red_sandstone_stairs,
block_purpur_stairs,
@@ -209,6 +221,8 @@ const mc_block_t block_class_ancil[] = {
block_birch_fence,
block_jungle_fence,
block_dark_oak_fence,
block_crimson_fence,
block_warped_fence,
block_acacia_fence};
const size_t block_class_ancil_len = COUNT_OF(block_class_ancil);
@@ -223,8 +237,11 @@ const mc_block_t block_class_alt_height[] = {
block_birch_stairs,
block_jungle_stairs,
block_quartz_stairs,
block_quartz_stairs,
block_acacia_stairs,
block_dark_oak_stairs,
block_crimson_stairs,
block_warped_stairs,
block_red_sandstone_stairs,
block_smooth_red_sandstone_stairs,
block_prismarine_stairs,

View File

@@ -280,7 +280,8 @@ generate_pseudo_data(RenderState* state, uint16_t ancilData) {
/* check for fences AND fence gates */
return check_adjacent_blocks(state, x, y, z, state->block) | check_adjacent_blocks(state, x, y, z, block_fence_gate) |
check_adjacent_blocks(state, x, y, z, block_fence_gate) | check_adjacent_blocks(state, x, y, z, block_birch_fence_gate) | check_adjacent_blocks(state, x, y, z, block_jungle_fence_gate) |
check_adjacent_blocks(state, x, y, z, block_dark_oak_fence_gate) | check_adjacent_blocks(state, x, y, z, block_acacia_fence_gate);
check_adjacent_blocks(state, x, y, z, block_dark_oak_fence_gate) | check_adjacent_blocks(state, x, y, z, block_acacia_fence_gate)
| check_adjacent_blocks(state, x, y, z, block_crimson_fence_gate) | check_adjacent_blocks(state, x, y, z, block_warped_fence_gate);
} else if (state->block == block_redstone_wire) { /* redstone */
/* three addiotional bit are added, one for on/off state, and

View File

@@ -168,6 +168,8 @@ enum mc_block_id {
block_log2 = 162,
block_acacia_stairs = 163,
block_dark_oak_stairs = 164,
block_crimson_stairs = 509,
block_warped_stairs = 510,
block_slime = 165,
block_barrier = 166,
block_iron_trapdoor = 167,
@@ -192,15 +194,21 @@ enum mc_block_id {
block_jungle_fence_gate = 185,
block_dark_oak_fence_gate = 186,
block_acacia_fence_gate = 187,
block_crimson_fence_gate = 513,
block_warped_fence_gate = 514,
block_spruce_fence = 188,
block_birch_fence = 189,
block_jungle_fence = 190,
block_dark_oak_fence = 191,
block_acacia_fence = 192,
block_crimson_fence = 511,
block_warped_fence = 512,
block_spruce_door = 193,
block_birch_door = 194,
block_jungle_door = 195,
block_acacia_door = 196,
block_crimson_door = 499,
block_warped_door = 500,
block_dark_oak_door = 197,
block_end_rod = 198,
block_chorus_plant = 199,
@@ -380,12 +388,16 @@ enum mc_block_id {
block_jungle_sign = 11404,
block_acacia_sign = 11405,
block_dark_oak_sign = 11406,
block_crimson_sign = 12505,
block_warped_sign = 12506,
block_oak_wall_sign = 11407,
block_spruce_wall_sign = 11408,
block_birch_wall_sign = 11409,
block_jungle_wall_sign = 11410,
block_acacia_wall_sign = 11411,
block_dark_oak_wall_sign = 11412,
block_crimson_wall_sign = 12507,
block_warped_wall_sign = 12508,
block_bamboo_sapling = 11413,
block_scaffolding = 11414,
block_bamboo = 11416,
@@ -579,6 +591,8 @@ enum mc_item_id {
item_jungle_door = 429,
item_acacia_door = 430,
item_dark_oak_door = 431,
item_crimson_door = 755,
item_warped_door = 756,
item_chorus_fruit = 432,
item_popped_chorus_fruit = 433,
item_beetroot = 434,
@@ -611,7 +625,7 @@ enum mc_item_id {
item_record_strad = 2264,
item_record_ward = 2265,
item_record_11 = 2266,
item_record_wait = 2267
item_record_wait = 2267,
};
typedef uint16_t mc_item_t;

View File

@@ -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 92
#define OVERVIEWER_EXTENSION_VERSION 93
#include <stdbool.h>
#include <stdint.h>