Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

i most likely changed something... i will be redoing this project fro…

…m scratch soon, this code is way too messy
  • Loading branch information...
commit 807d623e4256a2e7aba6bc0afb972188d75eb179 1 parent a2b407f
@contra authored
Showing with 194 additions and 108 deletions.
  1. +146 −78 .idea/workspace.xml
  2. BIN  out/artifacts/JMD/JMD.jar
  3. BIN  out/production/JMD/net/contra/jmd/Deobfuscator.class
  4. BIN  out/production/JMD/net/contra/jmd/allatori/AllatoriTransformer.class
  5. BIN  out/production/JMD/net/contra/jmd/dasho/DashOTransformer.class
  6. BIN  out/production/JMD/net/contra/jmd/generic/ForeignCallRemover.class
  7. BIN  out/production/JMD/net/contra/jmd/generic/GenericStringDeobfuscator.class
  8. BIN  out/production/JMD/net/contra/jmd/generic/Renamer.class
  9. BIN  out/production/JMD/net/contra/jmd/generic/StringFixer.class
  10. BIN  out/production/JMD/net/contra/jmd/generic/StringScanner.class
  11. BIN  out/production/JMD/net/contra/jmd/generic/TransformerTemplate.class
  12. BIN  out/production/JMD/net/contra/jmd/jshrink/JShrinkTransformer.class
  13. BIN  out/production/JMD/net/contra/jmd/jshrink/StoreHandler.class
  14. BIN  out/production/JMD/net/contra/jmd/smokescreen/SmokeScreenTransformer.class
  15. BIN  out/production/JMD/net/contra/jmd/util/GenericClassLoader.class
  16. BIN  out/production/JMD/net/contra/jmd/zkm/ZKMTransformer$1.class
  17. BIN  out/production/JMD/net/contra/jmd/zkm/ZKMTransformer$2.class
  18. BIN  out/production/JMD/net/contra/jmd/zkm/ZKMTransformer.class
  19. +6 −6 src/net/contra/jmd/Deobfuscator.java
  20. +17 −0 src/net/contra/jmd/Transformer.java
  21. +3 −5 src/net/contra/jmd/{ → transformers}/allatori/AllatoriTransformer.java
  22. +1 −1  src/net/contra/jmd/{ → transformers}/dasho/DashOTransformer.java
  23. +1 −1  src/net/contra/jmd/{ → transformers}/generic/ForeignCallRemover.java
  24. +3 −2 src/net/contra/jmd/{ → transformers}/generic/GenericStringDeobfuscator.java
  25. +2 −2 src/net/contra/jmd/{ → transformers}/generic/Renamer.java
  26. +1 −1  src/net/contra/jmd/{ → transformers}/generic/StringFixer.java
  27. +1 −1  src/net/contra/jmd/{ → transformers}/generic/StringScanner.java
  28. +1 −1  src/net/contra/jmd/{ → transformers}/generic/TransformerTemplate.java
  29. +7 −3 src/net/contra/jmd/{ → transformers}/jshrink/JShrinkTransformer.java
  30. +1 −1  src/net/contra/jmd/{ → transformers}/jshrink/StoreHandler.java
  31. +1 −2  src/net/contra/jmd/{ → transformers}/smokescreen/SmokeScreenTransformer.java
  32. +2 −4 src/net/contra/jmd/{ → transformers}/zkm/ZKMTransformer.java
  33. +1 −0  src/net/contra/jmd/util/GenericClassLoader.java
