AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-25 14:17:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Hetal728/MCGalaxy

Browse Source
This commit is contained in:
UnknownShadow200 2016-04-07 09:55:51 +10:00
commit 16a3341282
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Blocks/Block.CoreProps.cs
View File

@ -71,7 +71,7 @@ namespace MCGalaxy {
string[] names = { "air", "stone", "grass", "dirt", "cobblestone", "wood", "plant",
"adminium", "active_water", "water", "active_lava", "lava", "sand", "gravel",
"gold_ore", "iron_ore", "coal", "tree", "leaves", "sponge", "glass", "red",
"orange", "yellow", "greenyellow", "green", "springgreen", "cyan", "blue",
"orange", "yellow", "lime", "green", "springgreen", "cyan", "blue",
"blueviolet", "indigo", "purple", "magenta", "pink", "black", "gray", "white",
"yellow_flower", "red_flower", "brown_shroom", "red_shroom", "gold", "iron",
"double_stair", "stair", "brick", "tnt", "bookcase", "mossy_cobblestone",
@ -110,14 +110,19 @@ namespace MCGalaxy {
"train", "creeper", "zombie", "zombie_head", "unknown", "dove", "pidgeon", "duck",
"phoenix", "red_robin", "blue_bird", "unknown", "killer_phoenix", "unknown", "unknown",
"goldfish", "sea_sponge", "shark", "salmon", "betta_fish", "lava_shark", "snake",
"snake_tail", "door_gold", "door_gold_air", "unknown" };
"snake_tail", "door_gold", "door_gold_air", "unknown" };
for (int i = 0; i < names.Length; i++) {
Properties[i].Name = names[i];
if (names[i] != "unknown")
Aliases[names[i]] = (byte)i;
}
// Add old MCGalaxy aliases
Aliases["greenyellow"] = lightgreen;
// Add other aliases
Aliases["planks"] = wood; Aliases["log"] = trunk;
Aliases["stairs"] = staircasestep; Aliases["slab"] = staircasestep;
Aliases["doubleslab"] = staircasefull; Aliases["slabfull"] = staircasefull;
Aliases["solid"] = blackrock; Aliases["admintite"] = blackrock;
Aliases["blackrock"] = blackrock; Aliases["activewater"] = water;
Aliases["activelava"] = lava; Aliases["fhl"] = fastdeathlava;

12
Commands/Information/CmdBlocks.cs
View File

@ -32,7 +32,7 @@ namespace MCGalaxy.Commands
if (message == "")
{
Player.SendMessage(p, "Basic blocks: ");
for (byte i = 0; i < 50; i++)
for (byte i = 0; i < Block.CpeCount; i++)
{
message += ", " + Block.Name(i);
}
@ -41,8 +41,9 @@ namespace MCGalaxy.Commands
}
else if (message.ToLower() == "all")
{
message = "";
Player.SendMessage(p, "Complex blocks: ");
for (byte i = 50; i < 255; i++)
for (byte i = Block.CpeCount; i < 255; i++)
{
if (Block.Name(i).ToLower() != "unknown") message += ", " + Block.Name(i);
}
@ -72,9 +73,9 @@ namespace MCGalaxy.Commands
if (Block.Byte(message) != Block.Zero)
{
byte b = Block.Byte(message);
if (b < 51)
if (b < Block.CpeCount)
{
for (byte i = 51; i < 255; i++)
for (byte i = Block.CpeCount; i < 255; i++)
{
if (Block.Convert(i) == b)
printMessage += Block.Name(i) + ", ";
@ -116,7 +117,8 @@ namespace MCGalaxy.Commands
LevelPermission Perm = Group.Find(message).Permission;
foreach (Block.Blocks bL in Block.BlockList)
{
if (Block.canPlace(Perm, bL.type) && Block.Name(bL.type).ToLower() != "unknown") printMessage += Block.Name(bL.type) + ", ";
if (Block.canPlace(Perm, bL.type) && Block.Name(bL.type).ToLower() != "unknown")
printMessage += Block.Name(bL.type) + ", ";
}
if (printMessage != ">>>&b")