From c080f36a95a925e2b7feeb63005dcefa8c966acf Mon Sep 17 00:00:00 2001
From: 1987kostya <ivaninvideorec@gmail.com>
Date: Wed, 30 Dec 2020 19:33:34 +0600
Subject: [PATCH] Fixed FNaC 2 animation viewer bug
---
CTFAK/GUI/ErrorLogBox.Designer.cs | 2 +-
CTFAK/GUI/ErrorLogBox.cs | 5 +--
CTFAK/GUI/FrameViewer.Designer.cs | 3 +-
CTFAK/GUI/FrameViewer.cs | 14 +++---
CTFAK/GUI/GUIComponents/ChunkNode.cs | 6 +--
CTFAK/GUI/GUIComponents/ObjectBox.cs | 4 +-
CTFAK/GUI/HexViewForm.Designer.cs | 2 +-
CTFAK/GUI/HexViewForm.cs | 5 +--
CTFAK/GUI/MainConsole.Designer.cs | 2 +-
CTFAK/GUI/MainConsole.cs | 6 +--
CTFAK/GUI/MainForm.Designer.cs | 2 +-
CTFAK/GUI/MainForm.cs | 44 +++++++++----------
CTFAK/MMFParser/Constants.cs | 2 +-
CTFAK/MMFParser/EXE/ChunkList.cs | 9 ++--
CTFAK/MMFParser/EXE/DataLoader.cs | 6 +--
CTFAK/MMFParser/EXE/EXE.cs | 6 +--
CTFAK/MMFParser/EXE/GameData.cs | 9 ++--
CTFAK/MMFParser/EXE/Loaders/AppHeader.cs | 6 +--
CTFAK/MMFParser/EXE/Loaders/AppMenu.cs | 7 ++-
CTFAK/MMFParser/EXE/Loaders/Banks/FontBank.cs | 6 +--
.../MMFParser/EXE/Loaders/Banks/ImageBank.cs | 16 +++----
.../MMFParser/EXE/Loaders/Banks/MusicBank.cs | 8 ++--
.../MMFParser/EXE/Loaders/Banks/SoundBank.cs | 8 ++--
CTFAK/MMFParser/EXE/Loaders/ChunkLoader.cs | 6 +--
CTFAK/MMFParser/EXE/Loaders/Events/Events.cs | 6 +--
.../EXE/Loaders/Events/EventsParts.cs | 4 +-
.../Loaders/Events/Expressions/Expression.cs | 4 +-
.../Events/Parameters/AlterableValue.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Colour.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Create.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Every.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Float.cs | 4 +-
.../Loaders/Events/Parameters/GlobalValue.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Int.cs | 4 +-
.../Loaders/Events/Parameters/ParamObject.cs | 4 +-
.../Events/Parameters/ParameterCommon.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Position.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Remark.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Sample.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Short.cs | 4 +-
.../EXE/Loaders/Events/Parameters/Time.cs | 4 +-
CTFAK/MMFParser/EXE/Loaders/ExtData.cs | 4 +-
CTFAK/MMFParser/EXE/Loaders/Frame.cs | 6 +--
CTFAK/MMFParser/EXE/Loaders/FrameItems.cs | 9 ++--
CTFAK/MMFParser/EXE/Loaders/Globals.cs | 6 +--
CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs | 10 ++---
CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs | 6 +--
.../EXE/Loaders/Objects/Animations.cs | 7 ++-
.../MMFParser/EXE/Loaders/Objects/Backdrop.cs | 4 +-
.../MMFParser/EXE/Loaders/Objects/Counters.cs | 4 +-
.../EXE/Loaders/Objects/Movements.cs | 4 +-
.../EXE/Loaders/Objects/ObjectCommon.cs | 4 +-
CTFAK/MMFParser/EXE/Loaders/Objects/Value.cs | 4 +-
CTFAK/MMFParser/EXE/Loaders/StringChunk.cs | 6 +--
CTFAK/MMFParser/EXE/Loaders/Transition.cs | 7 ++-
CTFAK/MMFParser/EXE/Loaders/yves.cs | 6 +--
CTFAK/MMFParser/EXE/PackData.cs | 5 +--
CTFAK/MMFParser/MFA/Loaders/ChunkList.cs | 6 +--
CTFAK/MMFParser/MFA/Loaders/Controls.cs | 6 +--
CTFAK/MMFParser/MFA/Loaders/Events.cs | 13 +++---
CTFAK/MMFParser/MFA/Loaders/Frame.cs | 6 +--
CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs | 7 ++-
CTFAK/MMFParser/MFA/Loaders/FrameItem.cs | 8 ++--
CTFAK/MMFParser/MFA/Loaders/ImageBank.cs | 10 ++---
CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs | 9 ++--
CTFAK/MMFParser/MFA/Loaders/Layer.cs | 6 +--
CTFAK/MMFParser/MFA/Loaders/Transition.cs | 9 ++--
CTFAK/MMFParser/MFA/Loaders/ValueList.cs | 6 +--
.../MMFParser/MFA/Loaders/mfachunks/Active.cs | 4 +-
.../MFA/Loaders/mfachunks/AnimationObject.cs | 7 ++-
.../MFA/Loaders/mfachunks/Behaviours.cs | 6 +--
.../MFA/Loaders/mfachunks/Movements.cs | 7 ++-
.../MFA/Loaders/mfachunks/ObjectLoader.cs | 9 ++--
CTFAK/MMFParser/MFA/MFA.cs | 22 +++++-----
CTFAK/MMFParser/Translation/MFAGenerator.cs | 11 +++--
CTFAK/MMFParser/Translation/PAME2MFA.cs | 27 +++++-------
CTFAK/PluginAPI/IPlugin.cs | 2 +-
CTFAK/PluginAPI/PluginAPI.cs | 12 ++---
CTFAK/Program.cs | 11 +++--
CTFAK/Settings.cs | 2 +-
CTFAK/Utils/Backend.cs | 8 ++--
CTFAK/Utils/BitDict.cs | 2 +-
CTFAK/Utils/ByteFlag.cs | 2 +-
CTFAK/Utils/ByteReader.cs | 2 +-
CTFAK/Utils/ByteWriter.cs | 2 +-
CTFAK/Utils/Decompressor.cs | 4 +-
CTFAK/Utils/Decryption.cs | 2 +-
CTFAK/Utils/Helper.cs | 31 +++----------
CTFAK/Utils/ImageDumper.cs | 15 ++++---
CTFAK/Utils/ImageHelper.cs | 3 +-
CTFAK/Utils/Logger.cs | 5 +--
CTFAK/Utils/WAVReading.cs | 4 +-
92 files changed, 285 insertions(+), 347 deletions(-)
diff --git a/CTFAK/GUI/ErrorLogBox.Designer.cs b/CTFAK/GUI/ErrorLogBox.Designer.cs
index 6b846c2..d08ff71 100644
--- a/CTFAK/GUI/ErrorLogBox.Designer.cs
+++ b/CTFAK/GUI/ErrorLogBox.Designer.cs
@@ -1,6 +1,6 @@
using System.ComponentModel;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
partial class ErrorLogBox
{
diff --git a/CTFAK/GUI/ErrorLogBox.cs b/CTFAK/GUI/ErrorLogBox.cs
index 3541d0f..75e613a 100644
--- a/CTFAK/GUI/ErrorLogBox.cs
+++ b/CTFAK/GUI/ErrorLogBox.cs
@@ -2,10 +2,9 @@
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
-using System.Windows.Forms.VisualStyles;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
public partial class ErrorLogBox : Form
{
diff --git a/CTFAK/GUI/FrameViewer.Designer.cs b/CTFAK/GUI/FrameViewer.Designer.cs
index 7283b79..4780e6a 100644
--- a/CTFAK/GUI/FrameViewer.Designer.cs
+++ b/CTFAK/GUI/FrameViewer.Designer.cs
@@ -1,7 +1,6 @@
using System.ComponentModel;
-using System.Windows.Forms;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
partial class FrameViewer
{
diff --git a/CTFAK/GUI/FrameViewer.cs b/CTFAK/GUI/FrameViewer.cs
index a31d532..49eb44c 100644
--- a/CTFAK/GUI/FrameViewer.cs
+++ b/CTFAK/GUI/FrameViewer.cs
@@ -1,14 +1,14 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using Frame = DotNetCTFDumper.MMFParser.EXE.Loaders.Frame;
+using CTFAK.GUI.GUIComponents;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using Frame = CTFAK.MMFParser.EXE.Loaders.Frame;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
public partial class FrameViewer : Form
{
diff --git a/CTFAK/GUI/GUIComponents/ChunkNode.cs b/CTFAK/GUI/GUIComponents/ChunkNode.cs
index 6d0c225..e2851f5 100644
--- a/CTFAK/GUI/GUIComponents/ChunkNode.cs
+++ b/CTFAK/GUI/GUIComponents/ChunkNode.cs
@@ -1,8 +1,8 @@
using System.Windows.Forms;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI.GUIComponents
{
public class ChunkNode:TreeNode
{
diff --git a/CTFAK/GUI/GUIComponents/ObjectBox.cs b/CTFAK/GUI/GUIComponents/ObjectBox.cs
index 05d6e10..2a5937c 100644
--- a/CTFAK/GUI/GUIComponents/ObjectBox.cs
+++ b/CTFAK/GUI/GUIComponents/ObjectBox.cs
@@ -1,7 +1,7 @@
using System.Windows.Forms;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE.Loaders;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI.GUIComponents
{
public class ObjectBox:PictureBox
{
diff --git a/CTFAK/GUI/HexViewForm.Designer.cs b/CTFAK/GUI/HexViewForm.Designer.cs
index cabc1e6..87a5801 100644
--- a/CTFAK/GUI/HexViewForm.Designer.cs
+++ b/CTFAK/GUI/HexViewForm.Designer.cs
@@ -1,6 +1,6 @@
using System.ComponentModel;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
partial class HexViewForm
{
diff --git a/CTFAK/GUI/HexViewForm.cs b/CTFAK/GUI/HexViewForm.cs
index 3609dc3..6f86e0f 100644
--- a/CTFAK/GUI/HexViewForm.cs
+++ b/CTFAK/GUI/HexViewForm.cs
@@ -1,11 +1,10 @@
using System;
-using System.ComponentModel.Design;
using System.Drawing;
using System.Windows.Forms;
using Be.Windows.Forms;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
public partial class HexViewForm : Form
{
diff --git a/CTFAK/GUI/MainConsole.Designer.cs b/CTFAK/GUI/MainConsole.Designer.cs
index f217fe4..0195699 100644
--- a/CTFAK/GUI/MainConsole.Designer.cs
+++ b/CTFAK/GUI/MainConsole.Designer.cs
@@ -1,6 +1,6 @@
using System.ComponentModel;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
partial class MainConsole
{
diff --git a/CTFAK/GUI/MainConsole.cs b/CTFAK/GUI/MainConsole.cs
index 41fabc3..d03741a 100644
--- a/CTFAK/GUI/MainConsole.cs
+++ b/CTFAK/GUI/MainConsole.cs
@@ -1,12 +1,8 @@
using System;
-using System.IO;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Threading;
using System.Windows.Forms;
-using DotNetCTFDumper.Utils;
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
public partial class MainConsole : Form
{
diff --git a/CTFAK/GUI/MainForm.Designer.cs b/CTFAK/GUI/MainForm.Designer.cs
index b33d60b..ca4737d 100644
--- a/CTFAK/GUI/MainForm.Designer.cs
+++ b/CTFAK/GUI/MainForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace DotNetCTFDumper.GUI
+namespace CTFAK.GUI
{
partial class MainForm
{
diff --git a/CTFAK/GUI/MainForm.cs b/CTFAK/GUI/MainForm.cs
index 057f072..802d045 100644
--- a/CTFAK/GUI/MainForm.cs
+++ b/CTFAK/GUI/MainForm.cs
@@ -9,19 +9,18 @@ using System.Media;
using System.Threading;
using System.Windows.Forms;
using Be.Windows.Forms;
-using DotNetCTFDumper.MMFParser;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
-using DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks;
-using DotNetCTFDumper.MMFParser.Translation;
-using DotNetCTFDumper.Utils;
-using Animation = DotNetCTFDumper.MMFParser.EXE.Loaders.Objects.Animation;
-using AnimationDirection = DotNetCTFDumper.MMFParser.EXE.Loaders.Objects.AnimationDirection;
-using Keys = System.Windows.Forms.Keys;
-
-namespace DotNetCTFDumper.GUI
+using CTFAK.GUI.GUIComponents;
+using CTFAK.MMFParser;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using CTFAK.MMFParser.EXE.Loaders.Objects;
+using CTFAK.MMFParser.Translation;
+using CTFAK.Utils;
+using Animation = CTFAK.MMFParser.EXE.Loaders.Objects.Animation;
+using AnimationDirection = CTFAK.MMFParser.EXE.Loaders.Objects.AnimationDirection;
+
+namespace CTFAK.GUI
{
public partial class MainForm : Form
{
@@ -153,9 +152,10 @@ namespace DotNetCTFDumper.GUI
listBox1.Items.Clear();
var console = new MainConsole();
this.Location= new Point(0,0);
- this.Size= new Size(this.Size.Width-100,this.Size.Height);
+ this.Size= new Size(this.Size.Width-100,Screen.PrimaryScreen.Bounds.Height-120);
console.Show();
console.Location = new Point(this.Location.X+this.Size.Width-15,0);
+ console.Size=new Size(console.Size.Width,this.Size.Height);
}
@@ -352,30 +352,28 @@ namespace DotNetCTFDumper.GUI
}
-
-
- public void UpdateImageBar(int index, int all)
+ private void UpdateImageBar(int index, int all)
{
all -= 1;
imageBar.Value = (int) (index / (float) all * 100);
- imageLabel.Text = $"{index}/{all}";
+ imageLabel.Text = $@"{index}/{all}";
}
- public void UpdateSoundBar(int index, int all)
+ private void UpdateSoundBar(int index, int all)
{
all -= 1;
soundBar.Value = (int) (index / (float) all * 100);
- soundLabel.Text = $"{index}/{all}";
+ soundLabel.Text = $@"{index}/{all}";
}
- public void UpdateMusicBar(int index, int all)
+ private void UpdateMusicBar(int index, int all)
{
all -= 1;
musicBar.Value = (int) (index / (float) all * 100);
- musicLabel.Text = $"{index}/{all}";
+ musicLabel.Text = $@"{index}/{all}";
}
- public void IncrementSortedBar(int all)
+ private void IncrementSortedBar(int all)
{
SortedProgressBar.Visible = true;
SortedProgressBar.Maximum = all;
diff --git a/CTFAK/MMFParser/Constants.cs b/CTFAK/MMFParser/Constants.cs
index 0facb80..1e92903 100644
--- a/CTFAK/MMFParser/Constants.cs
+++ b/CTFAK/MMFParser/Constants.cs
@@ -1,4 +1,4 @@
-namespace DotNetCTFDumper.MMFParser
+namespace CTFAK.MMFParser
{
public static class Constants
{
diff --git a/CTFAK/MMFParser/EXE/ChunkList.cs b/CTFAK/MMFParser/EXE/ChunkList.cs
index 2caabae..eeed08b 100644
--- a/CTFAK/MMFParser/EXE/ChunkList.cs
+++ b/CTFAK/MMFParser/EXE/ChunkList.cs
@@ -1,12 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Events;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE
+namespace CTFAK.MMFParser.EXE
{
public class ChunkList
{
diff --git a/CTFAK/MMFParser/EXE/DataLoader.cs b/CTFAK/MMFParser/EXE/DataLoader.cs
index 139d013..4da1426 100644
--- a/CTFAK/MMFParser/EXE/DataLoader.cs
+++ b/CTFAK/MMFParser/EXE/DataLoader.cs
@@ -1,7 +1,7 @@
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE
+namespace CTFAK.MMFParser.EXE
{
public abstract class DataLoader
{
diff --git a/CTFAK/MMFParser/EXE/EXE.cs b/CTFAK/MMFParser/EXE/EXE.cs
index e9f93dd..1f616b5 100644
--- a/CTFAK/MMFParser/EXE/EXE.cs
+++ b/CTFAK/MMFParser/EXE/EXE.cs
@@ -1,10 +1,8 @@
using System;
-using System.Data.OleDb;
using System.IO;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE
+namespace CTFAK.MMFParser.EXE
{
public class Exe
{
diff --git a/CTFAK/MMFParser/EXE/GameData.cs b/CTFAK/MMFParser/EXE/GameData.cs
index 3f56de4..580a5bc 100644
--- a/CTFAK/MMFParser/EXE/GameData.cs
+++ b/CTFAK/MMFParser/EXE/GameData.cs
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE
+namespace CTFAK.MMFParser.EXE
{
public class GameData
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/AppHeader.cs b/CTFAK/MMFParser/EXE/Loaders/AppHeader.cs
index b53eed6..ab5d743 100644
--- a/CTFAK/MMFParser/EXE/Loaders/AppHeader.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/AppHeader.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class AppHeader : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/AppMenu.cs b/CTFAK/MMFParser/EXE/Loaders/AppMenu.cs
index 9359064..4e769ef 100644
--- a/CTFAK/MMFParser/EXE/Loaders/AppMenu.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/AppMenu.cs
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics.Eventing;
using System.IO;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class AppMenu : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Banks/FontBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/FontBank.cs
index 5ddebc5..8b0dab7 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Banks/FontBank.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Banks/FontBank.cs
@@ -1,7 +1,7 @@
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
+namespace CTFAK.MMFParser.EXE.Loaders.Banks
{
public class FontBank : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Banks/ImageBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/ImageBank.cs
index 7b359c0..44d3978 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Banks/ImageBank.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Banks/ImageBank.cs
@@ -4,13 +4,11 @@ using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.Utils;
-using Joveler.Compression.ZLib;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.GUI;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
+namespace CTFAK.MMFParser.EXE.Loaders.Banks
{
public class ImageBank : ChunkLoader
{
@@ -154,7 +152,8 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
public void Read(bool load)
{
- Handle = Reader.ReadInt32() - 1;
+ Handle = Reader.ReadInt32();
+ if (Exe.Instance.GameData.ProductVersion != Constants.Products.MMF15) Handle -= 1;
Position = (int) Reader.Tell();
if (load) Load();
else Preload();
@@ -162,7 +161,8 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
}
public override void Read()
{
- Handle = Reader.ReadInt32() - 1;
+ Handle = Reader.ReadInt32();
+ if (Exe.Instance.GameData.ProductVersion != Constants.Products.MMF15) Handle -= 1;
Position = (int) Reader.Tell();
Load();
}
diff --git a/CTFAK/MMFParser/EXE/Loaders/Banks/MusicBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/MusicBank.cs
index 3214010..0f7d2a7 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Banks/MusicBank.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Banks/MusicBank.cs
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.GUI;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
+namespace CTFAK.MMFParser.EXE.Loaders.Banks
{
public class MusicBank : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Banks/SoundBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/SoundBank.cs
index 12c020e..ebafcea 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Banks/SoundBank.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Banks/SoundBank.cs
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.GUI;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
+namespace CTFAK.MMFParser.EXE.Loaders.Banks
{
public class SoundBank : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/ChunkLoader.cs b/CTFAK/MMFParser/EXE/Loaders/ChunkLoader.cs
index 4489244..159f41e 100644
--- a/CTFAK/MMFParser/EXE/Loaders/ChunkLoader.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/ChunkLoader.cs
@@ -1,7 +1,7 @@
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public abstract class ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Events.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Events.cs
index 290dcee..b3fab91 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Events.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Events.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events
+namespace CTFAK.MMFParser.EXE.Loaders.Events
{
public class Events : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/EventsParts.cs b/CTFAK/MMFParser/EXE/Loaders/Events/EventsParts.cs
index 85bf128..6212e1b 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/EventsParts.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/EventsParts.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.IO;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events
+namespace CTFAK.MMFParser.EXE.Loaders.Events
{
public class Condition : DataLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs
index a7b43b3..e3498bb 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs
@@ -1,7 +1,7 @@
using System;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Expressions
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Expressions
{
class Expression : DataLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs
index 652822e..c9e2005 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs
@@ -1,7 +1,7 @@
using System;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class AlterableValue : Short
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs
index f21dbd5..1f596c3 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs
@@ -1,7 +1,7 @@
using System.Drawing;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Colour : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Create.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Create.cs
index 6c60ed4..c674dec 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Create.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Create.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Create : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Every.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Every.cs
index 72f7676..6594a6c 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Every.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Every.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Every : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Float.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Float.cs
index 4736a2e..046acce 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Float.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Float.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Float : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs
index 0c61aa2..1699e5a 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs
@@ -1,7 +1,7 @@
using System;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class GlobalValue : Short
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Int.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Int.cs
index 0a15f27..9c6b98b 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Int.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Int.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Int : Short
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs
index f0a02f5..efabced 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class ParamObject : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs
index 963217e..0b3cbad 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs
@@ -1,7 +1,7 @@
using System;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class ParameterCommon : DataLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Position.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Position.cs
index f0389f5..00e9544 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Position.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Position.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Position : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs
index 47e197b..961b722 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Remark : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs
index afb0e89..cd377ad 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Sample : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Short.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Short.cs
index c1b70de..00efde0 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Short.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Short.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Short : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Time.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Time.cs
index bc5120c..1c6da8b 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Time.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Time.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
+namespace CTFAK.MMFParser.EXE.Loaders.Events.Parameters
{
class Time : ParameterCommon
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/ExtData.cs b/CTFAK/MMFParser/EXE/Loaders/ExtData.cs
index 1e121f3..e86bb49 100644
--- a/CTFAK/MMFParser/EXE/Loaders/ExtData.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/ExtData.cs
@@ -1,7 +1,7 @@
using System;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
class ExtData : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Frame.cs b/CTFAK/MMFParser/EXE/Loaders/Frame.cs
index ee246b1..7a38b3b 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Frame.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Frame.cs
@@ -1,11 +1,9 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Drawing.Imaging;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
class FrameName : StringChunk
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/FrameItems.cs b/CTFAK/MMFParser/EXE/Loaders/FrameItems.cs
index 0555b51..1431b0b 100644
--- a/CTFAK/MMFParser/EXE/Loaders/FrameItems.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/FrameItems.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using System.Collections.Generic;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class FrameItems : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Globals.cs b/CTFAK/MMFParser/EXE/Loaders/Globals.cs
index 6c27acf..06e25ab 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Globals.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Globals.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class GlobalValues : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs b/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs
index e861415..0bc4cb7 100644
--- a/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using CTFAK.MMFParser.EXE.Loaders.Objects;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class ObjectInfo : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs b/CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs
index 9876ec2..a727358 100644
--- a/CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs
@@ -1,8 +1,8 @@
using System;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
class ObjectNames : ChunkLoader//2.5+ trash
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs
index 8ae33e8..c8cb0c1 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs
@@ -1,8 +1,7 @@
-using System;
-using System.Collections.Generic;
-using DotNetCTFDumper.Utils;
+using System.Collections.Generic;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
+namespace CTFAK.MMFParser.EXE.Loaders.Objects
{
public class Animations:ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Objects/Backdrop.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Backdrop.cs
index 8d05097..6642541 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Objects/Backdrop.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Objects/Backdrop.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
+namespace CTFAK.MMFParser.EXE.Loaders.Objects
{
public enum Obstacle
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Objects/Counters.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Counters.cs
index 878efe8..bd54888 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Objects/Counters.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Objects/Counters.cs
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
+namespace CTFAK.MMFParser.EXE.Loaders.Objects
{
public class Counter:ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Objects/Movements.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Movements.cs
index 8ec8b0c..5aa7cdd 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Objects/Movements.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Objects/Movements.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
+namespace CTFAK.MMFParser.EXE.Loaders.Objects
{
public class Movements:ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
index b3024cc..facab62 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
@@ -1,8 +1,8 @@
using System;
using System.Drawing;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
+namespace CTFAK.MMFParser.EXE.Loaders.Objects
{
public class ObjectCommon : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Objects/Value.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Value.cs
index 8e6eeb3..1163858 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Objects/Value.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Objects/Value.cs
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
+namespace CTFAK.MMFParser.EXE.Loaders.Objects
{
public class AlterableValues:ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/StringChunk.cs b/CTFAK/MMFParser/EXE/Loaders/StringChunk.cs
index c3004dd..73c8977 100644
--- a/CTFAK/MMFParser/EXE/Loaders/StringChunk.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/StringChunk.cs
@@ -1,8 +1,8 @@
using System;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class StringChunk : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/Transition.cs b/CTFAK/MMFParser/EXE/Loaders/Transition.cs
index a24654f..68967cd 100644
--- a/CTFAK/MMFParser/EXE/Loaders/Transition.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Transition.cs
@@ -1,8 +1,7 @@
-using System;
-using System.Drawing;
-using DotNetCTFDumper.Utils;
+using System.Drawing;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class Transition:ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/Loaders/yves.cs b/CTFAK/MMFParser/EXE/Loaders/yves.cs
index d6bb9de..425fef6 100644
--- a/CTFAK/MMFParser/EXE/Loaders/yves.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/yves.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.Runtime.InteropServices;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.EXE.Loaders
+namespace CTFAK.MMFParser.EXE.Loaders
{
public class AppIcon : ChunkLoader
{
diff --git a/CTFAK/MMFParser/EXE/PackData.cs b/CTFAK/MMFParser/EXE/PackData.cs
index 5074069..a1c33f8 100644
--- a/CTFAK/MMFParser/EXE/PackData.cs
+++ b/CTFAK/MMFParser/EXE/PackData.cs
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.IO;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.EXE
+namespace CTFAK.MMFParser.EXE
{
public class PackData
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs b/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs
index c5a6d8f..6ec2c5b 100644
--- a/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class ChunkList : DataLoader//This is used for MFA reading/writing
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/Controls.cs b/CTFAK/MMFParser/MFA/Loaders/Controls.cs
index d632981..c8e4655 100644
--- a/CTFAK/MMFParser/MFA/Loaders/Controls.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/Controls.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class Controls : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/Events.cs b/CTFAK/MMFParser/MFA/Loaders/Events.cs
index 2a025e8..649a0c5 100644
--- a/CTFAK/MMFParser/MFA/Loaders/Events.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/Events.cs
@@ -1,14 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Runtime.InteropServices;
-using System.Security.AccessControl;
-using System.Text;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Events;
-using DotNetCTFDumper.Utils;
-
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders.Events;
+using CTFAK.Utils;
+
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class Events:DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/Frame.cs b/CTFAK/MMFParser/MFA/Loaders/Frame.cs
index 540a586..711ba3d 100644
--- a/CTFAK/MMFParser/MFA/Loaders/Frame.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/Frame.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class Frame : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs b/CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs
index fc667d0..2282cf8 100644
--- a/CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs
@@ -1,8 +1,7 @@
-using System;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class FrameInstance:DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/FrameItem.cs b/CTFAK/MMFParser/MFA/Loaders/FrameItem.cs
index 48c5185..ac3c9bc 100644
--- a/CTFAK/MMFParser/MFA/Loaders/FrameItem.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/FrameItem.cs
@@ -1,10 +1,10 @@
using System;
using System.Diagnostics;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.MFA.Loaders.mfachunks;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class FrameItem : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs b/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs
index f29f49f..0466ee5 100644
--- a/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs
@@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using DotNetCTFDumper.Utils;
-using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using CTFAK.Utils;
+using static CTFAK.MMFParser.EXE.ChunkList;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class AGMIBank : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs b/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs
index b8d7e26..697373b 100644
--- a/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using System.Collections.Generic;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class ItemFolder:DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/Layer.cs b/CTFAK/MMFParser/MFA/Loaders/Layer.cs
index 61de57f..5e55658 100644
--- a/CTFAK/MMFParser/MFA/Loaders/Layer.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/Layer.cs
@@ -1,8 +1,8 @@
using System;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class Layer : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/Transition.cs b/CTFAK/MMFParser/MFA/Loaders/Transition.cs
index 6c7e953..89abadc 100644
--- a/CTFAK/MMFParser/MFA/Loaders/Transition.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/Transition.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Drawing;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using System.Drawing;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class Transition:DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/ValueList.cs b/CTFAK/MMFParser/MFA/Loaders/ValueList.cs
index dfe1c65..accd3df 100644
--- a/CTFAK/MMFParser/MFA/Loaders/ValueList.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/ValueList.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders
+namespace CTFAK.MMFParser.MFA.Loaders
{
public class ValueList : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/mfachunks/Active.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Active.cs
index abd3157..1eda87f 100644
--- a/CTFAK/MMFParser/MFA/Loaders/mfachunks/Active.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Active.cs
@@ -1,6 +1,6 @@
-using DotNetCTFDumper.Utils;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
+namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
{
public class Active : AnimationObject
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
index d29d177..540834a 100644
--- a/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
+namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
{
public class AnimationObject:ObjectLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs
index a436a6c..1f7ba68 100644
--- a/CTFAK/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
+namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
{
public class Behaviours : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/mfachunks/Movements.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Movements.cs
index 9dce2e9..73296b1 100644
--- a/CTFAK/MMFParser/MFA/Loaders/mfachunks/Movements.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Movements.cs
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Net.NetworkInformation;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
+namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
{
public class Movements : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
index 871776a..eefb6cf 100644
--- a/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
+++ b/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Drawing;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
+namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
{
public class ObjectLoader : DataLoader
{
diff --git a/CTFAK/MMFParser/MFA/MFA.cs b/CTFAK/MMFParser/MFA/MFA.cs
index 25fe26b..cc8179c 100644
--- a/CTFAK/MMFParser/MFA/MFA.cs
+++ b/CTFAK/MMFParser/MFA/MFA.cs
@@ -2,17 +2,17 @@
using System.Collections.Generic;
using System.Drawing;
using System.IO;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using DotNetCTFDumper.MMFParser.MFA.Loaders;
-using DotNetCTFDumper.MMFParser.Translation;
-using DotNetCTFDumper.Utils;
-using ChunkList = DotNetCTFDumper.MMFParser.MFA.Loaders.ChunkList;
-using Controls = DotNetCTFDumper.MMFParser.MFA.Loaders.Controls;
-using Frame = DotNetCTFDumper.MMFParser.MFA.Loaders.Frame;
-
-namespace DotNetCTFDumper.MMFParser.MFA
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using CTFAK.MMFParser.MFA.Loaders;
+using CTFAK.MMFParser.Translation;
+using CTFAK.Utils;
+using ChunkList = CTFAK.MMFParser.MFA.Loaders.ChunkList;
+using Controls = CTFAK.MMFParser.MFA.Loaders.Controls;
+using Frame = CTFAK.MMFParser.MFA.Loaders.Frame;
+
+namespace CTFAK.MMFParser.MFA
{
public class MFA : DataLoader
{
diff --git a/CTFAK/MMFParser/Translation/MFAGenerator.cs b/CTFAK/MMFParser/Translation/MFAGenerator.cs
index 538db31..6498788 100644
--- a/CTFAK/MMFParser/Translation/MFAGenerator.cs
+++ b/CTFAK/MMFParser/Translation/MFAGenerator.cs
@@ -1,12 +1,10 @@
-using System;
-using System.IO;
-using System.IO.Pipes;
+using System.IO;
using System.Net;
using System.Windows.Forms;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.Utils;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
-namespace DotNetCTFDumper.MMFParser.Translation
+namespace CTFAK.MMFParser.Translation
{
public static class MFAGenerator
{
@@ -26,6 +24,7 @@ namespace DotNetCTFDumper.MMFParser.Translation
Logger.Log("MFA Generation Error");
return null;
}
+
else if (dlg == DialogResult.Yes)
{
using (var wc = new WebClient())
diff --git a/CTFAK/MMFParser/Translation/PAME2MFA.cs b/CTFAK/MMFParser/Translation/PAME2MFA.cs
index 088d248..73fdeb6 100644
--- a/CTFAK/MMFParser/Translation/PAME2MFA.cs
+++ b/CTFAK/MMFParser/Translation/PAME2MFA.cs
@@ -2,22 +2,19 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
-using System.Web.UI.WebControls.Expressions;
-using System.Xml.Schema;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
-using DotNetCTFDumper.MMFParser.MFA.Loaders;
-using DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks;
-using DotNetCTFDumper.Utils;
-using Animation = DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks.Animation;
-using AnimationDirection = DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks.AnimationDirection;
-using ChunkList = DotNetCTFDumper.MMFParser.MFA.Loaders.ChunkList;
-using Frame = DotNetCTFDumper.MMFParser.EXE.Loaders.Frame;
-using Layer = DotNetCTFDumper.MMFParser.MFA.Loaders.Layer;
-using Movement = DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks.Movement;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders.Objects;
+using CTFAK.MMFParser.MFA.Loaders;
+using CTFAK.MMFParser.MFA.Loaders.mfachunks;
+using CTFAK.Utils;
+using Animation = CTFAK.MMFParser.MFA.Loaders.mfachunks.Animation;
+using AnimationDirection = CTFAK.MMFParser.MFA.Loaders.mfachunks.AnimationDirection;
+using ChunkList = CTFAK.MMFParser.MFA.Loaders.ChunkList;
+using Frame = CTFAK.MMFParser.EXE.Loaders.Frame;
+using Layer = CTFAK.MMFParser.MFA.Loaders.Layer;
+using Movement = CTFAK.MMFParser.MFA.Loaders.mfachunks.Movement;
-namespace DotNetCTFDumper.MMFParser.Translation
+namespace CTFAK.MMFParser.Translation
{
public static class Pame2Mfa
{
diff --git a/CTFAK/PluginAPI/IPlugin.cs b/CTFAK/PluginAPI/IPlugin.cs
index b3f488c..c9d3b20 100644
--- a/CTFAK/PluginAPI/IPlugin.cs
+++ b/CTFAK/PluginAPI/IPlugin.cs
@@ -1,4 +1,4 @@
-namespace DotNetCTFDumper.PluginAPI
+namespace CTFAK.PluginAPI
{
public interface IPlugin
{
diff --git a/CTFAK/PluginAPI/PluginAPI.cs b/CTFAK/PluginAPI/PluginAPI.cs
index c38a5a0..4d7cb48 100644
--- a/CTFAK/PluginAPI/PluginAPI.cs
+++ b/CTFAK/PluginAPI/PluginAPI.cs
@@ -1,17 +1,11 @@
using System;
using System.Collections.Generic;
-using System.Drawing;
using System.IO;
using System.Linq;
using System.Reflection;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.MFA;
-using DotNetCTFDumper.MMFParser.MFA.Loaders;
-using Frame = DotNetCTFDumper.MMFParser.MFA.Loaders.Frame;
-using Layer = DotNetCTFDumper.MMFParser.MFA.Loaders.Layer;
-
-namespace DotNetCTFDumper.PluginAPI
+using CTFAK.MMFParser.EXE;
+
+namespace CTFAK.PluginAPI
{
public static class PluginAPI
{
diff --git a/CTFAK/Program.cs b/CTFAK/Program.cs
index fca7f9a..7d19d42 100644
--- a/CTFAK/Program.cs
+++ b/CTFAK/Program.cs
@@ -5,13 +5,12 @@ using System.IO;
using System.Runtime.InteropServices;
using System.Threading;
using System.Windows.Forms;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.Translation;
-using DotNetCTFDumper.Utils;
+using CTFAK.GUI;
+using CTFAK.MMFParser.EXE;
+using CTFAK.Utils;
using Joveler.Compression.ZLib;
-namespace DotNetCTFDumper
+namespace CTFAK
{
public class Program
{
@@ -58,7 +57,7 @@ namespace DotNetCTFDumper
/*if (args.Length > 0 && (args[0] == "-h" || args[0] == "-help"))
{
Logger.Log("DotNetCTFDumper: 0.0.5", true, ConsoleColor.Green);
- Logger.Log("Lauch Args:", true, ConsoleColor.Green);
+ Logger.Log("Launch Args:", true, ConsoleColor.Green);
Logger.Log(" Filename - path to your exe or mfa", true, ConsoleColor.Green);
Logger.Log(" Info - Dump debug info to console(default:true)", true, ConsoleColor.Green);
Logger.Log(" DumpImages - Dump images to 'DUMP\\[your game]\\ImageBank'(default:false)", true,
diff --git a/CTFAK/Settings.cs b/CTFAK/Settings.cs
index d1091b9..615fa21 100644
--- a/CTFAK/Settings.cs
+++ b/CTFAK/Settings.cs
@@ -1,6 +1,6 @@
using System.IO;
-namespace DotNetCTFDumper
+namespace CTFAK
{
public static class Settings
{
diff --git a/CTFAK/Utils/Backend.cs b/CTFAK/Utils/Backend.cs
index 78d2040..92aa404 100644
--- a/CTFAK/Utils/Backend.cs
+++ b/CTFAK/Utils/Backend.cs
@@ -1,9 +1,9 @@
using System.ComponentModel;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using static DotNetCTFDumper.MMFParser.EXE.Exe;
+using CTFAK.GUI;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using static CTFAK.MMFParser.EXE.Exe;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public static class Backend
{
diff --git a/CTFAK/Utils/BitDict.cs b/CTFAK/Utils/BitDict.cs
index 26560ef..72dc606 100644
--- a/CTFAK/Utils/BitDict.cs
+++ b/CTFAK/Utils/BitDict.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public class BitDict
{
diff --git a/CTFAK/Utils/ByteFlag.cs b/CTFAK/Utils/ByteFlag.cs
index 183cbf8..54802c3 100644
--- a/CTFAK/Utils/ByteFlag.cs
+++ b/CTFAK/Utils/ByteFlag.cs
@@ -1,6 +1,6 @@
using System;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public static class ByteFlag
{
diff --git a/CTFAK/Utils/ByteReader.cs b/CTFAK/Utils/ByteReader.cs
index dd9724e..780b81b 100644
--- a/CTFAK/Utils/ByteReader.cs
+++ b/CTFAK/Utils/ByteReader.cs
@@ -3,7 +3,7 @@ using System.Drawing;
using System.IO;
using System.Text;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public class ByteReader : BinaryReader
{
diff --git a/CTFAK/Utils/ByteWriter.cs b/CTFAK/Utils/ByteWriter.cs
index 27d4d08..b63404e 100644
--- a/CTFAK/Utils/ByteWriter.cs
+++ b/CTFAK/Utils/ByteWriter.cs
@@ -3,7 +3,7 @@ using System.Drawing;
using System.IO;
using System.Text;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public class ByteWriter : BinaryWriter
{
diff --git a/CTFAK/Utils/Decompressor.cs b/CTFAK/Utils/Decompressor.cs
index 28a5df3..7fd5301 100644
--- a/CTFAK/Utils/Decompressor.cs
+++ b/CTFAK/Utils/Decompressor.cs
@@ -1,10 +1,8 @@
using System;
-using System.Diagnostics;
using System.IO;
-using System.Linq;
using Joveler.Compression.ZLib;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public static class Decompressor
{
diff --git a/CTFAK/Utils/Decryption.cs b/CTFAK/Utils/Decryption.cs
index 15a75e6..2dbfd42 100644
--- a/CTFAK/Utils/Decryption.cs
+++ b/CTFAK/Utils/Decryption.cs
@@ -2,7 +2,7 @@
using System.IO;
using System.Runtime.InteropServices;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
static class Decryption
{
diff --git a/CTFAK/Utils/Helper.cs b/CTFAK/Utils/Helper.cs
index e49e258..bc556df 100644
--- a/CTFAK/Utils/Helper.cs
+++ b/CTFAK/Utils/Helper.cs
@@ -7,13 +7,12 @@ using System.Linq;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Windows.Forms;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.MMFParser;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
+using CTFAK.GUI.GUIComponents;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders.Events.Parameters;
+using CTFAK.MMFParser.EXE.Loaders.Objects;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
static class Helper
{
@@ -127,28 +126,10 @@ namespace DotNetCTFDumper.Utils
temp += data[i].ToString("X2");
temp += " ";
}
-
return temp;
}
- public static void PrintHex(this byte[] data)
- {
- var blockSize = 16;
- var blocks = data.Split<byte>(blockSize);
- foreach (var block in blocks)
- {
- string charAcc = "";
- foreach (var b in block)
- {
- if (b < 128 && b > 32) charAcc += Convert.ToChar(b);
- else charAcc += '.';
- }
-
- var bLen = block.Count();
- //var accLen=
- }
- }
-
+
public static byte[] GetContents(this ByteWriter wrt)
{
var buff = new byte[wrt.BaseStream.Length];
diff --git a/CTFAK/Utils/ImageDumper.cs b/CTFAK/Utils/ImageDumper.cs
index 80090ba..6c5315a 100644
--- a/CTFAK/Utils/ImageDumper.cs
+++ b/CTFAK/Utils/ImageDumper.cs
@@ -3,13 +3,14 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
-using DotNetCTFDumper.GUI;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.MMFParser.EXE.Loaders;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
-using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
-
-namespace DotNetCTFDumper.Utils
+using CTFAK.GUI;
+using CTFAK.GUI.GUIComponents;
+using CTFAK.MMFParser.EXE;
+using CTFAK.MMFParser.EXE.Loaders;
+using CTFAK.MMFParser.EXE.Loaders.Banks;
+using CTFAK.MMFParser.EXE.Loaders.Objects;
+
+namespace CTFAK.Utils
{
public static class ImageDumper
{
diff --git a/CTFAK/Utils/ImageHelper.cs b/CTFAK/Utils/ImageHelper.cs
index a6c1d30..2cf3d11 100644
--- a/CTFAK/Utils/ImageHelper.cs
+++ b/CTFAK/Utils/ImageHelper.cs
@@ -1,7 +1,6 @@
using System;
-using System.IO;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public static class ImageHelper
{
diff --git a/CTFAK/Utils/Logger.cs b/CTFAK/Utils/Logger.cs
index c02a89b..2123345 100644
--- a/CTFAK/Utils/Logger.cs
+++ b/CTFAK/Utils/Logger.cs
@@ -1,9 +1,8 @@
using System;
using System.IO;
-using System.Web.UI.WebControls;
-using DotNetCTFDumper.GUI;
+using CTFAK.GUI;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
public static class Logger
{
diff --git a/CTFAK/Utils/WAVReading.cs b/CTFAK/Utils/WAVReading.cs
index 7f21a0e..1d4f96f 100644
--- a/CTFAK/Utils/WAVReading.cs
+++ b/CTFAK/Utils/WAVReading.cs
@@ -1,9 +1,9 @@
using System;
+using System.Diagnostics;
using System.IO;
using System.Text;
-using System.Diagnostics;
-namespace DotNetCTFDumper.Utils
+namespace CTFAK.Utils
{
class WavFile
{