From 22b7f19c9abb185402618311df03644c43444734 Mon Sep 17 00:00:00 2001 From: Evildeeds Date: Sun, 24 Sep 2017 23:12:08 +0200 Subject: [PATCH] Third block batch, Minecraft 1.10 is now supported #301 --- src/mc/blocks.cpp | 15 +++++++++++++++ src/mc/blocks.hpp | 12 ++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/mc/blocks.cpp b/src/mc/blocks.cpp index 3cf86307..534f056d 100644 --- a/src/mc/blocks.cpp +++ b/src/mc/blocks.cpp @@ -257,6 +257,11 @@ namespace mc { MaterialName[CommandBlockRepeating] = "CommandBlockRepeating"; MaterialName[CommandBlockChain] = "CommandBlockChain"; MaterialName[FrostedIce] = "FrostedIce"; + MaterialName[MagmaBlock] = "MagmaBlock"; + MaterialName[NetherWartBlock] = "NetherWartBlock"; + MaterialName[RedNetherBrick] = "RedNetherBrick"; + MaterialName[BoneBlock] = "BoneBlock"; + MaterialName[StructureVoid] = "StructureVoid"; MaterialName[StructureBlock] = "StructureBlock"; //MaterialName[PineLeaves] = "PineLeaves"; //MaterialName[BirchLeaves] = "BirchLeaves"; @@ -471,6 +476,11 @@ namespace mc { set_color(CommandBlockRepeating, 0, color(135, 122, 152, 255)); set_color(CommandBlockChain, 0, color(114, 135, 131, 255)); set_color(FrostedIce, 0, get_color(Ice)); + set_color(MagmaBlock, 0, color(132, 64, 26, 255)); + set_color(NetherWartBlock, 0, color(107, 60, 60, 255)); + set_color(RedNetherBrick, 0, color(106, 59, 62, 255)); + set_color(BoneBlock, 0, color(218, 214, 193, 255)); + set_color(StructureVoid, 0, SharedInvisColor); set_color(StructureBlock, 0, color(98, 74, 98, 255)); //set_color(PineLeaves, 0, color(50,89,45,128)); //set_color(BirchLeaves, 0, color(94,167,84,128)); @@ -685,6 +695,11 @@ namespace mc { MaterialModes[CommandBlockRepeating] = Block; MaterialModes[CommandBlockChain] = Block; MaterialModes[FrostedIce] = Block; + MaterialModes[MagmaBlock] = Block; + MaterialModes[NetherWartBlock] = Block; + MaterialModes[RedNetherBrick] = Block; + MaterialModes[BoneBlock] = Block; + MaterialModes[StructureVoid] = Block; MaterialModes[StructureBlock] = Block; //MaterialModes[PineLeaves] = Block; //MaterialModes[BirchLeaves] = Block; diff --git a/src/mc/blocks.hpp b/src/mc/blocks.hpp index eefffdc8..c0222cb2 100644 --- a/src/mc/blocks.hpp +++ b/src/mc/blocks.hpp @@ -224,12 +224,11 @@ namespace mc { CommandBlockRepeating = 0xD2, CommandBlockChain = 0xD3, FrostedIce = 0xD4, - - MagmaBlock = 0xD5, // FIXME - NetherWartBlock = 0xD6, // FIXME - RedNetherBrick = 0xD7, // FIXME - BoneBlock = 0xD8, // FIXME - StructureVoid = 0xD9, // FIXME + MagmaBlock = 0xD5, + NetherWartBlock = 0xD6, + RedNetherBrick = 0xD7, + BoneBlock = 0xD8, + StructureVoid = 0xD9, Observer = 0xDA, // FIXME ShulkerBoxWhite = 0xDB, // FIXME @@ -248,6 +247,7 @@ namespace mc { ShulkerBoxGreen = 0xE8, // FIXME ShulkerBoxRed = 0xE9, // FIXME ShulkerBoxBlack = 0xEA, // FIXME + GlazedTerracottaWhite = 0xEB, // FIXME GlazedTerracottaOrange = 0xEC, // FIXME GlazedTerracottaMagenta = 0xED, // FIXME