Merge pull request #49 from HexedHero/master

Pull Hexed changes
2022-03-05 19:09:05 +00:00 · 2022-03-05 19:09:05 +00:00 · 009b0c7667
commit 009b0c7667
parent dcee116657 362f4a63fc
4 changed files with 81 additions and 44 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,32 @@
+name: Build
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: "startsWith(github.event.head_commit.message, '[CI-BUILD]')"
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17 (Java 17)
+      uses: actions/setup-java@v2
+      with:
+        java-version: 17
+        distribution: 'temurin'
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-maven-
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: Upload artifacts (Jars)
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.event.repository.name }}
+        path: target/*.jar
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,11 @@
-
 \.idea/
-
 dependency-reduced-pom\.xml
-
 citizens-cmd\.iml

+# Maven 
 target/
+
+# Eclipse
+.settings/
+.classpath
+.project
--- a/README.md
+++ b/README.md
@ -1,26 +1,27 @@
 ![CitizensCMD Logo](https://i.imgur.com/nZjxytv.jpg)
-[![Spigot Project](https://img.shields.io/badge/Spigot-CitizensCMD-blue.svg?longCache=true&style=flat-square)](https://www.spigotmc.org/resources/citizens-cmd.30224/)
-[![GitHub issues](https://img.shields.io/github/issues/ipsk/CitizensCMD.svg?longCache=true&style=flat-square)](https://github.com/ipsk/CitizensCMD/issues)
-![GitHub issues](https://img.shields.io/github/last-commit/ipsk/CitizensCMD.svg?longCache=true&style=flat-square)
-[![GitHub issues](https://img.shields.io/badge/Guide-Wiki-blue.svg?longCache=true&style=flat-square)](https://github.com/ipsk/CitizensCMD/wiki)
-![GitHub](https://img.shields.io/github/license/ipsk/CitizensCMD.svg?style=flat-square)
+[![Spigot Project](https://img.shields.io/badge/Spigot-CitizensCMD-blue.svg?longCache=true&style=flat-square)](https://www.spigotmc.org/resources/30224/)
+[![GitHub issues](https://img.shields.io/github/issues/HexedHero/CitizensCMD.svg?longCache=true&style=flat-square)](https://github.com/HexedHero/CitizensCMD/issues)
+![GitHub issues](https://img.shields.io/github/last-commit/HexedHero/CitizensCMD.svg?longCache=true&style=flat-square)
+[![GitHub issues](https://img.shields.io/badge/Guide-Wiki-blue.svg?longCache=true&style=flat-square)](https://github.com/HexedHero/CitizensCMD/wiki)
+![GitHub](https://img.shields.io/github/license/HexedHero/CitizensCMD.svg?style=flat-square)

 # CitizensCMD
-**CitizensCMD** is an addition to the plugin [Citizens](https://www.spigotmc.org/resources/citizens.13811/) that allows you to execute commands by clicking an NPC.
-This plugin **NEEDS** Citizens to be installed, get it [here](https://www.spigotmc.org/resources/citizens.13811/).
+**CitizensCMD** is an addition to the plugin [Citizens](https://www.spigotmc.org/resources/13811/) that allows you to execute commands by clicking an NPC.
+This plugin **NEEDS** Citizens to be installed, get it [here](https://www.spigotmc.org/resources/13811/).

 ## Guide
-Need help? Check out the [wiki](https://github.com/ipsk/CitizensCMD/wiki) for more informations!
+Need help? Check out the [wiki](https://github.com/HexedHero/CitizensCMD/wiki) for more informations!

 ## Useful links

-  + [Project page](https://www.spigotmc.org/resources/citizens-cmd.30224/)
-  + [Citizens page](https://www.spigotmc.org/resources/citizens.13811/)
-  + [Wiki](https://github.com/ipsk/CitizensCMD/wiki)
-  + [Issues](https://github.com/ipsk/CitizensCMD/issues)
+  + [Project page](https://www.spigotmc.org/resources/30224/)
+  + [Citizens page](https://www.spigotmc.org/resources/13811/)
+  + [Wiki](https://github.com/HexedHero/CitizensCMD/wiki)
+  + [Issues](https://github.com/HexedHero/CitizensCMD/issues)

 ## Author

-+ **Mateus Moreira** - LichtHund - [@LichtHund](https://twitter.com/LichtHund)
+ **HexedHero** (Maintainer)
+ **Mateus Moreira** - LichtHund - [@LichtHund](https://twitter.com/LichtHund) (Creator)

 *A special thanks to **Glare** - [darbyjack](https://github.com/darbyjack); For helping me build this.*
--- a/pom.xml
+++ b/pom.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <groupId>me.mattstudios.plugins</groupId>
@ -14,42 +14,42 @@
    <description>citizens-cmd</description>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spigot.version>1.16.2-R0.1-SNAPSHOT</spigot.version>
-        <citizens.version>2.0.27-SNAPSHOT</citizens.version>
-        <papi.version>2.10.9</papi.version>
-        <vault.version>da407c0059</vault.version>
-        <jsonmsg.version>1.2.1</jsonmsg.version>
+        <spigot.version>1.18.2-R0.1-SNAPSHOT</spigot.version>
+        <citizens.version>2.0.29-SNAPSHOT</citizens.version>
+        <papi.version>2.11.1</papi.version>
+        <vault.version>1.7</vault.version>
+        <jsonmsg.version>1.3.1-SNAPSHOT</jsonmsg.version>
        <utils.version>341169d6e9</utils.version>
    </properties>

    <repositories>
        <repository>
-            <id>everything</id>
+            <id>Citizens-Repo</id>
            <url>https://repo.citizensnpcs.co/</url>
        </repository>
        <repository>
-            <id>spigotmc-repo</id>
+            <id>SpigotMC-Repo</id>
            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
        </repository>
        <repository>
-            <id>rayzr-repo</id>
-            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
+            <id>Rayzr-Repo</id>
+            <url>https://rayzr.dev/repo/</url>
        </repository>
        <repository>
-            <id>placeholderapi</id>
+            <id>ExtendedClip-Repo</id>
            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
        </repository>
        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>JitPack-Repo</id>
+            <url>https://jitpack.io/</url>
        </repository>
        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
+            <id>CodeMC-Repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
        </repository>
        <repository>
-            <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <id>Sonatype-Repo</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
        </repository>
    </repositories>

@ -80,32 +80,33 @@
        <dependency>
            <groupId>com.github.MilkBowl</groupId>
            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
+            <version>${vault.version}</version>
            <scope>provided</scope>
        </dependency>

        <!-- Compile -->
-        <!-- Json message repo -->
+        <!-- JSON Message -->
        <dependency>
-            <groupId>com.github.ipsk</groupId>
-            <artifactId>JSONMessage</artifactId>
-            <version>213d8c0c6c</version>
+            <groupId>me.rayzr522</groupId>
+            <artifactId>jsonmessage</artifactId>
+            <version>${jsonmsg.version}</version>
+            <scope>compile</scope>
        </dependency>
-        <!-- My utils -->
+        <!-- Matt's utils -->
        <dependency>
            <groupId>com.github.ipsk</groupId>
            <artifactId>MattUtils</artifactId>
            <version>${utils.version}</version>
            <scope>compile</scope>
        </dependency>
-
+        <!-- Matt's Framework -->
        <dependency>
            <groupId>me.mattstudios.utils</groupId>
            <artifactId>matt-framework</artifactId>
            <version>1.4.3</version>
            <scope>compile</scope>
        </dependency>
-
+        <!-- bStats -->
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
@ -120,7 +121,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.10.0</version>
                <configuration>
                    <source>1.8</source>
                    <target>1.8</target>
@ -129,7 +130,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.4</version>
                <configuration>
                    <relocations>
                        <relocation>