diff --git a/AutoUpdaterFlag.cs b/AutoUpdaterFlag.cs index 94c9b33..e4dcdb1 100644 --- a/AutoUpdaterFlag.cs +++ b/AutoUpdaterFlag.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace LibZNI +namespace LibAC { [AttributeUsage(AttributeTargets.Assembly, AllowMultiple =false, Inherited =true)] public class AutoUpdater : Attribute diff --git a/BigFloat.cs b/BigFloat.cs index 4a4b64c..bccae32 100644 --- a/BigFloat.cs +++ b/BigFloat.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Numerics; -namespace LibZNI +namespace LibAC { [Serializable] public class BigFloat : IComparable, IComparable, IEquatable diff --git a/HTTP.cs b/HTTP.cs index 7d02a75..99ab7f8 100644 --- a/HTTP.cs +++ b/HTTP.cs @@ -8,7 +8,7 @@ using System.IO; using System.Net.Http; using System.Net.Http.Headers; -namespace LibZNI +namespace LibAC { public class HTTP { diff --git a/Hashing.cs b/Hashing.cs index 07d8f9a..24d1d9a 100644 --- a/Hashing.cs +++ b/Hashing.cs @@ -1,5 +1,5 @@ -using LibZNI.Serialization; -using LibZNI.Serialization.ZNIFile; +using LibAC.Serialization; +using LibAC.Serialization.ACFile; using System; using System.Collections.Generic; using System.IO; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI +namespace LibAC { public class Hash : Serializable { diff --git a/Integrity/Branch.cs b/Integrity/Branch.cs deleted file mode 100644 index 296dd67..0000000 --- a/Integrity/Branch.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LibZNI.Integrity -{ - internal class Branch - { - private Leaf lA; - private Leaf lB; - - public Branch(Leaf a, Leaf b) - { - lA = a; - lB = b; - } - - public byte[] GetNodeHash() - { - byte[] h1 = Tools.SHA256HashBytes(lA.InputBytes); - byte[] h2 = Tools.SHA256HashBytes(lB.InputBytes); - - byte[] h3 = new byte[h1.Length + h2.Length]; - h1.CopyTo(h3, 0); - h2.CopyTo(h3, h1.Length); - - byte[] b = Tools.SHA256HashBytes(Tools.SHA256HashBytes(h3)); - return b; - } - public override string ToString() - { - byte[] i = GetNodeHash(); - return Tools.Hash2String(i); - } - } -} diff --git a/Integrity/Leaf.cs b/Integrity/Leaf.cs deleted file mode 100644 index f04c22f..0000000 --- a/Integrity/Leaf.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LibZNI.Integrity -{ - internal class Leaf - { - public byte[] InputBytes; - public Leaf(byte[] inputBytes) - { - InputBytes = inputBytes; - } - public Leaf(string input) - { - InputBytes = Encoding.UTF8.GetBytes(input); - } - } -} diff --git a/Integrity/LeafCreationException.cs b/Integrity/LeafCreationException.cs deleted file mode 100644 index 5d95784..0000000 --- a/Integrity/LeafCreationException.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LibZNI.Integrity -{ - internal class LeafCreationException : Exception - { - public LeafCreationException(string sMsg):base(sMsg) - { - - } - } -} diff --git a/Integrity/Tree.cs b/Integrity/Tree.cs deleted file mode 100644 index 3eb2297..0000000 --- a/Integrity/Tree.cs +++ /dev/null @@ -1,88 +0,0 @@ - - -#define MERKLE_VERBOSE - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LibZNI.Integrity -{ - public class Tree - { - private List Leaves; - public string MasterHash; - public Tree() - { - Leaves = new List(); - } - - public void NewLeaf(byte[] b = null, string s = null) - { - if(b != null) - { - Leaves.Add(new Leaf(b)); - return; - } - if(s != null) - { - Leaves.Add(new Leaf(s)); - return; - } - - throw new LeafCreationException("New leaf cannot be null!"); - } - - /// - /// This process will lock the program up for a few moments while the tree is processed - /// - public void ProcessTree() - { - List branches = new List(); - if((Leaves.Count % 2) != 0) - { - Leaves.Add(Leaves.Last()); - } - for(int i=0;i< Leaves.Count; i += 2) - { - Branch br = new Branch(Leaves[i], Leaves[i+1]); - bool iDo = false; -#if MERKLE_VERBOSE -iDo = true; -#endif - if(iDo) - { - Console.WriteLine($"New Branch: {br}"); - } - branches.Add(br); - } - while(branches.Count > 1) - { - if((branches.Count % 2) != 0) - { - branches.Add(branches.Last()); - } - Branch[] copy = branches.ToArray(); - branches.Clear(); - for(int i = 0; i < copy.Length; i += 2) - { - Leaf a = new Leaf(copy[i].GetNodeHash()); - Leaf b = new Leaf(copy[i + 1].GetNodeHash()); - bool iDo = false; - Branch br = new Branch(a,b); -#if MERKLE_VERBOSE -iDo=true; -#endif - if (iDo) - { - Console.WriteLine($"New Branch: {br}"); - } - branches.Add(br); - } - } - MasterHash = branches[0].ToString(); - } - } -} diff --git a/PluginSystem.cs b/PluginSystem.cs index ada7e36..7dcca8d 100644 --- a/PluginSystem.cs +++ b/PluginSystem.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace LibZNI +namespace LibAC { public interface IPlugin { diff --git a/Serialization/NBTReader.cs b/Serialization/NBTReader.cs index e5338e5..10bb6b1 100644 --- a/Serialization/NBTReader.cs +++ b/Serialization/NBTReader.cs @@ -2,14 +2,14 @@ // All credit for the implementation of this file should go to the fNBT Authors, unless stated otherwise by comment! -using LibZNI.Serialization.ZNIFile; +using LibAC.Serialization.ACFile; using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Text; -namespace LibZNI.Serialization +namespace LibAC.Serialization { /// BinaryReader wrapper that takes care of reading primitives from an NBT stream, /// while taking care of endianness, string encoding, and skipping. diff --git a/Serialization/NBTWriter.cs b/Serialization/NBTWriter.cs index 80cc669..961cd1e 100644 --- a/Serialization/NBTWriter.cs +++ b/Serialization/NBTWriter.cs @@ -1,13 +1,13 @@ // DISCLAIMER: Taken from fNBT to be altered to fit the needs of ZNI NBT // All credit for the implementation of this file should go to the fNBT Authors, unless stated otherwise by comment! -using LibZNI.Serialization.ZNIFile; +using LibAC.Serialization.ACFile; using System; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Text; -namespace LibZNI.Serialization +namespace LibAC.Serialization { /// BinaryWriter wrapper that writes NBT primitives to a stream, /// while taking care of endianness and string encoding, and counting bytes written. diff --git a/Serialization/Serializable.cs b/Serialization/Serializable.cs index 5a1a71a..b25f565 100644 --- a/Serialization/Serializable.cs +++ b/Serialization/Serializable.cs @@ -1,11 +1,11 @@ -using LibZNI.Serialization.ZNIFile; +using LibAC.Serialization.ACFile; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization +namespace LibAC.Serialization { public abstract class Serializable { diff --git a/Serialization/SerializingHelper.cs b/Serialization/SerializingHelper.cs index e3f053c..6fe7b75 100644 --- a/Serialization/SerializingHelper.cs +++ b/Serialization/SerializingHelper.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization +namespace LibAC.Serialization { public static class SerializingHelper { diff --git a/Serialization/TagIO.cs b/Serialization/TagIO.cs index 445a830..0041033 100644 --- a/Serialization/TagIO.cs +++ b/Serialization/TagIO.cs @@ -1,4 +1,4 @@ -using LibZNI.Serialization.ZNIFile; +using LibAC.Serialization.ACFile; using System; using System.Collections.Generic; using System.IO; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization +namespace LibAC.Serialization { /// /// This class contains helper functions for interacting with streams and files that are encoded using ZNIFile's structure diff --git a/Serialization/ZNIFile/BoolTag.cs b/Serialization/ZNIFile/BoolTag.cs index 2c55e7f..067b9b4 100644 --- a/Serialization/ZNIFile/BoolTag.cs +++ b/Serialization/ZNIFile/BoolTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class BoolTag : Tag { diff --git a/Serialization/ZNIFile/ByteArrayTag.cs b/Serialization/ZNIFile/ByteArrayTag.cs index 15cce94..8ffe556 100644 --- a/Serialization/ZNIFile/ByteArrayTag.cs +++ b/Serialization/ZNIFile/ByteArrayTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class ByteArrayTag : Tag { diff --git a/Serialization/ZNIFile/ByteTag.cs b/Serialization/ZNIFile/ByteTag.cs index 1dfdde7..06cb0bb 100644 --- a/Serialization/ZNIFile/ByteTag.cs +++ b/Serialization/ZNIFile/ByteTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class ByteTag : Tag { diff --git a/Serialization/ZNIFile/DoubleTag.cs b/Serialization/ZNIFile/DoubleTag.cs index 5464363..1b30627 100644 --- a/Serialization/ZNIFile/DoubleTag.cs +++ b/Serialization/ZNIFile/DoubleTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class DoubleTag : Tag { diff --git a/Serialization/ZNIFile/FloatTag.cs b/Serialization/ZNIFile/FloatTag.cs index 231bca1..7557c5b 100644 --- a/Serialization/ZNIFile/FloatTag.cs +++ b/Serialization/ZNIFile/FloatTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class FloatTag : Tag { diff --git a/Serialization/ZNIFile/Folder.cs b/Serialization/ZNIFile/Folder.cs index 8616c37..81cd982 100644 --- a/Serialization/ZNIFile/Folder.cs +++ b/Serialization/ZNIFile/Folder.cs @@ -9,7 +9,7 @@ using System.Reflection.Metadata.Ecma335; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class Folder : Tag, ICollection, ICollection { diff --git a/Serialization/ZNIFile/IntArrayTag.cs b/Serialization/ZNIFile/IntArrayTag.cs index b925c25..e856eb1 100644 --- a/Serialization/ZNIFile/IntArrayTag.cs +++ b/Serialization/ZNIFile/IntArrayTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class IntArrayTag : Tag { diff --git a/Serialization/ZNIFile/IntTag.cs b/Serialization/ZNIFile/IntTag.cs index 861efbb..b4ee5a8 100644 --- a/Serialization/ZNIFile/IntTag.cs +++ b/Serialization/ZNIFile/IntTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class IntTag : Tag { diff --git a/Serialization/ZNIFile/ListTag.cs b/Serialization/ZNIFile/ListTag.cs index 238cf89..a872962 100644 --- a/Serialization/ZNIFile/ListTag.cs +++ b/Serialization/ZNIFile/ListTag.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using static System.Net.Mime.MediaTypeNames; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class ListTag : Tag, IList, IList { diff --git a/Serialization/ZNIFile/LongArrayTag.cs b/Serialization/ZNIFile/LongArrayTag.cs index 21593a5..d0a580f 100644 --- a/Serialization/ZNIFile/LongArrayTag.cs +++ b/Serialization/ZNIFile/LongArrayTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class LongArrayTag : Tag { diff --git a/Serialization/ZNIFile/LongTag.cs b/Serialization/ZNIFile/LongTag.cs index abf4c5b..bd89fa2 100644 --- a/Serialization/ZNIFile/LongTag.cs +++ b/Serialization/ZNIFile/LongTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class LongTag : Tag { diff --git a/Serialization/ZNIFile/ShortTag.cs b/Serialization/ZNIFile/ShortTag.cs index 130b772..c6a36d3 100644 --- a/Serialization/ZNIFile/ShortTag.cs +++ b/Serialization/ZNIFile/ShortTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class ShortTag : Tag { diff --git a/Serialization/ZNIFile/StringTag.cs b/Serialization/ZNIFile/StringTag.cs index 02c014e..8133a55 100644 --- a/Serialization/ZNIFile/StringTag.cs +++ b/Serialization/ZNIFile/StringTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class StringTag : Tag { diff --git a/Serialization/ZNIFile/Tag.cs b/Serialization/ZNIFile/Tag.cs index 8d63ad1..f379855 100644 --- a/Serialization/ZNIFile/Tag.cs +++ b/Serialization/ZNIFile/Tag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public abstract class Tag : ICloneable, IComparable { diff --git a/Serialization/ZNIFile/TagType.cs b/Serialization/ZNIFile/TagType.cs index 329fc6b..98f4e29 100644 --- a/Serialization/ZNIFile/TagType.cs +++ b/Serialization/ZNIFile/TagType.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { // Aria: Changed to a type of byte which keeps it to only one byte when writing out in serializing public enum TagType : byte diff --git a/Serialization/ZNIFile/UUIDTag.cs b/Serialization/ZNIFile/UUIDTag.cs index dd49079..b0ab1e2 100644 --- a/Serialization/ZNIFile/UUIDTag.cs +++ b/Serialization/ZNIFile/UUIDTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class UUIDTag : Tag { diff --git a/Serialization/ZNIFile/ulongTag.cs b/Serialization/ZNIFile/ulongTag.cs index 48df36d..b6fa32a 100644 --- a/Serialization/ZNIFile/ulongTag.cs +++ b/Serialization/ZNIFile/ulongTag.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibZNI.Serialization.ZNIFile +namespace LibAC.Serialization.ACFile { public class uLongTag : Tag { diff --git a/Tools.cs b/Tools.cs index 116888a..5ace1f6 100644 --- a/Tools.cs +++ b/Tools.cs @@ -9,7 +9,7 @@ using System.Text; using System.Xml; using Newtonsoft.Json; -namespace LibZNI +namespace LibAC { public static class ConfigLocation @@ -291,6 +291,13 @@ namespace LibZNI return tmp._key; } + public static string ZHS(string ToHash, int len) + { + ZHash tmp = ZHash.Bytes2Hash(new byte[len]); + tmp.CalculateKey(ToHash); + return tmp._key; + } + public static string ZSR(string ToSerialize) { ZHash tmp = new ZHash(); diff --git a/Versioning.cs b/Versioning.cs index 284748c..4d8de02 100644 --- a/Versioning.cs +++ b/Versioning.cs @@ -1,5 +1,5 @@ -using LibZNI.Serialization; -using LibZNI.Serialization.ZNIFile; +using LibAC.Serialization; +using LibAC.Serialization.ACFile; using System; using System.Collections.Generic; using System.Linq; @@ -7,7 +7,7 @@ using System.Runtime; using System.Text; using System.Threading.Tasks; -namespace LibZNI +namespace LibAC { public class VersionNumberDifferentException : Exception { diff --git a/VolatileMemoryWorker.cs b/VolatileMemoryWorker.cs deleted file mode 100644 index a481145..0000000 --- a/VolatileMemoryWorker.cs +++ /dev/null @@ -1,36 +0,0 @@ -using LibZNI.Serialization; -using LibZNI.Serialization.ZNIFile; -using System.IO; - -/// -/// RAM-like memory -/// Memory is regularly saved to a temporary file called VM.RAM -/// The memory in this class should only be used for temporary persistance between tasks. It should be assumed that this data will purge every restart. -/// -namespace LibZNI -{ - - public class VolatileMemory : Serializable - { - public static Folder Memory = new Folder("MEM"); - - public override void save(Folder f) - { - f.Add(VolatileMemory.Memory); - } - public override void load(Folder f) - { - VolatileMemory.Memory = f["MEM"] as Folder; - } - - - public void FullSave() - { - - Folder f = new Folder("root"); - save(f); - - TagIO.SaveToFile(ConfigLocation.GetPath()+".volatile", f); - } - } -} \ No newline at end of file diff --git a/ZMap.cs b/ZMap.cs deleted file mode 100644 index 1dfee7f..0000000 --- a/ZMap.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LibZNI -{ - public class VectorList : IComparable - { - public T Key { get; set; } - public T2 Key2 { get; set; } - public V Value { get; set; } - - public VectorList(T x, T2 b, V c) - { - Key = x; - Key2 = b; - Value = c; - } - - public int CompareTo(object obj) - { - if(obj == null) - { - return -1; - } - VectorList _other = obj as VectorList; - if (Key.Equals(_other.Key)) - { - if (Key2.Equals(_other.Key2)) - { - if (Value.Equals(_other.Value)) - { - return 0; - } - } - } - return 1; - } - } - public class ZMap : IEnumerable> - { - public List> _list = new List>(); - public void Add(VectorList item) - { - if(!_list.Contains(item)) - _list.Add(item); - } - public void Remove(VectorList item) - { - _list.Remove(item); - } - - public V GetEntry(T a, T2 b) - { - try - { - return _list.First(x => x.Key.Equals(a) && x.Key2.Equals(b)).Value; - - } - catch - { - return default(V); - } - } - - public T2 GetK2(T a , V b) - { - try - { - return _list.First(x => x.Key.Equals(a) && x.Value.Equals(b)).Key2; - }catch - { - return default(T2); - } - } - - public IEnumerator> GetEnumerator() - { - return _list.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } -}