Fix bug. (#53)

* Fix bug.

* Fix bug.

* Clean up.

* Fix item id.

src/MineCase.Server.Interfaces/World/Block.cs

@@ -264,12 +264,12 @@ namespace MineCase.Server.World
 
     public enum WoodPlankType : uint
     {
-        OakWoodPlanks = 0,
-        SpruceWoodPlanks = 1,
-        BirchWoodPlanks = 2,
-        JungleWoodPlanks = 3,
-        AcaciaWoodPlanks = 4,
-        DarkOakWoodPlanks = 5
+        Oak = 0,
+        Spruce = 1,
+        Birch = 2,
+        Jungle = 3,
+        Acacia = 4,
+        DarkOak = 5
     }
 
     public enum StoneType : uint
@@ -293,12 +293,12 @@ namespace MineCase.Server.World
     [Flags]
     public enum SaplingsType : uint
     {
-        OakSapling = 0,
-        SpruceSapling = 1,
-        BirchSapling = 2,
-        JungleSapling = 3,
-        AcaciaSapling = 4,
-        DarkOakSapling = 5,
+        Oak = 0,
+        Spruce = 1,
+        Birch = 2,
+        Jungle = 3,
+        Acacia = 4,
+        DarkOak = 5,
 
         // 0x8 bit field : Set if sapling is ready to grow into a tree
         ReadyForTreeFlag = 0x8
@@ -337,10 +337,23 @@ namespace MineCase.Server.World
     [Flags]
     public enum WoodType : uint
     {
-        OakWoodOrAcaciaWood = 0,
-        SpruceWoodOrDarkOakWood = 1,
-        BirchWood = 2,
-        JungleWood = 3,
+        Oak = 0,
+        Spruce = 1,
+        Birch = 2,
+        Jungle = 3,
+
+        // 0x4 ~ 0x8 bits field specifying the orientation of the wood
+        FacingUpFlag = 0x0,
+        FacingEastFlag = 0x4,
+        FacingNorthFlag = 0x8,
+        OnlybarkFlag = 0xC
+    }
+
+    [Flags]
+    public enum Wood2Type : uint
+    {
+        Acacia = 0,
+        DarkOak = 1,
 
         // 0x4 ~ 0x8 bits field specifying the orientation of the wood
         FacingUpFlag = 0x0,
@@ -351,22 +364,34 @@ namespace MineCase.Server.World
 
     public enum LeaveType : uint
     {
-        OakLeaves = 0,
-        SpruceLeaves = 1,
-        BirchLeaves = 2,
-        JungleLeaves = 3,
-        OakLeavesNoDecay = 4,
-        SpruceLeavesNoDecay = 5,
-        BirchLeavesNoDecay = 6,
-        JungleLeavesNoDecay = 7,
-        OakLeavesCheckDecay = 8,
-        SpruceLeavesCheckDecay = 9,
-        BirchLeavesCheckDecay = 10,
-        JungleLeavesCheckDecay = 11,
-        OakLeavesNoDecayAndCheckDecay = 12,
-        SpruceLeavesNoDecayAndCheckDecay = 13,
-        BirchLeavesNoDecayAndCheckDecay = 14,
-        JungleLeavesNoDecayAndCheckDecay = 15
+        Oak = 0,
+        Spruce = 1,
+        Birch = 2,
+        Jungle = 3,
+        OakLeaves = 4,
+        SpruceNoDecay = 5,
+        BirchNoDecay = 6,
+        JungleNoDecay = 7,
+        OakCheckDecay = 8,
+        SpruceCheckDecay = 9,
+        BirchCheckDecay = 10,
+        JungleCheckDecay = 11,
+        OakNoDecayAndCheckDecay = 12,
+        SpruceNoDecayAndCheckDecay = 13,
+        BirchNoDecayAndCheckDecay = 14,
+        JungleNoDecayAndCheckDecay = 15
+    }
+
+    public enum Leave2Type : uint
+    {
+        Acacia = 0,
+        DarkOak = 1,
+        AcaciaNoDecay = 4,
+        DarkOakNoDecay = 5,
+        AcaciaCheckDecay = 8,
+        DarkOakCheckDecay = 9,
+        AcaciaNoDecayAndCheckDecay = 12,
+        DarkOakNoDecayAndCheckDecay = 13
     }
 
     /// <summary>
@@ -403,47 +428,59 @@ namespace MineCase.Server.World
 
     public enum DoubleStoneSlabType : uint
     {
-        DoubleStoneSlab = 0,
-        DoubleSandstoneSlab = 1,
-        DoubleWoodenSlab = 2,
-        DoubleCobblestoneSlab = 3,
-        DoubleBricksSlab = 4,
-        DoubleStoneBrickSlab = 5,
-        DoubleNetherBrickSlab = 6,
-        DoubleQuartzSlab = 7,
-        SmoothDoubleStoneSlab = 8,
-        SmoothDoubleSandstoneSlab = 9,
-        TileDoubleQuartzSlab = 10
+        Stone = 0,
+        Sandstone = 1,
+        Wooden = 2,
+        Cobblestone = 3,
+        Bricks = 4,
+        StoneBrick = 5,
+        NetherBrick = 6,
+        Quartz = 7,
+        SmoothStone = 8,
+        SmoothSandstone = 9,
+        TileQuartz = 15
+    }
+
+    public enum DoubleRedSandstoneSlabType : uint
+    {
+        Normal = 0,
+        Smooth = 8
     }
 
     public enum StoneSlabType : uint
     {
-        StoneSlab = 0,
-        SandstoneSlab = 1,
-        WoodenSlab = 2,
-        CobblestoneSlab = 3,
-        BricksSlab = 4,
-        StoneBrickSlab = 5,
-        NetherBrickSlab = 6,
-        QuartzSlab = 7,
-        UpperStoneSlab = 8,
-        UpperSandstoneSlab = 9,
-        UpperWoodenSlab = 10,
-        UpperCobblestoneSlab = 11,
-        UpperBricksSlab = 12,
-        UpperStoneBrickSlab = 13,
-        UpperNetherBrickSlab = 14,
-        UpperQuartzSlab = 15
+        Stone = 0,
+        Sandstone = 1,
+        Wooden = 2,
+        Cobblestone = 3,
+        Bricks = 4,
+        StoneBrick = 5,
+        NetherBrick = 6,
+        Quartz = 7,
+        UpperStone = 8,
+        UpperSandstone = 9,
+        UpperWooden = 10,
+        UpperCobblestone = 11,
+        UpperBricks = 12,
+        UpperStoneBrick = 13,
+        UpperNetherBrick = 14,
+        UpperQuartz = 15
+    }
+
+    public enum RedSandstoneSlabType : uint
+    {
+        Normal = 0,
+        Upper = 1
     }
 
     public enum DoubleWoodenSlabType : uint
     {
-        DoubleOak = 0,
-        DoubleSpruce = 1,
-        DoubleBirch = 2,
-        DoubleJungle = 3,
-        DoubleAcacia = 4,
-        DoubleDarkOak = 5
+        Oak = 0,
+        Spruce = 1,
+        Birch = 2,
+        Jungle = 3,
+        Acacia = 4,
+        DarkOak = 5
     }
 
     public enum WoodenSlabType : uint
@@ -470,16 +507,16 @@ namespace MineCase.Server.World
 
     public enum SandstoneType : uint
     {
-        Sandstone = 0,
-        ChiseledSandstone = 1,
-        SmoothSandstone = 2
+        Normal = 0,
+        Chiseled = 1,
+        Smooth = 2
     }
 
     public enum RedSandstoneType : uint
     {
-        RedSandstone = 0,
-        ChiseledRedSandstone = 1,
-        SmoothRedSandstone = 2
+        Normal = 0,
+        Chiseled = 1,
+        Smooth = 2
     }
 
     [Flags]
@@ -875,7 +912,7 @@ namespace MineCase.Server.World
 
     public enum CactusType : uint
     {
-        FreshlyPlantedCactus = 0,
+        FreshlyPlanted = 0,
         Interval1 = 1,
         Interval2 = 2,
         Interval3 = 3,
@@ -895,7 +932,7 @@ namespace MineCase.Server.World
 
     public enum SugarCaneType : uint
     {
-        FreshlyPlantedSugarCane = 0,
+        FreshlyPlanted = 0,
         Interval1 = 1,
         Interval2 = 2,
         Interval3 = 3,
@@ -957,10 +994,10 @@ namespace MineCase.Server.World
         FacingWest = 3,
 
         // 0x4 ~ 0x8 bit field specifying the redstone repeater's delay
-        RedstoneTick1Flag = 0x0,
-        RedstoneTick2Flag = 0x4,
-        RedstoneTick3Flag = 0x8,
-        RedstoneTick4Flag = 0xC
+        Tick1Flag = 0x0,
+        Tick2Flag = 0x4,
+        Tick3Flag = 0x8,
+        Tick4Flag = 0xC
     }
 
     [Flags]
@@ -1005,10 +1042,10 @@ namespace MineCase.Server.World
 
     public enum StoneBrickType : uint
     {
-        StoneBrick = 0,
-        MossyStoneBrick = 1,
-        CrackedStoneBrick = 2,
-        ChiseledStoneBrick = 3
+        Normal = 0,
+        Mossy = 1,
+        Cracked = 2,
+        Chiseled = 3
     }
 
     public enum PrismarineType : uint
@@ -1182,35 +1219,35 @@ namespace MineCase.Server.World
     public enum HeadForBlockType : uint
     {
         OnTheFloor = 1,
-        OnAWallFacingNorth = 2,
-        OnAWallFacingSouth = 3,
-        OnAWallFacingEast = 4,
-        OnAWallFacingWest = 5
+        OnWallFacingNorth = 2,
+        OnWallFacingSouth = 3,
+        OnWallFacingEast = 4,
+        OnWallFacingWest = 5
     }
 
     public enum BlockOfQuartzType : uint
     {
-        BlockOfQuartz = 0,
-        ChiseledQuartzBlock = 1,
-        PillarQuartzBlockVertical = 2,
-        PillarQuartzBlockNorthSouth = 3,
-        PillarQuartzBlockEastWest = 4
+        Normal = 0,
+        Chiseled = 1,
+        Vertical = 2,
+        NorthSouth = 3,
+        EastWest = 4
     }
 
     public enum AnvilForBlockType : uint
     {
-        AnvilNS = 0,
-        AnvilEW = 1,
-        AnvilSN = 2,
-        AnvilWE = 3,
-        SlightlyDamagedAnvilNS = 4,
-        SlightlyDamagedAnvilEW = 5,
-        SlightlyDamagedAnvilWE = 6,
-        SlightlyDamagedAnvilSN = 7,
-        VeryDamagedAnvilNS = 8,
-        VeryDamagedAnvilEW = 9,
-        VeryDamagedAnvilWE = 10,
-        VeryDamagedAnvilSN = 11
+        NorthSouth = 0,
+        EastWest = 1,
+        SouthNorth = 2,
+        WestEast = 3,
+        SlightlyDamagedNS = 4,
+        SlightlyDamagedEW = 5,
+        SlightlyDamagedWE = 6,
+        SlightlyDamagedSN = 7,
+        VeryDamagedNS = 8,
+        VeryDamagedEW = 9,
+        VeryDamagedWE = 10,
+        VeryDamagedSN = 11
     }
 
     public struct BlockState : IEquatable<BlockState>

src/MineCase.Server.Interfaces/World/Blocks.cs

@@ -51,7 +51,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState WoodPlanks(WoodPlankType type = WoodPlankType.OakWoodPlanks)
+        public static BlockState WoodPlanks(WoodPlankType type = WoodPlankType.Oak)
         {
             return new BlockState
             {
@@ -60,7 +60,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Sapling(SaplingsType type = SaplingsType.OakSapling)
+        public static BlockState Sapling(SaplingsType type = SaplingsType.Oak)
         {
             return new BlockState
             {
@@ -159,7 +159,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Wood(WoodType type = WoodType.OakWoodOrAcaciaWood)
+        public static BlockState Wood(WoodType type = WoodType.Oak)
         {
             return new BlockState
             {
@@ -168,7 +168,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Leaves(LeaveType type = LeaveType.OakLeaves)
+        public static BlockState Leaves(LeaveType type = LeaveType.Oak)
         {
             return new BlockState
             {
@@ -222,7 +222,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Sandstone(SandstoneType type = SandstoneType.Sandstone)
+        public static BlockState Sandstone(SandstoneType type = SandstoneType.Normal)
         {
             return new BlockState
             {
@@ -321,7 +321,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Wool(WoodType type = WoodType.OakWoodOrAcaciaWood)
+        public static BlockState Wool(ColorType type = ColorType.White)
         {
             return new BlockState
             {
@@ -393,7 +393,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState DoubleStoneSlab(DoubleStoneSlabType type = DoubleStoneSlabType.DoubleStoneSlab)
+        public static BlockState DoubleStoneSlab(DoubleStoneSlabType type = DoubleStoneSlabType.Stone)
         {
             return new BlockState
             {
@@ -402,7 +402,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState StoneSlab(StoneSlabType type = StoneSlabType.StoneSlab)
+        public static BlockState StoneSlab(StoneSlabType type = StoneSlabType.Stone)
         {
             return new BlockState
             {
@@ -735,7 +735,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Cactus(CactusType type = CactusType.FreshlyPlantedCactus)
+        public static BlockState Cactus(CactusType type = CactusType.FreshlyPlanted)
         {
             return new BlockState
             {
@@ -753,7 +753,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState SugarCane(SugarCaneType type = SugarCaneType.FreshlyPlantedSugarCane)
+        public static BlockState SugarCane(SugarCaneType type = SugarCaneType.FreshlyPlanted)
         {
             return new BlockState
             {
@@ -888,7 +888,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState StoneBricks(StoneBrickType type = StoneBrickType.StoneBrick)
+        public static BlockState StoneBricks(StoneBrickType type = StoneBrickType.Normal)
         {
             return new BlockState
             {
@@ -1131,7 +1131,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState DoubleWoodenSlab(DoubleWoodenSlabType type = DoubleWoodenSlabType.DoubleOak)
+        public static BlockState DoubleWoodenSlab(DoubleWoodenSlabType type = DoubleWoodenSlabType.Oak)
         {
             return new BlockState
             {
@@ -1311,7 +1311,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Anvil(AnvilForBlockType type = AnvilForBlockType.AnvilNS)
+        public static BlockState Anvil(AnvilForBlockType type = AnvilForBlockType.NorthSouth)
         {
             return new BlockState
             {
@@ -1401,7 +1401,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState BlockOfQuartz(BlockOfQuartzType type = BlockOfQuartzType.BlockOfQuartz)
+        public static BlockState BlockOfQuartz(BlockOfQuartzType type = BlockOfQuartzType.Normal)
         {
             return new BlockState
             {
@@ -1455,7 +1455,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Leaves2(LeaveType type = LeaveType.OakLeaves)
+        public static BlockState Leaves2(Leave2Type type = Leave2Type.Acacia)
         {
             return new BlockState
             {
@@ -1464,7 +1464,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState Wood2(WoodType type = WoodType.FacingUpFlag)
+        public static BlockState Wood2(Wood2Type type = Wood2Type.Acacia)
         {
             return new BlockState
             {
@@ -1617,7 +1617,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState RedSandstone(RedSandstoneType type = RedSandstoneType.RedSandstone)
+        public static BlockState RedSandstone(RedSandstoneType type = RedSandstoneType.Normal)
         {
             return new BlockState
             {
@@ -1635,7 +1635,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState DoubleRedSandstoneSlab(DoubleStoneSlabType type = DoubleStoneSlabType.DoubleStoneSlab)
+        public static BlockState DoubleRedSandstoneSlab(DoubleRedSandstoneSlabType type = DoubleRedSandstoneSlabType.Normal)
         {
             return new BlockState
             {
@@ -1644,7 +1644,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static BlockState RedSandstoneSlab(StoneSlabType type = StoneSlabType.StoneSlab)
+        public static BlockState RedSandstoneSlab(RedSandstoneSlabType type = RedSandstoneSlabType.Normal)
         {
             return new BlockState
             {

src/MineCase.Server.Interfaces/World/Item.cs

@@ -248,14 +248,20 @@ namespace MineCase.Server.World
         BoneMeal = 15
     }
 
-    public enum FishType : uint
+    public enum RawFishType : uint
     {
-        RawFishOrCookedFish = 0,
-        RawSalmonOrCookedSalmon = 1,
+        RawFish = 0,
+        RawSalmon = 1,
         Clownfish = 2,
         Pufferfish = 3
     }
 
+    public enum CookedFishType : uint
+    {
+        CookedFish = 0,
+        CookedSalmon = 1
+    }
+
     public enum HeadForItemType : uint
     {
         SkeletonSkull = 0,
@@ -268,70 +274,70 @@ namespace MineCase.Server.World
 
     public enum PotionNameType : uint
     {
-        WaterBottleOrMundanePotion = 0,
-        PotionOfRegeneration1 = 1,
-        PotionOfSwiftness1 = 2,
-        PotionOfFireResistance1 = 3,
-        PotionOfPoison1 = 4,
-        PotionOfHealing1 = 5,
-        PotionOfNightVision1 = 6,
-        ClearPotion = 7,
-        PotionOfWeakness1 = 8,
-        PotionOfStrength1 = 9,
-        PotionOfSlowness1 = 10,
-        PotionOfLeaping1 = 11,
-        PotionOfHarming1 = 12,
-        PotionOfWaterBreathing1 = 13,
-        PotionOfInvisibility1 = 14,
-        ThinPotion = 15,
-        AwkwardPotion = 16,
-        PotionOfRegeneration2 = 17,
-        PotionOfSwiftness2 = 18,
-        PotionOfFireResistance2 = 19,
-        PotionOfPoison2 = 20,
-        PotionOfHealing2 = 21,
-        PotionOfNightVision2 = 22,
-        BunglingPotion = 23,
-        PotionOfWeakness2 = 24,
-        PotionOfStrength2 = 25,
-        PotionOfSlowness2 = 26,
-        PotionOfLeaping2 = 27,
-        PotionOfHarming2 = 28,
-        PotionOfWaterBreathing2 = 29,
-        PotionOfInvisibility2 = 30,
-        DebonairPotion = 31,
-        ThickPotion = 32,
-        PotionOfRegeneration3 = 33,
-        PotionOfSwiftness3 = 34,
-        PotionOfFireResistance3 = 35,
-        PotionOfPoison3 = 36,
-        PotionOfHealing3 = 37,
-        PotionOfNightVision3 = 38,
-        CharmingPotion = 39,
-        PotionOfWeakness3 = 40,
-        PotionOfStrength3 = 41,
-        PotionOfSlowness3 = 42,
-        PotionOfLeaping3 = 43,
-        PotionOfHarming3 = 44,
-        PotionOfWaterBreathing3 = 45,
-        PotionOfInvisibility3 = 46,
-        SparklingPotion = 47,
-        PotentPotion = 48,
-        PotionOfRegeneration4 = 49,
-        PotionOfSwiftness4 = 50,
-        PotionOfFireResistance4 = 51,
-        PotionOfPoison4 = 52,
-        PotionOfHealing4 = 53,
-        PotionOfNightVision4 = 54,
-        RankPotion = 55,
-        PotionOfWeakness4 = 56,
-        PotionOfStrength4 = 57,
-        PotionOfSlowness4 = 58,
-        PotionOfLeaping4 = 59,
-        PotionOfHarming4 = 60,
-        PotionOfWaterBreathing4 = 61,
-        PotionOfInvisibility4 = 62,
-        StinkyPotion = 63
+        WaterBottle = 0,
+        Regeneration1 = 1,
+        Swiftness1 = 2,
+        FireResistance1 = 3,
+        Poison1 = 4,
+        Healing1 = 5,
+        NightVision1 = 6,
+        Clear = 7,
+        Weakness1 = 8,
+        Strength1 = 9,
+        Slowness1 = 10,
+        Leaping1 = 11,
+        Harming1 = 12,
+        WaterBreathing1 = 13,
+        Invisibility1 = 14,
+        Thin = 15,
+        Awkward = 16,
+        Regeneration2 = 17,
+        Swiftness2 = 18,
+        FireResistance2 = 19,
+        Poison2 = 20,
+        Healing2 = 21,
+        NightVision2 = 22,
+        Bungling = 23,
+        Weakness2 = 24,
+        Strength2 = 25,
+        Slowness2 = 26,
+        Leaping2 = 27,
+        Harming2 = 28,
+        WaterBreathing2 = 29,
+        Invisibility2 = 30,
+        Debonair = 31,
+        Thick = 32,
+        Regeneration3 = 33,
+        Swiftness3 = 34,
+        FireResistance3 = 35,
+        Poison3 = 36,
+        Healing3 = 37,
+        NightVision3 = 38,
+        Charming = 39,
+        Weakness3 = 40,
+        Strength3 = 41,
+        Slowness3 = 42,
+        Leaping3 = 43,
+        Harming3 = 44,
+        WaterBreathing3 = 45,
+        Invisibility3 = 46,
+        Sparkling = 47,
+        Potent = 48,
+        Regeneration4 = 49,
+        Swiftness4 = 50,
+        FireResistance4 = 51,
+        Poison4 = 52,
+        Healing4 = 53,
+        NightVision4 = 54,
+        Rank = 55,
+        Weakness4 = 56,
+        Strength4 = 57,
+        Slowness4 = 58,
+        Leaping4 = 59,
+        Harming4 = 60,
+        WaterBreathing4 = 61,
+        Invisibility4 = 62,
+        Stinky = 63
     }
 
     public enum PotionEffectType : uint
@@ -358,7 +364,7 @@ namespace MineCase.Server.World
         LessDuration = 32
     }
 
-    public enum PotionExtendedDurationType : uint
+    public enum PotionExDurationType : uint
     {
         Base = 0,
         MoreDuration = 64

src/MineCase.Server.Interfaces/World/Items.cs

@@ -843,7 +843,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static ItemState RawFish(FishType type = FishType.RawFishOrCookedFish)
+        public static ItemState RawFish(RawFishType type = RawFishType.RawFish)
         {
             return new ItemState
             {
@@ -852,7 +852,7 @@ namespace MineCase.Server.World
             };
         }
 
-        public static ItemState CookedFish(FishType type = FishType.RawFishOrCookedFish)
+        public static ItemState CookedFish(CookedFishType type = CookedFishType.CookedFish)
         {
             return new ItemState
             {
@@ -1061,7 +1061,7 @@ namespace MineCase.Server.World
 
         public static ItemState Potion(
             PotionNameType name,
-            PotionExtendedDurationType ex = PotionExtendedDurationType.Base,
+            PotionExDurationType ex = PotionExDurationType.Base,
             SplashPotionType splash = SplashPotionType.DrinkablePotion)
         {
             return new ItemState
@@ -1074,7 +1074,7 @@ namespace MineCase.Server.World
         public static ItemState Potion(
             PotionEffectType effect,
             PotionTierType tier = PotionTierType.Base,
-            PotionExtendedDurationType ex = PotionExtendedDurationType.Base,
+            PotionExDurationType ex = PotionExDurationType.Base,
             SplashPotionType splash = SplashPotionType.DrinkablePotion)
         {
             return new ItemState

src/MineCase.Server.Interfaces/World/Plants/TreeGenerator.cs

@@ -26,18 +26,18 @@ namespace MineCase.Server.World.Plants
             _treeType = treeType;
             if (treeType == PlantsType.Oak)
             {
-                _wood = BlockStates.Wood(WoodType.OakWoodOrAcaciaWood);
-                _leaves = BlockStates.Leaves(LeaveType.OakLeaves);
+                _wood = BlockStates.Wood(WoodType.Oak);
+                _leaves = BlockStates.Leaves(LeaveType.Oak);
             }
             else if (treeType == PlantsType.Spruce)
             {
-                _wood = BlockStates.Wood(WoodType.SpruceWoodOrDarkOakWood);
-                _leaves = BlockStates.Leaves(LeaveType.SpruceLeaves);
+                _wood = BlockStates.Wood(WoodType.Spruce);
+                _leaves = BlockStates.Leaves(LeaveType.Spruce);
             }
             else if (treeType == PlantsType.Birch)
             {
-                _wood = BlockStates.Wood(WoodType.BirchWood);
-                _leaves = BlockStates.Leaves(LeaveType.BirchLeaves);
+                _wood = BlockStates.Wood(WoodType.Birch);
+                _leaves = BlockStates.Leaves(LeaveType.Birch);
             }
         }