diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6151a44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/target/ +/.classpath +/.DS_Store +/.project +/addon-bskyblock.iml diff --git a/README.md b/README.md index 14a2a48..b48819b 100755 --- a/README.md +++ b/README.md @@ -1,26 +1,25 @@ -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=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. - -# 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 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 . diff --git a/pom.xml b/pom.xml index 232b61b..6ef3add 100644 --- a/pom.xml +++ b/pom.xml @@ -58,14 +58,14 @@ 2.0.9 - 1.19-R0.1-SNAPSHOT - 1.21.0 + 1.19.4-R0.1-SNAPSHOT + 1.23.0 ${build.version}-SNAPSHOT -LOCAL - 1.16.0 + 1.17.0 BentoBoxWorld_BSkyBlock bentobox-world @@ -219,7 +219,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.1 ${java.version} @@ -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 @@ -311,7 +312,7 @@ org.jacoco jacoco-maven-plugin - 0.8.3 + 0.8.7 true @@ -322,20 +323,25 @@ - pre-unit-test + prepare-agent prepare-agent - post-unit-test + report report + + + XML + + - \ No newline at end of file + diff --git a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java index 3035bc4..9e04af3 100644 --- a/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java +++ b/src/main/java/world/bentobox/bskyblock/BSkyBlockPladdon.java @@ -1,8 +1,10 @@ package world.bentobox.bskyblock; + import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.addons.Pladdon; + public class BSkyBlockPladdon extends Pladdon { @Override 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 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 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c38b629..d84f487 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,9 @@ -name: Pladdon +name: BentoBox-BSkyBlock main: world.bentobox.bskyblock.BSkyBlockPladdon -version: ${version} -api-version: 1.19 -description: A SkyBlock Plugin -author: tastybento -depend: - - BentoBox +version: ${project.version}${build.number} +api-version: "1.19" + +authors: [tastybento] +contributors: ["The BentoBoxWorld Community"] +website: https://bentobox.world +description: ${project.description} 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:")); }