Updated to work with addons like warps.

This commit is contained in:
tastybento 2018-05-28 15:46:07 -07:00
parent b402450253
commit 8f469eb339
5 changed files with 34 additions and 15 deletions

View File

@ -42,6 +42,7 @@ general:
changing-obsidian-to-lava: "Changing obsidian back into lava. Be careful!" changing-obsidian-to-lava: "Changing obsidian back into lava. Be careful!"
commands: commands:
# Parameters in <> are required, parameters in [] are optional
help: help:
header: "&7=========== &c[label] help &7===========" header: "&7=========== &c[label] help &7==========="
syntax: "&b[usage] &a[parameters]&7: &e[description]" syntax: "&b[usage] &a[parameters]&7: &e[description]"
@ -53,31 +54,31 @@ commands:
description: "admin command" description: "admin command"
team: team:
add: add:
parameters: "[leader] [player]" parameters: "<leader> <player>"
description: "add player to leader's team" description: "add player to leader's team"
name-not-leader: "&c[name] is not the leader" name-not-leader: "&c[name] is not the leader"
name-has-island: "&c[name] has an island. Unregister or delete them first!" name-has-island: "&c[name] has an island. Unregister or delete them first!"
disband: disband:
parameters: "[team leader]" parameters: "<team leader>"
description: "disband team leader's team" description: "disband team leader's team"
user-disband-leader: "&cNot leader! Use disband [leader]" user-disband-leader: "&cNot leader! Use disband [leader]"
disbanded: "&cAdmin disbanded your team!" disbanded: "&cAdmin disbanded your team!"
kick: kick:
parameters: "[team player]" parameters: "<team player>"
description: "kick a player from a team" description: "kick a player from a team"
cannot-kick-leader: "&cYou cannot kick the team leader. Kick members first" cannot-kick-leader: "&cYou cannot kick the team leader. Kick members first"
admin-kicked: "&cThe admin kicked you from the team." admin-kicked: "&cThe admin kicked you from the team."
makeleader: makeleader:
parameters: "[player]" parameters: "<player>"
description: "make player the team's leader" description: "make player the team's leader"
already-leader: "&cPlayer is already the leader!" already-leader: "&cPlayer is already the leader!"
register: register:
parameters: "[player]" parameters: "<player>"
description: "register player to unowned island you are on" description: "register player to unowned island you are on"
registered-island: "&aRegistered player to island at [xyz]." registered-island: "&aRegistered player to island at [xyz]."
already-owned: "&cIsland is already owned by another player!" already-owned: "&cIsland is already owned by another player!"
unregister: unregister:
parameters: "[owner]" parameters: "<owner>"
description: "unregister owner from island, but keep island blocks" description: "unregister owner from island, but keep island blocks"
unregistered-island: "&aUnregistered player from island at [xyz]." unregistered-island: "&aUnregistered player from island at [xyz]."
info: info:
@ -102,21 +103,21 @@ commands:
version: version:
description: "display %bsb_plugin_name% and addons versions" description: "display %bsb_plugin_name% and addons versions"
setrange: setrange:
parameters: "[player] [range]" parameters: "<player> <range>"
description: "set the range of player's island" description: "set the range of player's island"
range-updated: "Island range updated to [number]" range-updated: "Island range updated to [number]"
reload: reload:
description: "reload the plugin" description: "reload the plugin"
tp: tp:
parameters: "[player]" parameters: "<player>"
description: "teleport to a player's island" description: "teleport to a player's island"
manual: "&cNo safe warp found! Manually tp near to &b[location] &cand check it out" manual: "&cNo safe warp found! Manually tp near to &b[location] &cand check it out"
getrank: getrank:
parameters: "[player]" parameters: "<player>"
description: "get a player's rank on their island" description: "get a player's rank on their island"
rank-is: "&aRank is [rank] on their island." rank-is: "&aRank is [rank] on their island."
setrank: setrank:
parameters: "[player] [rank]" parameters: "<player> <rank>"
description: "set a player's rank on their island" description: "set a player's rank on their island"
unknown-rank: "&cUnknown rank!" unknown-rank: "&cUnknown rank!"
rank-set: "&aRank set from [from] to [to]." rank-set: "&aRank set from [from] to [to]."
@ -124,7 +125,7 @@ commands:
about: about:
description: "display copyright and license info" description: "display copyright and license info"
go: go:
parameters: "<home number>" parameters: "[home number]"
description: "teleport you to your island" description: "teleport you to your island"
teleport: "&aTeleporting you to your island." teleport: "&aTeleporting you to your island."
teleported: "&aTeleported you to home &e#[number]." teleported: "&aTeleported you to home &e#[number]."
@ -153,7 +154,7 @@ commands:
must-be-on-your-island: "You must be on your island to set home!" must-be-on-your-island: "You must be on your island to set home!"
num-homes: "Homes can be 1 to [max]." num-homes: "Homes can be 1 to [max]."
home-set: "Your island home has been set to your current location." home-set: "Your island home has been set to your current location."
parameters: "<home number>" parameters: "[home number]"
setname: setname:
description: "set a name for your island" description: "set a name for your island"
name-too-short: "&cToo short. Minimum size is [length] characters." name-too-short: "&cToo short. Minimum size is [length] characters."

View File

@ -4,6 +4,7 @@ import org.bukkit.World;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import us.tastybento.bskyblock.api.addons.Addon;
import us.tastybento.bskyblock.api.configuration.WorldSettings; import us.tastybento.bskyblock.api.configuration.WorldSettings;
import us.tastybento.bskyblock.api.placeholders.PlaceholderHandler; import us.tastybento.bskyblock.api.placeholders.PlaceholderHandler;
import us.tastybento.bskyblock.api.user.Notifier; import us.tastybento.bskyblock.api.user.Notifier;
@ -313,8 +314,6 @@ public class BSkyBlock extends JavaPlugin {
getLogger().warning(warning); getLogger().warning(warning);
} }
/** /**
* Registers a world as a world to be covered by this plugin * Registers a world as a world to be covered by this plugin
* @param world - Bukkit over world * @param world - Bukkit over world
@ -323,5 +322,5 @@ public class BSkyBlock extends JavaPlugin {
public void registerWorld(World world, WorldSettings worldSettings) { public void registerWorld(World world, WorldSettings worldSettings) {
islandWorldManager.addWorld(world, worldSettings); islandWorldManager.addWorld(world, worldSettings);
} }
} }

View File

@ -1300,6 +1300,11 @@ public class Settings implements ISettings<Settings>, WorldSettings {
public void setDragonSpawn(boolean dragonSpawn) { public void setDragonSpawn(boolean dragonSpawn) {
this.dragonSpawn = dragonSpawn; this.dragonSpawn = dragonSpawn;
} }
@Override
public String getPermissionPrefix() {
return "bskyblock";
}
} }

View File

@ -120,5 +120,10 @@ public interface WorldSettings {
* @return the max homes * @return the max homes
*/ */
public int getMaxHomes(); public int getMaxHomes();
/**
* @return the permission prefix
*/
public String getPermissionPrefix();
} }

View File

@ -445,4 +445,13 @@ public class IslandWorldManager {
public String getFriendlyName(World world) { public String getFriendlyName(World world) {
return worldSettings.get(Util.getWorld(world)).getFriendlyName(); return worldSettings.get(Util.getWorld(world)).getFriendlyName();
} }
/**
* Get the permission prefix for this world
* @param world
*/
public String getPermissionPrefix(World world) {
return worldSettings.get(Util.getWorld(world)).getPermissionPrefix();
}
} }