View
224 .idea/workspace.xml
@@ -3,9 +3,20 @@
<component name="ChangeListManager">
<list default="true" id="5c19ffb3-2980-48ba-a407-712bf5a16688" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/contra/jmd/generic/Renamer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/generic/Renamer.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/contra/jmd/util/GenericMethods.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/util/GenericMethods.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/contra/jmd/zkm/ZKMTransformer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/zkm/ZKMTransformer.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/contra/jmd/Deobfuscator.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/Deobfuscator.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/contra/jmd/util/GenericClassLoader.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/util/GenericClassLoader.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\allatori\AllatoriTransformer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/allatori/AllatoriTransformer.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\dasho\DashOTransformer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/dasho/DashOTransformer.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\generic\ForeignCallRemover.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/ForeignCallRemover.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\generic\GenericStringDeobfuscator.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/GenericStringDeobfuscator.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\generic\Renamer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/Renamer.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\generic\StringFixer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/StringFixer.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\generic\StringScanner.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/StringScanner.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\generic\TransformerTemplate.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/TransformerTemplate.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\jshrink\JShrinkTransformer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/jshrink/JShrinkTransformer.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\jshrink\StoreHandler.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/jshrink/StoreHandler.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\smokescreen\SmokeScreenTransformer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/smokescreen/SmokeScreenTransformer.java" />
+ <change type="MOVED" beforePath="F:\JMD\src\net\contra\jmd\zkm\ZKMTransformer.java" afterPath="$PROJECT_DIR$/src/net/contra/jmd/transformers/zkm/ZKMTransformer.java" />
</list>
<ignored path="JMD.iws" />
<ignored path=".idea/workspace.xml" />
@@ -25,7 +36,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/src/net/contra/jmd/jshrink/JShrinkTransformer.java" line="2" class="Class at JShrinkTransformer.java:2" package="">
+ <breakpoint url="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/jshrink/JShrinkTransformer.java" line="2" class="Class at JShrinkTransformer.java:2" package="">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -86,7 +97,7 @@
<file leaf-file-name="Deobfuscator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/contra/jmd/Deobfuscator.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="29" selection-start="2391" selection-end="2391" vertical-scroll-proportion="0.0">
+ <state line="74" column="76" selection-start="3212" selection-end="3212" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -101,19 +112,46 @@
</provider>
</entry>
</file>
- <file leaf-file-name="ZKMTransformer.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/zkm/ZKMTransformer.java">
+ <file leaf-file-name="AllatoriTransformer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/allatori/AllatoriTransformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="339" column="147" selection-start="12279" selection-end="12279" vertical-scroll-proportion="0.3596154">
+ <state line="53" column="49" selection-start="1636" selection-end="1636" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Renamer.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/generic/Renamer.java">
+ <file leaf-file-name="JShrinkTransformer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/jshrink/JShrinkTransformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="85" selection-start="292" selection-end="292" vertical-scroll-proportion="0.0">
+ <state line="99" column="27" selection-start="3326" selection-end="3326" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="GenericClassLoader.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/util/GenericClassLoader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="18" column="12" selection-start="433" selection-end="433" vertical-scroll-proportion="0.5387597">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="GenericStringDeobfuscator.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/GenericStringDeobfuscator.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="80" column="44" selection-start="3481" selection-end="3481" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DashOTransformer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/dasho/DashOTransformer.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="18" column="30" selection-start="416" selection-end="416" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -133,11 +171,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/src/net/contra/jmd/generic/StringScanner.java" />
- <option value="$PROJECT_DIR$/src/net/contra/jmd/obfuscate.java" />
- <option value="$PROJECT_DIR$/src/net/contra/jmd/generic/ForeignCallRemover.java" />
- <option value="$PROJECT_DIR$/src/net/contra/jmd/util/GenericClassLoader.java" />
- <option value="$PROJECT_DIR$/src/net/contra/jmd/util/LogHandler.java" />
<option value="$PROJECT_DIR$/src/net/contra/jmd/Deobfuscator.java" />
<option value="$PROJECT_DIR$/src/net/contra/jmd/generic/TransformerTemplate.java" />
<option value="$PROJECT_DIR$/src/net/contra/jmd/jshrink/StoreHandler.java" />
@@ -147,8 +180,13 @@
<option value="$PROJECT_DIR$/src/net/contra/jmd/jshrink/JShrinkTransformer.java" />
<option value="$PROJECT_DIR$/src/net/contra/jmd/generic/StringFixer.java" />
<option value="$PROJECT_DIR$/src/net/contra/jmd/util/GenericMethods.java" />
- <option value="$PROJECT_DIR$/src/net/contra/jmd/generic/Renamer.java" />
<option value="$PROJECT_DIR$/src/net/contra/jmd/zkm/ZKMTransformer.java" />
+ <option value="$PROJECT_DIR$/src/net/contra/jmd/generic/Renamer.java" />
+ <option value="$PROJECT_DIR$/src/net/contra/jmd/Transformer.java" />
+ <option value="$PROJECT_DIR$/src/net/contra/jmd/transformers/jshrink/JShrinkTransformer.java" />
+ <option value="$PROJECT_DIR$/src/net/contra/jmd/transformers/allatori/AllatoriTransformer.java" />
+ <option value="$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/GenericStringDeobfuscator.java" />
+ <option value="$PROJECT_DIR$/src/net/contra/jmd/util/GenericClassLoader.java" />
</list>
</option>
</component>
@@ -190,6 +228,7 @@
<sortByType />
</navigator>
<panes>
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -244,15 +283,40 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="zkm" />
+ <option name="myItemId" value="transformers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JMD" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JMD" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jmd" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="transformers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="generic" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="PackagesPane" />
- <pane id="Favorites" />
<pane id="Scope" />
+ <pane id="Favorites" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -268,9 +332,9 @@
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
- <property name="dynamic.classpath" value="false" />
- <property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
+ <property name="dynamic.classpath" value="false" />
</component>
<component name="RunManager" selected="Application.JMD">
<configuration default="true" type="Remote" factoryName="Remote">
@@ -285,6 +349,24 @@
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Make" enabled="true" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -317,24 +399,6 @@
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Make" enabled="true" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
<configuration default="true" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -382,7 +446,7 @@
<configuration default="false" name="JMD" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="net.contra.jmd.Deobfuscator" />
<option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="&quot;C:/Contra/ArbiMAGE-deob.jar&quot; renamer true" />
+ <option name="PROGRAM_PARAMETERS" value="&quot;C:/Contra/nexus-deob-deob.jar&quot; genericstringdeobfuscator true" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -452,22 +516,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1456" height="876" extended-state="6" />
- <editor active="true" />
+ <frame x="-8" y="-8" width="1456" height="876" extended-state="0" />
+ <editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32918397" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32918397" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24757953" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2461964" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19358534" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1971223" sideWeight="0.22067039" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32950467" sideWeight="0.7745505" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3287868" sideWeight="0.7759336" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22544952" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22406639" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32780084" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -511,90 +575,94 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/dasho/DashOTransformer.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/util/LogHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="58" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.03359684" />
+ <state line="21" column="30" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/generic/StringScanner.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/TransformerTemplate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="84" column="38" selection-start="2544" selection-end="2544" vertical-scroll-proportion="0.5124283" />
+ <state line="45" column="61" selection-start="1214" selection-end="1214" vertical-scroll-proportion="0.6740413" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/generic/ForeignCallRemover.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/jshrink/StoreHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="122" column="61" selection-start="4226" selection-end="4226" vertical-scroll-proportion="0.49763593" />
+ <state line="16" column="27" selection-start="329" selection-end="329" vertical-scroll-proportion="-0.09770115" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/util/LogHandler.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/StringFixer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="30" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" />
+ <state line="115" column="91" selection-start="4785" selection-end="4785" vertical-scroll-proportion="0.02556391" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/generic/TransformerTemplate.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/smokescreen/SmokeScreenTransformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="45" column="61" selection-start="1214" selection-end="1214" vertical-scroll-proportion="0.6740413" />
+ <state line="195" column="16" selection-start="6822" selection-end="7064" vertical-scroll-proportion="0.26153848" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/allatori/AllatoriTransformer.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/zkm/ZKMTransformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="62" selection-start="535" selection-end="535" vertical-scroll-proportion="0.41632652" />
+ <state line="20" column="4" selection-start="473" selection-end="541" vertical-scroll-proportion="0.22401172" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/util/GenericClassLoader.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/Renamer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="30" selection-start="500" selection-end="500" vertical-scroll-proportion="0.51293105" />
+ <state line="16" column="27" selection-start="315" selection-end="315" vertical-scroll-proportion="0.29282576" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/generic/GenericStringDeobfuscator.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/Transformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="13" selection-start="1502" selection-end="1502" vertical-scroll-proportion="0.6222547" />
+ <state line="13" column="30" selection-start="244" selection-end="244" vertical-scroll-proportion="0.24425288" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/jshrink/StoreHandler.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/util/GenericMethods.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="16" column="27" selection-start="329" selection-end="329" vertical-scroll-proportion="-0.09770115" />
+ <state line="94" column="72" selection-start="2943" selection-end="2943" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/generic/StringFixer.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/dasho/DashOTransformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="115" column="91" selection-start="4785" selection-end="4785" vertical-scroll-proportion="0.02556391" />
+ <state line="18" column="30" selection-start="416" selection-end="416" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/jshrink/JShrinkTransformer.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/Deobfuscator.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="134" selection-start="2339" selection-end="2339" vertical-scroll-proportion="0.02489019" />
+ <state line="74" column="76" selection-start="3212" selection-end="3212" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/Deobfuscator.java">
+ <entry file="jar://C:/Program Files/Java/jdk1.6.0_21/src.zip!/java/lang/ClassLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="29" selection-start="2391" selection-end="2391" vertical-scroll-proportion="0.0" />
+ <state line="465" column="0" selection-start="17676" selection-end="17676" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/generic/Renamer.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/jshrink/JShrinkTransformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="85" selection-start="292" selection-end="292" vertical-scroll-proportion="0.0">
+ <state line="99" column="27" selection-start="3326" selection-end="3326" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/smokescreen/SmokeScreenTransformer.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/allatori/AllatoriTransformer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="195" column="16" selection-start="6822" selection-end="7064" vertical-scroll-proportion="0.26153848">
+ <state line="53" column="49" selection-start="1636" selection-end="1636" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/util/GenericMethods.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/transformers/generic/GenericStringDeobfuscator.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="94" column="72" selection-start="2943" selection-end="2943" vertical-scroll-proportion="0.0">
+ <state line="80" column="44" selection-start="3481" selection-end="3481" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/zkm/ZKMTransformer.java">
+ <entry file="file://$PROJECT_DIR$/src/net/contra/jmd/util/GenericClassLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="339" column="147" selection-start="12279" selection-end="12279" vertical-scroll-proportion="0.3596154">
+ <state line="18" column="12" selection-start="433" selection-end="433" vertical-scroll-proportion="0.5387597">
<folding />
</state>
</provider>
View
BIN  out/artifacts/JMD/JMD.jar
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/Deobfuscator.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/allatori/AllatoriTransformer.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/dasho/DashOTransformer.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/generic/ForeignCallRemover.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/generic/GenericStringDeobfuscator.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/generic/Renamer.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/generic/StringFixer.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/generic/StringScanner.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/generic/TransformerTemplate.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/jshrink/JShrinkTransformer.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/jshrink/StoreHandler.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/smokescreen/SmokeScreenTransformer.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/util/GenericClassLoader.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/zkm/ZKMTransformer$1.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/zkm/ZKMTransformer$2.class
Binary file not shown
View
BIN  out/production/JMD/net/contra/jmd/zkm/ZKMTransformer.class
Binary file not shown
View
12 src/net/contra/jmd/Deobfuscator.java
@@ -1,12 +1,12 @@
package net.contra.jmd;
-import net.contra.jmd.allatori.AllatoriTransformer;
-import net.contra.jmd.dasho.DashOTransformer;
-import net.contra.jmd.generic.*;
-import net.contra.jmd.jshrink.JShrinkTransformer;
-import net.contra.jmd.smokescreen.SmokeScreenTransformer;
+import net.contra.jmd.transformers.allatori.AllatoriTransformer;
+import net.contra.jmd.transformers.dasho.DashOTransformer;
+import net.contra.jmd.transformers.generic.*;
+import net.contra.jmd.transformers.jshrink.JShrinkTransformer;
+import net.contra.jmd.transformers.smokescreen.SmokeScreenTransformer;
import net.contra.jmd.util.LogHandler;
-import net.contra.jmd.zkm.ZKMTransformer;
+import net.contra.jmd.transformers.zkm.ZKMTransformer;
import java.util.Scanner;
View
17 src/net/contra/jmd/Transformer.java
@@ -0,0 +1,17 @@
+package net.contra.jmd;
+
+import net.contra.jmd.util.LogHandler;
+import org.apache.bcel.generic.ClassGen;
+
+import java.util.*;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Eric
+ * Date: 12/13/10
+ * Time: 10:45 PM
+ */
+public interface Transformer {
+ void dump();
+ void transform();
+}
View
8 src/net/contra/jmd/allatori/AllatoriTransformer.java → ...md/transformers/allatori/AllatoriTransformer.java
@@ -1,12 +1,11 @@
-package net.contra.jmd.allatori;
+package net.contra.jmd.transformers.allatori;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
import org.apache.bcel.generic.*;
import org.apache.bcel.util.InstructionFinder;
-import org.apache.commons.io.IOUtils;
-import java.io.*;
+import java.io.File;
import java.util.*;
import java.util.jar.*;
@@ -40,9 +39,8 @@ public AllatoriTransformer(String jarfile) throws Exception {
if(isStringClass(cg) || isStringClassB(cg)) {
ALLATORI_CLASS = cg;
logger.debug("Allatori Class: " + ALLATORI_CLASS.getClassName());
- } else {
- cgs.put(cg.getClassName(), cg);
}
+ cgs.put(cg.getClassName(), cg);
} else {
NonClassEntries.add(entry, jf.getInputStream(entry));
}
View
2  src/net/contra/jmd/dasho/DashOTransformer.java → ...ntra/jmd/transformers/dasho/DashOTransformer.java
@@ -1,4 +1,4 @@
-package net.contra.jmd.dasho;
+package net.contra.jmd.transformers.dasho;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
View
2  src/net/contra/jmd/generic/ForeignCallRemover.java → .../jmd/transformers/generic/ForeignCallRemover.java
@@ -1,4 +1,4 @@
-package net.contra.jmd.generic;
+package net.contra.jmd.transformers.generic;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
View
5 ...contra/jmd/generic/GenericStringDeobfuscator.java → ...ansformers/generic/GenericStringDeobfuscator.java
@@ -8,7 +8,7 @@
If there is more leave it be or attempt to grab the values
*/
-package net.contra.jmd.generic;
+package net.contra.jmd.transformers.generic;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
@@ -77,7 +77,8 @@ public void replaceStrings() {
&& cgs.get(methodCallClass).containsMethod(methodCallMethod, methodCallSig) != null) {
if(!cgs.get(methodCallClass).isAbstract() && !cgs.get(methodCallClass).isNative()) {
byte[] bit = cgs.get(methodCallClass).getJavaClass().getBytes();
- cl = loader.loadClass(methodCallClass, bit);
+ Class cz = loader.loadClass(methodCallClass, bit);
+ cl = cz;
//TODO: Getting a classnotfound here. FIX IT!!!
} else {
continue;
View
4 src/net/contra/jmd/generic/Renamer.java → src/net/contra/jmd/transformers/generic/Renamer.java
@@ -1,4 +1,4 @@
-package net.contra.jmd.generic;
+package net.contra.jmd.transformers.generic;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
@@ -28,7 +28,7 @@ public Renamer(String jarfile) throws Exception {
Enumeration<JarEntry> entries = jf.entries();
//TODO: Make it not rename the main class
//TODO: Keep it from renaming like, methods that shouldn't be renamed and shit??
-
+ //TODO: Rename FIELDS MOTHERFUCKER
//Manifest jm = jf.getManifest();
//if(jm.getAttributes("Main-class") != null &&
//logger.debug("Found main class for jar: " + );
View
2  src/net/contra/jmd/generic/StringFixer.java → .../contra/jmd/transformers/generic/StringFixer.java
@@ -1,4 +1,4 @@
-package net.contra.jmd.generic;
+package net.contra.jmd.transformers.generic;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
View
2  src/net/contra/jmd/generic/StringScanner.java → ...ontra/jmd/transformers/generic/StringScanner.java
@@ -1,4 +1,4 @@
-package net.contra.jmd.generic;
+package net.contra.jmd.transformers.generic;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
View
2  src/net/contra/jmd/generic/TransformerTemplate.java → ...jmd/transformers/generic/TransformerTemplate.java
@@ -1,4 +1,4 @@
-package net.contra.jmd.generic;
+package net.contra.jmd.transformers.generic;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.ClassParser;
View
10 src/net/contra/jmd/jshrink/JShrinkTransformer.java → .../jmd/transformers/jshrink/JShrinkTransformer.java
@@ -1,9 +1,8 @@
-package net.contra.jmd.jshrink;
+package net.contra.jmd.transformers.jshrink;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
import org.apache.bcel.generic.*;
-import org.apache.commons.io.IOUtils;
import java.io.*;
import java.util.*;
@@ -19,7 +18,7 @@
private static LogHandler logger = new LogHandler("JShrinkTransformer");
private Map<String, ClassGen> cgs = new HashMap<String, ClassGen>();
String JAR_NAME;
- ClassGen LoaderClass;
+ ClassGen LoaderClass = null;
public JShrinkTransformer(String jarfile) throws Exception {
File jar = new File(jarfile);
@@ -47,8 +46,13 @@ public JShrinkTransformer(String jarfile) throws Exception {
}
}
logger.debug("Classes loaded from JAR");
+ if(LoaderClass == null) {
+ logger.error("Loader class not found! Class not using JShrink");
+ }
}
public boolean isLoader(ClassGen cg) {
+
+
if(cg.getMethods().length == 3 && cg.getMethods()[1].isStatic()
&& cg.getMethods()[1].isFinal()
&& cg.getMethods()[1].isPublic()
View
2  src/net/contra/jmd/jshrink/StoreHandler.java → ...contra/jmd/transformers/jshrink/StoreHandler.java
@@ -1,4 +1,4 @@
-package net.contra.jmd.jshrink;
+package net.contra.jmd.transformers.jshrink;
import net.contra.jmd.util.NonClassEntries;
View
3  ...ontra/jmd/smokescreen/SmokeScreenTransformer.java → ...nsformers/smokescreen/SmokeScreenTransformer.java
@@ -1,10 +1,9 @@
-package net.contra.jmd.smokescreen;
+package net.contra.jmd.transformers.smokescreen;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
import org.apache.bcel.generic.*;
import org.apache.bcel.util.InstructionFinder;
-import org.apache.commons.io.IOUtils;
import java.io.*;
import java.util.*;
View
6 src/net/contra/jmd/zkm/ZKMTransformer.java → ...t/contra/jmd/transformers/zkm/ZKMTransformer.java
@@ -1,10 +1,9 @@
-package net.contra.jmd.zkm;
+package net.contra.jmd.transformers.zkm;
import net.contra.jmd.util.*;
import org.apache.bcel.classfile.*;
import org.apache.bcel.generic.*;
import org.apache.bcel.util.InstructionFinder;
-import org.apache.commons.io.IOUtils;
import java.io.*;
import java.util.*;
@@ -18,7 +17,7 @@
*/
public class ZKMTransformer {
private static LogHandler logger = new LogHandler("ZKMTransformer");
- private Map<String, ClassGen> cgs;
+ private Map<String, ClassGen> cgs = new HashMap<String, ClassGen>();
private Map<String, ArrayList<String>> zkStrings = new HashMap<String, ArrayList<String>>();
String JAR_NAME;
private List<Field> flowObstructors = new LinkedList<Field>();
@@ -44,7 +43,6 @@ public ZKMTransformer(String classLoc, String className) throws Exception {
}
public ZKMTransformer(String jarfile) throws Exception {
- cgs = new HashMap<String, ClassGen>();
File jar = new File(jarfile);
JAR_NAME = jarfile;
JarFile jf = new JarFile(jar);
View
1  src/net/contra/jmd/util/GenericClassLoader.java
@@ -15,6 +15,7 @@ public GenericClassLoader(ClassLoader parent) {
//name = name.substring(0, name.lastIndexOf('.'));
Class c = null;
try {
+ //c = super.defineClass(crap, 0, crap.length);
c = super.defineClass(name, crap, 0, crap.length);
} catch(Exception e) {
return c;
Please sign in to comment.
Something went wrong with that request. Please try again.