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

This commit is contained in:
tastybento 2019-05-15 14:22:37 -07:00
commit abd38dceca
9 changed files with 24 additions and 6 deletions

View File

@ -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>

View File

@ -19,10 +19,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 AcidCommand extends CompositeCommand {
new AdminTeamDisbandCommand(this);
new AdminTeamSetownerCommand(this);
// Schems
new AdminSchemCommand(this);
new AdminBlueprintCommand(this);
// Register/unregister islands
new AdminRegisterCommand(this);
new AdminUnregisterCommand(this);

View File

@ -0,0 +1,17 @@
{
"uniqueId": "default",
"icon": "PRISMARINE",
"displayName": "§eThe Original AcidIsland",
"description": [
"§bAn island with a sheep - baa!",
"§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.