From f0eb6a6f83a6e46b865fbe0b485a834e90401988 Mon Sep 17 00:00:00 2001
From: nullifiedcat <nullifiedcat@gmail.com>
Date: Sun, 18 Dec 2016 13:14:44 +0300
Subject: [PATCH] GUI Start

---
 cathook/.cproject                       | 119 ++++++++++++++++++++++--
 cathook/.gitignore                      |   1 +
 cathook/.settings/language.settings.xml |  11 +++
 cathook/TODO                            |   6 ++
 cathook/src/.gitignore                  |   1 +
 cathook/src/common.h                    |   3 +-
 cathook/src/cvwrapper.h                 |  34 +++++++
 cathook/src/drawing.cpp                 |   1 +
 cathook/src/drawing.h                   |   1 +
 cathook/src/entity.cpp                  |   2 +-
 cathook/src/entity.h                    |   2 +-
 cathook/src/entitycache.cpp             |  18 +++-
 cathook/src/entitycache.h               |   1 +
 cathook/src/enums.h                     |   3 +-
 cathook/src/globals.cpp                 |  22 ++---
 cathook/src/gui/controls.cpp            |  50 ++++++++++
 cathook/src/gui/controls.h              |  43 +++++++++
 cathook/src/gui/gui.cpp                 |  30 ++++++
 cathook/src/gui/gui.h                   |  24 +++++
 cathook/src/hack.cpp                    |  25 ++++-
 cathook/src/hack.h                      |   5 +
 cathook/src/hacks/Aimbot.cpp            |   4 +
 cathook/src/hacks/Aimbot.h              |   2 +
 cathook/src/hacks/Airstuck.cpp          |   2 -
 cathook/src/hacks/ESP.cpp               |  22 ++++-
 cathook/src/hacks/ESP.h                 |   2 +
 cathook/src/hacks/Misc.cpp              |   2 +-
 cathook/src/helpers.cpp                 |  19 ++++
 cathook/src/helpers.h                   |   3 +
 cathook/src/hooks.cpp                   |   2 +
 cathook/src/hooks.h                     |   2 +
 cathook/src/logging.cpp                 |   4 +-
 cathook/src/targeting/ITargetSystem.cpp |   8 +-
 uran/.project                           |  38 --------
 34 files changed, 432 insertions(+), 80 deletions(-)
 create mode 100644 cathook/src/.gitignore
 create mode 100644 cathook/src/cvwrapper.h
 create mode 100644 cathook/src/gui/controls.cpp
 create mode 100644 cathook/src/gui/controls.h
 create mode 100644 cathook/src/gui/gui.cpp
 create mode 100644 cathook/src/gui/gui.h
 delete mode 100644 uran/.project

diff --git a/cathook/.cproject b/cathook/.cproject
index 2776ed06..db752922 100644
--- a/cathook/.cproject
+++ b/cathook/.cproject
@@ -7,11 +7,14 @@
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/UranHack"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/uran"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/cathook"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/UranHack/Debug"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/uran/Debug"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/uran/TF2"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/cathook/TF2"/>
 						<entry flags="RESOLVED" kind="libraryFile" name="UranHack" srcPrefixMapping="" srcRootPath=""/>
 						<entry flags="RESOLVED" kind="libraryFile" name="uran" srcPrefixMapping="" srcRootPath=""/>
+						<entry flags="RESOLVED" kind="libraryFile" name="cathook" srcPrefixMapping="" srcRootPath=""/>
 					</externalSetting>
 				</externalSettings>
 				<extensions>
@@ -32,9 +35,9 @@
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.782611349" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool command="g++" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.883030293" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
 								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.908662295" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1420733982" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.default" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1420733982" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.dialect.std.362725251" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.other.other.1916750610" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -shared -Wall -Wno-unknown-pragmas -fmessage-length=0 -m32" valueType="string"/>
+								<option id="gnu.cpp.compiler.option.other.other.1916750610" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -shared -Wall -Wno-unknown-pragmas -fmessage-length=0 -m32 -fvisibility=hidden" valueType="string"/>
 								<option id="gnu.cpp.compiler.option.other.pic.920050344" name="Position Independent Code (-fPIC)" superClass="gnu.cpp.compiler.option.other.pic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="gnu.cpp.compiler.option.include.paths.1848710724" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="/home/nullifiedcat/source-sdk-2013-master/mp/src/public"/>
@@ -87,8 +90,9 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-						<entry excluding="hooks|targeting|ipc|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry excluding="gui|copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="gui|hooks|targeting|ipc|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hooks"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/ipc"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/targeting"/>
@@ -140,8 +144,9 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-						<entry excluding="hooks|hacks|copypasted|targeting|ipc|mem|sdk" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry excluding="gui|copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="gui|hooks|hacks|copypasted|targeting|ipc|mem|sdk" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hooks"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/ipc"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/targeting"/>
@@ -155,8 +160,11 @@
 				<externalSettings>
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/uran"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/cathook"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/uran/HL2DM"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/cathook/HL2DM"/>
 						<entry flags="RESOLVED" kind="libraryFile" name="uran" srcPrefixMapping="" srcRootPath=""/>
+						<entry flags="RESOLVED" kind="libraryFile" name="cathook" srcPrefixMapping="" srcRootPath=""/>
 					</externalSetting>
 				</externalSettings>
 				<extensions>
