v6 (#62)

RoinujNosde · Jun 7, 2022 · e839636 · e839636
1 parent cf40362
commit e839636
Show file tree

Hide file tree

Showing 101 changed files with 5,011 additions and 2,031 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,7 @@
 /dependency-reduced-pom.xml
 /target/
 /.idea/
+/.settings/
+.project
+.classpath
+/.vscode/
diff --git a/IMG-20170812-WA0057.jpg b/IMG-20170812-WA0057.jpg
diff --git a/java/io/annotations.xml b/java/io/annotations.xml
@@ -0,0 +1,7 @@
+<root>
+    <item name='java.io.File java.io.File[] listFiles(java.io.FilenameFilter)'>
+        <annotation name='org.jetbrains.annotations.Contract'>
+            <val val="&quot;_ -&gt; !null&quot;"/>
+        </annotation>
+    </item>
+</root>
diff --git a/pom.xml b/pom.xml
@@ -25,6 +25,22 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -35,15 +51,23 @@
                     <relocations>
                         <relocation>
                             <pattern>com.google.gson</pattern>
-                            <shadedPattern>me.roinujnosde.titansbattle.gson</shadedPattern>
+                            <shadedPattern>me.roinujnosde.titansbattle.shaded.gson</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>co.aikar.commands</pattern>
-                            <shadedPattern>me.roinujnosde.titansbattle.acf</shadedPattern>
+                            <shadedPattern>me.roinujnosde.titansbattle.shaded.acf</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>co.aikar.locales</pattern>
-                            <shadedPattern>me.roinujnosde.titansbattle.locales</shadedPattern>
+                            <shadedPattern>me.roinujnosde.titansbattle.shaded.locales</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>de.tr7zw.changeme.nbtapi</pattern>
+                            <shadedPattern>me.roinujnosde.titansbattle.shaded.nbtapi</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>me.roinujnosde.titansbattle.shaded.bstats</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -84,8 +108,9 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
-            <id>codemc-repo</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
+            <id>roinujnosde-repo</id>
+            <name>RoinujNosde's Repository</name>
+            <url>https://repo.roinujnosde.me/releases</url>
         </repository>
         <repository>
             <id>aikar</id>
@@ -95,17 +120,21 @@
             <id>placeholderapi-repo</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.io/repository/maven-public/</url>
+        </repository>
     </repositories>
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.6</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
             <artifactId>SimpleClans</artifactId>
-            <version>2.15.0</version>
+            <version>2.16.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -131,6 +160,17 @@
             <version>2.10.9</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>de.tr7zw</groupId>
+            <artifactId>item-nbt-api</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <name>TitansBattle</name>