From c40926ec994b234e7978c4eef12bbb171df36ec1 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:34:55 +0000 Subject: [PATCH 1/8] Add GitHub actions --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..c75167f --- /dev/null +++ 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 From ab2c138e94f06641918fce6ee6fbe0b77e81c6d4 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:37:57 +0000 Subject: [PATCH 2/8] Change links to use this repo --- README.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e6336e6..94f1888 100644 --- 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) +[![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.* From e10cc0ce70daf64c7ef7bd54341fd65a7dbc7d2e Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:41:39 +0000 Subject: [PATCH 3/8] Whoops --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94f1888..e8272f3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![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/) +[![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) From e09a94cd81d1d79c1f7e42f0310c9178202d2374 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Sat, 26 Feb 2022 03:00:23 +0000 Subject: [PATCH 4/8] Update .gitignore --- .gitignore | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4016b6a..6b34c01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,11 @@ - \.idea/ - dependency-reduced-pom\.xml - citizens-cmd\.iml +# Maven target/ + +# Eclipse +.settings/ +.classpath +.project From 4ee2c081fea1f6f34dbc7fb490e7d5be5538974d Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Thu, 3 Mar 2022 06:05:27 +0000 Subject: [PATCH 5/8] Update dependencies and use rayzr repo - Spigot 1.16.2-R0.1-SNAPSHOT to 1.18.1-R0.1-SNAPSHOT - Citizens 2.0.27-SNAPSHOT to 2.0.29-SNAPSHOT - PlaceholderAPI 2.10.9 to 2.11.1 - JSONMessage 1.2.1 (Forked version) to 1.3.1-SNAPSHOT - maven-compiler-plugin 3.7.0 to 3.10.0 - maven-shade-plugin 3.1.0 to 3.2.4 --- pom.xml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index f30a0a2..0bc9ae2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 me.mattstudios.plugins @@ -14,11 +14,11 @@ citizens-cmd UTF-8 - 1.16.2-R0.1-SNAPSHOT - 2.0.27-SNAPSHOT - 2.10.9 + 1.18.1-R0.1-SNAPSHOT + 2.0.29-SNAPSHOT + 2.11.1 da407c0059 - 1.2.1 + 1.3.1-SNAPSHOT 341169d6e9 @@ -33,7 +33,7 @@ rayzr-repo - https://cdn.rawgit.com/Rayzr522/maven-repo/master/ + https://rayzr.dev/repo/ placeholderapi @@ -87,9 +87,10 @@ - com.github.ipsk - JSONMessage - 213d8c0c6c + me.rayzr522 + jsonmessage + ${jsonmsg.version} + compile @@ -120,7 +121,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.10.0 1.8 1.8 @@ -129,7 +130,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.0 + 3.2.4 From d6d5dc728377e2988c0102ae864f2c6860380599 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Thu, 3 Mar 2022 06:07:04 +0000 Subject: [PATCH 6/8] Update Spigot 1.18.1-R0.1-SNAPSHOT to 1.18.2-R0.1-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bc9ae2..e72a106 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ citizens-cmd UTF-8 - 1.18.1-R0.1-SNAPSHOT + 1.18.2-R0.1-SNAPSHOT 2.0.29-SNAPSHOT 2.11.1 da407c0059 From 4dc39c133795a9c0ce8d8b6811a86bdbf3aca524 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Thu, 3 Mar 2022 06:10:13 +0000 Subject: [PATCH 7/8] Actually use vault.version and some comment cleanup --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index e72a106..13652d7 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.18.2-R0.1-SNAPSHOT 2.0.29-SNAPSHOT 2.11.1 - da407c0059 + 1.7 1.3.1-SNAPSHOT 341169d6e9 @@ -80,33 +80,33 @@ com.github.MilkBowl VaultAPI - 1.7 + ${vault.version} provided - + me.rayzr522 jsonmessage ${jsonmsg.version} compile - + com.github.ipsk MattUtils ${utils.version} compile - + me.mattstudios.utils matt-framework 1.4.3 compile - + org.bstats bstats-bukkit From 362f4a63fcdca6ec1754669a342106e05fe57f91 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Thu, 3 Mar 2022 06:13:02 +0000 Subject: [PATCH 8/8] Clean up repo names --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 13652d7..cddc83e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,32 +24,32 @@ - everything + Citizens-Repo https://repo.citizensnpcs.co/ - spigotmc-repo + SpigotMC-Repo https://hub.spigotmc.org/nexus/content/groups/public/ - rayzr-repo + Rayzr-Repo https://rayzr.dev/repo/ - placeholderapi + ExtendedClip-Repo https://repo.extendedclip.com/content/repositories/placeholderapi/ - jitpack.io - https://jitpack.io + JitPack-Repo + https://jitpack.io/ - CodeMC - https://repo.codemc.org/repository/maven-public + CodeMC-Repo + https://repo.codemc.org/repository/maven-public/ - sonatype - https://oss.sonatype.org/content/repositories/snapshots + Sonatype-Repo + https://oss.sonatype.org/content/repositories/snapshots/