@@ -232,8 +240,103 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-						<entry excluding="hooks|targeting|ipc|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry excluding="gui|copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="gui|hooks|targeting|ipc|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hooks"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/ipc"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/targeting"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+			<storageModule moduleId="ilg.gnuarmeclipse.managedbuild.packs"/>
+		</cconfiguration>
+		<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1168214098.1070157341">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1168214098.1070157341" moduleId="org.eclipse.cdt.core.settings" name="Lilac">
+				<externalSettings>
+					<externalSetting>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/cathook"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/cathook/Lilac"/>
+						<entry flags="RESOLVED" kind="libraryFile" name="cathook" srcPrefixMapping="" srcRootPath=""/>
+					</externalSetting>
+				</externalSettings>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="so" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1168214098.1070157341" name="Lilac" parent="cdt.managedbuild.config.gnu.exe.debug">
+					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1168214098.1070157341." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.149538905" name="Linux GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.exe.debug" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1147037094" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+							<builder buildPath="${workspace_loc:/uran}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.1868212600" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1785053597" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool command="g++" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.64322965" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1050507477" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.375204967" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.default" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.option.dialect.std.1137434269" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.option.other.other.837066263" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -shared -Wall -Wno-unknown-pragmas -fmessage-length=0 -m32" valueType="string"/>
+								<option id="gnu.cpp.compiler.option.other.pic.1319177526" name="Position Independent Code (-fPIC)" superClass="gnu.cpp.compiler.option.other.pic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option id="gnu.cpp.compiler.option.include.paths.29736773" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="/home/nullifiedcat/source-sdk-2013-master/mp/src/public"/>
+									<listOptionValue builtIn="false" value="/home/nullifiedcat/source-sdk-2013-master/mp/src/mathlib"/>
+									<listOptionValue builtIn="false" value="/home/nullifiedcat/source-sdk-2013-master/mp/src/common"/>
+									<listOptionValue builtIn="false" value="/home/nullifiedcat/source-sdk-2013-master/mp/src/public/tier1"/>
+									<listOptionValue builtIn="false" value="/home/nullifiedcat/source-sdk-2013-master/mp/src/public/tier0"/>
+									<listOptionValue builtIn="false" value="/home/nullifiedcat/open-steamworks/osw"/>
+								</option>
+								<option id="gnu.cpp.compiler.option.other.verbose.719533586" name="Verbose (-v)" superClass="gnu.cpp.compiler.option.other.verbose" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option id="gnu.cpp.compiler.option.preprocessor.def.134480857" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="TF2"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1161146996" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.2099147204" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.2114841987" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.debug.option.debugging.level.276347413" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+								<option id="gnu.c.compiler.option.dialect.std.1674393024" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
+								<option id="gnu.c.compiler.option.misc.other.1221567645" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -shared -m32" valueType="string"/>
+								<option id="gnu.c.compiler.option.misc.pic.1172078632" name="Position Independent Code (-fPIC)" superClass="gnu.c.compiler.option.misc.pic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1099428418" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.658601179" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
+								<option defaultValue="true" id="gnu.c.link.option.shared.2056632490" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/>
+							</tool>
+							<tool command="g++" id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.745172906" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
+								<option id="gnu.cpp.link.option.libs.2026098467" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
+									<listOptionValue builtIn="false" value="vstdlib"/>
+									<listOptionValue builtIn="false" value=":libc.so.6"/>
+									<listOptionValue builtIn="false" value=":libstdc++.so.6"/>
+									<listOptionValue builtIn="false" value="tier0"/>
+								</option>
+								<option defaultValue="true" id="gnu.cpp.link.option.shared.1181140892" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" useByScannerDiscovery="false" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.flags.35408791" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-m32 -fno-gnu-unique -D_GLIBCXX_USE_CXX11_ABI=0" valueType="string"/>
+								<option id="gnu.cpp.link.option.paths.1832522129" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="&quot;/home/nullifiedcat/.steam/steam/steamapps/common/Team Fortress 2/bin&quot;"/>
+								</option>
+								<option id="gnu.cpp.link.option.nodeflibs.1742960105" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.cpp.link.option.nodeflibs" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.nostdlibs.1162558333" name="No startup or default libs (-nostdlib)" superClass="gnu.cpp.link.option.nostdlibs" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2037163100" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1254618951" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+								<option id="gnu.both.asm.option.include.paths.1287903940" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1988470844" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry excluding="gui|copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="gui|hooks|targeting|ipc|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hooks"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/ipc"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/targeting"/>
diff --git a/cathook/.gitignore b/cathook/.gitignore
index 70093fd5..f7b9e674 100644
--- a/cathook/.gitignore
+++ b/cathook/.gitignore
@@ -8,3 +8,4 @@
 /src_/
 /TF2/
 /HL2DM/
+/Lilac/
diff --git a/cathook/.settings/language.settings.xml b/cathook/.settings/language.settings.xml
index 1f6506fc..b2be47b2 100644
--- a/cathook/.settings/language.settings.xml
+++ b/cathook/.settings/language.settings.xml
@@ -33,4 +33,15 @@
 			</provider>
 		</extension>
 	</configuration>
+	<configuration id="cdt.managedbuild.config.gnu.exe.debug.1168214098.1070157341" name="Lilac">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-583682204379314874" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
+		</extension>
+	</configuration>
 </project>
diff --git a/cathook/TODO b/cathook/TODO
index 8eec041a..e29e8421 100644
--- a/cathook/TODO
+++ b/cathook/TODO
@@ -41,10 +41,16 @@ Airstuck Idle Kick fix
 Anti Backstab
 Critical rifles bodyshotting
 FLAG ESP
+Projectile ESP
 Hitbox position cache
 Spy alert uses angles
+Aimbot delay
 More esp tweaking
 halloween medkits
+Heavy Autoshoot continious
+NoZoom render hook
+Red money detect
+Tank ESP
 carrying esp
 Tracers/Spy Cam
 Glow Hack
diff --git a/cathook/src/.gitignore b/cathook/src/.gitignore
new file mode 100644
index 00000000..69840a91
--- /dev/null
+++ b/cathook/src/.gitignore
@@ -0,0 +1 @@
+/targeting/
diff --git a/cathook/src/common.h b/cathook/src/common.h
index 4fe5f105..78c4dcb4 100644
--- a/cathook/src/common.h
+++ b/cathook/src/common.h
@@ -23,6 +23,7 @@
 #include "trace.h"
 #include "prediction.h"
 
-#define CON_PREFIX "cat_"
+#define CON_NAME "cat"
+#define CON_PREFIX CON_NAME "_"
 
 #endif /* COMMON_H_ */
