Merge remote-tracking branch 'origin/blueprints' into develop
This commit is contained in:
commit
b51634b106
9
pom.xml
9
pom.xml
|
@ -112,11 +112,12 @@
|
||||||
</includes>
|
</includes>
|
||||||
</resource>
|
</resource>
|
||||||
<resource>
|
<resource>
|
||||||
<directory>src/main/resources/schems</directory>
|
<directory>src/main/resources/blueprints</directory>
|
||||||
<targetPath>./schems</targetPath>
|
<targetPath>./blueprints</targetPath>
|
||||||
<filtering>false</filtering>
|
<filtering>false</filtering>
|
||||||
<includes>
|
<includes>
|
||||||
<include>*.schem</include>
|
<include>*.blu</include>
|
||||||
|
<include>*.json</include>
|
||||||
</includes>
|
</includes>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -132,7 +133,7 @@
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<nonFilteredFileExtensions>
|
<nonFilteredFileExtensions>
|
||||||
<nonFilteredFileExtension>schem</nonFilteredFileExtension>
|
<nonFilteredFileExtension>blu</nonFilteredFileExtension>
|
||||||
</nonFilteredFileExtensions>
|
</nonFilteredFileExtensions>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
@ -78,7 +78,7 @@ public class BSkyBlock extends GameModeAddon {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void createWorlds() {
|
public void createWorlds() {
|
||||||
String worldName = settings.getWorldName();
|
String worldName = settings.getWorldName().toLowerCase();
|
||||||
if (getServer().getWorld(worldName) == null) {
|
if (getServer().getWorld(worldName) == null) {
|
||||||
log("Creating BSkyBlock world ...");
|
log("Creating BSkyBlock world ...");
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,9 +46,9 @@ public class Settings implements WorldSettings {
|
||||||
private String friendlyName = "BSkyBlock";
|
private String friendlyName = "BSkyBlock";
|
||||||
|
|
||||||
@ConfigComment("Name of the world - if it does not exist then it will be generated.")
|
@ConfigComment("Name of the world - if it does not exist then it will be generated.")
|
||||||
@ConfigComment("It acts like a prefix for nether and end (e.g. BSkyBlock_world, BSkyBlock_world_nether, BSkyBlock_world_end)")
|
@ConfigComment("It acts like a prefix for nether and end (e.g. bskyblock_world, bskyblock_world_nether, bskyblock_world_end)")
|
||||||
@ConfigEntry(path = "world.world-name")
|
@ConfigEntry(path = "world.world-name")
|
||||||
private String worldName = "BSkyBlock_world";
|
private String worldName = "bskyblock_world";
|
||||||
|
|
||||||
@ConfigComment("World difficulty setting - PEACEFUL, EASY, NORMAL, HARD")
|
@ConfigComment("World difficulty setting - PEACEFUL, EASY, NORMAL, HARD")
|
||||||
@ConfigComment("Other plugins may override this setting")
|
@ConfigComment("Other plugins may override this setting")
|
||||||
|
|
|
@ -18,10 +18,10 @@ import world.bentobox.bentobox.api.commands.admin.AdminTrashCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand;
|
import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand;
|
import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
|
import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
|
||||||
|
import world.bentobox.bentobox.api.commands.admin.blueprints.AdminBlueprintCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.deaths.AdminDeathsCommand;
|
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.range.AdminRangeCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.resets.AdminResetsResetCommand;
|
import world.bentobox.bentobox.api.commands.admin.resets.AdminResetsResetCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.schem.AdminSchemCommand;
|
|
||||||
import world.bentobox.bentobox.api.commands.admin.team.AdminTeamAddCommand;
|
import world.bentobox.bentobox.api.commands.admin.team.AdminTeamAddCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.team.AdminTeamDisbandCommand;
|
import world.bentobox.bentobox.api.commands.admin.team.AdminTeamDisbandCommand;
|
||||||
import world.bentobox.bentobox.api.commands.admin.team.AdminTeamKickCommand;
|
import world.bentobox.bentobox.api.commands.admin.team.AdminTeamKickCommand;
|
||||||
|
@ -57,7 +57,7 @@ public class AdminCommand extends CompositeCommand {
|
||||||
new AdminTeamDisbandCommand(this);
|
new AdminTeamDisbandCommand(this);
|
||||||
new AdminTeamSetownerCommand(this);
|
new AdminTeamSetownerCommand(this);
|
||||||
// Schems
|
// Schems
|
||||||
new AdminSchemCommand(this);
|
new AdminBlueprintCommand(this);
|
||||||
// Register/unregister islands
|
// Register/unregister islands
|
||||||
new AdminRegisterCommand(this);
|
new AdminRegisterCommand(this);
|
||||||
new AdminUnregisterCommand(this);
|
new AdminUnregisterCommand(this);
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
{
|
||||||
|
"uniqueId": "default",
|
||||||
|
"icon": "GRASS",
|
||||||
|
"displayName": "§eThe Original SkyBlock",
|
||||||
|
"description": [
|
||||||
|
"§bStandard island, with a cow - moo!",
|
||||||
|
"§aIncludes an Overworld island",
|
||||||
|
"§cIncludes a Nether island",
|
||||||
|
"§6Includes an End island"
|
||||||
|
],
|
||||||
|
"requirePermission": false,
|
||||||
|
"blueprints": {
|
||||||
|
"NORMAL": "island",
|
||||||
|
"NETHER": "nether-island",
|
||||||
|
"THE_END": "end-island"
|
||||||
|
}
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -11,8 +11,8 @@ world:
|
||||||
# Friendly name for this world. Used in admin commands. Must be a single word
|
# Friendly name for this world. Used in admin commands. Must be a single word
|
||||||
friendly-name: BSkyBlock
|
friendly-name: BSkyBlock
|
||||||
# Name of the world - if it does not exist then it will be generated.
|
# Name of the world - if it does not exist then it will be generated.
|
||||||
# It acts like a prefix for nether and end (e.g. BSkyBlock-world, BSkyBlock-world_nether, BSkyBlock-world_end)
|
# It acts like a prefix for nether and end (e.g. bskyblock-world, bskyblock-world_nether, bskyblock-world_end)
|
||||||
world-name: BSkyBlock_world
|
world-name: bskyblock_world
|
||||||
# World difficulty setting - PEACEFUL, EASY, NORMAL, HARD
|
# World difficulty setting - PEACEFUL, EASY, NORMAL, HARD
|
||||||
# Other plugins may override this setting
|
# Other plugins may override this setting
|
||||||
difficulty: NORMAL
|
difficulty: NORMAL
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue