From 8bdf268cf1707dc0cace0c7014205fb1fdc66860 Mon Sep 17 00:00:00 2001
From: LabodiDavid <labodidavid@gmail.com>
Date: Mon, 2 May 2022 14:13:09 +0200
Subject: [PATCH] Updated pom.xml & ReadMe.md

---
 .idea/jarRepositories.xml                     | 10 ++++
 README.md                                     | 17 +++++-
 SimplifyTools.iml                             | 52 ++-----------------
 pom.xml                                       | 38 ++++++++++----
 src/main/java/tk/ditservices/DITSystem.java   |  1 +
 src/main/java/tk/ditservices/TabManager.java  | 10 ++--
 .../ditservices/utils/AdvancementHelper.java  |  1 -
 .../java/tk/ditservices/utils/Server.java     |  1 -
 8 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 884e02f..ff96281 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,6 +11,11 @@
       <option name="name" value="jeff-media-public" />
       <option name="url" value="https://hub.jeff-media.com/nexus/repository/jeff-media-public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="papermc" />
+      <option name="name" value="papermc" />
+      <option name="url" value="https://papermc.io/repo/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="sonatype" />
       <option name="name" value="sonatype" />
@@ -26,6 +31,11 @@
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="spigot" />
+      <option name="name" value="spigot" />
+      <option name="url" value="https://hub.spigotmc.org/nexus/content/groups/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
diff --git a/README.md b/README.md
index c36d140..15d44a5 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,6 @@
  - **Custom Connect/Disconnect messages** - Allows you to customize the message that is broadcasted when someone joins or leaves the server.
   ![Connect messages preview](docs/img/2.gif)
  - **Plugin Manager** - Allows you to unload/load plugins without a server restart.
- (Note: This may be removed in 1.17.x versions for security reasons)
  - **Gameplay statistics** - You can check your gameplay statistics such as player/mob kills, etc.
  (Note: The plugin just shows the stats not recording itself, so stats before installing this plugin are counted too.)
   ![Stats preview](docs/img/3.gif)
@@ -31,6 +30,22 @@ _________________
 ## Main goal
 My main goal is to create a single plugin that has many features, so it's can replace plugins that i often use on my servers while lowering the plugins count.
 _________________