diff --git a/cathook/src/cvwrapper.h b/cathook/src/cvwrapper.h
new file mode 100644
index 00000000..9e3bff74
--- /dev/null
+++ b/cathook/src/cvwrapper.h
@@ -0,0 +1,34 @@
+/*
+ * cvwrapper.h
+ *
+ *  Created on: Dec 17, 2016
+ *      Author: nullifiedcat
+ */
+
+#ifndef CVWRAPPER_H_
+#define CVWRAPPER_H_
+
+class ConVar;
+
+enum CatVar_t {
+	CV_INT,
+	CV_FLOAT,
+	CV_STRING
+};
+
+class ICatVar {
+public:
+	virtual ~ICatVar();
+	virtual CatVar_t GetType() = 0;
+	virtual ConVar* GetConVar() = 0;
+};
+
+class CatVar_INT : public ICatVar {
+public:
+	CatVar_t GetType() { return CatVar_t::CV_INT; }
+	ConVar* GetConVar() { return m_pConVar; }
+
+	ConVar* m_pConVar;
+};
+
+#endif /* CVWRAPPER_H_ */
diff --git a/cathook/src/drawing.cpp b/cathook/src/drawing.cpp
index a7da4610..cc7af62f 100644
--- a/cathook/src/drawing.cpp
+++ b/cathook/src/drawing.cpp
@@ -89,6 +89,7 @@ Color draw::yellow(255, 255, 0, 255);
 Color draw::black(0, 0, 0, 255);
 
 Color colors::white(255, 255, 255, 255);
+Color colors::pink (255, 105, 180, 255);
 Color colors::black(0,  0,  0,   255);
 Color colors::tf_red(184, 56,  59,  255);
 Color colors::tf_blu(88,  133, 162, 255);
