AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Coloured /help

Browse Source
This commit is contained in:
UnknownShadow200 2017-03-02 20:13:56 +11:00
parent 87e0fbadd8
commit 5b0f5a6f35
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MCGalaxy/Commands/Information/CmdHelp.cs
View File

@ -30,20 +30,20 @@ namespace MCGalaxy.Commands {
}
public CmdHelp() { }
public override void Use(Player p, string message) {
public override void Use(Player p, string message) { System.Runtime.Serialization.Formatters.Binary.BinaryFormatter f;
switch (message.ToLower()) {
case "":
Player.Message(p, "Command Categories:");
Player.Message(p, " %aBuilding Chat Economy Games Info Moderation Other World");
Player.Message(p, "Other Categories:");
Player.Message(p, " %aRanks Colors Shortcuts Commands");
Player.Message(p, "To view help for a category, type %T/help CategoryName");
Player.Message(p, "To see detailed help for a command, type %T/help CommandName");
Player.Message(p, "To see your stats, type %T/whois");
Player.Message(p, "To see loaded maps, type %T/maps");
Player.Message(p, "To view your personal world options, use %T/OS");
Player.Message(p, "To join a map, type %T/goto WorldName");
Player.Message(p, "To send private messages, type %T@PlayerName Message");
Player.Message(p, "%HCommand Categories:");
Player.Message(p, " %TBuilding Chat Economy Games Info Moderation Other World");
Player.Message(p, "%HOther Categories:");
Player.Message(p, " %TRanks Colors Shortcuts Commands");
Player.Message(p, "%HTo view help for a category, type %T/help CategoryName");
Player.Message(p, "%HTo see detailed help for a command, type %T/help CommandName");
Player.Message(p, "%HTo see your stats, type %T/whois");
Player.Message(p, "%HTo see loaded maps, type %T/maps");
Player.Message(p, "%HTo view your personal world options, use %T/realm");
Player.Message(p, "%HTo join a map, type %T/goto WorldName");
Player.Message(p, "%HTo send private messages, type %T@PlayerName Message");
break;
case "ranks":
PrintRanks(p); break;

13
MCGalaxy/Levels/Level.Blocks.cs
View File

@ -435,6 +435,13 @@ namespace MCGalaxy {
else
Player.GlobalBlockchange(this, x, y, z, block, extBlock);
}
public BlockDefinition GetBlockDef(byte block, byte extBlock) {
if (block == Block.custom_block) return CustomBlockDefs[extBlock];
if (block >= Block.CpeCount || block == Block.air) return null;
return CustomBlockDefs[block];
}
public string BlockName(byte block, byte extBlock) {
BlockDefinition def = GetBlockDef(block, extBlock);
@ -442,11 +449,5 @@ namespace MCGalaxy {
return block != Block.custom_block ? Block.Name(block) : extBlock.ToString();
}
public BlockDefinition GetBlockDef(byte block, byte extBlock) {
if (block == Block.custom_block) return CustomBlockDefs[extBlock];
if (block >= Block.CpeCount || block == Block.air) return null;
return CustomBlockDefs[block];
}
}
}

4
MCGalaxy/util/Math/AABB.cs
View File

@ -125,6 +125,10 @@ namespace MCGalaxy {
float scale;
if (!Utils.TryParseDecimal(scaleStr, out scale)) return baseBB;
if (scale < 0.25f) scale = 0.25f;
float maxScale = model.CaselessEq("chibi") ? 3 : 2;
if (scale > maxScale) scale = maxScale;
return baseBB.Scale(scale);
}