Snapshot 23d12m2020y001v

LukeOnuke · Dec 23, 2020 · 061b1b2 · 061b1b2
1 parent 3e09be7
commit 061b1b2
Show file tree

Hide file tree

Showing 158 changed files with 1,315 additions and 1,476 deletions.
diff --git a/AdminTools/.idea/compiler.xml b/AdminTools/.idea/compiler.xml
diff --git a/AdminTools/.idea/discord.xml b/AdminTools/.idea/discord.xml
diff --git a/AdminTools/.idea/jarRepositories.xml b/AdminTools/.idea/jarRepositories.xml
diff --git a/AdminTools/.idea/misc.xml b/AdminTools/.idea/misc.xml
diff --git a/AdminTools/Assets/Themes/Aqua/style.css b/AdminTools/Assets/Themes/Aqua/style.css
@@ -387,4 +387,9 @@ pane{
 .edit:pressed .plus{
     -fx-fill: -at-accent;
     -fx-font-size: 50px;
+}
+
+.splash{
+    -fx-background-color: -at-background;
+    -fx-background-image: url('Assets/img/splash_screen.png');
 }
diff --git a/AdminTools/Assets/Themes/Default/style.css b/AdminTools/Assets/Themes/Default/style.css
@@ -387,4 +387,11 @@ pane{
 .edit:pressed .plus{
     -fx-fill: -at-accent;
     -fx-font-size: 50px;
+}
+
+.splash{
+    -fx-background-color: -at-darkbackground;
+    -fx-background-image: url("/Assets/img/.png");
+    -fx-background-position: center center;
+    -fx-background-size: cover;
 }
diff --git a/AdminTools/Assets/scripts/wa.atsf b/AdminTools/Assets/scripts/wa.atsf
@@ -1,6 +1,2 @@
-!print §aWhitelist add shortcut §farg0 §carg1
-
-
-
-
-!print yes
+!print §aWhitelist add shortcut §farg0
+whitelist add arg0
diff --git a/AdminTools/dependency-reduced-pom.xml b/AdminTools/dependency-reduced-pom.xml
diff --git a/AdminTools/log/log-08-11-2020-@03-02-40.log b/AdminTools/log/log-08-11-2020-@03-02-40.log
diff --git a/AdminTools/log/log-09-11-2020-@09-40-19.log b/AdminTools/log/log-09-11-2020-@09-40-19.log
diff --git a/AdminTools/log/log-11-11-2020-@01-16-45.log b/AdminTools/log/log-11-11-2020-@01-16-45.log
diff --git a/AdminTools/log/log-11-11-2020-@11-00-22.log b/AdminTools/log/log-11-11-2020-@11-00-22.log
diff --git a/AdminTools/log/log-11-11-2020-@12-38-17.log b/AdminTools/log/log-11-11-2020-@12-38-17.log
diff --git a/AdminTools/log/log-11-11-2020-@12-45-17.log b/AdminTools/log/log-11-11-2020-@12-45-17.log
diff --git a/AdminTools/log/log-12-11-2020-@01-00-51.log b/AdminTools/log/log-12-11-2020-@01-00-51.log
diff --git a/AdminTools/log/log-12-11-2020-@01-01-10.log b/AdminTools/log/log-12-11-2020-@01-01-10.log
diff --git a/AdminTools/log/log-12-11-2020-@01-02-34.log b/AdminTools/log/log-12-11-2020-@01-02-34.log
diff --git a/AdminTools/log/log-12-11-2020-@01-02-54.log b/AdminTools/log/log-12-11-2020-@01-02-54.log
diff --git a/AdminTools/log/log-12-11-2020-@01-03-25.log b/AdminTools/log/log-12-11-2020-@01-03-25.log
diff --git a/AdminTools/log/log-12-11-2020-@01-05-47.log b/AdminTools/log/log-12-11-2020-@01-05-47.log
diff --git a/AdminTools/log/log-12-11-2020-@01-07-14.log b/AdminTools/log/log-12-11-2020-@01-07-14.log
diff --git a/AdminTools/log/log-12-11-2020-@01-07-49.log b/AdminTools/log/log-12-11-2020-@01-07-49.log
diff --git a/AdminTools/log/log-12-11-2020-@01-08-49.log b/AdminTools/log/log-12-11-2020-@01-08-49.log
diff --git a/AdminTools/log/log-12-11-2020-@01-10-01.log b/AdminTools/log/log-12-11-2020-@01-10-01.log
diff --git a/AdminTools/log/log-12-11-2020-@01-11-04.log b/AdminTools/log/log-12-11-2020-@01-11-04.log
diff --git a/AdminTools/log/log-12-11-2020-@01-14-45.log b/AdminTools/log/log-12-11-2020-@01-14-45.log
diff --git a/AdminTools/log/log-12-11-2020-@01-16-39.log b/AdminTools/log/log-12-11-2020-@01-16-39.log
diff --git a/AdminTools/log/log-12-11-2020-@01-19-28.log b/AdminTools/log/log-12-11-2020-@01-19-28.log
diff --git a/AdminTools/log/log-12-11-2020-@01-19-28.log.lck b/AdminTools/log/log-12-11-2020-@01-19-28.log.lck
diff --git a/AdminTools/log/log-12-11-2020-@01-20-54.log b/AdminTools/log/log-12-11-2020-@01-20-54.log
diff --git a/AdminTools/log/log-12-11-2020-@01-20-54.log.lck b/AdminTools/log/log-12-11-2020-@01-20-54.log.lck
diff --git a/AdminTools/log/log-12-11-2020-@01-34-19.log b/AdminTools/log/log-12-11-2020-@01-34-19.log
diff --git a/AdminTools/log/log-12-11-2020-@02-18-25.log b/AdminTools/log/log-12-11-2020-@02-18-25.log
diff --git a/AdminTools/log/log-12-11-2020-@02-18-25.log.lck b/AdminTools/log/log-12-11-2020-@02-18-25.log.lck
diff --git a/AdminTools/log/log-12-11-2020-@02-26-12.log b/AdminTools/log/log-12-11-2020-@02-26-12.log
diff --git a/AdminTools/log/log-12-11-2020-@02-26-12.log.lck b/AdminTools/log/log-12-11-2020-@02-26-12.log.lck
diff --git a/AdminTools/log/log-12-11-2020-@02-45-13.log b/AdminTools/log/log-12-11-2020-@02-45-13.log
diff --git a/AdminTools/log/log-12-11-2020-@02-46-00.log b/AdminTools/log/log-12-11-2020-@02-46-00.log
diff --git a/AdminTools/log/log-12-11-2020-@02-48-36.log b/AdminTools/log/log-12-11-2020-@02-48-36.log
diff --git a/AdminTools/log/log-12-11-2020-@02-49-00.log b/AdminTools/log/log-12-11-2020-@02-49-00.log
diff --git a/AdminTools/log/log-12-11-2020-@02-53-12.log b/AdminTools/log/log-12-11-2020-@02-53-12.log
diff --git a/AdminTools/log/log-12-11-2020-@02-55-09.log b/AdminTools/log/log-12-11-2020-@02-55-09.log
diff --git a/AdminTools/log/log-12-11-2020-@03-12-48.log b/AdminTools/log/log-12-11-2020-@03-12-48.log
diff --git a/AdminTools/log/log-12-11-2020-@07-00-14.log b/AdminTools/log/log-12-11-2020-@07-00-14.log
diff --git a/AdminTools/log/log-12-11-2020-@07-02-06.log b/AdminTools/log/log-12-11-2020-@07-02-06.log
diff --git a/AdminTools/log/log-12-11-2020-@07-02-06.log.lck b/AdminTools/log/log-12-11-2020-@07-02-06.log.lck
diff --git a/AdminTools/log/log-12-11-2020-@12-57-09.log b/AdminTools/log/log-12-11-2020-@12-57-09.log
diff --git a/AdminTools/log/log-12-11-2020-@12-58-54.log b/AdminTools/log/log-12-11-2020-@12-58-54.log
diff --git a/AdminTools/log/log-13-11-2020-@03-08-41.log b/AdminTools/log/log-13-11-2020-@03-08-41.log
diff --git a/AdminTools/log/log-13-11-2020-@03-27-48.log b/AdminTools/log/log-13-11-2020-@03-27-48.log
diff --git a/AdminTools/log/log-13-11-2020-@03-28-22.log b/AdminTools/log/log-13-11-2020-@03-28-22.log
diff --git a/AdminTools/log/log-13-11-2020-@03-31-36.log b/AdminTools/log/log-13-11-2020-@03-31-36.log
diff --git a/AdminTools/log/log-13-11-2020-@03-40-33.log b/AdminTools/log/log-13-11-2020-@03-40-33.log
diff --git a/AdminTools/log/log-13-11-2020-@05-42-56.log b/AdminTools/log/log-13-11-2020-@05-42-56.log
diff --git a/AdminTools/log/log-13-11-2020-@05-42-56.log.lck b/AdminTools/log/log-13-11-2020-@05-42-56.log.lck
diff --git a/AdminTools/log/log-13-11-2020-@05-43-59.log b/AdminTools/log/log-13-11-2020-@05-43-59.log
diff --git a/AdminTools/log/log-13-11-2020-@05-43-59.log.lck b/AdminTools/log/log-13-11-2020-@05-43-59.log.lck
diff --git a/AdminTools/log/log-13-11-2020-@10-48-45.log b/AdminTools/log/log-13-11-2020-@10-48-45.log
diff --git a/AdminTools/log/log-13-11-2020-@11-07-19.log b/AdminTools/log/log-13-11-2020-@11-07-19.log
diff --git a/AdminTools/log/log-14-11-2020-@11-56-02.log b/AdminTools/log/log-14-11-2020-@11-56-02.log
diff --git a/AdminTools/log/log-15-11-2020-@01-25-42.log b/AdminTools/log/log-15-11-2020-@01-25-42.log
diff --git a/AdminTools/log/log-15-11-2020-@11-00-35.log b/AdminTools/log/log-15-11-2020-@11-00-35.log
diff --git a/AdminTools/log/log-15-11-2020-@11-24-01.log b/AdminTools/log/log-15-11-2020-@11-24-01.log
diff --git a/AdminTools/log/log-15-11-2020-@12-06-03.log b/AdminTools/log/log-15-11-2020-@12-06-03.log
diff --git a/AdminTools/log/log-15-11-2020-@12-06-03.log.lck b/AdminTools/log/log-15-11-2020-@12-06-03.log.lck
diff --git a/AdminTools/log/log-15-11-2020-@12-19-25.log b/AdminTools/log/log-15-11-2020-@12-19-25.log
diff --git a/AdminTools/log/log-15-11-2020-@12-41-00.log b/AdminTools/log/log-15-11-2020-@12-41-00.log
diff --git a/AdminTools/log/log-17-11-2020-@07-32-16.log b/AdminTools/log/log-17-11-2020-@07-32-16.log
diff --git a/AdminTools/log/log-18-11-2020-@11-18-20.log b/AdminTools/log/log-18-11-2020-@11-18-20.log
diff --git a/AdminTools/log/log-18-11-2020-@11-18-20.log.lck b/AdminTools/log/log-18-11-2020-@11-18-20.log.lck
diff --git a/AdminTools/mvn b/AdminTools/mvn
diff --git a/AdminTools/pom.xml b/AdminTools/pom.xml
@@ -159,14 +159,27 @@
 
         </dependency>
 
-
         <dependency>
             <groupId>com.lukeonuke</groupId>
             <artifactId>simplefxdialog</artifactId>
             <version>2.0.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.Vatuu</groupId>
+            <artifactId>discord-rpc</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>
@@ -250,12 +263,12 @@
                                 <addDependencies>true</addDependencies>
                                 <preCp>anything</preCp>
                             </classPath>
-                            <icon>${project.basedir}/src/main/resources/icon-baked.ico</icon>
+                            <icon>src/main/resources/img/icon-baked.ico</icon>
                             <jre>
                                 <jdkPreference>preferJdk</jdkPreference>
                                 <path>jdk/</path> <!-- Bundled java -->
                                 <opts>
-
+                                    <opt>-splash:Assets/img/splash_screen.png</opt>
                                 </opts>
                             </jre>
                             <versionInfo>