diff --git a/cathook/src/drawing.h b/cathook/src/drawing.h
index 16e6eef9..a838e5ca 100644
--- a/cathook/src/drawing.h
+++ b/cathook/src/drawing.h
@@ -24,6 +24,7 @@ struct ESPStringCompound {
 extern Color TEAM_COLORS[4];
 
 namespace colors {
+extern Color pink;
 extern Color white;
 extern Color black;
 extern Color tf_red;
diff --git a/cathook/src/entity.cpp b/cathook/src/entity.cpp
index 024329ed..0448f394 100644
--- a/cathook/src/entity.cpp
+++ b/cathook/src/entity.cpp
@@ -53,7 +53,7 @@ void EntityVariables::Init() {
 	this->hObserverTarget = gNetvars.get_offset("DT_BasePlayer", "m_hObserverTarget");
 	this->Rocket_iDeflected = gNetvars.get_offset("DT_TFBaseRocket", "m_iDeflected");
 	this->Grenade_iDeflected = gNetvars.get_offset("DT_TFWeaponBaseGrenadeProj", "m_iDeflected");
-	this->test = 2908;
+	this->bDistributed = gNetvars.get_offset("DT_CurrencyPack", "m_bDistributed");
 }
 
 void InitEntityOffsets() {
diff --git a/cathook/src/entity.h b/cathook/src/entity.h
index f1b14eb0..cfdcd195 100644
--- a/cathook/src/entity.h
+++ b/cathook/src/entity.h
@@ -83,7 +83,7 @@ public:
 	offset_t Rocket_iDeflected;
 	offset_t Grenade_iDeflected;
 
-	offset_t test;
+	offset_t bDistributed;
 };
 
 extern EntityVariables netvar;
diff --git a/cathook/src/entitycache.cpp b/cathook/src/entitycache.cpp
index 0b172708..716dd55a 100644
--- a/cathook/src/entitycache.cpp
+++ b/cathook/src/entitycache.cpp
@@ -52,8 +52,13 @@ void CachedEntity::Update(int idx) {
 		m_bIsVisible = (IsEntityVisible(m_pEntity, 0) || IsEntityVisible(m_pEntity, 4));
 		m_iHealth = Var<int>(netvar.iHealth);
 		m_iMaxHealth = g_pPlayerResource->GetMaxHealth(m_pEntity);
-		if (m_bIsVisible) m_lLastSeen = 0;
-		else m_lLastSeen++;
+		if (m_bIsVisible) {
+			m_lLastSeen = 0;
+			m_lSeenTicks++;
+		} else {
+			m_lSeenTicks = 0;
+			m_lLastSeen++;
+		}
 	}
 	if (m_iClassID == ClassID::CObjectSentrygun || m_iClassID == ClassID::CObjectDispenser || m_iClassID == ClassID::CObjectTeleporter) {
 		m_iTeam = Var<int>(netvar.iTeamNum); // TODO
@@ -61,8 +66,13 @@ void CachedEntity::Update(int idx) {
 		m_bIsVisible = (IsEntityVisible(m_pEntity, 0));
 		m_iHealth = Var<int>(netvar.iBuildingHealth);
 		m_iMaxHealth = Var<int>(netvar.iBuildingMaxHealth);
-		if (m_bIsVisible) m_lLastSeen = 0;
-		else m_lLastSeen++;
+		if (m_bIsVisible) {
+			m_lLastSeen = 0;
+			m_lSeenTicks++;
+		} else {
+			m_lSeenTicks = 0;
+			m_lLastSeen++;
+		}
 	}
 }
 
diff --git a/cathook/src/entitycache.h b/cathook/src/entitycache.h
index 0174345e..44f5afd2 100644
--- a/cathook/src/entitycache.h
+++ b/cathook/src/entitycache.h
@@ -42,6 +42,7 @@ public:
 	int m_iHealth;
 
 	bool m_bIsVisible;
+	unsigned long m_lSeenTicks;
 	unsigned long m_lLastSeen;
 
 
diff --git a/cathook/src/enums.h b/cathook/src/enums.h
index 1ad0dfe9..5a17e783 100644
--- a/cathook/src/enums.h
+++ b/cathook/src/enums.h
@@ -530,7 +530,8 @@ enum weaponmode {
 	weapon_melee,
 	weapon_pda,
 	weapon_medigun,
-	weapon_consumable
+	weapon_consumable,
+	weapon_throwable
 };
 
 enum hitbox_t {
diff --git a/cathook/src/globals.cpp b/cathook/src/globals.cpp
index 9b41523a..46b34645 100644
--- a/cathook/src/globals.cpp
+++ b/cathook/src/globals.cpp
@@ -5,20 +5,18 @@
  *      Author: nullifiedcat
  */
 
-#include "globals.h"
-
-#include "helpers.h"
+#include "common.h"
 
 void GlobalSettings::Init() {
-	this->bHackEnabled = CreateConVar("u_enabled", "1", "Hack enabled (GLOBAL)");
-	this->bIgnoreTaunting = CreateConVar("u_ignore_taunting", "1", "Ignore taunting players");
-	this->flForceFOV = CreateConVar("u_fov", "0", "Forces FOV");
-	this->bProfiler = CreateConVar("u_profiler", "0", "Profiler output enabled");
-	this->bNoZoom = CreateConVar("u_nozoom", "0", "No Zoom (Breaks aimbot)");
-	this->bNoFlinch = CreateConVar("u_noflinch", "0", "No-Flinch");
-	this->bSendPackets = CreateConVar("u_sendpackets", "1", "Send packets");
-	this->bShowLogo = CreateConVar("u_logo", "1", "Show logo");
-	this->sDisconnectMsg = CreateConVar("u_disconnect_msg", "", "Set custom disconnect message");
+	this->bHackEnabled = CreateConVar(CON_PREFIX "enabled", "1", "Hack enabled (GLOBAL)");
+	this->bIgnoreTaunting = CreateConVar(CON_PREFIX "ignore_taunting", "1", "Ignore taunting players");
+	this->flForceFOV = CreateConVar(CON_PREFIX "fov", "0", "Forces FOV");
+	this->bProfiler = CreateConVar(CON_PREFIX "profiler", "0", "Profiler output enabled");
+	this->bNoZoom = CreateConVar(CON_PREFIX "nozoom", "0", "No Zoom (Breaks aimbot)");
+	this->bNoFlinch = CreateConVar(CON_PREFIX "noflinch", "0", "No-Flinch");
+	this->bSendPackets = CreateConVar(CON_PREFIX "sendpackets", "1", "Send packets");
+	this->bShowLogo = CreateConVar(CON_PREFIX "logo", "1", "Show logo");
+	this->sDisconnectMsg = CreateConVar(CON_PREFIX "disconnect_msg", "", "Set custom disconnect message");
 }
 
 GlobalSettings g_Settings;
diff --git a/cathook/src/gui/controls.cpp b/cathook/src/gui/controls.cpp
new file mode 100644
index 00000000..250cb709
--- /dev/null
+++ b/cathook/src/gui/controls.cpp
@@ -0,0 +1,50 @@
+/*
+ * controls.cpp
+ *
+ *  Created on: Dec 17, 2016
+ *      Author: nullifiedcat
+ */
+
+#include "controls.h"
+#include "common.h"
+#include "sdk.h"
+
+GUI_List::GUI_List(const char* name) {
+	m_pszListName = name;
+	m_pFirst = 0;
+}
+
+void GUI_List::Draw(int x, int y) {
+	IGUIListElement* current = m_pFirst;
+	int n_elements = 0;
+	while (current) {
+		current->Draw(x + 1, y + 1 + n_elements * VERTICAL_SPACING);
+		n_elements++;
+		current = current->m_pNext;
+	}
+	draw::OutlineRect(x, y, x + LIST_WIDTH, y + n_elements * VERTICAL_SPACING, colors::tf_blu);
+}
+
+void GUI_List::AddElement(IGUIListElement* element) {
+	if (!m_pFirst) {
+		m_pFirst = element;
+		m_pLast = element;
+	}
+	IGUIListElement* current = m_pFirst;
+	while (current) {
+		current = current->m_pNext;
+	}
+	if (current) {
+		current->m_pNext = element;
+		element->m_pPrev = current;
+		m_pLast = current;
+	}
+}
+
+void GUIListElement_Var::GUIListElement_Var(ICatVar* var) {
+	m_pCatVar = var;
+}
+
+void GUIListElement_Var::Draw(int x, int y) {
+
+}
diff --git a/cathook/src/gui/controls.h b/cathook/src/gui/controls.h
new file mode 100644
index 00000000..226111f5
--- /dev/null
+++ b/cathook/src/gui/controls.h
@@ -0,0 +1,43 @@
+/*
+ * controls.h
+ *
+ *  Created on: Dec 17, 2016
+ *      Author: nullifiedcat
+ */
+
+#ifndef CONTROLS_H_
+#define CONTROLS_H_
+
+#define VERTICAL_SPACING 14
+#define LIST_WIDTH 100
+
+class GUI_List {
+public:
+	GUI_List(const char* name);
+	void Draw(int x, int y);
+	void AddElement(IGUIListElement* element);
+
+	IGUIListElement* m_pFirst;
+	IGUIListElement* m_pLast;
+	const char* m_pszListName;
+};
+
+class IGUIListElement {
+public:
+	virtual ~IGUIListElement();
+	virtual void Draw(int x, int y) = 0;
+	virtual void KeyEvent(ButtonCode_t key) = 0;
+	IGUIListElement* m_pNext;
+	IGUIListElement* m_pPrev;
+};
+
+class GUIListElement_Var : public IGUIListElement {
+public:
+	GUIListElement_Var(ICatVar* var);
+	void Draw(int x, int y);
+	void KeyEvent(ButtonCode_t key);
+
+	ICatVar* m_pCatVar;
+};
+
+#endif /* CONTROLS_H_ */
diff --git a/cathook/src/gui/gui.cpp b/cathook/src/gui/gui.cpp
new file mode 100644
index 00000000..7a0e1dd8
--- /dev/null
+++ b/cathook/src/gui/gui.cpp
@@ -0,0 +1,30 @@
+/*
+ * gui.cpp
+ *
+ *  Created on: Dec 17, 2016
+ *      Author: nullifiedcat
+ */
+
+#include "gui.h"
+#include "../common.h"
+#include "../sdk.h"
+
+GUI::GUI() {
+	m_bActive = false;
+}
+
+void GUI::Draw() {
+	if (!m_bActive) return;
+	draw::DrawString(50, 50, colors::pink, colors::black, false, "Menu Active!!");
+}
+
+bool GUI::KeyEvent(ButtonCode_t key) {
+	if (key == KEY_INSERT)
+		m_bActive = !m_bActive;
+	if (!m_bActive) return false;
+	switch (key) {
+	}
+	return false;
+}
+
+GUI* g_pGUI = 0;
diff --git a/cathook/src/gui/gui.h b/cathook/src/gui/gui.h
new file mode 100644
index 00000000..b6c2a7a7
--- /dev/null
+++ b/cathook/src/gui/gui.h
@@ -0,0 +1,24 @@
+/*
+ * gui.h
+ *
+ *  Created on: Dec 17, 2016
+ *      Author: nullifiedcat
+ */
+
+#ifndef GUI_H_
+#define GUI_H_
+
+#include "../sdk.h"
+
+class GUI {
+public:
+	GUI();
+	void Draw();
+	bool KeyEvent(ButtonCode_t key);
+
+	bool m_bActive;
+};
+
+extern GUI* g_pGUI;
+
+#endif /* GUI_H_ */
diff --git a/cathook/src/hack.cpp b/cathook/src/hack.cpp
index 34598457..9cd0c28c 100644
--- a/cathook/src/hack.cpp
+++ b/cathook/src/hack.cpp
@@ -42,6 +42,7 @@
 #include "netmessage.h"
 #include "targeting/ITargetSystem.h"
 #include "profiler.h"
+#include "gui/gui.h"
 
 #include "sdk.h"
 #include "copypasted/CSignature.h"
@@ -140,6 +141,7 @@ void hack::Hk_PaintTraverse(void* p, unsigned int vp, bool fr, bool ar) {
 				}
 			}
 		}
+		g_pGUI->Draw();
 		DrawStrings();
 	}
 }
