diff --git a/.gitignore b/.gitignore index b548b8c..6032c01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .idea/ out/ G-Earth2.iml -Extensions/ +/Extensions +/G-WinMem/.vs +/G-WinMem/x64 \ No newline at end of file diff --git a/G-WinMem/.vs/G-WinMem/v15/.suo b/G-WinMem/.vs/G-WinMem/v15/.suo deleted file mode 100644 index c9a09fe..0000000 Binary files a/G-WinMem/.vs/G-WinMem/v15/.suo and /dev/null differ diff --git a/G-WinMem/.vs/G-WinMem/v15/Browse.VC.db b/G-WinMem/.vs/G-WinMem/v15/Browse.VC.db deleted file mode 100644 index 47e31c3..0000000 Binary files a/G-WinMem/.vs/G-WinMem/v15/Browse.VC.db and /dev/null differ diff --git a/G-WinMem/.vs/G-WinMem/v15/Browse.VC.opendb b/G-WinMem/.vs/G-WinMem/v15/Browse.VC.opendb deleted file mode 100644 index d760d0a..0000000 Binary files a/G-WinMem/.vs/G-WinMem/v15/Browse.VC.opendb and /dev/null differ diff --git a/G-WinMem/.vs/G-WinMem/v15/ipch/960673476d9ee23e.ipch b/G-WinMem/.vs/G-WinMem/v15/ipch/960673476d9ee23e.ipch deleted file mode 100644 index aba0923..0000000 Binary files a/G-WinMem/.vs/G-WinMem/v15/ipch/960673476d9ee23e.ipch and /dev/null differ diff --git a/G-WinMem/.vs/G-WinMem/v15/ipch/da78a184f7c6129b.ipch b/G-WinMem/.vs/G-WinMem/v15/ipch/da78a184f7c6129b.ipch deleted file mode 100644 index 7f51fc9..0000000 Binary files a/G-WinMem/.vs/G-WinMem/v15/ipch/da78a184f7c6129b.ipch and /dev/null differ diff --git a/G-WinMem/G-WinMem/G-WinMem.vcxproj b/G-WinMem/G-WinMem/G-WinMem.vcxproj index 862b848..6285c9b 100644 --- a/G-WinMem/G-WinMem/G-WinMem.vcxproj +++ b/G-WinMem/G-WinMem/G-WinMem.vcxproj @@ -23,7 +23,7 @@ {D445BBD6-23E4-40AD-BB05-39E0401D7421} Win32Proj GWinMem - 10.0.17134.0 + 10.0.16299.0 diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.log b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.log new file mode 100644 index 0000000..a2dac04 --- /dev/null +++ b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.log @@ -0,0 +1,4 @@ + stdafx.cpp + G-WinMem.cpp +c:\users\jeunez\g-earth\g-winmem\g-winmem\g-winmem.cpp(119): warning C4244: 'argument': conversion from 'DWORD' to 'u_short', possible loss of data + G-WinMem.vcxproj -> C:\Users\Jeunez\G-Earth\G-WinMem\x64\Debug\G-WinMem.exe diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.obj b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.obj new file mode 100644 index 0000000..822ae6d Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.obj differ diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.pch b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.pch new file mode 100644 index 0000000..2c60fe3 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.pch differ diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.command.1.tlog b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.command.1.tlog new file mode 100644 index 0000000..f8185c1 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.command.1.tlog differ diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.read.1.tlog b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.read.1.tlog new file mode 100644 index 0000000..55b3512 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.read.1.tlog differ diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.write.1.tlog b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.write.1.tlog new file mode 100644 index 0000000..9cb6eef Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/CL.write.1.tlog differ diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/G-WinMem.lastbuildstate b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/G-WinMem.lastbuildstate new file mode 100644 index 0000000..a6c546f --- /dev/null +++ b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/G-WinMem.lastbuildstate @@ -0,0 +1,2 @@ +#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0.16299.0 +Debug|x64|C:\Users\Jeunez\G-Earth\G-WinMem\| diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.command.1.tlog b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.command.1.tlog new file mode 100644 index 0000000..07219d7 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.command.1.tlog differ diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.read.1.tlog b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.read.1.tlog new file mode 100644 index 0000000..70ca125 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.read.1.tlog differ diff --git a/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.write.1.tlog b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.write.1.tlog new file mode 100644 index 0000000..5dbf5c8 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/G-WinMem.tlog/link.write.1.tlog differ diff --git a/G-WinMem/G-WinMem/x64/Debug/stdafx.obj b/G-WinMem/G-WinMem/x64/Debug/stdafx.obj new file mode 100644 index 0000000..f15d0fd Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/stdafx.obj differ diff --git a/G-WinMem/G-WinMem/x64/Debug/vc141.idb b/G-WinMem/G-WinMem/x64/Debug/vc141.idb new file mode 100644 index 0000000..0273799 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/vc141.idb differ diff --git a/G-WinMem/G-WinMem/x64/Debug/vc141.pdb b/G-WinMem/G-WinMem/x64/Debug/vc141.pdb new file mode 100644 index 0000000..5def2d4 Binary files /dev/null and b/G-WinMem/G-WinMem/x64/Debug/vc141.pdb differ diff --git a/desktop.ini b/desktop.ini deleted file mode 100644 index 808f178..0000000 --- a/desktop.ini +++ /dev/null @@ -1,3 +0,0 @@ -[LocalizedFileNames] -jna-4.5.1.jar=@jna-4.5.1.jar,0 -jna-platform-4.5.1.jar=@jna-platform-4.5.1.jar,0 diff --git a/git b/git deleted file mode 100644 index e69de29..0000000 diff --git a/jna-4.5.1.jar b/jna-4.5.1.jar deleted file mode 100644 index 68216af..0000000 Binary files a/jna-4.5.1.jar and /dev/null differ diff --git a/jna-platform-4.5.1.jar b/jna-platform-4.5.1.jar deleted file mode 100644 index 5aeb3e4..0000000 Binary files a/jna-platform-4.5.1.jar and /dev/null differ diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index 889dc56..6948c82 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Main-Class: main.extensions.examples.adminonconnect.AdminOnConnect - +Manifest-Version: 1.0 +Main-Class: main.Main + diff --git a/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java b/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java index 969bf2b..92baebf 100644 --- a/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java +++ b/src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java @@ -31,7 +31,6 @@ public class WindowsHabboClient extends HabboClient { while((line = reader.readLine()) != null) { if (line.length() > 1) { possibleData.add(line); - System.out.println(line); } } p.destroy(); @@ -42,13 +41,12 @@ public class WindowsHabboClient extends HabboClient { public List getRC4possibilities() { List result = new ArrayList<>(); try { - Thread.sleep(3000); ArrayList possibleData = readPossibleBytes(); for (String possibleHexStr : possibleData) { result.add(DatatypeConverter.parseHexBinary(possibleHexStr)); } - } catch (IOException | URISyntaxException | InterruptedException e) { + } catch (IOException | URISyntaxException e) { e.printStackTrace(); } return result;