Punikekk · Punikekk · Oct 1, 2019 · Oct 1, 2019 · Oct 2, 2019 · Oct 4, 2019
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /.idea
 /target
 /test
-/out
+/out
+dependency-reduced-pom.xml
diff --git a/DarkBOT.iml b/DarkBOT.iml
@@ -4,15 +4,30 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/lib/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="gson-2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf:0.36" level="project" />
+    <orderEntry type="library" name="Maven: org.jgrapht:jgrapht-io:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:17.0.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf:0.36" level="project" />
+    <orderEntry type="library" name="Maven: com.miglayout:miglayout:3.7.4" level="project" />
+    <orderEntry type="library" name="Maven: org.jgrapht:jgrapht-core:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jheaps:jheaps:0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.jgrapht:jgrapht-io:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mvel:mvel2:2.4.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.2.0" level="project" />
+    <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:17.0.0" level="project" />
   </component>
 </module>
diff --git a/README.md b/README.md
@@ -7,3 +7,9 @@ How to run:
 - Add Run/Debug configuration:
   -> Main class: com.github.manolo8.darkbot.Bot
   -> Vm options: -Djava.library.path=./lib
+
+Distribution & support for the bot can be found over at discord: https://discord.gg/bEFgxCy
+
+Everyone is allowed to make, publish & redistribute videos & content about the software.
+
+Bugpoint is not affiliated in any way with this software. They claim themselves as the owners in DMCA claims, wich are all invalid.
diff --git a/config.json b/config.json
diff --git a/lib/DarkBot.dll b/lib/DarkBot.dll
diff --git a/lib/darcula.jar b/lib/darcula.jar
diff --git a/lib/verifier.jar b/lib/verifier.jar
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,18 @@
 
     <groupId>com.github.manolo8.darkbot</groupId>
     <artifactId>DarkBOT</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>1.13-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>jfrog</id>
+            <url>https://oss.jfrog.org/artifactory/oss-snapshot-local/com/formdev/</url>
+        </repository>
+    </repositories>
 
     <dependencies>
 
@@ -16,6 +27,60 @@
             <version>2.8.5</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.formdev</groupId>
+            <artifactId>flatlaf</artifactId>
+            <version>0.36</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.jidesoft</groupId>-->
+<!--            <artifactId>jide-oss</artifactId>-->
+<!--            <version>3.6.18</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.miglayout</groupId>
+            <artifactId>miglayout</artifactId>
+            <version>3.7.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jgrapht</groupId>
+            <artifactId>jgrapht-core</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jgrapht</groupId>
+            <artifactId>jgrapht-io</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mvel</groupId>
+            <artifactId>mvel2</artifactId>
+            <version>2.4.4.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna-platform</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>17.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -24,25 +89,57 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>8</source>
                     <target>8</target>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
 
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
-                        <id>assembly</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>shade</goal>
                         </goals>
-                        <phase>package</phase>
                         <configuration>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
