From 5d1b562593e5172dbebfcfcdb38abd8814c47aa4 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 27 Jan 2019 11:17:29 +0100 Subject: [PATCH 1/4] Added /bsbadmin setspawn --- .../java/world/bentobox/bskyblock/commands/AdminCommand.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java index 4159353..3782cb1 100644 --- a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java +++ b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java @@ -9,6 +9,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand; import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand; import world.bentobox.bentobox.api.commands.admin.AdminReloadCommand; import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand; +import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand; import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand; import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand; import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand; @@ -67,6 +68,8 @@ public class AdminCommand extends CompositeCommand { new AdminDeathsCommand(this); // Reload new AdminReloadCommand(this); + // Spawn + new AdminSetspawnCommand(this); } @Override From 99fb7bdc9aeb928e4acea7b5fccc60cda6133cfd Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 27 Jan 2019 11:17:39 +0100 Subject: [PATCH 2/4] Added /is spawn --- .../java/world/bentobox/bskyblock/commands/IslandCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java index 52aefa0..08d3f06 100644 --- a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java +++ b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java @@ -15,6 +15,7 @@ import world.bentobox.bentobox.api.commands.island.IslandResetnameCommand; import world.bentobox.bentobox.api.commands.island.IslandSethomeCommand; import world.bentobox.bentobox.api.commands.island.IslandSetnameCommand; import world.bentobox.bentobox.api.commands.island.IslandSettingsCommand; +import world.bentobox.bentobox.api.commands.island.IslandSpawnCommand; import world.bentobox.bentobox.api.commands.island.IslandUnbanCommand; import world.bentobox.bentobox.api.commands.island.team.IslandTeamCommand; import world.bentobox.bentobox.api.localization.TextVariables; @@ -41,6 +42,7 @@ public class IslandCommand extends CompositeCommand { new IslandInfoCommand(this); new IslandCreateCommand(this); new IslandGoCommand(this); + new IslandSpawnCommand(this); new IslandResetCommand(this); new IslandSetnameCommand(this); new IslandResetnameCommand(this); @@ -72,7 +74,5 @@ public class IslandCommand extends CompositeCommand { } user.sendMessage("general.errors.unknown-command", TextVariables.LABEL, getTopLabel()); return false; - } - } From 83069b6e868fd2abe22312394c10a34aaa81feed Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 27 Jan 2019 11:19:15 +0100 Subject: [PATCH 3/4] Release 1.1 (BentoBox 1.2.0) --- pom.xml | 4 ++-- .../java/world/bentobox/bskyblock/BSkyBlock.java | 1 - .../java/world/bentobox/bskyblock/Settings.java | 1 - src/main/resources/addon.yml | 4 +--- src/main/resources/config.yml | 14 +++++++------- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 9dd712f..7bc57a2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox bskyblock - 1.1-SNAPSHOT + 1.1 BSkyBlock BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. @@ -91,7 +91,7 @@ world.bentobox bentobox - 1.1.1-SNAPSHOT + 1.2.0 provided diff --git a/src/main/java/world/bentobox/bskyblock/BSkyBlock.java b/src/main/java/world/bentobox/bskyblock/BSkyBlock.java index 5aadfc4..0de4d57 100644 --- a/src/main/java/world/bentobox/bskyblock/BSkyBlock.java +++ b/src/main/java/world/bentobox/bskyblock/BSkyBlock.java @@ -42,7 +42,6 @@ public class BSkyBlock extends GameModeAddon { logError("BSkyBlock settings could not load! Addon disabled."); setState(State.DISABLED); } - } @Override diff --git a/src/main/java/world/bentobox/bskyblock/Settings.java b/src/main/java/world/bentobox/bskyblock/Settings.java index 3e76e68..9bbad29 100644 --- a/src/main/java/world/bentobox/bskyblock/Settings.java +++ b/src/main/java/world/bentobox/bskyblock/Settings.java @@ -31,7 +31,6 @@ import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2; @ConfigComment("This config file is dynamic and saved when the server is shutdown.") @ConfigComment("You cannot edit it while the server is running because changes will") @ConfigComment("be lost! Use in-game settings GUI or edit when server is offline.") -@ConfigComment("") public class Settings implements DataObject, WorldSettings { /* WORLD */ diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index 392e4c3..8e1ce46 100755 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -1,6 +1,7 @@ name: BSkyBlock main: world.bentobox.bskyblock.BSkyBlock version: ${version} +metrics: true authors: tastybento @@ -20,9 +21,6 @@ permissions: bskyblock.island.info: description: Let the player check their island level default: true - bskyblock.island.sethome: - description: Let the player set their island teleport point - default: true bskyblock.island.lock: description: Allows island locking default: false diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 2238068..a25a11b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,8 +1,7 @@ -# BSkyBlock Configuration 1.0 +# BSkyBlock Configuration 1.1 # This config file is dynamic and saved when the server is shutdown. # You cannot edit it while the server is running because changes will # be lost! Use in-game settings GUI or edit when server is offline. -# world: # Friendly name for this world. Used in admin commands. Must be a single word friendly-name: BSkyBlock @@ -82,10 +81,10 @@ world: dragon-spawn: false # Mob white list - these mobs will NOT be removed when logging in or doing /island remove-mobs-whitelist: + - WITHER + - PIG_ZOMBIE - ENDERMAN - ZOMBIE_VILLAGER - - PIG_ZOMBIE - - WITHER # World flags. These are boolean settings for various flags for this world flags: CREEPER_DAMAGE: true @@ -149,19 +148,20 @@ world: CRAFTING: 0 ENCHANTING: 0 SHEARING: 500 - SPAWN_EGGS: 500 BED: 500 + SPAWN_EGGS: 500 MILKING: 0 DISPENSER: 500 GATE: 0 EXPERIENCE_PICKUP: 500 HOPPER: 500 LEASH: 500 - BREAK_BLOCKS: 500 MOUNT_INVENTORY: 500 + BREAK_BLOCKS: 500 CHORUS_FRUIT: 500 CONTAINER: 500 JUKEBOX: 500 + POTION_THROWING: 500 # These are the default settings for new islands default-island-settings: PVP_END: false @@ -179,7 +179,7 @@ world: - spawnmob island: # Default max team size - # Permission size cannot be less than the default below. + # Permission size cannot be less than the default below. max-team-size: 4 # Default maximum number of homes a player can have. Min = 1 # Accessed via /is sethome or /is go From 343386f49315338bc02fa66e7b588e9f20bd92e0 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 27 Jan 2019 11:21:57 +0100 Subject: [PATCH 4/4] Version 1.1.1-SNAPSHOT (develop) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7bc57a2..d3d0e0e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox bskyblock - 1.1 + 1.1.1-SNAPSHOT BSkyBlock BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland.