From d07d4734bb362487cd057b3d2a2ba075659f8c45 Mon Sep 17 00:00:00 2001 From: jingwenMC <2313055824@qq.com> Date: Thu, 29 Dec 2022 08:52:22 +0800 Subject: [PATCH 1/7] Revert "Update README.md" This reverts commit 08e44e1e --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 021b952..b6a5068 100644 --- a/README.md +++ b/README.md @@ -28,15 +28,15 @@ Simply add the following to your `pom.xml`. - jingwenmc-repo - https://raw.githubusercontent.com/jingwenMC/MavenRepo/master + jitpack.io + https://jitpack.io - me.tigerhix.lib - scoreboard - 1.0.1-SNAPSHOT + com.github.TigerHix + ScoreboardLib + -SNAPSHOT Now you are able to create your own pretty scoreboards. From 485d9d04067eaa599ff0bf29e75e118df5411122 Mon Sep 17 00:00:00 2001 From: jingwenMC <2313055824@qq.com> Date: Thu, 29 Dec 2022 08:53:12 +0800 Subject: [PATCH 2/7] Re-using Jitpack's service --- .github/workflows/maven.yml | 68 ------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 9f97e26..0000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,68 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Build with Maven - run: mvn -B package --file pom.xml - - name: Upload a Build Artifact - uses: actions/upload-artifact@v2 - with: - # Artifact name - name: Jar_Snapshot_Build # optional - # A file, directory or wildcard pattern that describes what to upload - path: target/scoreboard-*.jar - - name: Upload to Repo - run: | - echo "Deploying to the Github..." - git clone --depth=1 https://${{ secrets.REPO_KEY }}@github.com/jingwenMC/MavenRepo.git /home/runner/MavenRepo - mvn deploy -DaltDeploymentRepository=maven-repo::default::file:/home/runner/MavenRepo - git config --global user.email "actions@github.com" - git config --global user.name "Github Actions User" - cd /home/runner/MavenRepo - git add . - echo "Committing..." - git commit -m "Auto update by Github Actions" - echo "Pushing..." - git push --force - - name: Auto Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: build-${{ github.run_number }} - release_name: ScoreboardLib Snapshot Build ${{ github.run_number }} - body: | - 提交代码自动发布的Release - 构建编号: build-${{ github.run_number }} - draft: false - prerelease: true - - name: Create zip Asset - run: | - zip -v Released_File_Build_${{ github.run_number }}.zip ./target/*.jar - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./Released_File_Build_${{ github.run_number }}.zip - asset_name: Released_File_Build_${{ github.run_number }}.zip - asset_content_type: application/zip \ No newline at end of file From 33aa2fad951b348edadb1b254e477d77f54041e9 Mon Sep 17 00:00:00 2001 From: jingwenMC <2313055824@qq.com> Date: Thu, 29 Dec 2022 09:07:01 +0800 Subject: [PATCH 3/7] Ensure Jitpack is using master branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b6a5068..8206db3 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Simply add the following to your `pom.xml`. com.github.TigerHix ScoreboardLib - -SNAPSHOT + master-SNAPSHOT Now you are able to create your own pretty scoreboards. From 28f5eab9baaa4958082258355d23c0c5acfa3ece Mon Sep 17 00:00:00 2001 From: jingwenMC <2313055824@qq.com> Date: Thu, 29 Dec 2022 09:10:59 +0800 Subject: [PATCH 4/7] Update pom.xml --- pom.xml | 89 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 295a251..0e1ee6b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,46 +18,75 @@ - tiger-repo - http://repo.tigerhix.me/content/groups/public/ + spigotmc-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sonatype + https://oss.sonatype.org/content/groups/public/ - - - nexus - http://repo.tigerhix.me/content/repositories/snapshots - - - - - - src/main/resources - true - - **/*.yml - **/*.properties - - - org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.8.1 - 1.7 - 1.7 - - -Xlint:all - -Xlint:-path - - true - true + ${java.version} + ${java.version} + + + org.projectlombok + lombok + 1.18.24 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + package + + shade + + + false + + + + + + + src/main/resources + true + + - - + + + org.spigotmc + spigot-api + 1.13.2-R0.1-SNAPSHOT + provided + + + org.jetbrains + annotations + 23.0.0 + provided + + + org.projectlombok + lombok + 1.18.24 + provided + + + \ No newline at end of file From 409f90c90ee4a6124147f31187ab335f181c9a8a Mon Sep 17 00:00:00 2001 From: jingwenMC <2313055824@qq.com> Date: Thu, 29 Dec 2022 09:11:32 +0800 Subject: [PATCH 5/7] Fixed an API issue --- .../me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java b/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java index b864c1b..cc281ca 100755 --- a/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java +++ b/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java @@ -269,10 +269,6 @@ public boolean isBanned() { return false; } - @Override - public void setBanned(boolean banned) { - } - @Override public boolean isWhitelisted() { return false; From 02fc43fa78437eaec95e25824c92b29e2e370f16 Mon Sep 17 00:00:00 2001 From: jingwenMC <2313055824@qq.com> Date: Sun, 8 Jan 2023 13:27:51 +0800 Subject: [PATCH 6/7] Enhancement on Team prefixes --- .../me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java b/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java index cc281ca..734e636 100755 --- a/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java +++ b/src/main/java/me/tigerhix/lib/scoreboard/type/SimpleScoreboard.java @@ -22,8 +22,8 @@ public class SimpleScoreboard implements Scoreboard { - private static final String TEAM_PREFIX = "Scoreboard_"; - private static int TEAM_COUNTER = 0; + private static final String TEAM_PREFIX = "S"; + private int TEAM_COUNTER = 0; private final org.bukkit.scoreboard.Scoreboard scoreboard; private final Objective objective; From 37ba95ef01aed21f5b98940a89e2a72ff4f6d78c Mon Sep 17 00:00:00 2001 From: jingwenMC <2313055824@qq.com> Date: Sun, 8 Jan 2023 13:29:42 +0800 Subject: [PATCH 7/7] Version update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e1ee6b..838ad7a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.tigerhix.lib scoreboard - 1.0.1-SNAPSHOT + 1.0.2 jar