+## Building 
+#### Dependencies:
+- spigot-api-1.18.2-R0.1-SNAPSHOT-shaded.jar (from Spigot Repo Downloads Automatically OR **BuildTools** generated `Spigot\Spigot-API\target\`)
+- brigadier-1.0.18.jar (from **BuildTools** generated `spigot-x.xx.x.jar\META-INF\libraries\`)
+- craftbukkit-1.18.2-R0.1-SNAPSHOT.jar (from downloaded `craftbukkit-x.xx.x.jar\META-INF\versions\`)
+##### Installing Dependencies:
+You can install the dependencies to your maven repository through CLI like this:
+
+- mvn install:install-file -Dfile=spigot-api-1.18.2-R0.1-SNAPSHOT-shaded.jar -DgroupId=org.spigotmc -DartifactId=spigot-api -Dversion=1.18.2-R0.1-SNAPSHOT -Dpackaging=jar
+
+
+- mvn install:install-file -Dfile=craftbukkit-1.18.2-R0.1-SNAPSHOT.jar -DgroupId=org.bukkit -DartifactId=craftbukkit -Dversion=1.18.2-R0.1-SNAPSHOT -Dpackaging=jar
+
+
+- mvn install:install-file -Dfile=brigadier-1.0.18.jar -DgroupId=com.mojang -DartifactId=brigadier -Dversion=1.0.18 -Dpackaging=jar
+_________________
 ## 3rd party libraries used by this plugin
 ### [Config-Updater by tchristofferson](https://github.com/tchristofferson/Config-Updater)
 ### [SpigotUpdateChecker by JEFF-Media-GbR](https://github.com/JEFF-Media-GbR/Spigot-UpdateChecker)
\ No newline at end of file
diff --git a/SimplifyTools.iml b/SimplifyTools.iml
index 78cccfa..26f1498 100644
--- a/SimplifyTools.iml
+++ b/SimplifyTools.iml
@@ -24,66 +24,20 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="craftbukkit-1.18.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.jeff_media:SpigotUpdateChecker:2.2.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.errorprone:error_prone_annotations:2.7.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-iostreams:2.17.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:9.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.oshi:oshi-core:5.8.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.dev.jna:jna:5.10.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.dev.jna:jna-platform:5.10.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.mojang:authlib:3.3.39" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.18.2-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.mojang:brigadier:1.0.18" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.mojang:datafixerupper:4.1.27" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.mojang:javabridge:1.2.24" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.mojang:logging:1.0.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.11.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.1.68.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: it.unimi.dsi:fastutil:8.5.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.jopt-simple:jopt-simple:5.0.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-core:2.17.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-slf4j18-impl:2.17.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.8.0-beta4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.xerial:sqlite-jdbc:3.36.0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: mysql:mysql-connector-java:8.0.27" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.protobuf:protobuf-java:3.11.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-resolver-provider:3.8.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model:3.8.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model-builder:3.8.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-interpolation:1.26" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact:3.8.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-builder-support:3.8.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-repository-metadata:3.8.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-api:1.6.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-spi:1.6.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-util:1.6.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-impl:1.6.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-utils:3.3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-transport-http:1.7.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: com.jeff_media:SpigotUpdateChecker:2.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 96a3494..82e50a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>tk.ditservices</groupId>
     <artifactId>SimplifyTools</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>SimplifyTools</name>
@@ -83,10 +83,18 @@
     </build>
 
     <repositories>
-		<!--<repository>
+        <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-		</repository>-->
+        </repository>
+        <repository>
+            <id>spigot</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
         <repository>
             <id>jeff-media-public</id>
             <url>https://hub.jeff-media.com/nexus/repository/jeff-media-public/</url>
@@ -98,18 +106,30 @@
     </repositories>
 
     <dependencies>
-        <!--For this version use BuildTools!-->
+        <dependency>
+            <groupId>com.jeff_media</groupId>
+            <artifactId>SpigotUpdateChecker</artifactId>
+            <version>2.2.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
+            <artifactId>spigot-api</artifactId>
             <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.jeff_media</groupId>
-            <artifactId>SpigotUpdateChecker</artifactId>
-            <version>2.2.0</version> <!-- Check on GitHub for the latest version -->
-            <scope>compile</scope>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>brigadier</artifactId>
+            <version>1.0.18</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/src/main/java/tk/ditservices/DITSystem.java b/src/main/java/tk/ditservices/DITSystem.java
index 25ad93a..74fae6d 100644
--- a/src/main/java/tk/ditservices/DITSystem.java
+++ b/src/main/java/tk/ditservices/DITSystem.java
@@ -1,6 +1,7 @@
 package tk.ditservices;
 
 import org.bukkit.scheduler.BukkitScheduler;
+//import org.bukkit.craftbukkit.v1_18_R2.scheduler.CraftScheduler;
 import tk.ditservices.commands.DitCmd;
 import tk.ditservices.listeners.ChatEvents;
 import tk.ditservices.listeners.LogChat;
diff --git a/src/main/java/tk/ditservices/TabManager.java b/src/main/java/tk/ditservices/TabManager.java
index 8401eae..9129a79 100644
--- a/src/main/java/tk/ditservices/TabManager.java
+++ b/src/main/java/tk/ditservices/TabManager.java
@@ -50,6 +50,8 @@ public class TabManager {
 
     }
 
+
+
     public void showTab(){
         if (headers.isEmpty() && footers.isEmpty()){
             return;
@@ -82,14 +84,7 @@ public class TabManager {
                     }
 
                     PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(headers.get(count1),footers.get(count2));
-                    /*Field a = packet.getClass().getDeclaredField("header");
-                    a.setAccessible(true);
-                    Field b = packet.getClass().getDeclaredField("footer");
-                    b.setAccessible(true);
 
-                    a.set(packet, headers.get(count1));
-                    b.set(packet,footers.get(count2));
-                    */
                     if (Bukkit.getOnlinePlayers().size() !=0){
                         for (Player player : Bukkit.getOnlinePlayers()){
                             PlayerConnection pConn = ((CraftPlayer)player).getHandle().b;
@@ -183,6 +178,7 @@ public class TabManager {
         }
     }
 
+
     /**
      * Replaces the msg values to their represents and recognizes MC color codes.
      * @param msg The text.
diff --git a/src/main/java/tk/ditservices/utils/AdvancementHelper.java b/src/main/java/tk/ditservices/utils/AdvancementHelper.java
index 6937e3f..5abb4b4 100644
--- a/src/main/java/tk/ditservices/utils/AdvancementHelper.java
+++ b/src/main/java/tk/ditservices/utils/AdvancementHelper.java
@@ -1,6 +1,5 @@
 package tk.ditservices.utils;
 
-import net.minecraft.advancements.Advancement;
 import tk.ditservices.DITLog;
 import tk.ditservices.DITSystem;
 import org.bukkit.configuration.file.FileConfiguration;
diff --git a/src/main/java/tk/ditservices/utils/Server.java b/src/main/java/tk/ditservices/utils/Server.java
index 04cfa64..08177a8 100644
--- a/src/main/java/tk/ditservices/utils/Server.java
+++ b/src/main/java/tk/ditservices/utils/Server.java
@@ -1,7 +1,6 @@
 package tk.ditservices.utils;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.*;
 import org.bukkit.entity.Player;
 import java.lang.Math;