Upstream/BSkyBlock
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BSkyBlock.git synced 2025-02-05 23:31:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/BentoBoxWorld/bskyblock.git

Browse Source 
into develop

Conflicts:
	pom.xml
This commit is contained in:
tastybento 2018-12-27 15:33:51 -08:00
commit 61d109d0e8
7 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -1,13 +1,6 @@
BSkyBlock
==========
[![Build Status](https://travis-ci.org/tastybento/bskyblock.svg?branch=master)](https://travis-ci.org/tastybento/bskyblock)
![Lines Of Code](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=ncloc)
![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=sqale_rating)
![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=reliability_rating)
![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=security_rating)
![Bugs](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=bugs)
[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/BSkyBlock)](https://ci.codemc.org/job/BentoBoxWorld/job/BSkyBlock/)
This is a survival game where the player starts with an island in the sky.
@ -28,4 +21,4 @@ You can find the projects on GitHub.
Bugs and Feature requests
=========================
File bug and feature requests here: https://github.com/BentoBoxWorld/addon-bskyblock/issues
File bug and feature requests here: https://github.com/BentoBoxWorld/BSkyBlock/issues

24
pom.xml
View File

@ -6,27 +6,27 @@
<groupId>world.bentobox</groupId>
<artifactId>BSkyBlock</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.6.2-SNAPSHOT</version>
<name>BSkyBlock</name>
<description>BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like ASkyBlock or AcidIsland.</description>
<url>https://github.com/BentoBoxWorld/addon-bskyblock</url>
<inceptionYear>2018</inceptionYear>
<description>BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland.</description>
<url>https://github.com/BentoBoxWorld/BSkyBlock</url>
<inceptionYear>2017</inceptionYear>
<scm>
<connection>scm:git:https://github.com/BentoBoxWorld/addon-bskyblock.git</connection>
<developerConnection>scm:git:git@github.com:BentoBoxWorld/addon-bskyblock.git</developerConnection>
<url>https://github.com/BentoBoxWorld/addon-bskyblock</url>
<connection>scm:git:https://github.com/BentoBoxWorld/BSkyBlock.git</connection>
<developerConnection>scm:git:git@github.com:BentoBoxWorld/BSkyBlock.git</developerConnection>
<url>https://github.com/BentoBoxWorld/BSkyBlock</url>
</scm>
<ciManagement>
<system>jenkins</system>
<url>http://ci.codemc.org/job/BentoBoxWorld/job/addon-bskyblock</url>
<url>http://ci.codemc.org/job/BentoBoxWorld/job/BSkyBlock</url>
</ciManagement>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/BentoBoxWorld/addon-bskyblock/issues</url>
<url>https://github.com/BentoBoxWorld/BSkyBlock/issues</url>
</issueManagement>
<distributionManagement>
@ -53,8 +53,8 @@
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
</repository>
<repository>
<id>codemc</id>
<url>https://repo.codemc.org/repository/maven-snapshots/</url>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public</url>
</repository>
</repositories>
@ -62,7 +62,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<version>1.13.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

4
src/main/java/world/bentobox/bskyblock/Settings.java
View File

@ -97,8 +97,8 @@ public class Settings implements DataObject, WorldSettings {
@ConfigEntry(path = "world.sea-height", needsReset = true)
private int seaHeight = 0;
@ConfigComment("Maximum number of islands in the world. Set to -1 for unlimited.")
@ConfigComment("If the number of islands is greater than this number, no new island will be created.")
@ConfigComment("Maximum number of islands in the world. Set to -1 or 0 for unlimited.")
@ConfigComment("If the number of islands is greater than this number, it will stop players from creating islands.")
@ConfigEntry(path = "world.max-islands")
private int maxIslands = -1;

3
src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
View File

@ -14,6 +14,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand;
import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand;
import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand;
import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
import world.bentobox.bentobox.api.commands.admin.deaths.AdminDeathsCommand;
import world.bentobox.bentobox.api.commands.admin.range.AdminRangeCommand;
import world.bentobox.bentobox.api.commands.admin.schem.AdminSchemCommand;
import world.bentobox.bentobox.api.commands.admin.team.AdminTeamAddCommand;
@ -62,6 +63,8 @@ public class AdminCommand extends CompositeCommand {
new AdminDeleteCommand(this);
// Why
new AdminWhyCommand(this);
new AdminDeathsCommand(this);
}
@Override

2
src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java
View File

@ -8,6 +8,7 @@ import world.bentobox.bentobox.api.commands.island.IslandBanCommand;
import world.bentobox.bentobox.api.commands.island.IslandBanlistCommand;
import world.bentobox.bentobox.api.commands.island.IslandCreateCommand;
import world.bentobox.bentobox.api.commands.island.IslandGoCommand;
import world.bentobox.bentobox.api.commands.island.IslandInfoCommand;
import world.bentobox.bentobox.api.commands.island.IslandLanguageCommand;
import world.bentobox.bentobox.api.commands.island.IslandResetCommand;
import world.bentobox.bentobox.api.commands.island.IslandResetnameCommand;
@ -37,6 +38,7 @@ public class IslandCommand extends CompositeCommand {
setPermission("island");
// Set up subcommands
new IslandAboutCommand(this);
new IslandInfoCommand(this);
new IslandCreateCommand(this);
new IslandGoCommand(this);
new IslandResetCommand(this);

12
src/main/resources/locales/en-US.yml Executable file
View File

@ -0,0 +1,12 @@
###########################################################################################
# This is a YML file. Be careful when editing. Check your edits in a YAML checker like #
# the one at http://yaml-online-parser.appspot.com #
###########################################################################################
bskyblock:
sign:
line0: "&cBSkyBlock"
line1: "Welcome!"
line2: "[name]"
line3: "Do not fall! &c<3"

BIN
src/main/resources/schems/island.schem
View File

Binary file not shown.