Upstream
/
addon-welcomewarpsigns
mirror of https://github.com/BentoBoxWorld/Warps.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added check for island level if the Level addon exists.

This commit is contained in:
Tastybento 2018-01-01 11:49:02 -08:00
parent dc5394ede2
commit 6453f25655
4 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -53,6 +53,11 @@
<artifactId>bskyblock</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>bskyblock.addon</groupId>
<artifactId>Level</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<repositories>
<repository>

20
src/bskyblock/addin/warps/Warp.java
View File

@ -1,5 +1,7 @@
package bskyblock.addin.warps;
import java.util.Optional;
import bskyblock.addin.warps.commands.WarpCommand;
import bskyblock.addin.warps.commands.WarpsCommand;
import bskyblock.addin.warps.config.PluginConfig;
@ -15,6 +17,8 @@ import us.tastybento.bskyblock.config.Settings;
*/
public class Warp extends Addon {
private static final String BSKYBLOCK_LEVEL = "BSkyBlock-Level";
// The BSkyBlock plugin instance.
private BSkyBlock bSkyBlock;
@ -24,6 +28,9 @@ public class Warp extends Addon {
// Warps signs object
private WarpSignsManager warpSignsManager;
// Level addon
private Optional<Addon> levelAddon;
@Override
public void onEnable() {
// Load the plugin's config
@ -46,6 +53,9 @@ public class Warp extends Addon {
CompositeCommand bsbIslandCmd = (CompositeCommand) BSkyBlock.getInstance().getCommandsManager().getCommand(Settings.ISLANDCOMMAND);
new WarpCommand(this, bsbIslandCmd);
new WarpsCommand(this, bsbIslandCmd);
// Get the level addon if it exists
setLevelAddon(getBSkyBlock().getAddonsManager().getAddonByName(BSKYBLOCK_LEVEL));
});
// Done
}
@ -64,9 +74,17 @@ public class Warp extends Addon {
public WarpPanelManager getWarpPanelManager() {
return warpPanelManager;
}
public WarpSignsManager getWarpSignsManager() {
return warpSignsManager;
}
public Optional<Addon> getLevelAddon() {
return levelAddon;
}
public void setLevelAddon(Optional<Addon> levelAddon) {
this.levelAddon = levelAddon;
}
}

12
src/bskyblock/addin/warps/WarpPanelManager.java
View File

@ -20,7 +20,7 @@ import us.tastybento.bskyblock.api.panels.builders.PanelItemBuilder;
public class WarpPanelManager {
private static final boolean DEBUG = true;
private static final boolean DEBUG = false;
private static final int PANEL_MAX_SIZE = 52;
private Warp plugin;
// This is a cache of heads, so they don't need to be created everytime
@ -87,6 +87,11 @@ public class WarpPanelManager {
return playerSkull;
}
/**
* Show the warp panel for the user
* @param user
* @param index
*/
public void showWarpPanel(User user, int index) {
List<UUID> warps = new ArrayList<>(plugin.getWarpSignsManager().getSortedWarps());
if (DEBUG) {
@ -99,7 +104,10 @@ public class WarpPanelManager {
}
// TODO use when locales are done.
//PanelBuilder panelBuilder = new PanelBuilder().setUser(user).setName(user.getTranslation("panel.title", "[number]", String.valueOf(index + 1)));
PanelBuilder panelBuilder = new PanelBuilder().setUser(user).setName(user.getTranslation("panel.title") + " " + String.valueOf(index + 1));
PanelBuilder panelBuilder = new PanelBuilder()
.setUser(user)
.setName(user.getTranslation("panel.title") + " " + String.valueOf(index + 1));
int i = index * PANEL_MAX_SIZE;
for (; i < (index * PANEL_MAX_SIZE + PANEL_MAX_SIZE) && i < warps.size(); i++) {
UUID owner = warps.get(i);

57
src/bskyblock/addin/warps/WarpSignsManager.java
View File

@ -16,7 +16,6 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
import org.apache.commons.lang.math.RandomUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
@ -31,16 +30,17 @@ import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.SignChangeEvent;
import bskyblock.addin.warps.config.Settings;
import bskyblock.addin.warps.database.object.WarpsDO;
import bskyblock.addin.warps.event.WarpInitiateEvent;
import bskyblock.addin.warps.event.WarpListEvent;
import bskyblock.addin.warps.event.WarpRemoveEvent;
import bskyblock.addon.level.Level;
import us.tastybento.bskyblock.BSkyBlock;
import us.tastybento.bskyblock.api.commands.User;
import us.tastybento.bskyblock.database.BSBDatabase;
import us.tastybento.bskyblock.database.managers.AbstractDatabaseHandler;
import us.tastybento.bskyblock.database.objects.Island;
import us.tastybento.bskyblock.database.objects.Island.SettingsFlag;
import us.tastybento.bskyblock.generators.IslandWorld;
import us.tastybento.bskyblock.util.Util;
@ -51,7 +51,8 @@ import us.tastybento.bskyblock.util.Util;
*
*/
public class WarpSignsManager implements Listener {
private static final boolean DEBUG = true;
private static final boolean DEBUG = false;
private static final boolean DEBUG2 = false;
private BSkyBlock bSkyBlock;
// Map of all warps stored as player, warp sign Location
private Map<UUID, Location> warpList;
@ -224,6 +225,7 @@ public class WarpSignsManager implements Listener {
it.remove();
}
}
/*
if (warpList.size() < 100) {
// TEST CODE
for (int i = 0; i < 300; i++) {
@ -238,7 +240,7 @@ public class WarpSignsManager implements Listener {
sign.update();
warpList.put(rand, new Location(IslandWorld.getIslandWorld(), x, 120, z));
}
}
}*/
}
/**
@ -290,29 +292,36 @@ public class WarpSignsManager implements Listener {
*/
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
public void onSignWarpCreate(SignChangeEvent e) {
plugin.getLogger().info("DEBUG: SignChangeEvent called");
if (DEBUG)
plugin.getLogger().info("DEBUG: SignChangeEvent called");
String title = e.getLine(0);
User player = User.getInstance(e.getPlayer());
if (player.getWorld().equals(IslandWorld.getIslandWorld()) || player.getWorld().equals(IslandWorld.getNetherWorld())) {
plugin.getLogger().info("DEBUG: Correct world");
if (DEBUG)
plugin.getLogger().info("DEBUG: Correct world");
if (e.getBlock().getType().equals(Material.SIGN_POST) || e.getBlock().getType().equals(Material.WALL_SIGN)) {
plugin.getLogger().info("DEBUG: The first line of the sign says " + title);
if (DEBUG)
plugin.getLogger().info("DEBUG: The first line of the sign says " + title);
// Check if someone is changing their own sign
// This should never happen !!
if (title.equalsIgnoreCase(plugin.getConfig().getString("welcomeLine"))) {
plugin.getLogger().info("DEBUG: Welcome sign detected");
if (DEBUG)
plugin.getLogger().info("DEBUG: Welcome sign detected");
// Welcome sign detected - check permissions
if (!(player.hasPermission(us.tastybento.bskyblock.config.Settings.PERMPREFIX + "island.addwarp"))) {
player.sendMessage("warps.error.no-permission");
return;
}
/*
if(!(ASkyBlockAPI.getInstance().getLongIslandLevel(player.getUniqueId()) > Settings.warpLevelsRestriction)){
player.sendMessage(ChatColor.RED + "warps.error.NotEnoughLevel"));
return;
if (plugin.getLevelAddon().isPresent()) {
Level lev = (Level) plugin.getLevelAddon().get();
if (lev.getIslandLevel(player.getUniqueId()) < Settings.warpLevelRestriction) {
player.sendMessage("warps.error.NotEnoughLevel");
player.sendLegacyMessage("Your level is only " + lev.getIslandLevel(player.getUniqueId()));
return;
}
}
*/
// Check that the player is on their island
if (!(bSkyBlock.getIslands().playerIsOnIsland(player))) {
player.sendMessage("warps.error.not-on-island");
@ -459,15 +468,15 @@ public class WarpSignsManager implements Listener {
if (signLocation == null) {
plugin.getWarpSignsManager().removeWarp(uuid);
} else {
if (DEBUG)
if (DEBUG2)
Bukkit.getLogger().info("DEBUG: getting sign text");
// Get the sign info if it exists
if (signLocation.getBlock().getType().equals(Material.SIGN_POST) || signLocation.getBlock().getType().equals(Material.WALL_SIGN)) {
if (DEBUG)
if (DEBUG2)
Bukkit.getLogger().info("DEBUG: sign is a sign");
Sign sign = (Sign)signLocation.getBlock().getState();
result.addAll(Arrays.asList(sign.getLines()));
if (DEBUG)
if (DEBUG2)
Bukkit.getLogger().info("DEBUG: " + result.toString());
}
// Clean up - remove the [WELCOME] line
@ -482,7 +491,7 @@ public class WarpSignsManager implements Listener {
break;
}
}
return result;
}
@ -500,7 +509,7 @@ public class WarpSignsManager implements Listener {
inFront.getBlockZ() + 0.5D, yaw, 30F);
user.teleport(actualWarp);
if (pvp) {
user.sendLegacyMessage(user.getTranslation("igs." + SettingsFlag.PVP_OVERWORLD) + " " + user.getTranslation("igs.allowed"));
//user.sendLegacyMessage(user.getTranslation("igs." + SettingsFlag.PVP_OVERWORLD) + " " + user.getTranslation("igs.allowed"));
user.getWorld().playSound(user.getLocation(), Sound.ENTITY_ARROW_HIT, 1F, 1F);
} else {
user.getWorld().playSound(user.getLocation(), Sound.ENTITY_BAT_TAKEOFF, 1F, 1F);
@ -576,10 +585,10 @@ public class WarpSignsManager implements Listener {
Island island = plugin.getBSkyBlock().getIslands().getIsland(owner);
boolean pvp = false;
if (island != null) {
if ((warpSpot.getWorld().equals(IslandWorld.getIslandWorld()) && island.getFlag(SettingsFlag.PVP_OVERWORLD))
|| (warpSpot.getWorld().equals(IslandWorld.getNetherWorld()) && island.getFlag(SettingsFlag.PVP_NETHER))) {
pvp = true;
}
//if ((warpSpot.getWorld().equals(IslandWorld.getIslandWorld()) && island.getFlag(SettingsFlag.PVP_OVERWORLD))
// || (warpSpot.getWorld().equals(IslandWorld.getNetherWorld()) && island.getFlag(SettingsFlag.PVP_NETHER))) {
// pvp = true;
//}
}
// Find out which direction the warp is facing
Block b = warpSpot.getBlock();
@ -617,7 +626,7 @@ public class WarpSignsManager implements Listener {
warpSpot.getBlockZ() + 0.5D);
user.teleport(actualWarp);
if (pvp) {
user.sendLegacyMessage(user.getTranslation("igs." + SettingsFlag.PVP_OVERWORLD) + " " + user.getTranslation("igs.Allowed"));
//user.sendLegacyMessage(user.getTranslation("igs." + SettingsFlag.PVP_OVERWORLD) + " " + user.getTranslation("igs.Allowed"));
user.getWorld().playSound(user.getLocation(), Sound.ENTITY_ARROW_HIT, 1F, 1F);
} else {
user.getWorld().playSound(user.getLocation(), Sound.ENTITY_BAT_TAKEOFF, 1F, 1F);