AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-10-03 18:43:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow lb/gb copying multiple blocks at once (Thanks TropicalMemes)

Browse Source
This commit is contained in:
UnknownShadow200 2020-05-03 00:11:35 +10:00
parent d29bf8245c
commit 781c407733
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
MCGalaxy/Commands/CPE/CustomBlockCommand.cs
View File

@ -125,6 +125,26 @@ namespace MCGalaxy.Commands.CPE {
string path = Paths.MapBlockDefs(map); string path = Paths.MapBlockDefs(map);
return BlockDefinition.Load(path); return BlockDefinition.Load(path);
} }
static bool DoCopy(Player p, bool global, string cmd, bool keepOrder,
BlockDefinition srcDef, BlockID src, BlockID dst) {
if (srcDef == null && src < Block.CpeCount) {
srcDef = DefaultSet.MakeCustomBlock(src);
}
if (srcDef == null) { MessageNoBlock(p, src, global, cmd); return false; }
BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
BlockDefinition dstDef = defs[dst];
if (ExistsInScope(dstDef, dst, global)) { MessageAlreadyBlock(p, dst, global, cmd); return false; }
BlockProps props = global ? Block.Props[src] : p.level.Props[src];
dstDef = srcDef.Copy();
dstDef.SetBlock(dst);
if (!keepOrder) dstDef.InventoryOrder = -1;
AddBlock(p, dstDef, global, cmd, props);
return true;
}
static void CopyAllHandler(Player p, string[] parts, CommandData data, bool global, string cmd) { static void CopyAllHandler(Player p, string[] parts, CommandData data, bool global, string cmd) {
if (parts.Length < 2) { Help(p, cmd); return; } if (parts.Length < 2) { Help(p, cmd); return; }
@ -151,8 +171,8 @@ namespace MCGalaxy.Commands.CPE {
static void CopyHandler(Player p, string[] parts, CommandData data, bool global, string cmd) { static void CopyHandler(Player p, string[] parts, CommandData data, bool global, string cmd) {
if (parts.Length < 2) { Help(p, cmd); return; } if (parts.Length < 2) { Help(p, cmd); return; }
BlockID src, dst; BlockID min, max, dst;
if (!CheckBlock(p, parts[1], out src, true)) return; if (!CheckBlocks(p, parts[1], out min, out max, true)) return;
BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs; BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
if (parts.Length > 2) { if (parts.Length > 2) {
@ -172,30 +192,13 @@ namespace MCGalaxy.Commands.CPE {
} }
} }
if (!DoCopy(p, global, cmd, false, defs[src], src, dst)) return; for (int i = min; i <= max && Block.ToRaw(dst) < Block.MaxRaw; i++, dst++) {
string scope = global ? "global" : "level"; if (!DoCopy(p, global, cmd, false, defs[i], (BlockID)i, dst)) continue;
p.Message("Duplicated the {0} custom block with id \"{1}\" to \"{2}\".", string scope = global ? "global" : "level";
scope, Block.ToRaw(src), Block.ToRaw(dst));
} p.Message("Duplicated the {0} custom block with id \"{1}\" to \"{2}\".",
scope, Block.ToRaw((BlockID)i), Block.ToRaw(dst));
static bool DoCopy(Player p, bool global, string cmd, bool keepOrder,
BlockDefinition srcDef, BlockID src, BlockID dst) {
if (srcDef == null && src < Block.CpeCount) {
srcDef = DefaultSet.MakeCustomBlock(src);
} }
if (srcDef == null) { MessageNoBlock(p, src, global, cmd); return false; }
BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
BlockDefinition dstDef = defs[dst];
if (ExistsInScope(dstDef, dst, global)) { MessageAlreadyBlock(p, dst, global, cmd); return false; }
BlockProps props = global ? Block.Props[src] : p.level.Props[src];
dstDef = srcDef.Copy();
dstDef.SetBlock(dst);
if (!keepOrder) dstDef.InventoryOrder = -1;
AddBlock(p, dstDef, global, cmd, props);
return true;
} }
static void DoInfo(Player p, BlockID block, bool global, string cmd) { static void DoInfo(Player p, BlockID block, bool global, string cmd) {
@ -649,10 +652,10 @@ namespace MCGalaxy.Commands.CPE {
return true; return true;
} }
static bool CheckBlock(Player p, string arg, out BlockID block, bool allowAir = false) { static bool CheckBlock(Player p, string arg, out BlockID block, bool air = false) {
block = Block.Invalid; block = Block.Invalid;
BlockID raw = 0; BlockID raw = 0;
BlockID min = (BlockID)(allowAir ? 0 : 1); BlockID min = (BlockID)(air ? 0 : 1);
BlockID max = Block.MaxRaw; BlockID max = Block.MaxRaw;
bool success = CommandParser.GetUShort(p, arg, "Block ID", ref raw, min, max); bool success = CommandParser.GetUShort(p, arg, "Block ID", ref raw, min, max);
@ -660,15 +663,15 @@ namespace MCGalaxy.Commands.CPE {
return success; return success;
} }
static bool CheckBlocks(Player p, string arg, out BlockID min, out BlockID max) { static bool CheckBlocks(Player p, string arg, out BlockID min, out BlockID max, bool air = false) {
bool success; bool success;
// Either "[id]" or "[min]-[max]" // Either "[id]" or "[min]-[max]"
if (arg.IndexOf('-') == -1) { if (arg.IndexOf('-') == -1) {
success = CheckBlock(p, arg, out min); success = CheckBlock(p, arg, out min, air);
max = min; max = min;
} else { } else {
string[] bits = arg.Split(new char[] { '-' }, 2); string[] bits = arg.Split(new char[] { '-' }, 2);
success = CheckBlock(p, bits[0], out min) & CheckBlock(p, bits[1], out max); success = CheckBlock(p, bits[0], out min, air) & CheckBlock(p, bits[1], out max, air);
} }
return success; return success;
} }