AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 04:32:50 -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 2017-08-10 20:40:06 +10:00
commit 18bdd6fd8f
10 changed files with 95 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MCGalaxy/Blocks/BlockDefinitions.cs
View File

@ -46,7 +46,7 @@ namespace MCGalaxy {
public const string GlobalPath = "blockdefs/global.json", GlobalBackupPath = "blockdefs/global.json.bak";
public static BlockDefinition[] GlobalDefs;
public static BlockProps[] GlobalProps = new BlockProps[Block.Count * 2];
public static BlockProps[] GlobalProps = new BlockProps[Block.Count];
public BlockDefinition Copy() {
BlockDefinition def = new BlockDefinition();
@ -136,19 +136,21 @@ namespace MCGalaxy {
public static void UpdateGlobalBlockProps() {
for (int i = 0; i < GlobalProps.Length; i++) {
ExtBlock block = ExtBlock.FromIndex(i);
ExtBlock block = ExtBlock.FromRaw((byte)i);
GlobalProps[i] = BlockProps.MakeDefault();
GlobalProps[i] = DefaultProps(block);
}
BlockProps.Load("global", GlobalProps, true);
BlockProps.Load("global", GlobalProps, false);
}
internal static BlockProps DefaultProps(ExtBlock block) {
if (block.IsPhysicsType) return Block.Props[block.Index];
if (block.IsCustomType || GlobalDefs[block.BlockID] != null)
return GlobalProps[block.Index];
return Block.Props[block.Index];
if (block.IsPhysicsType) {
return Block.Props[block.Index];
} else if (!block.IsCustomType && GlobalDefs[block.RawID] == null) {
return Block.Props[block.RawID];
} else {
return GlobalProps[block.RawID];
}
}
static void UpdateLoadedLevels(BlockDefinition[] oldGlobalDefs) {
@ -157,8 +159,9 @@ namespace MCGalaxy {
for (int i = 0; i < lvl.CustomBlockDefs.Length; i++) {
if (lvl.CustomBlockDefs[i] != oldGlobalDefs[i]) continue;
lvl.BlockProps[i] = GlobalProps[i];
lvl.UpdateCustomBlock((byte)i, GlobalDefs[i]);
ExtBlock block = ExtBlock.FromRaw((byte)i);
lvl.BlockProps[block.Index] = DefaultProps(block);
lvl.UpdateCustomBlock(block.RawID, GlobalDefs[i]);
}
}
}

6
MCGalaxy/Blocks/BlockProperties.cs
View File

@ -83,7 +83,7 @@ namespace MCGalaxy.Blocks {
"Killed by water : Killed by lava : Kills players : death message : " +
"Animal AI type : Stack block : Is OP block");
for (int i = 0; i < scope.Length; i++) {
if (!scope[i].Changed || !selector(i)) continue;
if (!scope[i].Changed || (selector != null && !selector(i))) continue;
BlockProps props = scope[i];
// Convert ext to raw ids
int id = i >= Block.Count ? (i - Block.Count) : i;
@ -97,7 +97,7 @@ namespace MCGalaxy.Blocks {
}
}
public static void Load(string group, BlockProps[] scope, bool custom) {
public static void Load(string group, BlockProps[] scope, bool lbScope) {
if (!Directory.Exists("blockprops")) return;
if (!File.Exists("blockprops/" + group + ".txt")) return;
@ -118,7 +118,7 @@ namespace MCGalaxy.Blocks {
continue;
}
int idx = raw;
if (custom && raw >= Block.CpeCount) idx += Block.Count;
if (lbScope && raw >= Block.CpeCount) idx += Block.Count;
bool.TryParse(parts[1], out scope[idx].IsRails);
bool.TryParse(parts[2], out scope[idx].IsTDoor);

2
MCGalaxy/Chat/LineWrapper.cs
View File

@ -31,7 +31,7 @@ namespace MCGalaxy {
//if (Regex.IsMatch(message, "&a")) break;
if ( lines.Count > 0 ) {
if ( message[0].ToString() == "&" )
if ( message[0] == '&' )
message = "> " + message.Trim();
else
message = "> " + color + message.Trim();

4
MCGalaxy/Commands/Bots/CmdBotSet.cs
View File

@ -53,13 +53,13 @@ namespace MCGalaxy.Commands.Bots {
}
string ai = args[1].ToLower();
if (ai == "hunt") {
if (ai.CaselessEq("hunt")) {
bot.hunt = !bot.hunt;
bot.Instructions.Clear();
bot.AIName = "";
UpdateBot(p, bot, "'s hunt instinct: " + bot.hunt);
return;
} else if (ai == "kill") {
} else if (ai.CaselessEq("kill")) {
if (!CheckExtraPerm(p)) { MessageNeedExtra(p, 1); return; }
bot.kill = !bot.kill;
UpdateBot(p, bot, "'s kill instinct: " + bot.kill);

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

@ -115,7 +115,7 @@ namespace MCGalaxy.Commands.CPE {
if (srcDef == null) { MessageNoBlock(p, src, global, cmd); return; }
if (ExistsInScope(dstDef, dst, global)) { MessageAlreadyBlock(p, dst, global, cmd); return; }
BlockProps props = global ? BlockDefinition.GlobalProps[src.Index] : p.level.BlockProps[src.Index];
BlockProps props = global ? BlockDefinition.GlobalProps[src.RawID] : p.level.BlockProps[src.Index];
dstDef = srcDef.Copy();
dstDef.BlockID = (byte)dst.RawID;
@ -538,7 +538,7 @@ namespace MCGalaxy.Commands.CPE {
return;
}
BlockDefinition.GlobalProps[block.Index] = props;
BlockDefinition.GlobalProps[block.RawID] = props;
Level[] loaded = LevelInfo.Loaded.Items;
byte raw = block.RawID;
@ -558,14 +558,15 @@ namespace MCGalaxy.Commands.CPE {
}
BlockProps props = BlockProps.MakeDefault();
BlockDefinition.GlobalProps[block.Index] = props;
if (!block.IsCustomType) props = Block.Props[block.RawID];
BlockDefinition.GlobalProps[block.RawID] = props;
Level[] loaded = LevelInfo.Loaded.Items;
byte raw = block.RawID;
if (!block.IsCustomType) props = Block.Props[raw];
foreach (Level lvl in loaded) {
if (lvl.CustomBlockDefs[raw] != BlockDefinition.GlobalDefs[raw]) continue;
lvl.BlockProps[block.Index] = BlockDefinition.GlobalProps[block.Index];
lvl.BlockProps[block.Index] = BlockDefinition.GlobalProps[block.RawID];
lvl.UpdateBlockHandler(block);
}
}

122
MCGalaxy/Commands/World/CmdBlockProperties.cs
View File

@ -40,7 +40,7 @@ namespace MCGalaxy.Commands.World {
SetProperty(p, scope, block, prop, args);
}
BlockProps[] GetScope(Player p, string scope) {
static BlockProps[] GetScope(Player p, string scope) {
if (scope.CaselessEq("core")) return Block.Props;
if (scope.CaselessEq("global")) return BlockDefinition.GlobalProps;
@ -57,7 +57,7 @@ namespace MCGalaxy.Commands.World {
return null;
}
ExtBlock GetBlock(Player p, BlockProps[] scope, string input) {
static ExtBlock GetBlock(Player p, BlockProps[] scope, string input) {
if (scope == Block.Props) {
byte raw;
if (!byte.TryParse(input, out raw))
@ -70,13 +70,17 @@ namespace MCGalaxy.Commands.World {
return new ExtBlock(raw, 0);
} else if (scope == BlockDefinition.GlobalProps) {
byte raw = BlockDefinition.GetBlock(input, BlockDefinition.GlobalDefs);
if (raw == Block.Invalid)
if (raw == Block.Invalid) {
Player.Message(p, "&cThere is no global custom block with id or name \"{0}\"", input);
return ExtBlock.Invalid;
}
return ExtBlock.FromRaw(raw);
} else {
byte raw = BlockDefinition.GetBlock(input, p.level.CustomBlockDefs);
if (raw == Block.Invalid)
if (raw == Block.Invalid) {
Player.Message(p, "&cThere is no level custom block with id or name \"{0}\"", input);
return ExtBlock.Invalid;
}
if (p.level.CustomBlockDefs[raw] == BlockDefinition.GlobalDefs[raw]) {
Player.Message(p, "&cUse %T/BlockProps global &cto modify this custom block."); return ExtBlock.Invalid;
@ -85,89 +89,77 @@ namespace MCGalaxy.Commands.World {
}
}
static int GetIndex(BlockProps[] scope, ExtBlock block) {
return scope == BlockDefinition.GlobalProps ? block.RawID : block.Index;
}
void SetProperty(Player p, BlockProps[] scope, ExtBlock block,
string prop, string[] args) {
int i = GetIndex(scope, block);
if (prop == "portal") {
Toggle(p, scope, block, "a portal",
(ref BlockProps props) => props.IsPortal = !props.IsPortal,
(BlockProps props) => props.IsPortal);
scope[i].IsPortal = !scope[i].IsPortal;
OnToggleSet(p, scope, block, "a portal", scope[i].IsPortal);
} else if (prop == "mb" || prop == "messageblock") {
Toggle(p, scope, block, "a message block",
(ref BlockProps props) => props.IsMessageBlock = !props.IsMessageBlock,
(BlockProps props) => props.IsMessageBlock);
scope[i].IsMessageBlock = !scope[i].IsMessageBlock;
OnToggleSet(p, scope, block, "a message block", scope[i].IsMessageBlock);
} else if (prop == "rails") {
Toggle(p, scope, block, "train rails",
(ref BlockProps props) => props.IsRails = !props.IsRails,
(BlockProps props) => props.IsRails);
scope[i].IsRails = !scope[i].IsRails;
OnToggleSet(p, scope, block, "train rails", scope[i].IsRails);
} else if (prop == "waterkills") {
Toggle(p, scope, block, "killed by water",
(ref BlockProps props) => props.WaterKills = !props.WaterKills,
(BlockProps props) => props.WaterKills);
scope[i].WaterKills = !scope[i].WaterKills;
OnToggleSet(p, scope, block, "killed by water", scope[i].WaterKills);
} else if (prop == "lavakills") {
Toggle(p, scope, block, "killed by lava",
(ref BlockProps props) => props.LavaKills = !props.LavaKills,
(BlockProps props) => props.LavaKills);
scope[i].LavaKills = !scope[i].LavaKills;
OnToggleSet(p, scope, block, "killed by lava", scope[i].LavaKills);
} else if (prop == "door") {
Toggle(p, scope, block, "a door",
(ref BlockProps props) => props.IsDoor = !props.IsDoor,
(BlockProps props) => props.IsDoor);
scope[i].IsDoor = !scope[i].IsDoor;
OnToggleSet(p, scope, block, "a door", scope[i].IsDoor);
} else if (prop == "tdoor") {
Toggle(p, scope, block, "a tdoor",
(ref BlockProps props) => props.IsTDoor = !props.IsTDoor,
(BlockProps props) => props.IsTDoor);
scope[i].IsTDoor = !scope[i].IsTDoor;
OnToggleSet(p, scope, block, "a tdoor", scope[i].IsTDoor);
} else if (prop == "killer" || prop == "death") {
Toggle(p, scope, block, "a killer block",
(ref BlockProps props) => props.KillerBlock = !props.KillerBlock,
(BlockProps props) => props.KillerBlock);
scope[i].KillerBlock = !scope[i].KillerBlock;
OnToggleSet(p, scope, block, "a killer block", scope[i].KillerBlock);
} else if (prop == "deathmsg" || prop == "deathmessage") {
string msg = args.Length > 3 ? args[3] : null;
SetDeathMessage(p, scope, block, msg);
SetDeathMessage(p, scope, block, i, msg);
} else if (prop == "animalai" || prop == "animal") {
string msg = args.Length > 3 ? args[3] : null;
SetEnum(p, scope, block, msg);
SetEnum(p, scope, block, i, msg);
} else if (prop == "stackid" || prop == "stackblock") {
string msg = args.Length > 3 ? args[3] : null;
SetStackId(p, scope, block, msg);
SetStackId(p, scope, block, i, msg);
} else if (prop == "opblock" || prop == "op") {
Toggle(p, scope, block, "an OP block",
(ref BlockProps props) => props.OPBlock = !props.OPBlock,
(BlockProps props) => props.OPBlock);
scope[i].OPBlock = !scope[i].OPBlock;
OnToggleSet(p, scope, block, "an OP block", scope[i].OPBlock);
} else {
Help(p);
}
}
delegate void BoolSetter(ref BlockProps props);
delegate bool BoolGetter(BlockProps props);
static void Toggle(Player p, BlockProps[] scope, ExtBlock block, string type,
BoolSetter setter, BoolGetter getter) {
BlockProps props = scope[block.Index];
setter(ref props);
scope[block.Index] = props;
static void OnToggleSet(Player p, BlockProps[] scope, ExtBlock block, string type, bool on) {
Level lvl = Player.IsSuper(p) ? null : p.level;
Player.Message(p, "Block {0} is {1}: {2}",
BlockName(scope, lvl, block),
type, getter(props) ? "&aYes" : "&cNo");
type, on ? "&aYes" : "&cNo");
OnPropsChanged(scope, lvl, block);
}
static void SetEnum(Player p, BlockProps[] scope, ExtBlock block, string msg) {
static void SetEnum(Player p, BlockProps[] scope, ExtBlock block, int i, string msg) {
Level lvl = Player.IsSuper(p) ? null : p.level;
AnimalAI ai = AnimalAI.None;
if (!CommandParser.GetEnum(p, msg, "Animal AI", ref ai)) return;
scope[block.Index].AnimalAI = ai;
scope[i].AnimalAI = ai;
Player.Message(p, "Animal AI for {0} set to: {1}",
BlockName(scope, lvl, block), ai);
OnPropsChanged(scope, lvl, block);
}
static void SetDeathMessage(Player p, BlockProps[] scope, ExtBlock block, string msg) {
scope[block.Index].DeathMessage = msg;
static void SetDeathMessage(Player p, BlockProps[] scope, ExtBlock block, int i, string msg) {
scope[i].DeathMessage = msg;
Level lvl = Player.IsSuper(p) ? null : p.level;
if (msg == null) {
@ -180,7 +172,7 @@ namespace MCGalaxy.Commands.World {
OnPropsChanged(scope, lvl, block);
}
static void SetStackId(Player p, BlockProps[] scope, ExtBlock block, string msg) {
static void SetStackId(Player p, BlockProps[] scope, ExtBlock block, int i, string msg) {
Level lvl = Player.IsSuper(p) ? null : p.level;
ExtBlock stackBlock;
@ -189,7 +181,7 @@ namespace MCGalaxy.Commands.World {
} else {
if (!CommandParser.GetBlock(p, msg, out stackBlock)) return;
}
scope[block.Index].StackId = stackBlock.RawID;
scope[i].StackId = stackBlock.RawID;
if (stackBlock.IsAir) {
Player.Message(p, "Removed stack block for {0}",
@ -205,43 +197,39 @@ namespace MCGalaxy.Commands.World {
static void OnPropsChanged(BlockProps[] scope, Level level, ExtBlock block) {
int idx = block.Index;
scope[idx].Changed = true;
scope[GetIndex(scope, block)].Changed = true;
if (scope == Block.Props) {
BlockProps.Save("core", scope, i => true);
BlockProps.Save("core", scope, null);
Level[] loaded = LevelInfo.Loaded.Items;
BlockDefinition.GlobalProps[idx] = BlockDefinition.DefaultProps(block);
if (!block.IsPhysicsType)
BlockDefinition.GlobalProps[block.RawID] = BlockDefinition.DefaultProps(block);
foreach (Level lvl in loaded) {
lvl.BlockProps[idx] = BlockDefinition.GlobalProps[idx];
if (lvl.HasCustomProps(block)) continue;
lvl.BlockProps[block.Index] = BlockDefinition.DefaultProps(block);
lvl.UpdateBlockHandler(block);
}
} else if (scope == BlockDefinition.GlobalProps) {
Level[] loaded = LevelInfo.Loaded.Items;
BlockProps.Save("global", scope, SelectGlobal);
BlockProps.Save("global", scope, null);
byte raw = block.RawID;
foreach (Level lvl in loaded) {
if (lvl.CustomBlockDefs[raw] != BlockDefinition.GlobalDefs[raw]) continue;
lvl.BlockProps[idx] = BlockDefinition.GlobalProps[idx];
if (lvl.HasCustomProps(block)) continue;
lvl.BlockProps[block.Index] = BlockDefinition.DefaultProps(block);
lvl.UpdateBlockHandler(block);
}
} else {
BlockProps.Save("lvl_" + level.name, scope, i => SelectLevel(level, i));
BlockProps.Save("lvl_" + level.name, scope, idx => SelectLevel(level, idx));
level.UpdateBlockHandler(block);
}
}
static bool SelectGlobal(int i) {
ExtBlock block = ExtBlock.FromIndex(i);
return !block.IsPhysicsType && BlockDefinition.GlobalDefs[block.RawID] != null;
}
static bool SelectLevel(Level lvl, int i) {
ExtBlock block = ExtBlock.FromIndex(i);
return !block.IsPhysicsType &&
lvl.CustomBlockDefs[block.RawID] != BlockDefinition.GlobalDefs[block.RawID];
return lvl.HasCustomProps(ExtBlock.FromIndex(i));
}
static string BlockName(BlockProps[] scope, Level lvl, ExtBlock block) {

11
MCGalaxy/Commands/World/CmdOverseer.cs
View File

@ -97,16 +97,13 @@ namespace MCGalaxy.Commands.World {
static string NextLevel(Player p) {
string level = p.name.ToLower();
if (LevelInfo.MapExists(level) || LevelInfo.MapExists(level + "00")) {
for (int i = 2; i < p.group.OverseerMaps + 2; i++) {
// subtract 1, because we accounted for it in above if statement
for (int i = 2; i < (p.group.OverseerMaps - 1) + 2; i++) {
if (LevelInfo.MapExists(p.name.ToLower() + i)) continue;
if(i > p.group.OverseerMaps) {
Player.Message(p, "You have reached the limit for your overseer maps."); return null;
}
return p.name.ToLower() + i;
}
if (level == p.name.ToLower()) {
Player.Message(p, "You have reached the limit for your overseer maps."); return null;
}
Player.Message(p, "You have reached the limit for your overseer maps."); return null;
}
return level;
}

9
MCGalaxy/Levels/Level.cs
View File

@ -467,12 +467,15 @@ namespace MCGalaxy {
public ushort MinX, MinY, MinZ;
}
internal bool HasCustomProps(ExtBlock block) {
if (block.IsPhysicsType) return false;
return CustomBlockDefs[block.RawID] != BlockDefinition.GlobalDefs[block.RawID];
}
void LoadCoreProps() {
for (int i = 0; i < BlockProps.Length; i++) {
ExtBlock block = ExtBlock.FromIndex(i);
byte raw = block.RawID;
if (block.IsPhysicsType || CustomBlockDefs[raw] == BlockDefinition.GlobalDefs[raw]) {
if (!HasCustomProps(block)) {
BlockProps[i] = BlockDefinition.DefaultProps(block);
} else {
BlockProps[i] = MCGalaxy.Blocks.BlockProps.MakeDefault();

4
MCGalaxy/Server/Server.Init.cs
View File

@ -85,8 +85,8 @@ namespace MCGalaxy {
List<string> maps = AutoloadMaps.AllNames();
foreach (string map in maps) {
string name = map.ToLower();
if (name != mainLevel.name) CmdLoad.LoadLevel(null, name);
if (map.CaselessEq(mainLevel.name)) continue;
CmdLoad.LoadLevel(null, map);
}
}

2
MCGalaxy/util/Formatting/Matcher.cs
View File

@ -73,9 +73,7 @@ namespace MCGalaxy {
/// <summary> Find partial matches of 'name' against the list of ranks. </summary>
public static Group FindRanks(Player p, string name) {
name = name.ToLower();
Group.MapName(ref name);
int matches = 0;
return Find<Group>(p, name, out matches, Group.GroupList,
null, g => Colors.Strip(g.Name), "ranks");