Cleanup and added the missing doors for MC 1.8 #299 #301

udoprog · Sep 19, 2017 · 2018f83 · 2018f83
1 parent f1a80e0
commit 2018f83
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/src/mc/blocks.cpp b/src/mc/blocks.cpp
@@ -238,6 +238,11 @@ namespace mc {
     MaterialName[FenceJungle] = "JungleFence";
     MaterialName[FenceDarkOak] = "DarkOakFence";
     MaterialName[FenceAcacia] = "AcaciaFence";
+    MaterialName[DoorSpruce] = "SpruceDoor";
+    MaterialName[DoorBirch] = "BirchDoor";
+    MaterialName[DoorJungle] = "JungleDoor";
+    MaterialName[DoorAcacia] = "AcaciaDoor";
+    MaterialName[DoorDarkOak] = "DarkOakDoor";
     //MaterialName[PineLeaves] = "PineLeaves";
     //MaterialName[BirchLeaves] = "BirchLeaves";
 
@@ -430,6 +435,11 @@ namespace mc {
     set_color(FenceJungle, 0, get_color(FenceGateJungle));
     set_color(FenceDarkOak, 0, get_color(FenceGateDarkOak));
     set_color(FenceAcacia, 0, get_color(FenceGateAcacia));
+    set_color(DoorSpruce, 0, SharedInvisColor);
+    set_color(DoorBirch, 0, SharedInvisColor);
+    set_color(DoorJungle, 0, SharedInvisColor);
+    set_color(DoorAcacia, 0, SharedInvisColor);
+    set_color(DoorDarkOak, 0, SharedInvisColor);
     //set_color(PineLeaves, 0, color(50,89,45,128));
     //set_color(BirchLeaves, 0, color(94,167,84,128));
 
@@ -622,6 +632,11 @@ namespace mc {
     MaterialModes[FenceJungle] = Block;
     MaterialModes[FenceDarkOak] = Block;
     MaterialModes[FenceAcacia] = Block;
+    MaterialModes[DoorSpruce] = Block;
+    MaterialModes[DoorBirch] = Block;
+    MaterialModes[DoorJungle] = Block;
+    MaterialModes[DoorAcacia] = Block;
+    MaterialModes[DoorDarkOak] = Block;
     //MaterialModes[PineLeaves] = Block;
     //MaterialModes[BirchLeaves] = Block;
 

diff --git a/src/mc/blocks.hpp b/src/mc/blocks.hpp
@@ -73,12 +73,12 @@ namespace mc {
     DiamondOre = 0x38,
     DiamondBlock = 0x39,
     Workbench = 0x3A,
-    Crops = 0x3B,
+    Crops = 0x3B, // Wheat
     Soil = 0x3C,
     Furnace = 0x3D,
     BurningFurnace = 0x3E,
     SignPost = 0x3F,
-    WoodenDoor = 0x40,
+    WoodenDoor = 0x40, // Oak wood door
     Ladder = 0x41,
     MinecartTracks = 0x42,
     CobblestoneStairs = 0x43,
@@ -193,17 +193,21 @@ namespace mc {
     RedSandstone = 0xB3,
     RedSandstoneStairs = 0xB4,
     RedSandstoneSlab = 0xB6,
-
-    FenceGateSprouce = 0xB7,   // FIXME
-    FenceGateBrich = 0xB8,     // FIXME
-    FenceGateJungle = 0xB9,    // FIXME
-    FenceGateDarkOak = 0xBA,   // FIXME
-    FenceGateAcacia = 0xBB,    // FIXME
-    FenceSprouce = 0xBC,       // FIXME
-    FenceBrich = 0xBD,         // FIXME
-    FenceJungle = 0xBE,        // FIXME
-    FenceDarkOak = 0xBF,       // FIXME
-    FenceAcacia = 0xC0,        // FIXME
+    FenceGateSprouce = 0xB7,
+    FenceGateBrich = 0xB8,
+    FenceGateJungle = 0xB9,
+    FenceGateDarkOak = 0xBA,
+    FenceGateAcacia = 0xBB,
+    FenceSprouce = 0xBC,
+    FenceBrich = 0xBD,
+    FenceJungle = 0xBE,
+    FenceDarkOak = 0xBF,
+    FenceAcacia = 0xC0,
+    DoorSpruce = 0xC1,
+    DoorBirch = 0xC2,
+    DoorJungle = 0xC3,
+    DoorAcacia = 0xC4,
+    DoorDarkOak = 0xC5,
 
     Endrod = 0xC6,             // FIXME
     ChorusPlant = 0xC7,        // FIXME
@@ -213,9 +217,12 @@ namespace mc {
     PurpurStairs = 0xCB,       // FIXME
     PurpurSlab = 0xCD,         // FIXME
     EndStoneBricks = 0xCE,     // FIXME
+    CropsBeetroot = 0xCF,      // FIXME
     GrassPath = 0xD0,          // FIXME
+    EndGateway = 0xD1,         // FIXME
     CommandBlockRepeating = 0xD2,// FIXME
     CommandBlockChain = 0xD3,  // FIXME
+
     MagmaBlock = 0xD5,         // FIXME
     NetherWartBlock = 0xD6,    // FIXME
     RedNetherBrick = 0xD7,     // FIXME