+                            <finalName>DarkBot</finalName>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/LICENSE*</exclude>
+                                        <exclude>META-INF/NOTICE.txt</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>net.java.dev.jna:*</artifact>
+                                    <includes>
+                                        <include>com/sun/jna/*</include>
+                                        <include>com/sun/jna/ptr/*</include>
+                                        <include>com/sun/jna/platform/win32/**</include>
+                                        <include>com/sun/jna/win32/**</include>
+                                        <include>com/sun/jna/win32-x86-64/**</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>**/*.html</exclude>
+                                        <exclude>**/*.template</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.github.manolo8.darkbot.Bot</mainClass>
+                                </transformer>
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>
@@ -51,68 +148,32 @@
             <plugin>
                 <groupId>com.github.wvengen</groupId>
                 <artifactId>proguard-maven-plugin</artifactId>
-                <version>2.0.13</version>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
-                        <id>obfuscation-packaging</id>
                         <phase>package</phase>
-                        <goals>
-                            <goal>proguard</goal>
-                        </goals>
+                        <goals><goal>proguard</goal></goals>
                         <configuration>
-                            <proguardVersion>6.1.0beta2</proguardVersion>
-                            <obfuscate>true</obfuscate>
-                            <attach>true</attach>
-                            <appendClassifier>false</appendClassifier>
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                            <injar>${project.build.finalName}-jar-with-dependencies.jar</injar>
-                            <injarNotExistsSkip>false</injarNotExistsSkip>
-                            <archive>
-                                <manifest>
-                                    <mainClass>com.github.manolo8.darkbot.Bot</mainClass>
-                                </manifest>
-                            </archive>
-                            <libs>
-                                <lib>${java.home}/lib/rt.jar</lib>
-                            </libs>
-
+                            <injar>DarkBot.jar</injar>
+                            <outjar>DarkBot.jar</outjar>
                             <options>
-                                <option>-keep public class com.github.manolo8.darkbot.Bot
-                                    {*;}
-                                </option>
-                                <option>-keep public class com.github.manolo8.darkbot.config.Config
-                                    {*;}
-                                </option>
-                                <option>-keep public class com.github.manolo8.darkbot.config.BoxInfo
-                                    {*;}
-                                </option>
-                                <option>-keep public class com.github.manolo8.darkbot.config.NpcInfo
-                                    {*;}
-                                </option>
-                                <option>-keep public class com.github.manolo8.darkbot.core.DarkBotAPI
-                                    {*;}
-                                </option>
-                                <option>-keepattributes Signature</option>
-                                <option>-dontusemixedcaseclassnames</option>
-                                <option>-dontskipnonpubliclibraryclasses</option>
-                                <option>-verbose</option>
-                                <option>-optimizationpasses 5</option>
-                                <option>-overloadaggressively</option>
-                                <option>-repackageclasses ''</option>
                                 <option>-allowaccessmodification</option>
-                                <option>-target 1.8</option>
-
+                                <option>-dontoptimize</option>
+                                <option>-dontobfuscate</option>
+                                <option>-dontnote</option>
+                                <option>-dontwarn</option>
+                                <option>-keepattributes Signature</option>
+                                <option>-keep class com.github.manolo8.** { *; }</option>
+                                <option>-keep class a{}</option>
+                                <option>-keep class com.formdev.** { *; }</option>
+                                <option>-keep class com.sun.jna.* { *; }</option>
                             </options>
+                            <libs>
+                                <lib>${java.home}/lib/rt.jar</lib>
+                            </libs>
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>net.sf.proguard</groupId>
-                        <artifactId>proguard-base</artifactId>
-                        <version>6.1.0beta2</version>
-                    </dependency>
-                </dependencies>
             </plugin>
 
         </plugins>

diff --git a/replacements.txt b/replacements.txt
@@ -0,0 +1,5 @@
+//for v10.0.19071543, * means is a replacement or just add this in formater
+_-UV=*Main*
+_-P1v=*Screen Manager*
+_-15e=*Gui Manager*
+//didnt check for other names on that version.
diff --git a/src/main/java/a.java b/src/main/java/a.java
@@ -0,0 +1,3 @@
+public class a extends Exception {
+  int a;
+}
diff --git a/src/main/java/com/github/manolo8/darkbot/Bot.java b/src/main/java/com/github/manolo8/darkbot/Bot.java
@@ -1,9 +1,33 @@
 package com.github.manolo8.darkbot;
 
+import com.formdev.flatlaf.FlatDarkLaf;
+import com.github.manolo8.darkbot.config.ConfigManager;
+import com.github.manolo8.darkbot.utils.LogUtils;
+
+import javax.swing.*;
+
 public class Bot {
 
     public static void main(String[] args) {
+        if (System.console() == null
+                && Bot.class.getProtectionDomain().getCodeSource().getLocation().getPath().endsWith(".jar")) {
+            LogUtils.setOutputToFile();
+        }
+        try {
+            UIManager.getFont("Label.font"); // Prevents a linux crash
+            UIManager.setLookAndFeel(new FlatDarkLaf());
+            UIManager.put("Button.arc", 0);
+            UIManager.put("Component.arc", 0);
+        } catch (UnsupportedLookAndFeelException e) {
+            e.printStackTrace();
+        }
+        SwingUtilities.invokeLater(Main::new);
+    }
 
-        new Main();
+    public static class NoOpBot {
+        public static void main(String[] args) {
+            ConfigManager.FORCE_NO_OP = true;
+            Bot.main(args);
+        }
     }
 }