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

Cleanup /blocks, fix CmdLoad erroring when dll did not exist.

Browse Source
This commit is contained in:
UnknownShadow200 2016-09-06 19:25:32 +10:00
parent 38fed28abf
commit 8b680ea217
3 changed files with 98 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
Commands/Information/CmdBlocks.cs
View File

@ -16,6 +16,7 @@
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
using System.Collections.Generic;
using MCGalaxy.Blocks; using MCGalaxy.Blocks;
namespace MCGalaxy.Commands namespace MCGalaxy.Commands
@ -29,113 +30,98 @@ namespace MCGalaxy.Commands
public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override LevelPermission defaultRank { get { return LevelPermission.Guest; } }
public override CommandAlias[] Aliases { public override CommandAlias[] Aliases {
get { return new[] { new CommandAlias("materials") }; } get { return new[] { new CommandAlias("materials") }; }
} }
public CmdBlocks() { } public CmdBlocks() { }
public override void Use(Player p, string message) public override void Use(Player p, string message) {
{ string[] args = message.Split(' ');
if (message == "") string modifier = args.Length > 1 ? args[1] : "";
{
if (args[0] == "" || args[0].CaselessEq("basic")) {
Player.Message(p, "Basic blocks: "); Player.Message(p, "Basic blocks: ");
for (byte i = 0; i < Block.CpeCount; i++) MultiPageOutput.Output(p, BasicBlocks(), (name, i) => name,
{ "blocks basic", "blocks", modifier, false);
message += ", " + Block.Name(i); } else if (args[0].CaselessEq("all") || args[0].CaselessEq("complex")) {
}
Player.Message(p, message.Remove(0, 2));
Player.Message(p, "&d/blocks all <0/1/2/3/4> %Swill show the rest.");
}
else if (message.ToLower() == "all")
{
message = "";
Player.Message(p, "Complex blocks: "); Player.Message(p, "Complex blocks: ");
for (byte i = Block.CpeCount; i < 255; i++) MultiPageOutput.Output(p, ComplexBlocks(), (name, i) => name,
{ "blocks complex", "blocks", modifier, false);
if (Block.Name(i).ToLower() != "unknown") message += ", " + Block.Name(i); } else if (Block.Byte(args[0]) != Block.Zero) {
} OutputBlockData(p, args[0]);
Player.Message(p, message.Remove(0, 2)); } else if (Group.Find(args[0]) != null) {
Player.Message(p, "Use &d/blocks all <0/1/2/3/4> %Sfor a readable list."); Group grp = Group.Find(args[0]);
} List<string> blocks = RankBlocks(grp.Permission);
else if (message.ToLower().IndexOf(' ') != -1 && message.Split(' ')[0] == "all")
{ if (blocks.Count == 0) {
int foundRange = 0; Player.Message(p, "{0} %Scannot modify any blocks.", grp.ColoredName);
try { foundRange = int.Parse(message.Split(' ')[1]); } } else {
catch { Player.Message(p, "Incorrect syntax"); return; } Player.Message(p, "Blocks which {0} %Scan place: ", grp.ColoredName);
MultiPageOutput.Output(p, blocks, (name, i) => name,
if (foundRange >= 5 || foundRange < 0) { Player.Message(p, "Number must be between 0 and 4"); return; } "blocks " + args[0], "blocks", modifier, false);
message = "";
Player.Message(p, "Blocks between " + foundRange * 51 + " and " + (foundRange + 1) * 51);
for (byte i = (byte)(foundRange * 51); i < (byte)((foundRange + 1) * 51); i++)
{
if (Block.Name(i).ToLower() != "unknown") message += ", " + Block.Name(i);
}
Player.Message(p, message.Remove(0, 2));
}
else
{
string printMessage = ">>>&b";
if (Block.Byte(message) != Block.Zero)
{
byte b = Block.Byte(message);
if (b < Block.CpeCount)
{
for (byte i = Block.CpeCount; i < 255; i++)
{
if (Block.Convert(i) == b)
printMessage += Block.Name(i) + ", ";
}
if (printMessage != ">>>&b")
{
Player.Message(p, "Blocks which look like \"" + message + "\":");
Player.Message(p, printMessage.Remove(printMessage.Length - 2));
}
else Player.Message(p, "No Complex Blocks look like \"" + message + "\"");
}
else
{
Player.Message(p, "&bComplex information for \"" + message + "\":");
Player.Message(p, "&cBlock will appear as a \"" + Block.Name(Block.Convert(b)) + "\" block");
OutputProperties(p, b);
}
}
else if (Group.Find(message) != null)
{
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 (printMessage != ">>>&b")
{
Player.Message(p, "Blocks which " + Group.Find(message).ColoredName + " %Scan place: ");
Player.Message(p, printMessage.Remove(printMessage.Length - 2));
}
else Player.Message(p, "No blocks are specific to this rank");
}
else if (message.IndexOf(' ') == -1)
{
if (message.ToLower() == "count") Player.Message(p, "Blocks in this map: " + p.level.blocks.Length);
else Help(p);
}
else
{
Player.Message(p, "Unable to find block or rank");
} }
} else if (args.Length > 1) {
Help(p);
} else {
Player.Message(p, "Unable to find block or rank");
} }
} }
static void OutputProperties(Player p, byte b) { static List<string> BasicBlocks() {
List<string> items = new List<string>(Block.CpeCount);
for (int i = 0; i < Block.CpeCount; i++)
items.Add(Block.Props[i].Name);
return items;
}
static List<string> ComplexBlocks() {
List<string> items = new List<string>(256);
for (int i = Block.CpeCount; i < Block.Zero; i++) {
if (Block.Props[i].Name.CaselessEq("unknown")) continue;
items.Add(Block.Props[i].Name);
}
return items;
}
static List<string> RankBlocks(LevelPermission perm) {
List<string> items = new List<string>(256);
foreach (Block.Blocks bl in Block.BlockList) {
if (!Block.canPlace(perm, bl.type)) continue;
if (Block.Name(bl.type).CaselessEq("unknown")) continue;
items.Add(Block.Name(bl.type));
}
return items;
}
static void OutputBlockData(Player p, string block) {
byte b = Block.Byte(block);
if (b >= Block.CpeCount) {
Player.Message(p, "&bComplex information for \"{0}\":", block);
Player.Message(p, "&cBlock will appear as a \"{0}\" block", Block.Name(Block.Convert(b)));
OutputBlockProps(p, b);
return;
}
string msg = "";
for (byte i = Block.CpeCount; i < Block.Zero; i++) {
if (Block.Convert(i) == b)
msg += Block.Name(i) + ", ";
}
if (msg != "") {
Player.Message(p, "Blocks which look like \"{0}\":", block);
Player.Message(p, msg.Remove(msg.Length - 2));
} else {
Player.Message(p, "No Complex Blocks look like \"{0}\"", block);
}
}
static void OutputBlockProps(Player p, byte b) {
BlockProperties props = Block.Props[b]; BlockProperties props = Block.Props[b];
if (Block.LightPass(b, 0, BlockDefinition.GlobalDefs)) if (Block.LightPass(b, 0, BlockDefinition.GlobalDefs))
Player.Message(p, "Block will allow light through"); Player.Message(p, "Block will allow light through");
if (Block.Physics(b)) if (Block.Physics(b))
Player.Message(p, "Block affects physics in some way"); //AFFECT! Player.Message(p, "Block affects physics in some way"); //AFFECT!
else else
Player.Message(p, "Block will not affect physics in any way"); //It's AFFECT! Player.Message(p, "Block will not affect physics in any way"); //It's AFFECT!
if (Block.NeedRestart(b)) Player.Message(p, "The block's physics will auto-start"); if (Block.NeedRestart(b)) Player.Message(p, "The block's physics will auto-start");
@ -154,7 +140,7 @@ namespace MCGalaxy.Commands
public override void Help(Player p) { public override void Help(Player p) {
Player.Message(p, "%T/blocks %H- Lists all basic blocks"); Player.Message(p, "%T/blocks %H- Lists all basic blocks");
Player.Message(p, "%T/blocks all %H- Lists all complex blocks"); Player.Message(p, "%T/blocks complex %H- Lists all complex blocks");
Player.Message(p, "%T/blocks [basic block] %H- Lists all blocks which look the same"); Player.Message(p, "%T/blocks [basic block] %H- Lists all blocks which look the same");
Player.Message(p, "%T/blocks [complex block] %H- Lists specific info on that block"); Player.Message(p, "%T/blocks [complex block] %H- Lists specific info on that block");
Player.Message(p, "%T/blocks [rank] %H- Lists all blocks [rank] can use"); Player.Message(p, "%T/blocks [rank] %H- Lists all blocks [rank] can use");

21
Commands/Scripting/CmdCmdLoad.cs
View File

@ -15,6 +15,8 @@
or implied. See the Licenses for the specific language governing or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System.IO;
namespace MCGalaxy.Commands { namespace MCGalaxy.Commands {
public sealed class CmdCmdLoad : Command { public sealed class CmdCmdLoad : Command {
public override string name { get { return "cmdload"; } } public override string name { get { return "cmdload"; } }
@ -24,21 +26,24 @@ namespace MCGalaxy.Commands {
public override LevelPermission defaultRank { get { return LevelPermission.Nobody; } } public override LevelPermission defaultRank { get { return LevelPermission.Nobody; } }
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
string cmdName = message.Split(' ')[0]; if (!Formatter.ValidName(p, message, "command")) return;
if (Command.all.Contains(cmdName)) { if (Command.all.Contains(message)) {
Player.Message(p, "That command is already loaded!"); return; Player.Message(p, "That command is already loaded!"); return;
}
if (!File.Exists(Scripting.DllDir + "Cmd" + message + ".dll")) {
Player.Message(p, "File &9Cmd" + message + ".dll %Snot found."); return;
} }
string error = Scripting.Load("Cmd" + cmdName); string error = Scripting.Load("Cmd" + message);
if (error != null) { Player.Message(p, error); return; } if (error != null) { Player.Message(p, error); return; }
GrpCommands.fillRanks(); GrpCommands.fillRanks();
Player.Message(p, "Command was successfully loaded."); Player.Message(p, "Command was successfully loaded.");
} }
public override void Help(Player p) { public override void Help(Player p) {
Player.Message(p, "%T/cmdload <command>"); Player.Message(p, "%T/cmdload [command name]");
Player.Message(p, "%HLoads a compiled command into the server for use."); Player.Message(p, "%HLoads a compiled command into the server for use.");
Player.Message(p, "%HThis method load both C# and Visual Basic compiled commands."); Player.Message(p, "%H Loads both C# and Visual Basic compiled commands.");
} }
} }
} }

8
Commands/Scripting/CmdCompile.cs
View File

@ -41,7 +41,7 @@ namespace MCGalaxy.Commands {
} }
if (!File.Exists(Scripting.SourceDir + "Cmd" + args[0] + engine.Ext)) { if (!File.Exists(Scripting.SourceDir + "Cmd" + args[0] + engine.Ext)) {
Player.Message(p, "File &9Cmd" + args[0] + engine.Ext + " %Snot found!"); return; Player.Message(p, "File &9Cmd" + args[0] + engine.Ext + " %Snot found."); return;
} }
bool success = false; bool success = false;
try { try {
@ -59,10 +59,10 @@ namespace MCGalaxy.Commands {
} }
public override void Help(Player p) { public override void Help(Player p) {
Player.Message(p, "%T/compile <class name>"); Player.Message(p, "%T/compile [class name]");
Player.Message(p, "%HCompiles a command class file into a DLL."); Player.Message(p, "%HCompiles a command class file into a DLL.");
Player.Message(p, "%T/compile <class name> vb"); Player.Message(p, "%T/compile [class name] vb");
Player.Message(p, "%HCompiles a command class (that was written in visual basic) file into a DLL."); Player.Message(p, "%HCompiles a command class (written in visual basic) file into a DLL.");
Player.Message(p, "%H class name: &9Cmd&e<class name>&9.cs"); Player.Message(p, "%H class name: &9Cmd&e<class name>&9.cs");
} }
} }