Merge remote-tracking branch 'origin/blueprints' into develop

pom.xml

@@ -112,11 +112,12 @@
 				</includes>
 			</resource>
 			<resource>
-				<directory>src/main/resources/schems</directory>
-				<targetPath>./schems</targetPath>
+				<directory>src/main/resources/blueprints</directory>
+				<targetPath>./blueprints</targetPath>
 				<filtering>false</filtering>
 				<includes>
-					<include>*.schem</include>
+					<include>*.blu</include>
+					<include>*.json</include>
 				</includes>
 			</resource>
 		</resources>
@@ -132,7 +133,7 @@
 				<version>3.1.0</version>
 				<configuration>
 					<nonFilteredFileExtensions>
-						<nonFilteredFileExtension>schem</nonFilteredFileExtension>
+						<nonFilteredFileExtension>blu</nonFilteredFileExtension>
 					</nonFilteredFileExtensions>
 				</configuration>
 			</plugin>

src/main/java/world/bentobox/bskyblock/BSkyBlock.java

@@ -78,7 +78,7 @@ public class BSkyBlock extends GameModeAddon {
 
     @Override
     public void createWorlds() {
-        String worldName = settings.getWorldName();
+        String worldName = settings.getWorldName().toLowerCase();
         if (getServer().getWorld(worldName) == null) {
             log("Creating BSkyBlock world ...");
         }

src/main/java/world/bentobox/bskyblock/Settings.java

@@ -46,9 +46,9 @@ public class Settings implements WorldSettings {
     private String friendlyName = "BSkyBlock";
 
     @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")
-    private String worldName = "BSkyBlock_world";
+    private String worldName = "bskyblock_world";
 
     @ConfigComment("World difficulty setting - PEACEFUL, EASY, NORMAL, HARD")
     @ConfigComment("Other plugins may override this setting")

src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java

@@ -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.AdminVersionCommand;
 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.range.AdminRangeCommand;
 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.AdminTeamDisbandCommand;
 import world.bentobox.bentobox.api.commands.admin.team.AdminTeamKickCommand;
@@ -57,7 +57,7 @@ public class AdminCommand extends CompositeCommand {
         new AdminTeamDisbandCommand(this);
         new AdminTeamSetownerCommand(this);
         // Schems
-        new AdminSchemCommand(this);
+        new AdminBlueprintCommand(this);
         // Register/unregister islands
         new AdminRegisterCommand(this);
         new AdminUnregisterCommand(this);

src/main/resources/blueprints/default.json

@@ -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"
+  }
+}

src/main/resources/config.yml

@@ -11,8 +11,8 @@ world:
   # Friendly name for this world. Used in admin commands. Must be a single word
   friendly-name: BSkyBlock
   # 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)
-  world-name: BSkyBlock_world
+  # It acts like a prefix for nether and end (e.g. bskyblock-world, bskyblock-world_nether, bskyblock-world_end)
+  world-name: bskyblock_world
   # World difficulty setting - PEACEFUL, EASY, NORMAL, HARD
   # Other plugins may override this setting
   difficulty: NORMAL