From 27695157bbb9f9db12ce43f4f7189acca2dc7cf9 Mon Sep 17 00:00:00 2001 From: Esophose Date: Mon, 27 May 2019 12:56:25 -0600 Subject: [PATCH] Island weather, structure block updates, language fix, interact perms --- .../skyblock/listeners/Interact.java | 96 ++++++++++--- .../goodandevil/skyblock/menus/Weather.java | 53 +++++--- .../skyblock/utils/world/block/BlockUtil.java | 14 ++ src/main/resources/language.yml | 128 ++++++++++-------- 4 files changed, 200 insertions(+), 91 deletions(-) diff --git a/src/main/java/me/goodandevil/skyblock/listeners/Interact.java b/src/main/java/me/goodandevil/skyblock/listeners/Interact.java index 19e7f0c5..7a26ac7a 100644 --- a/src/main/java/me/goodandevil/skyblock/listeners/Interact.java +++ b/src/main/java/me/goodandevil/skyblock/listeners/Interact.java @@ -7,6 +7,7 @@ import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.block.Beacon; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.EntityType; @@ -73,6 +74,17 @@ public class Interact implements Listener { .getFileConfiguration().getString("Island.Settings.Permission.Message")); soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); + return; + } + } else if (block.getState() instanceof Beacon) { + if (!islandManager.hasPermission(player, block.getLocation(), "Beacon")) { + event.setCancelled(true); + + messageManager.sendMessage(player, + skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml")) + .getFileConfiguration().getString("Island.Settings.Permission.Message")); + soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); + return; } } @@ -123,17 +135,6 @@ public class Interact implements Listener { .getFileConfiguration().getString("Island.Settings.Permission.Message")); soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); - return; - } - } else if (block.getType() == Material.BEACON) { - if (!islandManager.hasPermission(player, block.getLocation(), "Beacon")) { - event.setCancelled(true); - - messageManager.sendMessage(player, - skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml")) - .getFileConfiguration().getString("Island.Settings.Permission.Message")); - soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); - return; } } else if (block.getType() == Materials.LEGACY_BED_BLOCK.parseMaterial() @@ -288,7 +289,8 @@ public class Interact implements Listener { || block.getType() == Materials.JUNGLE_TRAPDOOR.parseMaterial() || block.getType() == Materials.ACACIA_TRAPDOOR.parseMaterial() || block.getType() == Materials.DARK_OAK_TRAPDOOR.parseMaterial() - || block.getType() == Material.NOTE_BLOCK || block.getType() == Material.HOPPER + || block.getType() == Material.NOTE_BLOCK + || block.getType() == Material.HOPPER || block.getType() == Materials.COMPARATOR.parseMaterial() || block.getType() == Materials.LEGACY_REDSTONE_COMPARATOR_OFF.parseMaterial() || block.getType() == Materials.LEGACY_REDSTONE_COMPARATOR_ON.parseMaterial() @@ -328,6 +330,17 @@ public class Interact implements Listener { .getFileConfiguration().getString("Island.Settings.Permission.Message")); soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); + return; + } + } else if (block.getType() == Material.TNT) { + if (!islandManager.hasPermission(player, block.getLocation(), "Destroy")) { + event.setCancelled(true); + + messageManager.sendMessage(player, + skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml")) + .getFileConfiguration().getString("Island.Settings.Permission.Message")); + soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); + return; } } else if (block.getType() == Materials.LEGACY_CAKE_BLOCK.getPostMaterial()) { @@ -421,6 +434,32 @@ public class Interact implements Listener { return; } } + } else if (block.getType() == Material.TNT) { + if (skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")) + .getFileConfiguration().getBoolean("Island.Block.EndFrame.Enable") + && islandManager.hasPermission(player, block.getLocation(), "Destroy")) { + + if (Bukkit.getPluginManager().isPluginEnabled("EpicAnchors")) { + if (com.songoda.epicanchors.EpicAnchorsPlugin.getInstance().getAnchorManager().getAnchor(block.getLocation()) != null) { + event.setCancelled(true); + return; + } + } + + ItemStack is = event.getPlayer().getItemInHand(); + + if (is == null || is.getType() == Material.AIR) { + block.setType(Material.AIR); + player.getInventory().addItem(new ItemStack(Materials.END_PORTAL_FRAME.parseMaterial(), 1)); + player.updateInventory(); + + soundManager.playSound(player, Sounds.CHICKEN_EGG_POP.bukkitSound(), 10.0F, 10.0F); + + event.setCancelled(true); + + return; + } + } } if ((event.getItem() != null) && (event.getItem().getType() != Material.AIR) && !event.isCancelled()) { @@ -452,7 +491,7 @@ public class Interact implements Listener { player.updateInventory(); } } - } else if (event.getItem().getType() == Materials.BAT_SPAWN_EGG.parseMaterial()) { + } else if (event.getItem().getType().name().contains("SPAWN_EGG")) { if (!islandManager.hasPermission(player, block.getLocation(), "SpawnEgg")) { event.setCancelled(true); @@ -506,7 +545,9 @@ public class Interact implements Listener { || block.getType() == Materials.BIRCH_PRESSURE_PLATE.parseMaterial() || block.getType() == Materials.JUNGLE_PRESSURE_PLATE.parseMaterial() || block.getType() == Materials.ACACIA_PRESSURE_PLATE.parseMaterial() - || block.getType() == Materials.DARK_OAK_PRESSURE_PLATE.parseMaterial()) { + || block.getType() == Materials.DARK_OAK_PRESSURE_PLATE.parseMaterial() + || block.getType() == Materials.LIGHT_WEIGHTED_PRESSURE_PLATE.parseMaterial() + || block.getType() == Materials.HEAVY_WEIGHTED_PRESSURE_PLATE.parseMaterial()) { if (!islandManager.hasPermission(player, block.getLocation(), "PressurePlate")) { event.setCancelled(true); } @@ -520,7 +561,17 @@ public class Interact implements Listener { soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); } } + } else if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_AIR) { + if (event.getItem() != null && event.getItem().getType() == Material.EGG) { + if (!skyblock.getIslandManager().hasPermission(player, "Projectile")) { + event.setCancelled(true); + messageManager.sendMessage(player, + skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml")) + .getFileConfiguration().getString("Island.Settings.Permission.Message")); + soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); + } + } } } @@ -686,8 +737,7 @@ public class Interact implements Listener { return; } - } - else if(entity instanceof StorageMinecart){ + } else if(entity instanceof StorageMinecart){ if (!islandManager.hasPermission(player, entity.getLocation(), "Storage")) { event.setCancelled(true); @@ -698,8 +748,7 @@ public class Interact implements Listener { return; } - } - else if (entity.getType() == EntityType.MINECART || entity.getType() == EntityType.BOAT) { + } else if (entity.getType() == EntityType.MINECART || entity.getType() == EntityType.BOAT) { if (!islandManager.hasPermission(player, entity.getLocation(), "MinecartBoat")) { event.setCancelled(true); @@ -708,6 +757,17 @@ public class Interact implements Listener { .getFileConfiguration().getString("Island.Settings.Permission.Message")); soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); + return; + } + } else if (entity.getType() == EntityType.MINECART_HOPPER) { + if (!islandManager.hasPermission(player, entity.getLocation(), "Hopper")) { + event.setCancelled(true); + + messageManager.sendMessage(player, + skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml")) + .getFileConfiguration().getString("Island.Settings.Permission.Message")); + soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F); + return; } } diff --git a/src/main/java/me/goodandevil/skyblock/menus/Weather.java b/src/main/java/me/goodandevil/skyblock/menus/Weather.java index 195cb124..ad48296c 100644 --- a/src/main/java/me/goodandevil/skyblock/menus/Weather.java +++ b/src/main/java/me/goodandevil/skyblock/menus/Weather.java @@ -112,9 +112,12 @@ public class Weather { if (!island.isWeatherSynchronized()) { for (Player all : islandManager.getPlayersAtIsland(island, IslandWorld.Normal)) { + all.resetPlayerTime(); + all.resetPlayerWeather(); all.setPlayerTime(island.getTime(), fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml")) .getFileConfiguration().getBoolean("Island.Weather.Time.Cycle")); + all.setPlayerWeather(island.getWeather()); } } @@ -132,6 +135,11 @@ public class Weather { if (!island.isWeatherSynchronized()) { for (Player all : islandManager.getPlayersAtIsland(island, IslandWorld.Normal)) { + all.resetPlayerTime(); + all.resetPlayerWeather(); + all.setPlayerTime(island.getTime(), + fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml")) + .getFileConfiguration().getBoolean("Island.Weather.Time.Cycle")); all.setPlayerWeather(island.getWeather()); } } @@ -183,25 +191,25 @@ public class Weather { if (islandTime == 0) { timeName = configLoad.getString("Menu.Weather.Item.Info.Time.Dawn"); - timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Day"); + timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Dawn"); } else if (islandTime == 1000) { timeName = configLoad.getString("Menu.Weather.Item.Info.Time.Day"); - timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Noon"); + timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Day"); } else if (islandTime == 6000) { timeName = configLoad.getString("Menu.Weather.Item.Info.Time.Noon"); - timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Dusk"); + timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Noon"); } else if (islandTime == 12000) { timeName = configLoad.getString("Menu.Weather.Item.Info.Time.Dusk"); - timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Night"); + timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Dusk"); } else if (islandTime == 13000) { timeName = configLoad.getString("Menu.Weather.Item.Info.Time.Night"); - timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Midnight"); + timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Night"); } else if (islandTime == 18000) { timeName = configLoad.getString("Menu.Weather.Item.Info.Time.Midnight"); - timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Dawn"); + timeChoice = configLoad.getString("Menu.Weather.Item.Time.Choice.Midnight"); } - if (island.getWeather() == WeatherType.CLEAR) { + if (island.getWeather() != WeatherType.CLEAR) { weatherChoice = configLoad.getString("Menu.Weather.Item.Weather.Choice.Downfall"); } else { weatherChoice = configLoad.getString("Menu.Weather.Item.Weather.Choice.Clear"); @@ -215,21 +223,34 @@ public class Weather { nInv.addItem(nInv.createItem(new ItemStack(Material.NAME_TAG), configLoad.getString("Menu.Weather.Item.Info.Displayname"), - configLoad.getStringList("Menu.Weather.Item.Info.Lore"), + configLoad.getStringList("Menu.Weather.Item.Info.Lore." + (island.isWeatherSynchronized() ? "Synchronised" : "Unsynchronised")), new Placeholder[] { new Placeholder("%synchronised", weatherSynchronised), new Placeholder("%time_name", timeName), new Placeholder("%time", "" + island.getTime()), new Placeholder("%weather", island.getWeatherName()) }, null, null), 0); nInv.addItem(nInv.createItem(Materials.BLACK_STAINED_GLASS_PANE.parseItem(), configLoad.getString("Menu.Weather.Item.Barrier.Displayname"), null, null, null, null), 1); - nInv.addItem(nInv.createItem(Materials.SUNFLOWER.parseItem(), - configLoad.getString("Menu.Weather.Item.Time.Displayname"), - configLoad.getStringList("Menu.Weather.Item.Time.Lore"), - new Placeholder[] { new Placeholder("%choice", timeChoice) }, null, null), 2); - nInv.addItem(nInv.createItem(new ItemStack(Material.GHAST_TEAR), - configLoad.getString("Menu.Weather.Item.Weather.Displayname"), - configLoad.getStringList("Menu.Weather.Item.Weather.Lore"), - new Placeholder[] { new Placeholder("%choice", weatherChoice) }, null, null), 3); + + if (!island.isWeatherSynchronized()) { + nInv.addItem(nInv.createItem(Materials.SUNFLOWER.parseItem(), + configLoad.getString("Menu.Weather.Item.Time.Displayname"), + configLoad.getStringList("Menu.Weather.Item.Time.Lore"), + new Placeholder[] { new Placeholder("%choice", timeChoice) }, null, null), 2); + nInv.addItem(nInv.createItem(new ItemStack(Material.GHAST_TEAR), + configLoad.getString("Menu.Weather.Item.Weather.Displayname"), + configLoad.getStringList("Menu.Weather.Item.Weather.Lore"), + new Placeholder[] { new Placeholder("%choice", weatherChoice) }, null, null), 3); + } else { + nInv.addItem(nInv.createItem(Materials.BARRIER.parseItem(), + configLoad.getString("Menu.Weather.Item.Disabled.Time.Displayname"), + configLoad.getStringList("Menu.Weather.Item.Disabled.Time.Lore"), + new Placeholder[] { new Placeholder("%choice", timeChoice) }, null, null), 2); + nInv.addItem(nInv.createItem(new ItemStack(Material.BARRIER), + configLoad.getString("Menu.Weather.Item.Disabled.Weather.Displayname"), + configLoad.getStringList("Menu.Weather.Item.Disabled.Weather.Lore"), + new Placeholder[] { new Placeholder("%choice", weatherChoice) }, null, null), 3); + } + nInv.addItem(nInv.createItem(new ItemStack(Material.TRIPWIRE_HOOK), configLoad.getString("Menu.Weather.Item.Synchronised.Displayname"), configLoad.getStringList("Menu.Weather.Item.Synchronised.Lore"), diff --git a/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockUtil.java b/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockUtil.java index 15209db6..8f8d3d1c 100644 --- a/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockUtil.java +++ b/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockUtil.java @@ -304,10 +304,12 @@ public final class BlockUtil { BrewingStand brewingStand = (BrewingStand) block.getState(); brewingStand.setBrewingTime(blockData.getBrewingTime()); brewingStand.setFuelLevel(blockData.getFuelLevel()); + brewingStand.update(); } else if (blockTypeState == BlockStateType.COMMANDBLOCK) { CommandBlock commandBlock = (CommandBlock) block.getState(); commandBlock.setCommand(blockData.getCommand()); commandBlock.setName(blockData.getCommandBlockName()); + commandBlock.update(); } else if (blockTypeState == BlockStateType.CHEST) { Chest chest = (Chest) block.getState(); @@ -317,6 +319,8 @@ public final class BlockUtil { chest.getInventory().setItem(slotList, is); } } + + chest.update(); } else if (blockTypeState == BlockStateType.DISPENSER) { Dispenser dispenser = (Dispenser) block.getState(); @@ -326,6 +330,8 @@ public final class BlockUtil { dispenser.getInventory().setItem(slotList, is); } } + + dispenser.update(); } else if (blockTypeState == BlockStateType.DROPPER) { Dropper dropper = (Dropper) block.getState(); @@ -335,6 +341,8 @@ public final class BlockUtil { dropper.getInventory().setItem(slotList, is); } } + + dropper.update(); } else if (blockTypeState == BlockStateType.HOPPER) { Hopper hopper = (Hopper) block.getState(); @@ -344,6 +352,8 @@ public final class BlockUtil { hopper.getInventory().setItem(slotList, is); } } + + hopper.update(); } else if (blockTypeState == BlockStateType.CREATURESPAWNER) { CreatureSpawner creatureSpawner = (CreatureSpawner) block.getState(); @@ -352,6 +362,7 @@ public final class BlockUtil { } creatureSpawner.setDelay(blockData.getDelay()); + creatureSpawner.update(); } else if (blockTypeState == BlockStateType.FURNACE) { Furnace furnace = (Furnace) block.getState(); furnace.setBurnTime(blockData.getBurnTime()); @@ -369,6 +380,7 @@ public final class BlockUtil { if (blockData.getPlaying() != null) { jukebox.setPlaying(Material.valueOf(blockData.getPlaying().toUpperCase())); } + jukebox.update(); } else if (blockTypeState == BlockStateType.SIGN) { Sign sign = (Sign) block.getState(); @@ -404,6 +416,7 @@ public final class BlockUtil { endGateway.setExitLocation( new Location(exitLocationWorld, exitLocationX, exitLocationY, exitLocationZ)); + endGateway.update(); } if (NMSVersion > 9) { @@ -418,6 +431,7 @@ public final class BlockUtil { shulkerBox.getInventory().setItem(slotList, is); } } + shulkerBox.update(); } } } diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index 65592bfb..798e3fb5 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -386,7 +386,7 @@ Command: Message: '&bSkyBlock &8| &cError&8: &eYou cannot kick Visitors because your Island is closed.' Kicked: Sender: - Message: '&bSkyBlock &8| &aInfo&8: &eYou have kicked &c%Visitors &evisitors from your Island.' + Message: '&bSkyBlock &8| &aInfo&8: &eYou have kicked &c%visitors &evisitors from your Island.' Target: Message: '&bSkyBlock &8| &aInfo&8: &eYou have been kicked from the Island.' Visitors: @@ -476,7 +476,7 @@ Command: Yourself: Message: '&bSkyBlock &8| &aInfo&8: &eYou are at &d%player''s &eIsland.' Other: - Message: '&bSkyBlock &8| &aInfo&8: &eThe player &a%target &eis at &d%Owner''s &eIsland.' + Message: '&bSkyBlock &8| &aInfo&8: &eThe player &a%target &eis at &d%owner''s &eIsland.' None: Yourself: Message: '&bSkyBlock &8| &aInfo&8: &eYou are not at an Island.' @@ -1141,26 +1141,26 @@ Menu: - '&7Island Visits&8: &e%visits' - '&7Island Votes&8: &e%votes' - '' - - '&7Current Visitors&8: &a%Visitors' + - '&7Current Visitors&8: &a%visitors' - '' - '&eClick to close Island!' Closed: Lore: - - '&7Island Visits&8: &e%Visitors' + - '&7Island Visits&8: &e%visitors' - '&7Island Votes&8: &e%votes' - '' - '&aClick to open Island!' Disabled: Closed: Lore: - - '&7Island Visits&8: &e%Visitors' + - '&7Island Visits&8: &e%visitors' - '' - '&eClick to open Island!' Open: Lore: - '&7Island Visits&8: &e%visits' - '' - - '&7Current Visitors&8: &a%Visitors' + - '&7Current Visitors&8: &a%visitors' - '' - '&eClick to close Island!' Displayname: '&aIsland Visit Statistics' @@ -1930,7 +1930,7 @@ Menu: - '&e%island_members/%island_capacity' - '' - '&bMembers:' - - '&e%Members' + - '&e%members' - '' - '&bOperators:' - '&e%operators' @@ -2191,7 +2191,7 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '' - '&7Safety&8: %safety' @@ -2202,7 +2202,7 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '' - '&7Safety&8: %safety' @@ -2219,7 +2219,7 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '&7Votes&8: &6%votes' - '' @@ -2232,7 +2232,7 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '&7Votes&8: &6%votes' - '' @@ -2248,7 +2248,7 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '&7Votes&8: &6%votes' - '' @@ -2264,7 +2264,7 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '&7Votes&8: &6%votes' - '' @@ -2348,19 +2348,19 @@ Menu: Remove: remove Disabled: Lore: - - '&7Owner&8: &f%Owner' + - '&7Owner&8: &f%owner' - '' - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '&7Votes&8: &6%votes' - '' - '&7Safety&8: %safety' Enabled: Lore: - - '&7Owner&8: &f%Owner' + - '&7Owner&8: &f%mwner' - '' - '&7Signature&8:' - '%signature' @@ -2368,7 +2368,7 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '&7Votes&8: &6%votes' - '' @@ -2377,7 +2377,7 @@ Menu: Signature: Enabled: Lore: - - '&7Owner&8: &f%Owner' + - '&7Owner&8: &f%owner' - '' - '&7Signature&8:' - '%signature' @@ -2385,18 +2385,18 @@ Menu: - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '' - '&7Safety&8: %safety' Disabled: Lore: - - '&7Owner&8: &f%Owner' + - '&7Owner&8: &f%owner' - '' - '&7Players At Island&8: &f%players&7/&f%player_capacity' - '' - '&7Level&8: &b%level' - - '&7Members&8: &e%Members' + - '&7Members&8: &e%members' - '&7Visits&8: &e%visits' - '' - '&7Safety&8: %safety' @@ -2468,7 +2468,7 @@ Menu: - '&e%island_members/%island_capacity' - '' - '&bMembers:' - - '&e%Members' + - '&e%members' - '' - '&bOperators:' - '&e%operators' @@ -2771,52 +2771,66 @@ Menu: Enabled: '&atrue' Disabled: '&cfalse' Time: - Dawn: dawn/sunrise - Day: day - Noon: midday/noon - Dusk: dusk/sunset - Night: night - Midnight: midnight + Dawn: Sunrise + Day: Day + Noon: Noon + Dusk: Sunset + Night: Night + Midnight: Midnight Lore: - - '&7Synchronised&8: %synchronised' - - '&7Weather&8: &6%weather' - - '&7Time&8: &6%time &o(%time_name)' + Synchronised: + - '&7Synchronized&8: %synchronised' + Unsynchronised: + - '&7Synchronized&8: %synchronised' + - '&7Time&8: &6%time_name' + - '&7Weather&8: &6%weather' Barrier: Displayname: '&cIsland Weather Options >' + Disabled: + Time: + Displayname: '&aTime' + Lore: + - '&cChanging time is disabled' + - '&cwhile synchronized.' + Weather: + Displayname: '&aWeather' + Lore: + - '&cChanging weather is disabled' + - '&cwhile synchronized.' Time: Displayname: '&aTime' Choice: - Dawn: dawn/sunrise - Day: day - Noon: midday/noon - Dusk: dusk/sunset - Night: night - Midnight: midnight + Dawn: Sunrise + Day: Day + Noon: Noon + Dusk: Sunset + Night: Night + Midnight: Midnight Lore: - - '&7Choice&8: &b%choice' + - '&7Currently&8: &b%choice' - '' - - '&eClick to change time!' + - '&eClick to change the time!' Weather: Displayname: '&aWeather' Choice: - Clear: clear - Downfall: downfall + Clear: Clear + Downfall: Downfall Lore: - '&7Choice&8: &b%choice' - '' - - '&eClick to change weather!' + - '&eClick to change the weather!' Synchronised: - Displayname: '&aSynchronised' + Displayname: '&aSynchronized' Choice: - Enable: Enable - Disable: Disable + Enable: enable + Disable: disable Lore: - - '&7When enabled, the weather' - - '&7and time will operate the' - - '&7same weather and time as' - - '&7the world. When disabled,' - - '&7the weather and time will' - - '&7be fixed.' + - '&7When enabled, the time and' + - '&7weather will use the same' + - '&7values as the server.' + - '&7When disabled, the time' + - '&7and weather will be separate' + - '&7for the island players.' - '' - '&eClick to %choice!' Title: '&8Island Weather' @@ -2827,23 +2841,23 @@ Menu: Displayname: '&a&lIsland Top %position' Bank: Lore: - - '&7Owner&8: &f%Owner' + - '&7Owner&8: &f%owner' - '&7Balance&8: &f$%balance' - - '&7Members&8: &f%Members' + - '&7Members&8: &f%members' - '' - '&7Signature&8:' - '%signature' Level: Lore: - - '&7Owner&8: &f%Owner' + - '&7Owner&8: &f%owner' - '&7Level&8: &f%level' - - '&7Members&8: &f%Members' + - '&7Members&8: &f%members' - '' - '&7Signature&8:' - '%signature' Votes: Lore: - - '&7Owner&8: &f%Owner' + - '&7Owner&8: &f%owner' - '&7Votes&8: &f%votes' - '' - '&7Signature&8:' @@ -2916,7 +2930,7 @@ Menu: Statistics: Displayname: '&bIsland Visitors' Lore: - - '&7Visitors&8: &f%Visitors' + - '&7Visitors&8: &f%visitors' Previous: Displayname: '&a< Previous Page' Exit: