Merge branch 'nightly' of https://github.com/stargate-rewritten/Starg…

…ate-Bukkit into nightly
stargate-rewritten · Dec 31, 2023 · 3cd556f · 3cd556f
2 parents 519db8f + c3f0020
commit 3cd556f
Showing 3 changed files with 102 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,67 @@
+# General Filters
 target/
-.idea/
-/bin/
 *.prefs
-.classpath
+*.class
+
+# Eclipse
+.externalToolBuilders/
+*.launch
+.factorypath
+.recommenders/
+.apt_generated/
+.apt_generated_test/
+.cache-main
+.scala_dependencies
+.worksheet
 .project
+.classpath
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# IntelliJ
+.idea/
+out/
+
+# Testing
 test.db
-*.secret
+*.secret
+*.log
+
+# Packages
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# Netbeans
+**/nbproject/private/
+**/nbproject/Makefile-*.mk
+**/nbproject/Package-*.bash
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+nbactions.xml
+
+# VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+.history/
+*.vsix
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Stargate-Bukkit
 
-`Supporting MC 1.16+ in the Bukkit Ecosystem`
+`Supporting MC 1.17+ in the Bukkit Ecosystem`
 
 > **THIS IS A DEVELOPMENT BUILD FROM THE NIGHTLY CHANNEL!**<br>
 > <br>
@@ -16,25 +16,24 @@
 
 ## Description
 
-Stargate-Bukkit is the original MineCraft portal plugin; it existed for as long as MineCraft server modding has been
-feasible!
+**The original, and still the best, transportation solution for the [Bukkit](https://docs.papermc.io/paper) ecosystem!**<br>A Minecraft [Spigot](https://www.spigotmc.org/wiki/spigot/)/[Paper](https://github.com/PaperMC/Paper) plugin facilitating player interactions through interconnection.
 
-## History
-
-Originally conceived and written by Dinnerbone, the project is now maintained
-by [dozens of individual developers](https://github.com/stargate-bukkit/Stargate-Bukkit/graphs/contributors).<br>
-Notable contributions in the Bukkit ecosystem have been made by the project's upstream developers, theDgtl and
-PseudoKnight.
-
-In 2021 the project was rewritten by Thorinwasher and EpicKnarvik97; this is that rewrite.
+> **:desktop_computer: [Website](https://sgrewritten.org)**<br>**:arrow_down: [Downloads](https://sgrewritten.org/download)**<br>**:bookmark_tabs: [Documentation](https://sgrewritten.org/wiki)**<br>**:speaking_head: [Support](https://sgrewritten.org/discord)**
 
 ## Features
 
-|                                                     **Immersive**                                                      |                                                                    **User-Oriented**                                                                    |                                                           **Capable**                                                           |
-|:----------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------------:|
+|                        **Immersive**                         |                      **User-Oriented**                       |                         **Capable**                          |
+| :----------------------------------------------------------: | :----------------------------------------------------------: | :----------------------------------------------------------: |
 | Stargate's interface is integrated within gameplay; players can create, use, and destroy portals without any commands! | All of StarGate's features are designed to allow for non-admin users to create and manage their own portal networks in a balanced and risk free manner. | By default, StarGate boasts a comprehensive network system, dozens of portal types (flags), and highly configurable behaviours. |
 
-|                                              **Configurable**                                               |                                                                                                         **Expandable**                                                                                                          |                                                     **Customizable**                                                      |
-|:-----------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------:|
-| Stargate has a comprehensive and intuitive config, highly granular permissions, and multi-language support! | The StarGate community has developed an ecosystem of [add-ons](https://github.com/search?q=topic%3Aaddon+org%3Astargate-bukkit+fork%3Atrue), which collectively add integration and design-philosophy expansions to the plugin. | Stargate supports numerous customizations; from sign formatting to gate designs, all user-facing details can be modified! |
+|                       **Configurable**                       |                        **Expandable**                        |                       **Customizable**                       |
+| :----------------------------------------------------------: | :----------------------------------------------------------: | :----------------------------------------------------------: |
+| Stargate has a comprehensive and intuitive config, highly granular permissions, and multi-language support! | The StarGate community has developed an ecosystem of [add-ons](https://sgrewritten.org/addons), which collectively add integration and design-philosophy expansions to the plugin. | Stargate supports numerous customizations; from sign formatting to gate designs, all user-facing details can be modified! |
+
+------
+
+## Context and Credits
+
+*The continuation of Minecraft's first portal plugin, Stargate, by [Sturmeh](https://github.com/sturmeh) and [Dinnerbone](https://github.com/dinnerbone).*<br>*Guided by [the original philosophy](https://sgrewritten.org/philosophy) and [rewritten](https://sgrewritten.org/rewrite) from the ground up for modern versions of MC.*<br>*With inspiration from [Drakia](https://github.com/drakiaxyz)'s [port](https://bukkit.org/threads/stargate-the-original-portal-plugin.3274/) and it's subsequent revivals (notably [SGRevived](https://github.com/epicknarvik97) and [SG10](https://github.com/thorinwasher))*.
 
+*:heart: [Credits](https://sgrewritten.org/credits)*
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,6 @@
             <id>papermc</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
-
     </repositories>
 
     <dependencies>
@@ -51,49 +50,49 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
+            <version>24.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>5.0.1</version>
+            <version>5.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.42.0.0</version>
+            <version>3.44.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
-            <version>8.0.32</version>
+            <version>8.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.9.2</version>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.9</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -105,7 +104,7 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>9.2.0</version>
+            <version>9.8.0</version>
         </dependency>
         <dependency>
             <groupId>net.coreprotect</groupId>
@@ -122,7 +121,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>5.2.3</version>
+            <version>5.2.5</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -132,16 +131,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.12.1</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <release>17</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.1</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <artifactSet>
@@ -184,6 +182,12 @@
                                 <exclude>com/cryptomorin/xseries/Skull*</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.MF</exclude>
+                            </excludes>
+                        </filter>
                         <filter>
                             <artifact>org.apache.tika:tika-parsers</artifact>
                             <includes>
@@ -198,6 +202,9 @@
                             </includes>
                         </filter>
                     </filters>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
+                    </transformers>
                 </configuration>
                 <executions>
                     <execution>
@@ -211,7 +218,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -235,7 +242,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.3</version>
             </plugin>
         </plugins>
         <resources>