LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'workstations' of https://github.com/IncredibleHolg/Minecraft-Overviewer

Browse Source
This commit is contained in:
Nicolas F
2019-07-13 17:37:58 +02:00
parent a422270666 419889c1f1
commit 634e13c92c
4 changed files with 71 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
overviewer_core/src/mc_id.h
View File

@@ -279,6 +279,17 @@ enum mc_block_id {
block_mossy_stone_brick_slab = 11356,
block_smooth_quartz_slab = 11357,
block_smooth_stone_slab = 11358,
block_fletching_table = 11359,
block_cartography_table = 11360,
block_smithing_table = 11361,
block_blast_furnace = 11362,
// block_blast_furnace lit 11363
block_smoker = 11364,
// block_smoker lit = 11365,
block_lectern = 11366,
block_loom = 11367,
block_stonecutter = 11368,
block_grindstone = 11369,
};
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
// and want to force users to rebuild
#define OVERVIEWER_EXTENSION_VERSION 68
#define OVERVIEWER_EXTENSION_VERSION 69
#include <stdbool.h>
#include <stdint.h>

52
overviewer_core/textures.py
View File

@@ -2343,6 +2343,58 @@ def smithing_table(self, blockid, data):
img = self.build_full_block(top, None, None, side3, side4, None)
return img
@material(blockid=11362, solid=True, nodata=True)
def blast_furnace(self, blockid, data):
top = self.load_image_texture("assets/minecraft/textures/block/blast_furnace_top.png")
side3 = self.load_image_texture("assets/minecraft/textures/block/blast_furnace_side.png")
side4 = self.load_image_texture("assets/minecraft/textures/block/blast_furnace_front.png")
img = self.build_full_block(top, None, None, side3, side4, None)
return img
@material(blockid=11364, solid=True, nodata=True)
def smoker(self, blockid, data):
top = self.load_image_texture("assets/minecraft/textures/block/smoker_top.png")
side3 = self.load_image_texture("assets/minecraft/textures/block/smoker_side.png")
side4 = self.load_image_texture("assets/minecraft/textures/block/smoker_front.png")
img = self.build_full_block(top, None, None, side3, side4, None)
return img
@material(blockid=11366, solid=True, nodata=True)
def lectern(self, blockid, data):
top = self.load_image_texture("assets/minecraft/textures/block/lectern_top.png")
side3 = self.load_image_texture("assets/minecraft/textures/block/lectern_sides.png")
side4 = self.load_image_texture("assets/minecraft/textures/block/lectern_front.png")
img = self.build_full_block(top, None, None, side3, side4, None)
return img
@material(blockid=11367, solid=True, nodata=True)
def loom(self, blockid, data):
top = self.load_image_texture("assets/minecraft/textures/block/loom_top.png")
side3 = self.load_image_texture("assets/minecraft/textures/block/loom_side.png")
side4 = self.load_image_texture("assets/minecraft/textures/block/loom_front.png")
img = self.build_full_block(top, None, None, side3, side4, None)
return img
@material(blockid=11368, solid=True, nodata=True)
def stonecutter(self, blockid, data):
top = self.load_image_texture("assets/minecraft/textures/block/stonecutter_top.png")
side3 = side4 = self.load_image_texture("assets/minecraft/textures/block/stonecutter_side.png")
img = self.build_full_block(top, None, None, side3, side4, None)
return img
@material(blockid=11369, solid=True, nodata=True)
def grindstone(self, blockid, data):
top = side3 = side4 = self.load_image_texture("assets/minecraft/textures/block/grindstone_side.png")
img = self.build_full_block(top, None, None, side3, side4, None)
return img
# crops with 8 data values (like wheat)
@material(blockid=59, data=list(range(8)), transparent=True, nospawn=True)
def crops8(self, blockid, data):

7
overviewer_core/world.py
View File

@@ -799,6 +799,13 @@ class RegionSet(object):
"minecraft:fletching_table": (11359, 0),
"minecraft:cartography_table": (11360, 0),
"minecraft:smithing_table": (11361, 0),
"minecraft:blast_furnace": (11362, 0),
"minecraft:smoker": (11364, 0),
"minecraft:lectern": (11366, 0),
"minecraft:loom": (11367, 0),
"minecraft:stonecutter": (11368, 0),
"minecraft:grindstone": (11369, 0)
}
colors = [ 'white', 'orange', 'magenta', 'light_blue',