diff --git a/src/mc/blocks.cpp b/src/mc/blocks.cpp index 534f056d..9329b42a 100644 --- a/src/mc/blocks.cpp +++ b/src/mc/blocks.cpp @@ -262,6 +262,23 @@ namespace mc { MaterialName[RedNetherBrick] = "RedNetherBrick"; MaterialName[BoneBlock] = "BoneBlock"; MaterialName[StructureVoid] = "StructureVoid"; + MaterialName[Observer] = "Observer"; + MaterialName[ShulkerBoxWhite] = "ShulkerBoxWhite"; + MaterialName[ShulkerBoxOrange] = "ShulkerBoxOrange"; + MaterialName[ShulkerBoxMagenta] = "ShulkerBoxMagenta"; + MaterialName[ShulkerBoxLightBlue] = "ShulkerBoxLightBlue"; + MaterialName[ShulkerBoxYellow] = "ShulkerBoxYellow"; + MaterialName[ShulkerBoxLime] = "ShulkerBoxLime"; + MaterialName[ShulkerBoxPink] = "ShulkerBoxPink"; + MaterialName[ShulkerBoxGray] = "ShulkerBoxGray"; + MaterialName[ShulkerBoxLightGray] = "ShulkerBoxLightGray"; + MaterialName[ShulkerBoxCyan] = "ShulkerBoxCyan"; + MaterialName[ShulkerBoxPurple] = "ShulkerBoxPurple"; + MaterialName[ShulkerBoxBlue] = "ShulkerBoxBlue"; + MaterialName[ShulkerBoxBrown] = "ShulkerBoxBrown"; + MaterialName[ShulkerBoxGreen] = "ShulkerBoxGreen"; + MaterialName[ShulkerBoxRed] = "ShulkerBoxRed"; + MaterialName[ShulkerBoxBlack] = "ShulkerBoxBlack"; MaterialName[StructureBlock] = "StructureBlock"; //MaterialName[PineLeaves] = "PineLeaves"; //MaterialName[BirchLeaves] = "BirchLeaves"; @@ -481,6 +498,23 @@ namespace mc { 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(Observer, 0, get_color(Dispenser)); + set_color(ShulkerBoxWhite, 0, color(205, 210, 210, 255)); + set_color(ShulkerBoxOrange, 0, color(228, 104, 9, 255)); + set_color(ShulkerBoxMagenta, 0, color(168, 52, 158, 255)); + set_color(ShulkerBoxLightBlue, 0, color(46, 156, 206, 255)); + set_color(ShulkerBoxYellow, 0, color(241, 182, 27, 255)); + set_color(ShulkerBoxLime, 0, color(94, 163, 22, 255)); + set_color(ShulkerBoxPink, 0, color(221, 114, 150, 255)); + set_color(ShulkerBoxGray, 0, color(56, 59, 63, 255)); + set_color(ShulkerBoxLightGray, 0, color(117, 117, 108, 255)); + set_color(ShulkerBoxCyan, 0, color(20, 116, 130, 255)); + set_color(ShulkerBoxPurple, 0, color(148, 103, 148, 255)); + set_color(ShulkerBoxBlue, 0, color(42, 44, 135, 255)); + set_color(ShulkerBoxBrown, 0, color(103, 64, 35, 255)); + set_color(ShulkerBoxGreen, 0, color(76, 96, 32, 255)); + set_color(ShulkerBoxRed, 0, color(138, 30, 29, 255)); + set_color(ShulkerBoxBlack, 0, color(23, 24, 28, 255)); 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)); @@ -700,6 +734,23 @@ namespace mc { MaterialModes[RedNetherBrick] = Block; MaterialModes[BoneBlock] = Block; MaterialModes[StructureVoid] = Block; + MaterialModes[Observer] = Block; + MaterialModes[ShulkerBoxWhite] = Block; + MaterialModes[ShulkerBoxOrange] = Block; + MaterialModes[ShulkerBoxMagenta] = Block; + MaterialModes[ShulkerBoxLightBlue] = Block; + MaterialModes[ShulkerBoxYellow] = Block; + MaterialModes[ShulkerBoxLime] = Block; + MaterialModes[ShulkerBoxPink] = Block; + MaterialModes[ShulkerBoxGray] = Block; + MaterialModes[ShulkerBoxLightGray] = Block; + MaterialModes[ShulkerBoxCyan] = Block; + MaterialModes[ShulkerBoxPurple] = Block; + MaterialModes[ShulkerBoxBlue] = Block; + MaterialModes[ShulkerBoxBrown] = Block; + MaterialModes[ShulkerBoxGreen] = Block; + MaterialModes[ShulkerBoxRed] = Block; + MaterialModes[ShulkerBoxBlack] = Block; MaterialModes[StructureBlock] = Block; //MaterialModes[PineLeaves] = Block; //MaterialModes[BirchLeaves] = Block; diff --git a/src/mc/blocks.hpp b/src/mc/blocks.hpp index c0222cb2..fd571163 100644 --- a/src/mc/blocks.hpp +++ b/src/mc/blocks.hpp @@ -229,24 +229,23 @@ namespace mc { RedNetherBrick = 0xD7, BoneBlock = 0xD8, StructureVoid = 0xD9, - - Observer = 0xDA, // FIXME - ShulkerBoxWhite = 0xDB, // FIXME - ShulkerBoxOrange = 0xDC, // FIXME - ShulkerBoxMagenta = 0xDD, // FIXME - ShulkerBoxLightBlue = 0xDE,// FIXME - ShulkerBoxYellow = 0xDF, // FIXME - ShulkerBoxLime = 0xE0, // FIXME - ShulkerBoxPink = 0xE1, // FIXME - ShulkerBoxGray = 0xE2, // FIXME - ShulkerBoxLightGray = 0xE3,// FIXME - ShulkerBoxCyan = 0xE4, // FIXME - ShulkerBoxPurple = 0xE5, // FIXME - ShulkerBoxBlue = 0xE6, // FIXME - ShulkerBoxBrown = 0xE7, // FIXME - ShulkerBoxGreen = 0xE8, // FIXME - ShulkerBoxRed = 0xE9, // FIXME - ShulkerBoxBlack = 0xEA, // FIXME + Observer = 0xDA, + ShulkerBoxWhite = 0xDB, + ShulkerBoxOrange = 0xDC, + ShulkerBoxMagenta = 0xDD, + ShulkerBoxLightBlue = 0xDE, + ShulkerBoxYellow = 0xDF, + ShulkerBoxLime = 0xE0, + ShulkerBoxPink = 0xE1, + ShulkerBoxGray = 0xE2, + ShulkerBoxLightGray = 0xE3, + ShulkerBoxCyan = 0xE4, + ShulkerBoxPurple = 0xE5, + ShulkerBoxBlue = 0xE6, + ShulkerBoxBrown = 0xE7, + ShulkerBoxGreen = 0xE8, + ShulkerBoxRed = 0xE9, + ShulkerBoxBlack = 0xEA, GlazedTerracottaWhite = 0xEB, // FIXME GlazedTerracottaOrange = 0xEC, // FIXME