From 925f9500226f2ed0dca11fce5c556412560836db Mon Sep 17 00:00:00 2001 From: 1987kostya Date: Sun, 20 Dec 2020 16:48:31 +0600 Subject: [PATCH] Removed useless debug info, add time data to log --- DotNetCTFDumper/GUI/MainForm.cs | 1 - .../MMFParser/EXE/Loaders/AppMenu.cs | 2 +- .../MMFParser/EXE/Loaders/Banks/ImageBank.cs | 15 +++++++-------- .../MMFParser/EXE/Loaders/Banks/SoundBank.cs | 4 ++-- .../MMFParser/EXE/Loaders/Events/Events.cs | 18 +----------------- DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs | 2 +- .../MMFParser/EXE/Loaders/ObjectInfo.cs | 1 - .../MMFParser/EXE/Loaders/ObjectNames.cs | 4 ++-- .../EXE/Loaders/Objects/ObjectCommon.cs | 2 +- .../MMFParser/EXE/Loaders/Objects/Value.cs | 6 ++---- .../MMFParser/MFA/Loaders/Events.cs | 5 ----- DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs | 4 ---- .../MMFParser/MFA/Loaders/FrameInstance.cs | 1 - .../MMFParser/MFA/Loaders/FrameItem.cs | 1 - .../MMFParser/MFA/Loaders/ItemFolder.cs | 1 - .../MMFParser/MFA/Loaders/Transition.cs | 4 ---- .../MFA/Loaders/mfachunks/Movements.cs | 1 - DotNetCTFDumper/Utils/ImageDumper.cs | 3 --- DotNetCTFDumper/Utils/Logger.cs | 4 ++-- 19 files changed, 19 insertions(+), 60 deletions(-) diff --git a/DotNetCTFDumper/GUI/MainForm.cs b/DotNetCTFDumper/GUI/MainForm.cs index 3dc4285..c43d274 100644 --- a/DotNetCTFDumper/GUI/MainForm.cs +++ b/DotNetCTFDumper/GUI/MainForm.cs @@ -858,7 +858,6 @@ namespace DotNetCTFDumper.GUI { var node = (ChunkNode)imagesTreeView.SelectedNode; var path = $"{Settings.ImagePath}\\{Helper.GetTreePath(imagesTreeView,(ChunkNode) imagesTreeView.SelectedNode)}"; - Console.WriteLine(Helper.GetCurrentTime()+ "Saving "+path); if (node == null) return; ImageDumper.SaveFromNode(node); diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/AppMenu.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/AppMenu.cs index bd1f996..9359064 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/AppMenu.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/AppMenu.cs @@ -159,7 +159,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders } } - Console.WriteLine(Name); + } public void Load() diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs index cf276c4..dd7deee 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs @@ -46,10 +46,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks Settings.DumpImages = cache; } - public void Preload() - { - - } + public void LoadByHandle(int handle) { @@ -71,10 +68,11 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks NumberOfItems = Reader.ReadUInt32(); - Console.WriteLine($"Found {NumberOfItems} images"); + Logger.Log($"Found {NumberOfItems} images",true,ConsoleColor.Green); //if (!Settings.DumpImages) return; + Logger.Log("Reading Images",true,ConsoleColor.Green); for (int i = 0; i < NumberOfItems; i++) { if (MainForm.BreakImages) @@ -84,10 +82,11 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks } var item = new ImageItem(Reader); + item.Read(!PreloadOnly); tempImages.Add(item.Handle, item); - // if (SaveImages) item.Save($"{Settings.ImagePath}\\" + item.Handle.ToString() + ".png"); + if (SaveImages) item.Save($"{Settings.ImagePath}\\" + item.Handle.ToString() + ".png"); OnImageSaved?.Invoke(i,(int) NumberOfItems); @@ -97,10 +96,10 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks //images[item.handle] = item; } - + Logger.Log("Images success",true,ConsoleColor.Green); if (!MainForm.BreakImages) Images = tempImages; MainForm.BreakImages = false; - Console.WriteLine("Len:"+Images.Keys.Count); + } } diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/SoundBank.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/SoundBank.cs index d06bcd2..12c020e 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/SoundBank.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/SoundBank.cs @@ -43,7 +43,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks Items = new List(); NumOfItems = Reader.ReadInt32(); - Logger.Log("Found " + NumOfItems + " sounds"); + Logger.Log("Found " + NumOfItems + " sounds",true,ConsoleColor.Green); //if (!Settings.DumpSounds) return; for (int i = 0; i < NumOfItems; i++) @@ -63,6 +63,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks } + Logger.Log("Sounds Success",true,ConsoleColor.Green); } public void Write(ByteWriter writer) { @@ -155,7 +156,6 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks if (Settings.DumpSounds) { Name = Helper.CleanInput(Name); - Console.WriteLine($"Dumping {Name}"); File.WriteAllBytes($"{Settings.SoundPath}\\{Name}.wav", Data); } //Save($"{Settings.DumpPath}\\SoundBank\\{Name}.wav"); diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Events.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Events.cs index 500967b..0049e54 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Events.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Events.cs @@ -179,23 +179,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events } Reader.Seek(currentPosition + Size); - Console.WriteLine("IF:"); - if (Conditions != null) - { - foreach (var item in Conditions) - { - Console.WriteLine("\t" + item.ToString()); - } - } - - Console.WriteLine("DO:"); - if (Actions != null) - { - foreach (var item in Actions) - { - Console.WriteLine("\t" + item.ToString()); - } - } + } public void Write(ByteWriter Writer) diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs index d82327a..38bb84c 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs @@ -98,7 +98,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders if (name != null) //Just to be sure { this.Name = name.Value; - Console.WriteLine("Reading Frame: "+Name); + Logger.Log("Reading Frame: "+Name,true,ConsoleColor.Green); } var password = Chunks.GetChunk(); if (password != null) //Just to be sure diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectInfo.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectInfo.cs index ac4405c..e861415 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectInfo.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectInfo.cs @@ -107,7 +107,6 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders if (images.Images[firstFrameHandle].Bitmap == null) { - Console.WriteLine("Preloading "+firstFrameHandle); images.LoadByHandle(firstFrameHandle); } diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs index b672ae7..e77bf4a 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs @@ -23,8 +23,8 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders while(true) { if (Reader.Tell() >= endpos+4) break; - - Console.WriteLine(Reader.ReadWideString()); + var name = Reader.ReadWideString(); + } } diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs index c6046db..3901312 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs @@ -144,7 +144,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects Reader.Seek(currentPosition+_movementsOffset); Movements = new Movements(Reader); Movements.Read(); - Console.WriteLine("Movements done"); + //Console.WriteLine("Movements done"); } diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Value.cs b/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Value.cs index 1284739..8e6eeb3 100644 --- a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Value.cs +++ b/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Value.cs @@ -27,8 +27,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects var item = Reader.ReadInt32(); Items.Add(item); - Console.WriteLine("Found Value: "+item); - + } } @@ -64,8 +63,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects { var item = Reader.ReadWideString(); Items.Add(item); - Console.WriteLine("Found String: "+item); - + } } diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Events.cs b/DotNetCTFDumper/MMFParser/MFA/Loaders/Events.cs index edb824e..b024fc6 100644 --- a/DotNetCTFDumper/MMFParser/MFA/Loaders/Events.cs +++ b/DotNetCTFDumper/MMFParser/MFA/Loaders/Events.cs @@ -63,7 +63,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders { string name = Reader.ReadAscii(4); - Console.WriteLine("Group: "+name+" "+Encoding.ASCII.GetBytes(name).GetHex()+", Position: "+Reader.Tell()); if (name == EventData) { uint size = Reader.ReadUInt32(); @@ -210,7 +209,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders if (ObjectTypes != null) { - Console.WriteLine("Writing ObjectTypes"); Writer.WriteAscii(ObjectListData); Writer.WriteInt16(-1); Writer.WriteInt16((short) ObjectTypes.Count); @@ -238,7 +236,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders //if (X != 0) { - Console.WriteLine("Writing X"); Writer.WriteAscii(EditorPositionData); Writer.WriteInt16(1); Writer.WriteInt32((int) X); @@ -249,7 +246,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders } //if (LineY != 0) { - Console.WriteLine("Writing LineY"); Writer.WriteAscii(EditorLineData); Writer.WriteInt16(1); Writer.WriteUInt32(LineY); @@ -257,7 +253,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders Writer.WriteUInt32(EventLine); Writer.WriteUInt32(EventLineY); } - Console.WriteLine("Writing EventEditorData"); Writer.WriteAscii(EventEditorData); Writer.WriteInt32(EditorDataUnk); Writer.WriteInt16((short) ConditionWidth); diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs b/DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs index 28ce555..890e442 100644 --- a/DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs +++ b/DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs @@ -142,7 +142,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders { Handle = Reader.ReadInt32(); Name = Helper.AutoReadUnicode(Reader); - Console.WriteLine(Name); SizeX = Reader.ReadInt32(); SizeY = Reader.ReadInt32(); Background = Reader.ReadColor(); @@ -192,7 +191,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders var frameitem = new FrameItem(Reader); frameitem.Read(); Items.Add(frameitem); - Console.WriteLine("Frameitem:" + frameitem.Name); } Folders = new List(); @@ -220,9 +218,7 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders //} Events = new Events(Reader); - Console.WriteLine("BeforeEventsPos: " + Reader.Tell()); Events.Read(); - Console.WriteLine("AfterEventsPos: " + Reader.Tell()); Chunks = new ChunkList(Reader); Chunks.Read(); MFA.emptyEvents = Events; diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameInstance.cs b/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameInstance.cs index 9716e55..fc667d0 100644 --- a/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameInstance.cs +++ b/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameInstance.cs @@ -33,7 +33,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders ParentType = Reader.ReadUInt32(); ItemHandle = Reader.ReadUInt32(); ParentHandle = (uint) Reader.ReadInt32(); - Console.WriteLine($"ParentH:{ParentHandle}, ParentT: {ParentType}, Handle: {Handle}, Flags: {Flags}, ItemHandle: {ItemHandle}"); } public override void Write(ByteWriter Writer) diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameItem.cs b/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameItem.cs index b32202b..a14cc1d 100644 --- a/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameItem.cs +++ b/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameItem.cs @@ -52,7 +52,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders ObjectType = Reader.ReadInt32(); Handle = Reader.ReadInt32(); Name = Helper.AutoReadUnicode(Reader); - Console.WriteLine($"Name: {Name}"); Transparent = Reader.ReadInt32(); InkEffect = Reader.ReadInt32(); diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/ItemFolder.cs b/DotNetCTFDumper/MMFParser/MFA/Loaders/ItemFolder.cs index 84a288a..b1e59fa 100644 --- a/DotNetCTFDumper/MMFParser/MFA/Loaders/ItemFolder.cs +++ b/DotNetCTFDumper/MMFParser/MFA/Loaders/ItemFolder.cs @@ -23,7 +23,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders public override void Read() { UnkHeader = Reader.ReadUInt32(); - Console.WriteLine("UNK HEADER: "+UnkHeader.ToString("X4")); if (UnkHeader == 0x70000004) { Name = Reader.AutoReadUnicode(); diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Transition.cs b/DotNetCTFDumper/MMFParser/MFA/Loaders/Transition.cs index 086aa42..6c7e953 100644 --- a/DotNetCTFDumper/MMFParser/MFA/Loaders/Transition.cs +++ b/DotNetCTFDumper/MMFParser/MFA/Loaders/Transition.cs @@ -27,13 +27,9 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders public override void Read() { Module = Reader.AutoReadUnicode(); - Console.WriteLine(Module); Name = Reader.AutoReadUnicode(); - Console.WriteLine(Name); Id = Reader.ReadAscii(4); - Console.WriteLine(Id); TransitionId = Reader.ReadAscii(4); - Console.WriteLine(TransitionId); Duration = Reader.ReadInt32(); Flags = Reader.ReadInt32(); Color = Reader.ReadColor(); diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Movements.cs b/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Movements.cs index 7f7cabe..56b6d97 100644 --- a/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Movements.cs +++ b/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Movements.cs @@ -96,7 +96,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks MovingAtStart = Reader.ReadByte(); Reader.Skip(3); DirectionAtStart = Reader.ReadInt32(); - Console.WriteLine($"Player: {Player}, Type: {Type}, DirectionAtStart: {DirectionAtStart}, Identifier: {Identifier}"); extData = Reader.ReadBytes(DataSize-12); //ONLY STATIC MOVEMENT IS SUPPORTED RN //TODO:Movement Types diff --git a/DotNetCTFDumper/Utils/ImageDumper.cs b/DotNetCTFDumper/Utils/ImageDumper.cs index 2afc62e..80090ba 100644 --- a/DotNetCTFDumper/Utils/ImageDumper.cs +++ b/DotNetCTFDumper/Utils/ImageDumper.cs @@ -17,7 +17,6 @@ namespace DotNetCTFDumper.Utils { var bank = Exe.Instance.GameData.GameChunks.GetChunk(); var fullPath = $"{Settings.ImagePath}\\Sorted\\{node.FullPath}"; - Console.WriteLine("FULL PATH: "+fullPath); if (fullPath == null) return; if (!(node.loader is ImageItem)) Directory.CreateDirectory(fullPath); @@ -66,7 +65,6 @@ namespace DotNetCTFDumper.Utils for (int i = 0; i < anim.DirectionDict[0].Frames.Count; i++) { var frame = dirpair.Value.Frames[i]; - Console.WriteLine("Trying to save: "+$"{fullPath}\\Direction {anim.DirectionDict.ToList().IndexOf(dirpair)}\\{i}.png"); bank.Images[frame].Save($"{fullPath}\\Direction {anim.DirectionDict.ToList().IndexOf(dirpair)}\\{i}.png"); } } @@ -76,7 +74,6 @@ namespace DotNetCTFDumper.Utils for (int i = 0; i < anim.DirectionDict[0].Frames.Count; i++) { var frame = anim.DirectionDict[0].Frames[i]; - Console.WriteLine("Trying to save: "+$"{fullPath}\\{i}.png"); bank.Images[frame].Save($"{fullPath}\\{i}.png"); } } diff --git a/DotNetCTFDumper/Utils/Logger.cs b/DotNetCTFDumper/Utils/Logger.cs index be3a15b..2ddb0ef 100644 --- a/DotNetCTFDumper/Utils/Logger.cs +++ b/DotNetCTFDumper/Utils/Logger.cs @@ -16,12 +16,12 @@ namespace DotNetCTFDumper.Utils _writer.AutoFlush = true; } - _writer.WriteLine(text); + _writer.WriteLine(Helper.GetCurrentTime()+ text); if (logToScreen) { Console.ForegroundColor = color; - Console.WriteLine(text); + Console.WriteLine(Helper.GetCurrentTime()+text); Console.ForegroundColor = ConsoleColor.White; }