From bb119ed33b563eb9c91fa978dd0dae8a02ade927 Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Thu, 23 Jun 2022 21:39:27 +0200 Subject: [PATCH 01/10] added some of the wood blocks --- overviewer_core/src/block_class.c | 7 ++++- overviewer_core/src/mc_id.h | 9 ++++++- overviewer_core/textures.py | 43 +++++++++++++++++++++++-------- overviewer_core/world.py | 17 ++++++++++-- 4 files changed, 61 insertions(+), 15 deletions(-) diff --git a/overviewer_core/src/block_class.c b/overviewer_core/src/block_class.c index 27299160c..8391f89cc 100644 --- a/overviewer_core/src/block_class.c +++ b/overviewer_core/src/block_class.c @@ -113,6 +113,7 @@ const mc_block_t block_class_stair[] = { block_jungle_stairs, block_crimson_stairs, block_warped_stairs, + block_mangrove_stairs, block_quartz_stairs, block_acacia_stairs, block_dark_oak_stairs, @@ -162,7 +163,8 @@ const mc_block_t block_class_door[] = { block_acacia_door, block_dark_oak_door, block_crimson_door, - block_warped_door}; + block_warped_door, + block_mangrove_door}; const size_t block_class_door_len = COUNT_OF(block_class_door); const mc_block_t block_class_ancil[] = { @@ -174,6 +176,7 @@ const mc_block_t block_class_ancil[] = { block_acacia_door, block_dark_oak_door, block_crimson_door, + block_mangrove_door, block_oak_stairs, block_brick_stairs, block_stone_brick_stairs, @@ -187,6 +190,7 @@ const mc_block_t block_class_ancil[] = { block_dark_oak_stairs, block_crimson_stairs, block_warped_stairs, + block_mangrove_stairs, block_red_sandstone_stairs, block_smooth_red_sandstone_stairs, block_purpur_stairs, @@ -270,6 +274,7 @@ const mc_block_t block_class_alt_height[] = { block_dark_oak_stairs, block_crimson_stairs, block_warped_stairs, + block_mangrove_stairs, block_red_sandstone_stairs, block_smooth_red_sandstone_stairs, block_prismarine_stairs, diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index dd3126fc6..5d8ee1fa0 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -170,6 +170,7 @@ enum mc_block_id { block_dark_oak_stairs = 164, block_crimson_stairs = 509, block_warped_stairs = 510, + block_mangrove_stairs = 518, block_slime = 165, block_barrier = 166, block_iron_trapdoor = 167, @@ -194,8 +195,10 @@ 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_crimson_fence_gate = 517, block_warped_fence_gate = 514, + block_mangrove_fence_gate = 515, + block_mangrove_fence = 516, block_spruce_fence = 188, block_birch_fence = 189, block_jungle_fence = 190, @@ -210,6 +213,7 @@ enum mc_block_id { block_crimson_door = 499, block_warped_door = 500, block_dark_oak_door = 197, + block_mangrove_door = 517, block_end_rod = 198, block_chorus_plant = 199, block_chorus_flower = 200, @@ -504,6 +508,7 @@ enum mc_block_id { block_dark_oak_sign = 11406, block_crimson_sign = 12505, block_warped_sign = 12506, + block_mangrove_sign = 12507, block_oak_wall_sign = 11407, block_spruce_wall_sign = 11408, block_birch_wall_sign = 11409, @@ -512,6 +517,7 @@ enum mc_block_id { block_dark_oak_wall_sign = 11412, block_crimson_wall_sign = 12507, block_warped_wall_sign = 12508, + block_mangrove_wall_sign = 12509, block_bamboo_sapling = 11413, block_scaffolding = 11414, block_bamboo = 11416, @@ -713,6 +719,7 @@ enum mc_item_id { item_dark_oak_door = 431, item_crimson_door = 755, item_warped_door = 756, + item_mangrove_door = 757, item_chorus_fruit = 432, item_popped_chorus_fruit = 433, item_beetroot = 434, diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index b809d242f..6cbd53d51 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -978,7 +978,7 @@ def dirt_blocks(self, blockid, data): block(blockid=4, top_image="assets/minecraft/textures/block/cobblestone.png") # wooden planks -@material(blockid=5, data=list(range(8)), solid=True) +@material(blockid=5, data=list(range(9)), solid=True) def wooden_planks(self, blockid, data): if data == 0: # normal return self.build_block(self.load_image_texture("assets/minecraft/textures/block/oak_planks.png"), self.load_image_texture("assets/minecraft/textures/block/oak_planks.png")) @@ -996,6 +996,9 @@ def wooden_planks(self, blockid, data): return self.build_block(self.load_image_texture("assets/minecraft/textures/block/crimson_planks.png"),self.load_image_texture("assets/minecraft/textures/block/crimson_planks.png")) if data == 7: # warped return self.build_block(self.load_image_texture("assets/minecraft/textures/block/warped_planks.png"),self.load_image_texture("assets/minecraft/textures/block/warped_planks.png")) + if data == 8: # warped + return self.build_block(self.load_image_texture("assets/minecraft/textures/block/mangrove_planks.png"),self.load_image_texture("assets/minecraft/textures/block/mangrove_planks.png")) + @material(blockid=6, data=list(range(16)), transparent=True) def saplings(self, blockid, data): @@ -1167,6 +1170,8 @@ def wood(self, blockid, data): 1126: { 0: ("mangrove_log_top.png", "mangrove_log.png"), 1: ("stripped_mangrove_log_top.png", "stripped_mangrove_log.png"), + 2: ("mangrove_log.png", "mangrove_log.png"), + 3: ("stripped_mangrove_log.png", "stripped_mangrove_log.png"), }, } @@ -2086,7 +2091,7 @@ def fire(self, blockid, data): # smooth_red_sandstone blackstone polished_blackstone polished_blackstone_brick # also all the copper variants # also all deepslate variants -@material(blockid=[53, 67, 108, 109, 114, 128, 134, 135, 136, 156, 163, 164, 180, 203, 509, 510, +@material(blockid=[53, 67, 108, 109, 114, 128, 134, 135, 136, 156, 163, 164, 180, 203, 509, 510, 518, 11337, 11338, 11339, 11370, 11371, 11374, 11375, 11376, 11377, 11378, 11379, 11380, 11381, 11382, 11383, 11384, 11415, 1030, 1031, 1032, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1099, 1100, 1101, 1102], @@ -2120,6 +2125,7 @@ def stairs(self, blockid, data): 203: "assets/minecraft/textures/block/purpur_block.png", 509: "assets/minecraft/textures/block/crimson_planks.png", 510: "assets/minecraft/textures/block/warped_planks.png", + 518: "assets/minecraft/textures/block/mangrove_planks.png", 11337: "assets/minecraft/textures/block/prismarine.png", 11338: "assets/minecraft/textures/block/dark_prismarine.png", 11339: "assets/minecraft/textures/block/prismarine_bricks.png", @@ -2902,7 +2908,7 @@ def farmland(self, blockid, data): # signposts -@material(blockid=[63,11401,11402,11403,11404,11405,11406,12505,12506], data=list(range(16)), transparent=True) +@material(blockid=[63,11401,11402,11403,11404,11405,11406,12505,12506,12507], data=list(range(16)), transparent=True) def signpost(self, blockid, data): # first rotations @@ -2924,6 +2930,7 @@ def signpost(self, blockid, data): 11406: ("dark_oak_planks.png", "dark_oak_log.png"), 12505: ("crimson_planks.png", "crimson_stem.png"), 12506: ("warped_planks.png", "warped_stem.png"), + 12507: ("mangrove_planks.png", "mangrove_log.png"), } texture_path, texture_stick_path = ["assets/minecraft/textures/block/" + x for x in sign_texture[blockid]] @@ -2971,7 +2978,7 @@ def signpost(self, blockid, data): # wooden and iron door # uses pseudo-ancildata found in iterate.c -@material(blockid=[64,71,193,194,195,196,197, 499, 500], data=list(range(32)), transparent=True) +@material(blockid=[64,71,193,194,195,196,197, 499, 500, 517], data=list(range(32)), transparent=True) def door(self, blockid, data): #Masked to not clobber block top/bottom & swung info if self.rotation == 1: @@ -3009,6 +3016,8 @@ def door(self, blockid, data): raw_door = self.load_image_texture("assets/minecraft/textures/block/crimson_door_top.png") elif blockid == 500: # warped door raw_door = self.load_image_texture("assets/minecraft/textures/block/warped_door_top.png") + elif blockid == 517: # warped door + raw_door = self.load_image_texture("assets/minecraft/textures/block/mangrove_door_top.png") else: # bottom of the door if blockid == 64: raw_door = self.load_image_texture("assets/minecraft/textures/block/oak_door_bottom.png") @@ -3028,6 +3037,8 @@ def door(self, blockid, data): raw_door = self.load_image_texture("assets/minecraft/textures/block/crimson_door_bottom.png") elif blockid == 500: # warped door raw_door = self.load_image_texture("assets/minecraft/textures/block/warped_door_bottom.png") + elif blockid == 517: # warped door + raw_door = self.load_image_texture("assets/minecraft/textures/block/mangrove_door_bottom.png") # if you want to render all doors as closed, then force # force closed to be True @@ -3171,7 +3182,7 @@ def ladder(self, blockid, data): # wall signs -@material(blockid=[68,11407,11408,11409,11410,11411,11412,12507,12508], data=[2, 3, 4, 5], transparent=True) +@material(blockid=[68,11407,11408,11409,11410,11411,11412,12507,12508,12509], data=[2, 3, 4, 5], transparent=True) def wall_sign(self, blockid, data): # wall sign # first rotations @@ -3201,6 +3212,7 @@ def wall_sign(self, blockid, data): # wall sign 11412: "dark_oak_planks.png", 12507: "crimson_planks.png", 12508: "warped_planks.png", + 12509: "mangrove_planks.png" } texture_path = "assets/minecraft/textures/block/" + sign_texture[blockid] texture = self.load_image_texture(texture_path).copy() @@ -3383,7 +3395,7 @@ def levers(self, blockid, data): return img # wooden and stone pressure plates, and weighted pressure plates -@material(blockid=[70, 72,147,148,11301,11302,11303,11304,11305, 1033,11517,11518], data=[0,1], transparent=True) +@material(blockid=[70, 72,147,148,11301,11302,11303,11304,11305, 1033,11517,11518,11519], data=[0,1], transparent=True) def pressure_plate(self, blockid, data): texture_name = {70:"assets/minecraft/textures/block/stone.png", # stone 72:"assets/minecraft/textures/block/oak_planks.png", # oak @@ -3394,6 +3406,7 @@ def pressure_plate(self, blockid, data): 11305:"assets/minecraft/textures/block/dark_oak_planks.png", # dark oak 11517:"assets/minecraft/textures/block/crimson_planks.png", # crimson 11518:"assets/minecraft/textures/block/warped_planks.png", # warped + 11519:"assets/minecraft/textures/block/mangrove_planks.png", # mangrove 147:"assets/minecraft/textures/block/gold_block.png", # light golden 148:"assets/minecraft/textures/block/iron_block.png", # heavy iron 1033:"assets/minecraft/textures/block/polished_blackstone.png" @@ -3427,7 +3440,7 @@ def pressure_plate(self, blockid, data): block(blockid=[73, 74], top_image="assets/minecraft/textures/block/redstone_ore.png") # stone and wood buttons -@material(blockid=(77,143,11326,11327,11328,11329,11330,1034,11515,11516), data=list(range(16)), transparent=True) +@material(blockid=(77,143,11326,11327,11328,11329,11330,1034,11515,11516,11517), data=list(range(16)), transparent=True) def buttons(self, blockid, data): # 0x8 is set if the button is pressed mask this info and render @@ -3463,7 +3476,8 @@ def buttons(self, blockid, data): 11330:"assets/minecraft/textures/block/dark_oak_planks.png", 1034:"assets/minecraft/textures/block/polished_blackstone.png", 11515:"assets/minecraft/textures/block/crimson_planks.png", - 11516:"assets/minecraft/textures/block/warped_planks.png" + 11516:"assets/minecraft/textures/block/warped_planks.png", + 11517:"assets/minecraft/textures/block/mangrove_planks.png" }[blockid] t = self.load_image_texture(texturepath).copy() @@ -3678,7 +3692,7 @@ def jukebox(self, blockid, data): return self.build_block(self.load_image_texture("assets/minecraft/textures/block/jukebox_top.png"), self.load_image_texture("assets/minecraft/textures/block/note_block.png")) # nether and normal fences -@material(blockid=[85, 188, 189, 190, 191, 192, 113, 511, 512], data=list(range(16)), transparent=True, nospawn=True) +@material(blockid=[85, 188, 189, 190, 191, 192, 113, 511, 512, 516], data=list(range(16)), transparent=True, nospawn=True) def fence(self, blockid, data): # create needed images for Big stick fence if blockid == 85: # normal fence @@ -3713,6 +3727,10 @@ def fence(self, blockid, data): fence_top = self.load_image_texture("assets/minecraft/textures/block/warped_planks.png").copy() fence_side = self.load_image_texture("assets/minecraft/textures/block/warped_planks.png").copy() fence_small_side = self.load_image_texture("assets/minecraft/textures/block/warped_planks.png").copy() + elif blockid == 516: # mangrove fence + fence_top = self.load_image_texture("assets/minecraft/textures/block/mangrove_planks.png").copy() + fence_side = self.load_image_texture("assets/minecraft/textures/block/mangrove_planks.png").copy() + fence_small_side = self.load_image_texture("assets/minecraft/textures/block/mangrove_planks.png").copy() else: # netherbrick fence fence_top = self.load_image_texture("assets/minecraft/textures/block/nether_bricks.png").copy() fence_side = self.load_image_texture("assets/minecraft/textures/block/nether_bricks.png").copy() @@ -4221,7 +4239,7 @@ def build_torch(active): # trapdoor # the trapdoor is looks like a sprite when opened, that's not good -@material(blockid=[96,167,11332,11333,11334,11335,11336,12501,12502], data=list(range(16)), transparent=True, nospawn=True) +@material(blockid=[96,167,11332,11333,11334,11335,11336,12501,12502,12503], data=list(range(16)), transparent=True, nospawn=True) def trapdoor(self, blockid, data): # rotation @@ -4252,6 +4270,7 @@ def trapdoor(self, blockid, data): 11336:"assets/minecraft/textures/block/dark_oak_trapdoor.png", 12501:"assets/minecraft/textures/block/crimson_trapdoor.png", 12502:"assets/minecraft/textures/block/warped_trapdoor.png", + 12503:"assets/minecraft/textures/block/mangrove_trapdoor.png", }[blockid] if data & 0x4 == 0x4: # opened trapdoor @@ -4483,7 +4502,7 @@ def vines(self, blockid, data): # fence gates -@material(blockid=[107, 183, 184, 185, 186, 187, 513, 514], data=list(range(8)), transparent=True, nospawn=True) +@material(blockid=[107, 183, 184, 185, 186, 187, 513, 514, 515], data=list(range(8)), transparent=True, nospawn=True) def fence_gate(self, blockid, data): # rotation @@ -4526,6 +4545,8 @@ def fence_gate(self, blockid, data): gate_side = self.load_image_texture("assets/minecraft/textures/block/crimson_planks.png").copy() elif blockid == 514: # Warped gate_side = self.load_image_texture("assets/minecraft/textures/block/warped_planks.png").copy() + elif blockid == 515: # Mangrove + gate_side = self.load_image_texture("assets/minecraft/textures/block/mangrove_planks.png").copy() else: return None diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 0fd3f796e..59af0cfe4 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -323,6 +323,7 @@ def __init__(self, regiondir, rel): 'minecraft:dark_oak_planks': (5, 5), 'minecraft:crimson_planks': (5, 6), 'minecraft:warped_planks': (5, 7), + 'minecraft:mangrove_planks': (5, 8), 'minecraft:sapling': (6, 0), 'minecraft:bedrock': (7, 0), 'minecraft:water': (8, 0), @@ -420,6 +421,7 @@ def __init__(self, regiondir, rel): 'minecraft:oak_stairs': (53, 0), 'minecraft:crimson_stairs': (509, 0), 'minecraft:warped_stairs': (510, 0), + 'minecraft:mangrove_stairs': (518, 0), 'minecraft:chest': (54, 0), 'minecraft:redstone_wire': (55, 0), 'minecraft:diamond_ore': (56, 0), @@ -437,6 +439,7 @@ def __init__(self, regiondir, rel): 'minecraft:dark_oak_sign': (11406, 0), 'minecraft:crimson_sign': (12505, 0), 'minecraft:warped_sign': (12506, 0), + 'minecraft:mangrove_sign': (12507, 0), 'minecraft:oak_door': (64, 0), 'minecraft:ladder': (65, 0), 'minecraft:rail': (66, 0), @@ -450,6 +453,7 @@ def __init__(self, regiondir, rel): 'minecraft:dark_oak_wall_sign': (11412, 0), 'minecraft:crimson_wall_sign': (12507, 0), 'minecraft:warped_wall_sign': (12508, 0), + 'minecraft:mangrove_wall_sign': (12509, 0), 'minecraft:lever': (69, 0), 'minecraft:stone_pressure_plate': (70, 0), 'minecraft:iron_door': (71, 0), @@ -651,8 +655,9 @@ def __init__(self, regiondir, rel): 'minecraft:jungle_fence_gate': (185, 0), 'minecraft:dark_oak_fence_gate': (186, 0), 'minecraft:acacia_fence_gate': (187, 0), - 'minecraft:crimson_fence_gate': (513, 0), + 'minecraft:crimson_fence_gate': (517, 0), 'minecraft:warped_fence_gate': (514, 0), + 'minecraft:mangrove_fence_gate': (515, 0), 'minecraft:spruce_fence': (188, 0), 'minecraft:birch_fence': (189, 0), 'minecraft:jungle_fence': (190, 0), @@ -660,6 +665,7 @@ def __init__(self, regiondir, rel): 'minecraft:acacia_fence': (192, 0), 'minecraft:crimson_fence': (511, 0), 'minecraft:warped_fence': (512, 0), + 'minecraft:mangrove_fence': (516, 0), 'minecraft:spruce_door': (193, 0), 'minecraft:birch_door': (194, 0), 'minecraft:jungle_door': (195, 0), @@ -667,6 +673,7 @@ def __init__(self, regiondir, rel): 'minecraft:dark_oak_door': (197, 0), 'minecraft:crimson_door': (499, 0), 'minecraft:warped_door': (500, 0), + 'minecraft:mangrove_door': (517, 0), 'minecraft:end_rod': (198, 0), 'minecraft:chorus_plant': (199, 0), 'minecraft:chorus_flower': (200, 0), @@ -873,6 +880,8 @@ def __init__(self, regiondir, rel): 'minecraft:mangrove_log': (1126, 0), 'minecraft:stripped_mangrove_log': (1126, 1), 'minecraft:muddy_mangrove_roots': (1127, 0), + 'minecraft:mangrove_wood': (1126, 2), + 'minecraft:stripped_mangrove_wood': (1126, 3), # New blocks 'minecraft:carved_pumpkin': (11300, 0), @@ -883,6 +892,7 @@ def __init__(self, regiondir, rel): 'minecraft:dark_oak_pressure_plate': (11305, 0), 'minecraft:crimson_pressure_plate': (11517, 0), 'minecraft:warped_pressure_plate': (11518, 0), + 'minecraft:mangrove_pressure_plate': (11519, 0), 'minecraft:stripped_oak_log': (11306, 0), 'minecraft:stripped_spruce_log': (11306, 1), 'minecraft:stripped_birch_log': (11306, 2), @@ -922,6 +932,7 @@ def __init__(self, regiondir, rel): 'minecraft:dark_oak_button': (11330,0), 'minecraft:crimson_button': (11515,0), 'minecraft:warped_button': (11516,0), + 'minecraft:mangrove_button': (11517,0), 'minecraft:dried_kelp_block': (11331,0), 'minecraft:spruce_trapdoor': (11332, 0), 'minecraft:birch_trapdoor': (11333, 0), @@ -930,6 +941,7 @@ def __init__(self, regiondir, rel): 'minecraft:dark_oak_trapdoor': (11336, 0), 'minecraft:crimson_trapdoor': (12501, 0), 'minecraft:warped_trapdoor': (12502, 0), + 'minecraft:mangrove_trapdoor': (12503, 0), 'minecraft:petrified_oak_slab': (126, 0), 'minecraft:prismarine_stairs': (11337, 0), 'minecraft:dark_prismarine_stairs': (11338, 0), @@ -1049,7 +1061,8 @@ def __repr__(self): def _get_block(self, palette_entry): wood_slabs = ('minecraft:oak_slab','minecraft:spruce_slab','minecraft:birch_slab','minecraft:jungle_slab', - 'minecraft:acacia_slab','minecraft:dark_oak_slab','minecraft:petrified_oak_slab', 'minecraft:crimson_slab', 'minecraft:warped_slab') + 'minecraft:acacia_slab','minecraft:dark_oak_slab','minecraft:petrified_oak_slab', + 'minecraft:crimson_slab', 'minecraft:warped_slab') stone_slabs = ('minecraft:stone_slab', 'minecraft:sandstone_slab','minecraft:red_sandstone_slab', 'minecraft:cobblestone_slab', 'minecraft:brick_slab','minecraft:purpur_slab', 'minecraft:stone_brick_slab', 'minecraft:nether_brick_slab', From 6bca0f513f8cf3e6855d58b73b56245ecf8fe41c Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Thu, 23 Jun 2022 21:42:15 +0200 Subject: [PATCH 02/10] force rebuild --- overviewer_core/src/overviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index e4c1beb7f..a5083c61d 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -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 113 +#define OVERVIEWER_EXTENSION_VERSION 114 #include #include From 0dd9bf5d978ef58bf579745bc264206851fa28e5 Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 05:13:41 +0200 Subject: [PATCH 03/10] typo --- overviewer_core/world.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 59af0cfe4..3f1e660b7 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -655,7 +655,7 @@ def __init__(self, regiondir, rel): 'minecraft:jungle_fence_gate': (185, 0), 'minecraft:dark_oak_fence_gate': (186, 0), 'minecraft:acacia_fence_gate': (187, 0), - 'minecraft:crimson_fence_gate': (517, 0), + 'minecraft:crimson_fence_gate': (513, 0), 'minecraft:warped_fence_gate': (514, 0), 'minecraft:mangrove_fence_gate': (515, 0), 'minecraft:spruce_fence': (188, 0), From 82628e8dc5f986e9f51a04bc97f430e97368387a Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 11:42:14 +0200 Subject: [PATCH 04/10] froglights --- overviewer_core/src/mc_id.h | 4 ++++ overviewer_core/textures.py | 5 +++++ overviewer_core/world.py | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index dd3126fc6..1ab5f8b3e 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -268,6 +268,10 @@ enum mc_block_id { block_structure_block = 255, block_jigsaw = 256, block_shulker_box = 257, + + block_pearlescent_froglight = 451, + block_verdant_froglight = 452, + block_ochre_froglight = 453, // 1.16 stuff block_ancient_debris = 1000, block_basalt = 1001, diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index b809d242f..0df02948a 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -5279,6 +5279,11 @@ def prismarine_block(self, blockid, data): # sea lantern block(blockid=169, top_image="assets/minecraft/textures/block/sea_lantern.png") +# froglights +block(blockid=451, top_image="assets/minecraft/textures/block/pearlescent_froglight.png") +block(blockid=452, top_image="assets/minecraft/textures/block/verdant_froglight.png") +block(blockid=453, top_image="assets/minecraft/textures/block/ochre_froglight.png") + # hay block @material(blockid=170, data=list(range(9)), solid=True) def hayblock(self, blockid, data): diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 0fd3f796e..f12f6f826 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -693,6 +693,10 @@ def __init__(self, regiondir, rel): 'minecraft:armor_stand': (416, 0), # not rendering + 'minecraft:pearlescent_froglight': (451, 0), + 'minecraft:verdant_froglight': (452, 0), + 'minecraft:ochre_froglight': (453, 0), + # The following blocks are underwater and are not yet rendered. # To avoid spurious warnings, we'll treat them as water for now. 'minecraft:brain_coral': (8, 0), From 5150a541e5936150728655555b215f649f6f0b12 Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 11:44:39 +0200 Subject: [PATCH 05/10] force rebuild --- overviewer_core/src/overviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index e4c1beb7f..398d817f0 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -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 113 +#define OVERVIEWER_EXTENSION_VERSION 115 #include #include From b6520f9b2dd22a4d09facf6d42dc8b98f7a8049c Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 12:07:31 +0200 Subject: [PATCH 06/10] top and side --- overviewer_core/textures.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 0df02948a..7c0fc6ca8 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -5280,9 +5280,9 @@ def prismarine_block(self, blockid, data): block(blockid=169, top_image="assets/minecraft/textures/block/sea_lantern.png") # froglights -block(blockid=451, top_image="assets/minecraft/textures/block/pearlescent_froglight.png") -block(blockid=452, top_image="assets/minecraft/textures/block/verdant_froglight.png") -block(blockid=453, top_image="assets/minecraft/textures/block/ochre_froglight.png") +block(blockid=451, top_image="assets/minecraft/textures/block/pearlescent_froglight_top.png", side_image="assets/minecraft/textures/block/pearlescent_froglight_side.png") +block(blockid=452, top_image="assets/minecraft/textures/block/verdant_froglight_top.png", side_image="assets/minecraft/textures/block/verdant_froglight_side.png") +block(blockid=453, top_image="assets/minecraft/textures/block/ochre_froglight_top.png", side_image="assets/minecraft/textures/block/ochre_froglight_side.png") # hay block @material(blockid=170, data=list(range(9)), solid=True) From 2f2dc0924be5fedf2543eb68628d755d33243ad4 Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 19:41:02 +0200 Subject: [PATCH 07/10] frogspawn --- overviewer_core/src/mc_id.h | 3 +++ overviewer_core/textures.py | 6 ++++++ overviewer_core/world.py | 1 + 3 files changed, 10 insertions(+) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index 1ab5f8b3e..cd1402122 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -293,6 +293,9 @@ enum mc_block_id { block_crimson_roots = 1019, block_soul_soil = 1020, block_nether_gold_ore = 1021, + + block_frogspawn = 454, + // Solid Nether stone blocks block_polished_blackstone = 1022, block_chiseled_polished_blackstone = 1023, diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 7c0fc6ca8..d3025b625 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4609,6 +4609,12 @@ def lilypad(self, blockid, data): return self.build_full_block(None, None, None, None, None, t) +@material(blockid=454, nodata=True, transparent=True) +def frogspawn(self, blockid, data): + t = self.load_image_texture("assets/minecraft/textures/block/frogspawn.png") + + return self.build_full_block(None, None, None, None, None, t) + # nether bricks @material(blockid=112, data=list(range(3)), solid=True) def nether_bricks(self, blockid, data): diff --git a/overviewer_core/world.py b/overviewer_core/world.py index f12f6f826..93acbe7e1 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -499,6 +499,7 @@ def __init__(self, regiondir, rel): 'minecraft:stone_brick_stairs': (109, 0), 'minecraft:mycelium': (110, 0), 'minecraft:lily_pad': (111, 0), + 'minecraft:frogspawn': (454, 0), 'minecraft:nether_bricks': (112, 0), 'minecraft:cracked_nether_bricks': (112, 1), 'minecraft:chiseled_nether_bricks': (112, 2), From 56f822e47f3a1fe280e2c5fc2fd461825d73e324 Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 20:30:40 +0200 Subject: [PATCH 08/10] azalea --- overviewer_core/src/mc_id.h | 1 + overviewer_core/textures.py | 12 ++++++++++++ overviewer_core/world.py | 2 ++ 3 files changed, 15 insertions(+) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index cd1402122..a29df80b4 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -295,6 +295,7 @@ enum mc_block_id { block_nether_gold_ore = 1021, block_frogspawn = 454, + block_azalea = 455, // Solid Nether stone blocks block_polished_blackstone = 1022, diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index d3025b625..19bf409d0 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4655,6 +4655,18 @@ def enchantment_table(self, blockid, data): return img +@material(blockid=455, data=list(range(2)),transparent=True) +def azalea(self, blockid, data): + if data == 0: # just come up + top = self.load_image_texture("assets/minecraft/textures/block/azalea_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/azalea_side.png") + if data == 1: # just come up + top = self.load_image_texture("assets/minecraft/textures/block/flowering_azalea_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/flowering_azalea_side.png") + img = self.build_full_block(top, None, None, side, side) + + return img + # brewing stand # TODO this is a place holder, is a 2d image pasted @material(blockid=117, data=list(range(5)), transparent=True) diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 93acbe7e1..35b6e3a45 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -500,6 +500,8 @@ def __init__(self, regiondir, rel): 'minecraft:mycelium': (110, 0), 'minecraft:lily_pad': (111, 0), 'minecraft:frogspawn': (454, 0), + 'minecraft:azalea': (455, 0), + 'minecraft:flowering_azalea': (455, 1), 'minecraft:nether_bricks': (112, 0), 'minecraft:cracked_nether_bricks': (112, 1), 'minecraft:chiseled_nether_bricks': (112, 2), From 4844e41bc2d49355d94ae6601c951fc11ea9d45e Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 20:40:56 +0200 Subject: [PATCH 09/10] target block --- overviewer_core/src/mc_id.h | 1 + overviewer_core/textures.py | 3 +++ overviewer_core/world.py | 1 + 3 files changed, 5 insertions(+) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index a29df80b4..48311a592 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -296,6 +296,7 @@ enum mc_block_id { block_frogspawn = 454, block_azalea = 455, + block_target = 456, // Solid Nether stone blocks block_polished_blackstone = 1022, diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 19bf409d0..c2929022b 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -5297,6 +5297,9 @@ def prismarine_block(self, blockid, data): # sea lantern block(blockid=169, top_image="assets/minecraft/textures/block/sea_lantern.png") +# target +block(blockid=456, top_image="assets/minecraft/textures/block/target_top.png", side_image="assets/minecraft/textures/block/target_side.png") + # froglights block(blockid=451, top_image="assets/minecraft/textures/block/pearlescent_froglight_top.png", side_image="assets/minecraft/textures/block/pearlescent_froglight_side.png") block(blockid=452, top_image="assets/minecraft/textures/block/verdant_froglight_top.png", side_image="assets/minecraft/textures/block/verdant_froglight_side.png") diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 35b6e3a45..b35c3b4a7 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -502,6 +502,7 @@ def __init__(self, regiondir, rel): 'minecraft:frogspawn': (454, 0), 'minecraft:azalea': (455, 0), 'minecraft:flowering_azalea': (455, 1), + 'minecraft:target':(456,0), 'minecraft:nether_bricks': (112, 0), 'minecraft:cracked_nether_bricks': (112, 1), 'minecraft:chiseled_nether_bricks': (112, 2), From aa3907ff7f121c8b592cebf8fc8b87b3b36be8f1 Mon Sep 17 00:00:00 2001 From: Lieuwe Westra Date: Fri, 24 Jun 2022 23:24:51 +0200 Subject: [PATCH 10/10] azalea stem --- overviewer_core/textures.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index c2929022b..f53effa2b 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4665,6 +4665,9 @@ def azalea(self, blockid, data): side = self.load_image_texture("assets/minecraft/textures/block/flowering_azalea_side.png") img = self.build_full_block(top, None, None, side, side) + t = self.load_image_texture("assets/minecraft/textures/block/azalea_plant.png") + stem = self.build_billboard(t) + alpha_over(img,stem,(0,-2)) return img # brewing stand