@@ -149,6 +151,14 @@ bool Hk_CanPacket(void* thisptr) {
 	return g_Settings.bSendPackets->GetBool() && ((CanPacket_t*)hooks::hkNetChannel->GetMethod(hooks::offCanPacket))(thisptr);
 }
 
+typedef int(IN_KeyEvent_t)(void* thisptr, int eventcode, ButtonCode_t keynum, const char* pszCurrentBinding);
+int Hk_IN_KeyEvent(void* thisptr, int eventcode, ButtonCode_t keynum, const char* pszCurrentBinding) {
+	if (eventcode == 1) {
+		if (g_pGUI->KeyEvent(keynum)) return 1;
+	}
+	return ((IN_KeyEvent_t*)hooks::hkClient->GetMethod(hooks::offKeyEvent))(thisptr, eventcode, keynum, pszCurrentBinding);
+}
+
 typedef bool(SendNetMsg_t)(void* thisptr, INetMessage& msg, bool forcereliable, bool voice);
 bool Hk_SendNetMsg(void* thisptr, INetMessage& msg, bool bForceReliable = false, bool bVoice = false) {
 	//logging::Info("Sending NetMsg! %i", msg.GetType());
@@ -168,7 +178,7 @@ bool Hk_SendNetMsg(void* thisptr, INetMessage& msg, bool bForceReliable = false,
 typedef void(Shutdown_t)(void*, const char*);
 void Hk_Shutdown(void* thisptr, const char* reason) {
 	const char* new_reason;
-	if (g_Settings.sDisconnectMsg->m_StringLength > 0) {
+	if (g_Settings.sDisconnectMsg->m_StringLength > 1) {
 		new_reason = g_Settings.sDisconnectMsg->GetString();
 	} else {
 		new_reason = reason;
@@ -309,6 +319,16 @@ void hack::InitHacks() {
 	ADD_HACK(SpyAlert);
 }
 
+ConCommand* hack::c_Cat = 0;
+
+void hack::CC_Cat(const CCommand& args) {
+	interfaces::cvar->ConsoleColorPrintf(colors::tf_blu, "CatHook");
+	interfaces::cvar->ConsoleColorPrintf(colors::white, " by ");
+	interfaces::cvar->ConsoleColorPrintf(colors::tf_blu, "d4rkc4t\n");
+	interfaces::cvar->ConsoleColorPrintf(colors::white, "Build: " __DATE__ " " __TIME__"\n");
+	interfaces::cvar->ConsoleColorPrintf(colors::tf_red, "[DEVELOPER BUILD]\n");
+}
+
 void hack::Initialize() {
 	logging::Initialize();
 	logging::Info("Build: " __DATE__ " " __TIME__);
@@ -325,6 +345,7 @@ void hack::Initialize() {
 	draw::Initialize();
 	logging::Info("Adding hacks...");
 	BeginConVars();
+	hack::c_Cat = CreateConCommand(CON_NAME, &hack::CC_Cat, "Info");
 	hack::InitHacks();
 	logging::Info("Init global settings");
 	g_Settings.Init();
@@ -348,6 +369,7 @@ void hack::Initialize() {
 	while(!(clientMode = **(uintptr_t***)((uintptr_t)((*(void***)interfaces::baseClient)[10]) + 1))) {
 		sleep(1);
 	}
+	g_pGUI = new GUI();
 	hooks::hkClientMode->Init((void*)clientMode, 0);
 	hooks::hkClientMode->HookMethod((void*)&hack::Hk_CreateMove, hooks::offCreateMove);
 	hooks::hkClientMode->HookMethod((void*)&hack::Hk_OverrideView, hooks::offOverrideView);
@@ -356,6 +378,7 @@ void hack::Initialize() {
 	hooks::hkClient->Init((void*)interfaces::baseClient, 0);
 	hooks::hkClient->HookMethod((void*)&hack::Hk_FrameStageNotify, hooks::offFrameStageNotify);
 	hooks::hkClient->HookMethod((void*)&hack::Hk_DispatchUserMessage, hooks::offFrameStageNotify + 1);
+	hooks::hkClient->HookMethod((void*)&Hk_IN_KeyEvent, hooks::offKeyEvent);
 	hooks::hkClient->Apply();
 	logging::Info("Hooked!");
 	InitStrings();
diff --git a/cathook/src/hack.h b/cathook/src/hack.h
index 5b887b5a..ffd3ba9f 100644
--- a/cathook/src/hack.h
+++ b/cathook/src/hack.h
@@ -20,6 +20,8 @@ class IHack;
 class CUserCmd;
 class CViewSetup;
 class bf_read;
+class ConCommand;
+class CCommand;
 
 namespace hack {
 
@@ -41,6 +43,9 @@ void Shutdown();
 
 void InitHacks();
 
+void CC_Cat(const CCommand& args);
+extern ConCommand* c_Cat;
+
 }
 
 #endif /* HACK_H_ */
diff --git a/cathook/src/hacks/Aimbot.cpp b/cathook/src/hacks/Aimbot.cpp
index 07b806e2..785912d2 100644
--- a/cathook/src/hacks/Aimbot.cpp
+++ b/cathook/src/hacks/Aimbot.cpp
@@ -67,10 +67,12 @@ Aimbot::Aimbot() {
 	this->v_fSmoothValue = CreateConVar(CON_PREFIX "aimbot_smooth_value", "0.2", "Smooth value");
 	this->v_iAimKey = CreateConVar(CON_PREFIX "aimbot_aimkey", "0", "Aim Key");
 	this->v_iPriorityMode = CreateConVar(CON_PREFIX "aimbot_prioritymode", "0", "Priority mode [SMART/FOV/DISTANCE/HEALTH]");
+	this->v_bMinigunFix = CreateConVar(CON_PREFIX "aimbot_minigun_fix", "1", "Minigun fix [EXPERIMENTAL]");
 	v_bAimBuildings = CreateConVar(CON_PREFIX "aimbot_buildings", "1", "Aim at buildings");
 	v_bActiveOnlyWhenCanShoot = CreateConVar(CON_PREFIX "aimbot_only_when_can_shoot", "1", "Aimbot active only when can shoot");
 	v_fSmoothAutoshootTreshold = CreateConVar(CON_PREFIX "aimbot_smooth_autoshoot_treshold", "0.01", "Smooth aim autoshoot treshold");
 	this->v_fSmoothRandomness = CreateConVar(CON_PREFIX "aimbot_smooth_randomness", "1.0", "Smooth randomness");
+	this->v_iSeenDelay = CreateConVar(CON_PREFIX "aimbot_delay", "0", "Delay before shooting if enemy was invisible");
 	fix_silent = false;
 }
 
@@ -96,6 +98,7 @@ bool Aimbot::CreateMove(void*, float, CUserCmd* cmd) {
 	case weapon_medigun:
 	case weapon_pda:
 	case weapon_consumable:
+	case weapon_throwable:
 		return true;
 	};
 
@@ -259,6 +262,7 @@ bool Aimbot::ShouldTarget(IClientEntity* entity) {
 	if (!entity) return false;
 	if (entity->IsDormant()) return false;
 	if (IsPlayer(entity)) {
+		if (gEntityCache.GetEntity(entity->entindex())->m_lSeenTicks < this->v_iSeenDelay->GetInt()) return false;
 		if (IsPlayerInvulnerable(entity)) return false;
 		int team = GetEntityValue<int>(entity, netvar.iTeamNum);
 		int local = interfaces::engineClient->GetLocalPlayer();
diff --git a/cathook/src/hacks/Aimbot.h b/cathook/src/hacks/Aimbot.h
index d810a7c4..83d84d81 100644
--- a/cathook/src/hacks/Aimbot.h
+++ b/cathook/src/hacks/Aimbot.h
@@ -41,6 +41,7 @@ public:
 	bool m_bAimKeySwitch;
 	ConVar* v_iAimKey;
 	ConVar* v_iAimKeyMode;
+	ConVar* v_bMinigunFix;
 	ConVar* v_bSmooth;
 	ConVar* v_fSmoothValue;
 	ConVar* v_bDebug;
@@ -48,6 +49,7 @@ public:
 	ConVar* v_fFOV;
 	ConVar* v_iHitbox;
 	ConVar* v_bAutoHitbox;
+	ConVar* v_iSeenDelay;
 	ConVar* v_bPrediction;
 	ConVar* v_bAutoShoot;
 	ConVar* v_bSilent;
diff --git a/cathook/src/hacks/Airstuck.cpp b/cathook/src/hacks/Airstuck.cpp
index d6870d75..367afd3d 100644
--- a/cathook/src/hacks/Airstuck.cpp
+++ b/cathook/src/hacks/Airstuck.cpp
@@ -23,8 +23,6 @@ const char* Airstuck::GetName() {
 }
 
 bool Airstuck::CreateMove(void*, float, CUserCmd* cmd) {
-	interfaces::cvar->FindVar("net_fakeloss")->SetValue(0);
-	interfaces::cvar->FindVar("host_timescale")->SetValue(1.0f);
 	if (v_bStuck->GetBool()) {
 		if (cmd->buttons & (IN_ATTACK | IN_ATTACK2)) {
 			return true;
diff --git a/cathook/src/hacks/ESP.cpp b/cathook/src/hacks/ESP.cpp
index 2014e7f1..26e05818 100644
--- a/cathook/src/hacks/ESP.cpp
+++ b/cathook/src/hacks/ESP.cpp
@@ -38,7 +38,7 @@ ESP::ESP() {
 	this->v_bEnabled = CreateConVar(CON_PREFIX "esp_enabled", "0", "Enables ESP");
 	this->v_bEntityESP = CreateConVar(CON_PREFIX "esp_entity", "0", "Entity ESP (dev)");
 	this->v_bTeammates = CreateConVar(CON_PREFIX "esp_teammates", "0", "ESP own team");
-	this->v_bItemESP = CreateConVar(CON_PREFIX "esp_item", "0", "Item ESP (powerups, health packs, etc)");
+	this->v_bItemESP = CreateConVar(CON_PREFIX "esp_item", "1", "Item ESP (powerups, health packs, etc)");
 	this->v_bTeammatePowerup = CreateConVar(CON_PREFIX "esp_powerup_team", "1", "Show powerups on teammates if u_esp_teammates is 0");
 	this->v_bShowEntityID = CreateConVar(CON_PREFIX "esp_entity_id", "0", "Shows EID");
 	this->v_bShowDistance = CreateConVar(CON_PREFIX "esp_distance", "1", "Distance ESP");
@@ -52,8 +52,10 @@ ESP::ESP() {
 	v_bShowAmmoPacks = CreateConVar(CON_PREFIX "esp_item_ammo", "0", "Show ammo packs");
 	v_bShowHealthPacks = CreateConVar(CON_PREFIX "esp_item_health", "1", "Show health packs");
 	v_bShowPowerups = CreateConVar(CON_PREFIX "esp_item_powerups", "1", "Show powerups");
+	this->v_bShowTank = CreateConVar(CON_PREFIX "esp_show_tank", "1", "Tank ESP");
 	v_bShowHealthNumbers = CreateConVar(CON_PREFIX "esp_health_num", "1", "Show health number");
 	v_bShowMoney = CreateConVar(CON_PREFIX "esp_money", "1", "MvM money");
+	v_bShowRedMoney = CreateConVar(CON_PREFIX "esp_money_red", "1", "Red MvM money");
 }
 
 #define ESP_HEIGHT 14
@@ -158,6 +160,10 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 	}
 
 	switch (ent->m_iClassID) {
+	case ClassID::CTFTankBoss: {
+		if (!this->v_bShowTank->GetBool()) break;
+		ent->AddESPString(color, bgclr, "Tank");
+	} break;
 	case ClassID::CTFDroppedWeapon: {
 		if (!this->v_bItemESP->GetBool()) break;
 		if (!this->v_bShowDroppedWeapons->GetBool()) break;
@@ -178,9 +184,17 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 	}
 	case ClassID::CCurrencyPack: {
 		if (!v_bShowMoney->GetBool()) break;
-		color = colors::green;
-		ent->AddESPString(color, bgclr, "$$$");
-		ent->AddESPString(color, bgclr, "%im", (int)(ent->m_flDistance / 64 * 1.22f));
+		if (false && ent->Var<int>(netvar.bDistributed)) {
+			if (this->v_bShowRedMoney->GetBool()) {
+				color = colors::tf_red;
+				ent->AddESPString(color, bgclr, "$$$");
+				ent->AddESPString(color, bgclr, "%im", (int)(ent->m_flDistance / 64 * 1.22f));
+			}
+		} else {
+			color = colors::green;
+			ent->AddESPString(color, bgclr, "$$$");
+			ent->AddESPString(color, bgclr, "%im", (int)(ent->m_flDistance / 64 * 1.22f));
+		}
 	} break;
 	case ClassID::CBaseAnimating: {
 		if (!this->v_bItemESP->GetBool()) break;
diff --git a/cathook/src/hacks/ESP.h b/cathook/src/hacks/ESP.h
index b3297b69..5e494943 100644
--- a/cathook/src/hacks/ESP.h
+++ b/cathook/src/hacks/ESP.h
@@ -31,9 +31,11 @@ public:
 	ConVar* v_bShowHealthPacks;
 	ConVar* v_bShowPowerups;
 	ConVar* v_bShowMoney;
+	ConVar* v_bShowRedMoney;
 	ConVar* v_bTeammatePowerup;
 	ConVar* v_bShowHead;
 	ConVar* v_bShowEntityID;
+	ConVar* v_bShowTank;
 	ConVar* v_bBox;
 	ConVar* v_bShowDistance;
 	ConVar* v_bShowFriendID;
diff --git a/cathook/src/hacks/Misc.cpp b/cathook/src/hacks/Misc.cpp
index f316eb7f..c3064674 100644
--- a/cathook/src/hacks/Misc.cpp
+++ b/cathook/src/hacks/Misc.cpp
@@ -328,7 +328,7 @@ void Misc::PaintTraverse(void*, unsigned int, bool, bool) {
 			AddSideString(draw::white, draw::black, "Speed: %f", speed);
 			AddSideString(draw::white, draw::black, "Gravity: %f", gravity);
 			AddSideString(draw::white, draw::black, "IsZoomed: %i", g_pLocalPlayer->bWasZoomed);
-			AddSideString(draw::white, draw::black, "???: %f", GetEntityValue<float>(g_pLocalPlayer->entity, netvar.test));
+			//AddSideString(draw::white, draw::black, "???: %f", GetEntityValue<float>(g_pLocalPlayer->entity, netvar.test));
 			//AddSideString(draw::white, draw::black, "VecPunchAngle: %f %f %f", pa.x, pa.y, pa.z);
 			//draw::DrawString(10, y, draw::white, draw::black, false, "VecPunchAngleVel: %f %f %f", pav.x, pav.y, pav.z);
 			//y += 14;
diff --git a/cathook/src/helpers.cpp b/cathook/src/helpers.cpp
index d7bfd851..2ea3e7f2 100644
--- a/cathook/src/helpers.cpp
+++ b/cathook/src/helpers.cpp
@@ -430,6 +430,9 @@ weaponmode GetWeaponMode(IClientEntity* player) {
 	case ClassID::CTFFlareGun_Revenge:
 	case ClassID::CTFSyringeGun:
 		return weaponmode::weapon_projectile;
+	case ClassID::CTFJar:
+	case ClassID::CTFJarMilk:
+		return weaponmode::weapon_throwable;
 	};
 	if (weapon_handle == GetEntityValue<int>(player, netvar.hMyWeapons + sizeof(int) * 3)) return weaponmode::weapon_pda;
 	if (GetEntityValue<int>(player, netvar.iClass) == tf_class::tf_medic) {
@@ -775,6 +778,22 @@ void RunEnginePrediction(IClientEntity* ent, CUserCmd *ucmd) {
 	return;
 }
 
+float oldCurtime;
+float oldFrametime;
+
+void StartPrediction(CUserCmd* cmd) {
+	oldCurtime = interfaces::gvars->curtime;
+	oldFrametime = interfaces::gvars->frametime;
+	interfaces::gvars->curtime = GetEntityValue<int>(g_pLocalPlayer->entity, netvar.nTickBase) * interfaces::gvars->interval_per_tick;
+	interfaces::gvars->frametime = interfaces::gvars->interval_per_tick;
+	//interfaces::gamemovement->
+}
+
+void EndPrediction() {
+	interfaces::gvars->curtime = oldCurtime;
+	interfaces::gvars->frametime = oldFrametime;
+}
+
 char* strfmt(const char* fmt, ...) {
 	char* buf = new char[1024];
 	va_list list;
diff --git a/cathook/src/helpers.h b/cathook/src/helpers.h
index d4f50101..6a59eace 100644
--- a/cathook/src/helpers.h
+++ b/cathook/src/helpers.h
@@ -83,6 +83,9 @@ bool IsEntityVisiblePenetration(IClientEntity* entity, int hb);
 
 void RunEnginePrediction(IClientEntity* ent, CUserCmd *ucmd = NULL);
 
+void StartPrediction(CUserCmd* cmd);
+void EndPrediction();
+
 // Stolen Code
 
 // F1 c&p
diff --git a/cathook/src/hooks.cpp b/cathook/src/hooks.cpp
index 5ecca006..f2909acf 100644
--- a/cathook/src/hooks.cpp
+++ b/cathook/src/hooks.cpp
@@ -18,6 +18,7 @@ unsigned int hooks::offFrameStageNotify = 35;
 unsigned int hooks::offCanPacket = 57;
 unsigned int hooks::offSendNetMsg = 41;
 unsigned int hooks::offShutdown = 37;
+unsigned int hooks::offKeyEvent = 20;
 
 // This thing had been copypasted from somewhere, maybe from F1Public.
 
@@ -72,3 +73,4 @@ hooks::VMTHook* hooks::hkClientMode = 0;
 hooks::VMTHook* hooks::hkPanel = 0;
 hooks::VMTHook* hooks::hkClient = 0;
 hooks::VMTHook* hooks::hkNetChannel = 0;
+hooks::VMTHook* hooks::hkClientDLL = 0;
diff --git a/cathook/src/hooks.h b/cathook/src/hooks.h
index 7fa27b76..230f0675 100644
--- a/cathook/src/hooks.h
+++ b/cathook/src/hooks.h
@@ -35,6 +35,7 @@ extern VMTHook* hkPanel;
 extern VMTHook* hkClientMode;
 extern VMTHook* hkClient;
 extern VMTHook* hkNetChannel;
+extern VMTHook* hkClientDLL;
 
 extern unsigned int offPaintTraverse;
 extern unsigned int offCreateMove;
@@ -43,6 +44,7 @@ extern unsigned int offFrameStageNotify;
 extern unsigned int offCanPacket;
 extern unsigned int offSendNetMsg;
 extern unsigned int offShutdown;
+extern unsigned int offKeyEvent;
 
 }
 
diff --git a/cathook/src/logging.cpp b/cathook/src/logging.cpp
index cbcb6b60..298061bf 100644
--- a/cathook/src/logging.cpp
+++ b/cathook/src/logging.cpp
@@ -20,7 +20,7 @@ FILE* logging::handle = 0;
 void logging::Initialize() {
 	passwd* pwd = getpwuid(getuid());
 	char* user = pwd->pw_name;
-	logging::handle = fopen(strfmt("/tmp/uran-%s.log", user), "w");
+	logging::handle = fopen(strfmt("/tmp/cathook-%s.log", user), "w");
 }
 
 void logging::Info(const char* fmt, ...) {
@@ -32,7 +32,7 @@ void logging::Info(const char* fmt, ...) {
 	va_end(list);
 	size_t length = strlen(buffer);
 	char* result = new char[length + 9];
-	sprintf(result, "[Hack] %s\n", buffer);
+	sprintf(result, "[CAT] %s\n", buffer);
 	fprintf(logging::handle, "%s", result);
 	fflush(logging::handle);
 	if (interfaces::cvar) {
diff --git a/cathook/src/targeting/ITargetSystem.cpp b/cathook/src/targeting/ITargetSystem.cpp
index 511f48df..c6c085c3 100644
--- a/cathook/src/targeting/ITargetSystem.cpp
+++ b/cathook/src/targeting/ITargetSystem.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "ITargetSystem.h"
-#include "../helpers.h"
+#include "../common.h"
 
 TargetingConVars* g_pTargetingConVars = 0;
 
@@ -14,9 +14,9 @@ ITargetSystem::~ITargetSystem() {}
 
 void InitTargetingConVars() {
 	g_pTargetingConVars = new TargetingConVars();
-	g_pTargetingConVars->bTargetInvisible = CreateConVar("u_target_ignore_cloak", "0", "Ignore cloak when targeting");
-	g_pTargetingConVars->flMaxFOV = CreateConVar("u_target_max_fov", "0", "Maximum FOV when targeting");
-	g_pTargetingConVars->iMaxDistance = CreateConVar("u_target_max_distance", "0", "Maximum distance when targeting");
+	g_pTargetingConVars->bTargetInvisible = CreateConVar(CON_PREFIX "target_ignore_cloak", "0", "Ignore cloak when targeting");
+	g_pTargetingConVars->flMaxFOV = CreateConVar(CON_PREFIX "target_max_fov", "0", "Maximum FOV when targeting");
+	g_pTargetingConVars->iMaxDistance = CreateConVar(CON_PREFIX "target_max_distance", "0", "Maximum distance when targeting");
 }
 
 
diff --git a/uran/.project b/uran/.project
deleted file mode 100644
index 8f65f418..00000000
--- a/uran/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cathook</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>0</id>
-			<name>src_</name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>