From 267205b8d96418a01603ee46b0cbc5492e4521fa Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 23 Jan 2016 20:52:16 +1100 Subject: [PATCH] Remove the unused seralizer.cs (use json instead), remove three old hardcoded commands /care, /facepalm, and /alpaca. --- Commands/Moderation/CmdWarn.cs | 2 +- Commands/other/CmdChain.cs | 5 - MCGalaxy_.csproj | 1 - Player/Player.cs | 3 - util/Serializer.cs | 236 --------------------------------- 5 files changed, 1 insertion(+), 246 deletions(-) delete mode 100644 util/Serializer.cs diff --git a/Commands/Moderation/CmdWarn.cs b/Commands/Moderation/CmdWarn.cs index b610a3362..e19139b72 100644 --- a/Commands/Moderation/CmdWarn.cs +++ b/Commands/Moderation/CmdWarn.cs @@ -51,7 +51,7 @@ namespace MCGalaxy.Commands // Check the caller's rank if (p != null && p.group.Permission <= who.group.Permission) { - Player.SendMessage(p, "you can't warn a player equal or higher rank."); + Player.SendMessage(p, "Cannot warn a player of equal or higher rank."); return; } diff --git a/Commands/other/CmdChain.cs b/Commands/other/CmdChain.cs index 237f20bf4..e7eb83549 100644 --- a/Commands/other/CmdChain.cs +++ b/Commands/other/CmdChain.cs @@ -27,12 +27,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return false; } } public override LevelPermission defaultRank { get { return LevelPermission.Operator; } } public CmdChain() { } - // Fields - public int x; - public int y; - public int z; - // Methods public override void Help(Player p) { Player.SendMessage(p, "/chain - Shoots a chain of brown mushrooms and grabs a block and brings it back to the start."); diff --git a/MCGalaxy_.csproj b/MCGalaxy_.csproj index 212058794..e5c58ebb9 100644 --- a/MCGalaxy_.csproj +++ b/MCGalaxy_.csproj @@ -628,7 +628,6 @@ - Designer ResXFileCodeGenerator diff --git a/Player/Player.cs b/Player/Player.cs index 43e48bf82..c0213a2de 100644 --- a/Player/Player.cs +++ b/Player/Player.cs @@ -2029,9 +2029,6 @@ return; } } - if ( cmd.ToLower() == "care" ) { SendMessage("Dmitchell94 now loves you with all his heart."); return; } - if ( cmd.ToLower() == "facepalm" ) { SendMessage("Fenderrock87's bot army just simultaneously facepalm'd at your use of this command."); return; } - if ( cmd.ToLower() == "alpaca" ) { SendMessage("Leitrean's Alpaca Army just raped your woman and pillaged your villages!"); return; } //DO NOT REMOVE THE TWO COMMANDS BELOW, /PONY AND /RAINBOWDASHLIKESCOOLTHINGS. -EricKilla if ( cmd.ToLower() == "pony" ) { if ( ponycount < 2 ) { diff --git a/util/Serializer.cs b/util/Serializer.cs deleted file mode 100644 index ff2fdf0d6..000000000 --- a/util/Serializer.cs +++ /dev/null @@ -1,236 +0,0 @@ -/* - Copyright 2011 MCGalaxy - - Dual-licensed under the Educational Community License, Version 2.0 and - the GNU General Public License, Version 3 (the "Licenses"); you may - not use this file except in compliance with the Licenses. You may - obtain a copy of the Licenses at - - http://www.opensource.org/licenses/ecl2.php - http://www.gnu.org/licenses/gpl-3.0.html - - Unless required by applicable law or agreed to in writing, - software distributed under the Licenses are distributed on an "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - or implied. See the Licenses for the specific language governing - permissions and limitations under the Licenses. -*/ -/* - * Serializer.cs - * This is the Serializer class for the PHPSerializationLibrary - * - * Copyright 2004 Conversive, Inc. (Modified for use with MCGalaxy) - * - */ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Text; -namespace MCGalaxy -{ - /// - /// Serializer Class. - /// - public sealed class Serializer - { - //types: - // N = null - // s = string - // i = int - // d = double - // a = array (hashtable) - - private Dictionary seenHashtables; //for serialize (to infinte prevent loops) - private Dictionary seenArrayLists; //for serialize (to infinte prevent loops) lol - - private int pos; //for unserialize - - public bool XMLSafe = true; //This member tells the serializer wether or not to strip carriage returns from strings when serializing and adding them back in when deserializing - //http://www.w3.org/TR/REC-xml/#sec-line-ends - - public Encoding StringEncoding = new System.Text.UTF8Encoding(); - - private System.Globalization.NumberFormatInfo nfi; - - public Serializer() - { - this.nfi = new System.Globalization.NumberFormatInfo(); - this.nfi.NumberGroupSeparator = ""; - this.nfi.NumberDecimalSeparator = "."; - } - - public string Serialize(object obj) - { - this.seenArrayLists = new Dictionary(); - this.seenHashtables = new Dictionary(); - - return this.serialize(obj, new StringBuilder()).ToString(); - }//Serialize(object obj) - - private StringBuilder serialize(object obj, StringBuilder sb) - { - if(obj == null) - { - return sb.Append("N;"); - } - else if(obj is string) - { - string str = (string)obj; - if(this.XMLSafe) - { - str = str.Replace("\r\n","\n");//replace \r\n with \n - str = str.Replace("\r", "\n");//replace \r not followed by \n with a single \n Should we do this? - } - return sb.Append("s:" + this.StringEncoding.GetByteCount(str) + ":\"" + str + "\";"); - } - else if(obj is bool) - { - return sb.Append("b:" + (((bool)obj) ? "1" : "0") + ";"); - } - else if(obj is int) - { - int i = (int)obj; - return sb.Append("i:" + i.ToString(this.nfi) + ";"); - } - else if(obj is double) - { - double d = (double)obj; - - return sb.Append("d:" + d.ToString(this.nfi) + ";"); - } - else if(obj is ArrayList) - { - if (this.seenArrayLists.ContainsKey((ArrayList)obj)) - return sb.Append("N;");//cycle detected - else - this.seenArrayLists.Add((ArrayList)obj, true); - - ArrayList a = (ArrayList)obj; - sb.Append("a:" + a.Count + ":{"); - for(int i = 0; i < a.Count; i++) - { - this.serialize(i, sb); - this.serialize(a[i], sb); - } - sb.Append("}"); - return sb; - } - else if(obj is Hashtable) - { - if (this.seenHashtables.ContainsKey((Hashtable)obj)) - return sb.Append("N;");//cycle detected - else - this.seenHashtables.Add((Hashtable)obj, true); - - Hashtable a = (Hashtable)obj; - sb.Append("a:" + a.Count + ":{"); - foreach(DictionaryEntry entry in a) - { - this.serialize(entry.Key, sb); - this.serialize(entry.Value, sb); - } - sb.Append("}"); - return sb; - } - else - { - return sb; - } - }//Serialize(object obj) - - public object Deserialize(string str) - { - this.pos = 0; - return deserialize(str); - }//Deserialize(string str) - - private object deserialize(string str) - { - if(str == null || str.Length <= this.pos) - return new Object(); - - int start, end, length; - string stLen; - switch(str[this.pos]) - { - case 'N': - this.pos += 2; - return null; - case 'b': - char chBool; - chBool = str[pos + 2]; - this.pos += 4; - return chBool == '1'; - case 'i': - string stInt; - start = str.IndexOf(":", this.pos) + 1; - end = str.IndexOf(";", start); - stInt = str.Substring(start, end - start); - this.pos += 3 + stInt.Length; - return Int32.Parse(stInt, this.nfi); - case 'd': - string stDouble; - start = str.IndexOf(":", this.pos) + 1; - end = str.IndexOf(";", start); - stDouble = str.Substring(start, end - start); - this.pos += 3 + stDouble.Length; - return Double.Parse(stDouble, this.nfi); - case 's': - start = str.IndexOf(":", this.pos) + 1; - end = str.IndexOf(":", start); - stLen = str.Substring(start, end - start); - int bytelen = Int32.Parse(stLen); - length=bytelen; - //This is the byte length, not the character length - so we migth - //need to shorten it before usage. This also implies bounds checking - if ((end+2+length)>=str.Length) length=str.Length-2-end; - string stRet = str.Substring(end + 2, length); - while (this.StringEncoding.GetByteCount(stRet)>bytelen) - { - length--; - stRet = str.Substring(end + 2, length); - } - this.pos += 6 + stLen.Length + length; - if(this.XMLSafe) - { - stRet = stRet.Replace("\n", "\r\n"); - } - return stRet; - case 'a': - //if keys are ints 0 through N, returns an ArrayList, else returns Hashtable - start = str.IndexOf(":", this.pos) + 1; - end = str.IndexOf(":", start); - stLen = str.Substring(start, end - start); - length = Int32.Parse(stLen); - Hashtable htRet = new Hashtable(length); - ArrayList alRet = new ArrayList(length); - this.pos += 4 + stLen.Length; //a:Len:{ - for(int i = 0; i < length; i++) - { - //read key - object key = deserialize(str); - //read value - object val = deserialize(str); - - if(alRet != null) - { - if(key is int && (int)key == alRet.Count) - alRet.Add(val); - else - alRet = null; - } - htRet[key] = val; - } - this.pos++; //skip the } - if(this.pos < str.Length && str[this.pos] == ';')//skipping our old extra array semi-colon bug (er... php's weirdness) - this.pos++; - if(alRet != null) - return alRet; - else - return htRet; - default: - return ""; - }//switch - }//unserialzie(object) - }//class Serializer -}