From 66a37da076c86226350026f0b5c1a519e06a2181 Mon Sep 17 00:00:00 2001 From: BONNe Date: Tue, 4 Oct 2022 14:59:54 +0300 Subject: [PATCH 01/20] Init next BSkyBlock version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 232b61b..f78b4ff 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ -LOCAL - 1.16.0 + 1.17.0 BentoBoxWorld_BSkyBlock bentobox-world From fe780a94cd55264191d91499deb98b3c3b3a13b7 Mon Sep 17 00:00:00 2001 From: BONNe Date: Tue, 4 Oct 2022 15:00:40 +0300 Subject: [PATCH 02/20] Fix failing unit-test --- .../bentobox/bskyblock/commands/IslandAboutCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/world/bentobox/bskyblock/commands/IslandAboutCommandTest.java b/src/test/java/world/bentobox/bskyblock/commands/IslandAboutCommandTest.java index 65a0072..4fcd9bf 100644 --- a/src/test/java/world/bentobox/bskyblock/commands/IslandAboutCommandTest.java +++ b/src/test/java/world/bentobox/bskyblock/commands/IslandAboutCommandTest.java @@ -33,7 +33,7 @@ public class IslandAboutCommandTest { User user = mock(User.class); c.execute(user, "", Collections.emptyList()); // Verify - Mockito.verify(user).sendRawMessage(Mockito.eq("Copyright (c) 2017 - 2020 tastybento, Poslovitch")); + Mockito.verify(user).sendRawMessage(Mockito.eq("Copyright (c) 2017 - 2022 tastybento, Poslovitch")); Mockito.verify(user).sendRawMessage(Mockito.eq("About BSkyBlock 1.2.3:")); } From 2238e04709ef810bcdf68fa8411f79613d897090 Mon Sep 17 00:00:00 2001 From: DahliaSR Date: Mon, 31 Oct 2022 06:13:03 +0000 Subject: [PATCH 03/20] Translate de.yml via GitLocalize --- src/main/resources/locales/de.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/locales/de.yml b/src/main/resources/locales/de.yml index dff51be..0abb2d3 100644 --- a/src/main/resources/locales/de.yml +++ b/src/main/resources/locales/de.yml @@ -2,6 +2,6 @@ bskyblock: sign: line0: "&cBSkyBlock" - line1: Herzlich willkommen! + line1: Herzlich Willkommen! line2: "[name]" - line3: Fall nicht hin! &c<3 + line3: Fall nicht runter! &c<3 From 04cfa794529348d77869bae4a2559b8c480c9464 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 31 Oct 2022 06:13:37 +0000 Subject: [PATCH 05/20] Translate ru.yml via GitLocalize --- src/main/resources/locales/ru.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/resources/locales/ru.yml diff --git a/src/main/resources/locales/ru.yml b/src/main/resources/locales/ru.yml new file mode 100644 index 0000000..1bb5b0f --- /dev/null +++ b/src/main/resources/locales/ru.yml @@ -0,0 +1,7 @@ +--- +bskyblock: + sign: + line0: "&cBSkyBlock" + line1: Добро пожаловать! + line2: "[name]" + line3: Не падай! &c <3 From 20e2ee1e22df1096eaa07d6860b18fa626a0057c Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 9 Feb 2023 15:08:31 -0800 Subject: [PATCH 07/20] Add ${argLine} to get jacoco coverage --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f78b4ff..ca037d1 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,7 @@ 3.0.0-M5 + ${argLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED @@ -338,4 +339,4 @@ - \ No newline at end of file + From 352ec8d5b2d1086159d84110f1450f21f1f7113b Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 9 Feb 2023 16:55:44 -0800 Subject: [PATCH 08/20] Fix Jacoco POM entry to enable code scanning --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ca037d1..ea0a398 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ org.jacoco jacoco-maven-plugin - 0.8.3 + 0.8.7 true @@ -323,16 +323,21 @@ - pre-unit-test + prepare-agent prepare-agent - post-unit-test + report report + + + XML + + From 300a80b3e387e42e811e7f1d1e7506ad9bb936b6 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 9 Feb 2023 16:59:59 -0800 Subject: [PATCH 09/20] Update compiler maven plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea0a398..67b329d 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.1 ${java.version} From 86d6eb1da6629fd380013a11c6d9e09d9c103204 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 9 Feb 2023 17:02:42 -0800 Subject: [PATCH 10/20] Update script to Java 17 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9cf60c..c771fd5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,10 +14,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 16 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 16 + java-version: 17 - name: Cache SonarCloud packages uses: actions/cache@v1 with: From 11201c775805fd4a95aa5e42e51fe0638a8e57c4 Mon Sep 17 00:00:00 2001 From: blombergs5 Date: Sun, 12 Feb 2023 13:37:16 -0500 Subject: [PATCH 11/20] Update README.md (#493) added link to releases page --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14a2a48..15904f6 100755 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Play SkyBlock with your friends! Don't fall! See the config.yml for all the sett ## Installation 1. Install BentoBox and run it on the server at least once to create its data folders. -2. Place this jar in the addons folder of the BentoBox plugin. +2. Place [this jar](https://github.com/BentoBoxWorld/BSkyBlock/releases) in the addons folder of the BentoBox plugin. 3. Restart the server. 4. The addon will create worlds and a data folder and inside the folder will be a config.yml. 5. Stop the server . From 7e7512549cd07cadcc4d1292ef1e5e7f2db3afd9 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 25 Mar 2023 09:12:35 -0700 Subject: [PATCH 12/20] Updated plugin.yml to have name of addon to make it unique --- .gitignore | 4 ++++ src/main/resources/plugin.yml | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9d01fad --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +/.classpath +/.DS_Store +/.project diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c38b629..d087787 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,7 @@ -name: Pladdon +name: BSkyBlock main: world.bentobox.bskyblock.BSkyBlockPladdon version: ${version} api-version: 1.19 description: A SkyBlock Plugin author: tastybento -depend: - - BentoBox + From 9d4d671168e2f2f711ef8bdb20f7f1639af799fc Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 25 Mar 2023 09:46:28 -0700 Subject: [PATCH 13/20] Switch to use annotations for plugin.yml --- pom.xml | 5 +++++ .../java/world/bentobox/bskyblock/BSkyBlockPladdon.java | 7 +++++++ src/main/resources/plugin.yml | 7 ------- 3 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 src/main/resources/plugin.yml diff --git a/pom.xml b/pom.xml index 67b329d..06b8ba9 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,11 @@ ${spigot.version} provided + + org.spigotmc + plugin-annotations + 1.2.3-SNAPSHOT + org.mockito diff --git a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java index 3035bc4..9e47dbc 100644 --- a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java +++ b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java @@ -1,8 +1,15 @@ package world.bentobox.bskyblock; +import org.bukkit.plugin.java.annotation.dependency.Dependency; +import org.bukkit.plugin.java.annotation.plugin.ApiVersion; +import org.bukkit.plugin.java.annotation.plugin.Plugin; + import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.addons.Pladdon; +@Plugin(name="BSkyBlock", version="1.0") +@ApiVersion(ApiVersion.Target.v1_17) +@Dependency(value = "BentoBox") public class BSkyBlockPladdon extends Pladdon { @Override diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index d087787..0000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: BSkyBlock -main: world.bentobox.bskyblock.BSkyBlockPladdon -version: ${version} -api-version: 1.19 -description: A SkyBlock Plugin -author: tastybento - From 12092cb89f2c954770702eeb4c1255b07be31b7f Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 25 Mar 2023 09:53:30 -0700 Subject: [PATCH 14/20] Remove dependency --- src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java index 9e47dbc..fe9063d 100644 --- a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java +++ b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java @@ -1,6 +1,5 @@ package world.bentobox.bskyblock; -import org.bukkit.plugin.java.annotation.dependency.Dependency; import org.bukkit.plugin.java.annotation.plugin.ApiVersion; import org.bukkit.plugin.java.annotation.plugin.Plugin; @@ -9,7 +8,6 @@ import world.bentobox.bentobox.api.addons.Pladdon; @Plugin(name="BSkyBlock", version="1.0") @ApiVersion(ApiVersion.Target.v1_17) -@Dependency(value = "BentoBox") public class BSkyBlockPladdon extends Pladdon { @Override From dee662b4b6fb231a396b30ad577b4692e60c9c6a Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 25 Mar 2023 18:24:59 -0700 Subject: [PATCH 15/20] Update README.md Update flags from SonarCloud --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 15904f6..006a538 100755 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ BSkyBlock ========== [![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/BSkyBlock)](https://ci.codemc.org/job/BentoBoxWorld/job/BSkyBlock/) -[![Lines Of Code](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abskyblock&metric=ncloc)](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=ncloc) -[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abskyblock&metric=sqale_rating)](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=Maintainability) -[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abskyblock&metric=reliability_rating)](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=Reliability) -[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abskyblock&metric=security_rating)](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=Security) -[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abskyblock&metric=bugs)](https://sonarcloud.io/project/issues?id=world.bentobox%3Abskyblock&resolved=false&types=BUG) +[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) +[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) +[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) +[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) +[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=bugs)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) # NOTE BSkyBlock requires BentoBox, so to run BSkyBlock, you must have BentoBox installed and place BSkyBlock in BentoBox's addon folder. From 55e7732b829e7447759edb00c90c93819f8a4115 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 25 Mar 2023 18:28:20 -0700 Subject: [PATCH 16/20] Update README.md --- README.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 006a538..b48819b 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -BSkyBlock -========== +# BSkyBlock + [![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/BSkyBlock)](https://ci.codemc.org/job/BentoBoxWorld/job/BSkyBlock/) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) @@ -7,15 +7,14 @@ BSkyBlock [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BSkyBlock&metric=bugs)](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock) -# NOTE -BSkyBlock requires BentoBox, so to run BSkyBlock, you must have BentoBox installed and place BSkyBlock in BentoBox's addon folder. - -# Documentation - -Go to [docs.bentobox.world](https://docs.bentobox.world). +BSkyBlock ## About -Play SkyBlock with your friends! Don't fall! See the config.yml for all the settings. +Play SkyBlock with your friends! Don't fall! See the config.yml for all the settings. This is an addon for BentoBox. + +## Documentation + +Go to [docs.bentobox.world](https://docs.bentobox.world). ## Installation From f341e05ba4cda32b6171b25ceb033b791fba117f Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 8 Apr 2023 19:03:31 +0300 Subject: [PATCH 17/20] Create plugin.yml --- src/main/resources/plugin.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/resources/plugin.yml diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..d84f487 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,9 @@ +name: BentoBox-BSkyBlock +main: world.bentobox.bskyblock.BSkyBlockPladdon +version: ${project.version}${build.number} +api-version: "1.19" + +authors: [tastybento] +contributors: ["The BentoBoxWorld Community"] +website: https://bentobox.world +description: ${project.description} From 92b73661591f5e9757d5bb463a72fead62fc90fd Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 8 Apr 2023 19:04:01 +0300 Subject: [PATCH 18/20] Update pom.xml --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 06b8ba9..67b329d 100644 --- a/pom.xml +++ b/pom.xml @@ -137,11 +137,6 @@ ${spigot.version} provided - - org.spigotmc - plugin-annotations - 1.2.3-SNAPSHOT - org.mockito From 0efc1af21fa50d6e1baa1f0fe4e2104a00dddae3 Mon Sep 17 00:00:00 2001 From: BONNe Date: Sat, 8 Apr 2023 19:04:16 +0300 Subject: [PATCH 19/20] Update BSkyBlockPladdon.java --- src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java index fe9063d..9e04af3 100644 --- a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java +++ b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java @@ -1,13 +1,10 @@ package world.bentobox.bskyblock; -import org.bukkit.plugin.java.annotation.plugin.ApiVersion; -import org.bukkit.plugin.java.annotation.plugin.Plugin; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.addons.Pladdon; -@Plugin(name="BSkyBlock", version="1.0") -@ApiVersion(ApiVersion.Target.v1_17) + public class BSkyBlockPladdon extends Pladdon { @Override From e88ee17d1ca4bea706a4770bc50c89439e917925 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 15 Apr 2023 11:30:36 -0700 Subject: [PATCH 20/20] Updated dependencies --- .gitignore | 1 + pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9d01fad..6151a44 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /.classpath /.DS_Store /.project +/addon-bskyblock.iml diff --git a/pom.xml b/pom.xml index 67b329d..6ef3add 100644 --- a/pom.xml +++ b/pom.xml @@ -58,8 +58,8 @@ 2.0.9 - 1.19-R0.1-SNAPSHOT - 1.21.0 + 1.19.4-R0.1-SNAPSHOT + 1.23.0 ${build.version}-SNAPSHOT