LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge pull request #1634 from Gyzie/saplings_rework

Browse Source 
Created seperate sapling blocks and added bamboo_sapling
This commit is contained in:
Nicolas F
2019-10-26 21:52:59 +02:00
committed by GitHub
parent 79a5668bd2 7342085140
commit d07c2e708b
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
overviewer_core/src/mc_id.h
View File

@@ -305,6 +305,12 @@ enum mc_block_id {
block_andesite_stairs = 11382, block_andesite_stairs = 11382,
block_end_stone_brick_stairs = 11383, block_end_stone_brick_stairs = 11383,
block_red_nether_brick_stairs = 11384, block_red_nether_brick_stairs = 11384,
block_oak_sapling = 11385,
block_spruce_sapling = 11386,
block_birch_sapling = 11387,
block_jungle_sapling = 11388,
block_acacia_sapling = 11389,
block_dark_oak_sapling = 11390,
block_oak_sign = 11401, block_oak_sign = 11401,
block_spruce_sign = 11402, block_spruce_sign = 11402,
block_birch_sign = 11403, block_birch_sign = 11403,
@@ -317,6 +323,7 @@ enum mc_block_id {
block_jungle_wall_sign = 11410, block_jungle_wall_sign = 11410,
block_acacia_wall_sign = 11411, block_acacia_wall_sign = 11411,
block_dark_oak_wall_sign = 11412, block_dark_oak_wall_sign = 11412,
block_bamboo_sapling = 11413,
}; };
typedef uint16_t mc_block_t; typedef uint16_t mc_block_t;

2
overviewer_core/src/overviewer.h
View File

@@ -31,7 +31,7 @@
// increment this value if you've made a change to the c extesion // increment this value if you've made a change to the c extesion
// and want to force users to rebuild // and want to force users to rebuild
#define OVERVIEWER_EXTENSION_VERSION 74 #define OVERVIEWER_EXTENSION_VERSION 75
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>

8
overviewer_core/textures.py
View File

@@ -987,6 +987,14 @@ def saplings(self, blockid, data):
tex = self.load_image_texture("assets/minecraft/textures/block/dark_oak_sapling.png") tex = self.load_image_texture("assets/minecraft/textures/block/dark_oak_sapling.png")
return self.build_sprite(tex) return self.build_sprite(tex)
sprite(blockid=11385, imagename="assets/minecraft/textures/block/oak_sapling.png")
sprite(blockid=11386, imagename="assets/minecraft/textures/block/spruce_sapling.png")
sprite(blockid=11387, imagename="assets/minecraft/textures/block/birch_sapling.png")
sprite(blockid=11388, imagename="assets/minecraft/textures/block/jungle_sapling.png")
sprite(blockid=11389, imagename="assets/minecraft/textures/block/acacia_sapling.png")
sprite(blockid=11390, imagename="assets/minecraft/textures/block/dark_oak_sapling.png")
sprite(blockid=11413, imagename="assets/minecraft/textures/block/bamboo_stage0.png")
# bedrock # bedrock
block(blockid=7, top_image="assets/minecraft/textures/block/bedrock.png") block(blockid=7, top_image="assets/minecraft/textures/block/bedrock.png")

14
overviewer_core/world.py
View File

@@ -314,12 +314,7 @@ class RegionSet(object):
'minecraft:jungle_planks': (5, 3), 'minecraft:jungle_planks': (5, 3),
'minecraft:acacia_planks': (5, 4), 'minecraft:acacia_planks': (5, 4),
'minecraft:dark_oak_planks': (5, 5), 'minecraft:dark_oak_planks': (5, 5),
'minecraft:oak_sapling': (6, 0), 'minecraft:sapling': (6, 0),
'minecraft:spruce_sapling': (6, 1),
'minecraft:birch_sapling': (6, 2),
'minecraft:jungle_sapling': (6, 3),
'minecraft:acacia_sapling': (6, 4),
'minecraft:dark_oak_sapling': (6, 5),
'minecraft:bedrock': (7, 0), 'minecraft:bedrock': (7, 0),
'minecraft:water': (8, 0), 'minecraft:water': (8, 0),
'minecraft:lava': (10, 0), 'minecraft:lava': (10, 0),
@@ -831,6 +826,13 @@ class RegionSet(object):
'minecraft:andesite_stairs': (11382, 0), 'minecraft:andesite_stairs': (11382, 0),
'minecraft:end_stone_brick_stairs': (11383, 0), 'minecraft:end_stone_brick_stairs': (11383, 0),
'minecraft:red_nether_brick_stairs': (11384, 0), 'minecraft:red_nether_brick_stairs': (11384, 0),
'minecraft:oak_sapling': (11385, 0),
'minecraft:spruce_sapling': (11386, 0),
'minecraft:birch_sapling': (11387, 0),
'minecraft:jungle_sapling': (11388, 0),
'minecraft:acacia_sapling': (11389, 0),
'minecraft:dark_oak_sapling': (11390, 0),
'minecraft:bamboo_sapling': (11413, 0),
} }
colors = [ 'white', 'orange', 'magenta', 'light_blue', colors = [ 'white', 'orange', 'magenta', 'light_blue',