Merge branch 'develop' into master
This commit is contained in:
BONNe
commit
f44c6fa2a8
|
|
@ -0,0 +1,5 @@
|
|||
/target/
|
||||
/.classpath
|
||||
/.DS_Store
|
||||
/.project
|
||||
/addon-bskyblock.iml
|
||||
29
README.md
29
README.md
|
|
@ -1,26 +1,25 @@
|
|||
BSkyBlock
|
||||
==========
|
||||
# BSkyBlock
|
||||
|
||||
[](https://ci.codemc.org/job/BentoBoxWorld/job/BSkyBlock/)
|
||||
[](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=ncloc)
|
||||
[](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=Maintainability)
|
||||
[](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=Reliability)
|
||||
[](https://sonarcloud.io/component_measures?id=world.bentobox%3Abskyblock&metric=Security)
|
||||
[](https://sonarcloud.io/project/issues?id=world.bentobox%3Abskyblock&resolved=false&types=BUG)
|
||||
[](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock)
|
||||
[](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock)
|
||||
[](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock)
|
||||
[](https://sonarcloud.io/summary/new_code?id=BentoBoxWorld_BSkyBlock)
|
||||
[](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).
|
||||
<img width="509" alt="BSkyBlock" src="https://user-images.githubusercontent.com/4407265/227750292-5617537d-c99a-4a7e-864e-5de990b8c195.png">
|
||||
|
||||
## 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 .
|
||||
|
|
|
|||
22
pom.xml
22
pom.xml
|
|
@ -58,14 +58,14 @@
|
|||
<!-- Non-minecraft related dependencies -->
|
||||
<powermock.version>2.0.9</powermock.version>
|
||||
<!-- More visible way how to change dependency versions -->
|
||||
<spigot.version>1.19-R0.1-SNAPSHOT</spigot.version>
|
||||
<bentobox.version>1.21.0</bentobox.version>
|
||||
<spigot.version>1.19.4-R0.1-SNAPSHOT</spigot.version>
|
||||
<bentobox.version>1.23.0</bentobox.version>
|
||||
<!-- Revision variable removes warning about dynamic version -->
|
||||
<revision>${build.version}-SNAPSHOT</revision>
|
||||
<!-- Do not change unless you want different name for local builds. -->
|
||||
<build.number>-LOCAL</build.number>
|
||||
<!-- This allows to change between versions. -->
|
||||
<build.version>1.16.0</build.version>
|
||||
<build.version>1.17.0</build.version>
|
||||
<!-- Sonar Cloud -->
|
||||
<sonar.projectKey>BentoBoxWorld_BSkyBlock</sonar.projectKey>
|
||||
<sonar.organization>bentobox-world</sonar.organization>
|
||||
|
|
@ -219,7 +219,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.7.0</version>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<release>${java.version}</release>
|
||||
</configuration>
|
||||
|
|
@ -230,6 +230,7 @@
|
|||
<version>3.0.0-M5</version>
|
||||
<configuration>
|
||||
<argLine>
|
||||
${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 @@
|
|||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.3</version>
|
||||
<version>0.8.7</version>
|
||||
<configuration>
|
||||
<append>true</append>
|
||||
<excludes>
|
||||
|
|
@ -322,20 +323,25 @@
|
|||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pre-unit-test</id>
|
||||
<id>prepare-agent</id>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>post-unit-test</id>
|
||||
<id>report</id>
|
||||
<goals>
|
||||
<goal>report</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<formats>
|
||||
<format>XML</format>
|
||||
</formats>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
bskyblock:
|
||||
sign:
|
||||
line0: "&cBSkyBlock"
|
||||
line1: Добро пожаловать!
|
||||
line2: "[name]"
|
||||
line3: Не падай! &c <3
|
||||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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:"));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue