Merge branch '3.3-dev'

ArcanePlugins · Dec 6, 2021 · 4fdf4ff · 4fdf4ff
2 parents 35a283c + c34a8b9
commit 4fdf4ff
Show file tree

Hide file tree

Showing 103 changed files with 3,600 additions and 2,499 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,12 +6,15 @@
 #   Why? Different developers use different IDE settings.
 /target/
 /.idea
+.idea
+.idea/
 LevelledMobs.iml
 
 # Eclipse IDE
 #   Why? Different developers use different IDE settings.
 .classpath
 .project
 /.settings
+/.idea/
 .idea/jarRepositories.xml
 .idea/discord.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/pom.xml b/pom.xml
@@ -10,14 +10,14 @@
 
     <groupId>me.lokka30</groupId>
     <artifactId>LevelledMobs</artifactId>
-    <version>3.2.6 b576</version>
+    <version>3.3.0 b579</version>
     <packaging>jar</packaging>
 
     <name>LevelledMobs</name>
     <description>The Ultimate RPG Mob Levelling Plugin</description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -62,6 +62,7 @@
                             </excludes>
                         </filter>
                     </filters>
+                    <minimizeJar>true</minimizeJar>
                 </configuration>
                 <executions>
                     <execution>
@@ -71,6 +72,11 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <artifactSet>
+                                <includes>
+                                    <include>*:*</include>
+                                </includes>
+                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
@@ -85,6 +91,14 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>essentials-releases</id>
+            <url>https://repo.essentialsx.net/releases/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
         <repository>
             <id>placeholderapi</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
@@ -120,6 +134,18 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.19.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
@@ -153,7 +179,8 @@
         <dependency>
             <groupId>com.github.lokka30</groupId>
             <artifactId>MicroLib</artifactId>
-            <version>2.3.1</version>
+            <version>3.2.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.dmulloy2</groupId>
@@ -170,7 +197,13 @@
         <dependency>
             <groupId>simplepets.brainsynder</groupId>
             <artifactId>API</artifactId>
-            <version>5.0-BUILD-89</version>
+            <version>5.0-BUILD-98</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.9</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>