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

Switch to 1.13 API

This commit is contained in:
tastybento 2018-07-26 22:42:47 -07:00
parent 6dd7d0f762
commit b780d68064
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -45,7 +45,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

14
src/bskyblock/addon/warps/WarpSignsListener.java
View File

@ -20,9 +20,9 @@ import us.tastybento.bskyblock.api.user.User;
/**
* Handles warping. Players can add one sign
*
*
* @author tastybento
*
*
*/
public class WarpSignsListener implements Listener {
private BSkyBlock plugin;
@ -46,7 +46,7 @@ public class WarpSignsListener implements Listener {
public void onSignBreak(BlockBreakEvent e) {
Block b = e.getBlock();
// Signs only
if (!b.getType().equals(Material.SIGN_POST) && !b.getType().equals(Material.WALL_SIGN)) {
if (!b.getType().equals(Material.SIGN) && !b.getType().equals(Material.WALL_SIGN)) {
return;
}
if (!addon.inRegisteredWorld(b.getWorld())) {
@ -83,14 +83,14 @@ public class WarpSignsListener implements Listener {
/**
* Event handler for Sign Changes
*
*
* @param e - event
*/
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
public void onSignWarpCreate(SignChangeEvent e) {
Block b = e.getBlock();
// Signs only
if (!b.getType().equals(Material.SIGN_POST) && !b.getType().equals(Material.WALL_SIGN)) {
if (!b.getType().equals(Material.SIGN) && !b.getType().equals(Material.WALL_SIGN)) {
return;
}
if (!addon.inRegisteredWorld(b.getWorld())) {
@ -110,7 +110,7 @@ public class WarpSignsListener implements Listener {
Level lev = (Level) addon.getLevelAddon().get();
if (lev.getIslandLevel(b.getWorld(), user.getUniqueId()) < Settings.warpLevelRestriction) {
user.sendMessage("warps.error.not-enough-level");
user.sendMessage("warps.error.your-level-is",
user.sendMessage("warps.error.your-level-is",
"[level]", String.valueOf(lev.getIslandLevel(b.getWorld(), user.getUniqueId())),
"[required]", String.valueOf(Settings.warpLevelRestriction));
return;
@ -148,7 +148,7 @@ public class WarpSignsListener implements Listener {
// so,
// deactivate it
Block oldSignBlock = oldSignLoc.getBlock();
if (oldSignBlock.getType().equals(Material.SIGN_POST) || oldSignBlock.getType().equals(Material.WALL_SIGN)) {
if (oldSignBlock.getType().equals(Material.SIGN) || oldSignBlock.getType().equals(Material.WALL_SIGN)) {
// The block is still a sign
Sign oldSign = (Sign) oldSignBlock.getState();
if (oldSign != null) {

34
src/bskyblock/addon/warps/WarpSignsManager.java
View File

@ -36,9 +36,9 @@ import us.tastybento.bskyblock.util.Util;
/**
* Handles warping. Players can add one sign
*
*
* @author tastybento
*
*
*/
public class WarpSignsManager {
private static final boolean DEBUG2 = false;
@ -72,7 +72,7 @@ public class WarpSignsManager {
/**
* Stores warps in the warp array
*
*
* @param playerUUID - the player's UUID
* @param loc
*/
@ -96,7 +96,7 @@ public class WarpSignsManager {
/**
* Provides the location of the warp for player or null if one is not found
*
*
* @param playerUUID - the player's UUID
* - the warp requested
* @return Location of warp
@ -165,8 +165,8 @@ public class WarpSignsManager {
/**
* Lists all the known warps
* @param world
*
* @param world
*
* @return UUID set of warps
*/
public Set<UUID> listWarps(World world) {
@ -185,7 +185,7 @@ public class WarpSignsManager {
// Load into map
if (warps != null) {
warps.getWarpSigns().forEach((k,v) -> {
if (k != null && (k.getBlock().getType().equals(Material.SIGN_POST) || k.getBlock().getType().equals(Material.WALL_SIGN))) {
if (k != null && (k.getBlock().getType().equals(Material.SIGN) || k.getBlock().getType().equals(Material.WALL_SIGN))) {
// Add to map
getWarpList(k.getWorld()).put(v, k);
}
@ -199,7 +199,7 @@ public class WarpSignsManager {
*/
private void popSign(Location loc) {
Block b = loc.getBlock();
if (b.getType().equals(Material.SIGN_POST) || b.getType().equals(Material.WALL_SIGN)) {
if (b.getType().equals(Material.SIGN) || b.getType().equals(Material.WALL_SIGN)) {
Sign s = (Sign) b.getState();
if (s != null) {
if (s.getLine(0).equalsIgnoreCase(ChatColor.GREEN + addon.getConfig().getString("welcomeLine"))) {
@ -211,8 +211,8 @@ public class WarpSignsManager {
}
/**
* Removes a warp at a location.
*
* Removes a warp at a location.
*
* @param loc
*/
public void removeWarp(Location loc) {
@ -238,7 +238,7 @@ public class WarpSignsManager {
/**
* Remove warp sign owned by UUID
*
*
* @param uuid
*/
public void removeWarp(World world, UUID uuid) {
@ -269,11 +269,11 @@ public class WarpSignsManager {
Location signLocation = getWarp(world, uuid);
if (signLocation == null) {
addon.getWarpSignsManager().removeWarp(world, uuid);
} else {
} else {
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 (signLocation.getBlock().getType().equals(Material.SIGN) || signLocation.getBlock().getType().equals(Material.WALL_SIGN)) {
if (DEBUG2)
Bukkit.getLogger().info("DEBUG: sign is a sign");
Sign sign = (Sign)signLocation.getBlock().getState();
@ -325,7 +325,7 @@ public class WarpSignsManager {
/**
* Converts block face direction to radial degrees. Returns 0 if block face
* is not radial.
*
*
* @param face
* @return degrees
*/
@ -387,14 +387,14 @@ public class WarpSignsManager {
Island island = addon.getBSkyBlock().getIslands().getIsland(world, owner);
boolean pvp = false;
if (island != null) {
//if ((warpSpot.getWorld().equals(IslandWorld.getIslandWorld()) && island.getFlag(SettingsFlag.PVP_OVERWORLD))
//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();
if (b.getType().equals(Material.SIGN_POST) || b.getType().equals(Material.WALL_SIGN)) {
if (b.getType().equals(Material.SIGN) || b.getType().equals(Material.WALL_SIGN)) {
Sign sign = (Sign) b.getState();
org.bukkit.material.Sign s = (org.bukkit.material.Sign) sign.getData();
BlockFace directionFacing = s.getFacing();
@ -417,7 +417,7 @@ public class WarpSignsManager {
if (!(plugin.getIslands().isSafeLocation(warpSpot))) {
user.sendMessage("warps.error.NotSafe");
// WALL_SIGN's will always be unsafe if the place in front is obscured.
if (b.getType().equals(Material.SIGN_POST)) {
if (b.getType().equals(Material.SIGN)) {
addon.getLogger().warning(
"Unsafe warp found at " + warpSpot.toString() + " owned by " + addon.getBSkyBlock().getPlayers().getName(owner));