Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-03-13 06:59:14 +01:00
Code Issues Projects Releases Wiki Activity

Anvil GUI fix and inventory opening synchronization

Browse Source
This commit is contained in:
Esophose 2019-04-24 01:32:07 -06:00
parent a903b722c0
commit 561291c288
23 changed files with 1256 additions and 2039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/me/goodandevil/skyblock/menus/Bans.java
View File

@ -23,7 +23,7 @@ import me.goodandevil.skyblock.placeholder.Placeholder;
import me.goodandevil.skyblock.playerdata.PlayerData;
import me.goodandevil.skyblock.playerdata.PlayerDataManager;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.item.SkullUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEvent;
@ -100,11 +100,9 @@ public class Bans {
configLoad.getString("Menu.Bans.Item.Information.Displayname"))))) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().dispatchCommand(player,
"island ban " + event1.getName());
@ -116,14 +114,13 @@ public class Bans {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is1 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is1.getItemMeta();
im.setDisplayName(configLoad.getString("Menu.Bans.Item.Word.Enter"));
is.setItemMeta(im);
is1.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is1);
gui.open();
}
}, 1L);
} else if ((is.getType() == Material.BARRIER) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
@ -138,23 +135,13 @@ public class Bans {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
'&', configLoad.getString("Menu.Bans.Item.Next.Displayname")))) {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
if ((island.hasRole(IslandRole.Operator, player.getUniqueId())
&& island.getSetting(IslandRole.Operator, "Unban").getStatus())
@ -162,13 +149,8 @@ public class Bans {
String playerName = ChatColor.stripColor(is.getItemMeta().getDisplayName());
Bukkit.getServer().dispatchCommand(player, "island unban " + playerName);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 3L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 3L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Command.Island.Bans.Permission.Message"));

7
src/main/java/me/goodandevil/skyblock/menus/Biome.java
View File

@ -148,12 +148,7 @@ public class Biome {
soundManager.playSound(player, Sounds.SPLASH.bukkitSound(), 1.0F, 1.0F);
}
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}

28
src/main/java/me/goodandevil/skyblock/menus/Border.java
View File

@ -92,12 +92,7 @@ public class Border {
islandManager.updateBorder(island);
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if ((is.getType() == Materials.LIGHT_BLUE_DYE.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&',
@ -114,12 +109,7 @@ public class Border {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
} else if ((is.getType() == Materials.LIME_DYE.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
@ -137,12 +127,7 @@ public class Border {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
} else if ((is.getType() == Materials.RED_DYE.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
@ -160,12 +145,7 @@ public class Border {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}

42
src/main/java/me/goodandevil/skyblock/menus/Coop.java
View File

@ -23,7 +23,7 @@ import me.goodandevil.skyblock.placeholder.Placeholder;
import me.goodandevil.skyblock.playerdata.PlayerData;
import me.goodandevil.skyblock.playerdata.PlayerDataManager;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.item.SkullUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEvent;
@ -98,11 +98,9 @@ public class Coop {
configLoad.getString("Menu.Coop.Item.Information.Displayname"))))) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().dispatchCommand(player,
"island coop " + event1.getName());
@ -114,14 +112,13 @@ public class Coop {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is1 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is1.getItemMeta();
im.setDisplayName(configLoad.getString("Menu.Coop.Item.Word.Enter"));
is.setItemMeta(im);
is1.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is1);
gui.open();
}
}, 1L);
} else if ((is.getType() == Material.BARRIER) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
@ -136,23 +133,13 @@ public class Coop {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
'&', configLoad.getString("Menu.Coop.Item.Next.Displayname")))) {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
if ((island.hasRole(IslandRole.Operator, player.getUniqueId())
&& island.getSetting(IslandRole.Operator, "CoopPlayers").getStatus())
@ -160,13 +147,8 @@ public class Coop {
String playerName = ChatColor.stripColor(is.getItemMeta().getDisplayName());
Bukkit.getServer().dispatchCommand(player, "island coop " + playerName);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 3L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 3L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Command.Island.Coop.Permission.Message"));

9
src/main/java/me/goodandevil/skyblock/menus/Creator.java
View File

@ -123,13 +123,8 @@ public class Creator {
configLoad.getString("Island.Creator.Selector.Permission.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
return;
}

72
src/main/java/me/goodandevil/skyblock/menus/Information.java
View File

@ -134,13 +134,8 @@ public class Information {
Information.Viewer.Type.Members));
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if ((is.getType() == Materials.LEGACY_EMPTY_MAP.getPostMaterial())
&& (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(
@ -159,13 +154,8 @@ public class Information {
Information.Viewer.Type.Visitors));
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
}
}
}
@ -300,13 +290,8 @@ public class Information {
Information.Viewer.Type.Categories));
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if ((is.getType() == Materials.PAINTING.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString(
@ -332,26 +317,16 @@ public class Information {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Information.Members.Item.Next.Displayname")))) {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
soundManager.playSound(player, Sounds.CHICKEN_EGG_POP.bukkitSound(), 1.0F,
1.0F);
@ -484,13 +459,8 @@ public class Information {
Information.Viewer.Type.Categories));
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if ((is.getType() == Materials.PAINTING.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString(
@ -516,26 +486,16 @@ public class Information {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Information.Visitors.Item.Next.Displayname")))) {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
soundManager.playSound(player, Sounds.CHICKEN_EGG_POP.bukkitSound(), 1.0F,
1.0F);

22
src/main/java/me/goodandevil/skyblock/menus/Leaderboard.java
View File

@ -95,12 +95,7 @@ public class Leaderboard {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
});
@ -170,13 +165,7 @@ public class Leaderboard {
.setViewer(new Viewer(Viewer.Type.Browse));
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
soundManager.playSound(player, Sounds.CHEST_CLOSE.bukkitSound(), 1.0F, 1.0F);
}
@ -350,12 +339,7 @@ public class Leaderboard {
viewer.getType().name())));
nInv.setRows(6);
Bukkit.getServer().getScheduler().runTask(skyblock, new Runnable() {
@Override
public void run() {
nInv.open();
}
});
Bukkit.getServer().getScheduler().runTask(skyblock, () -> nInv.open());
}
}
}

4
src/main/java/me/goodandevil/skyblock/menus/Levelling.java
View File

@ -170,13 +170,13 @@ public class Levelling {
playerData1.setPage(playerData1.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
'&', configLoad.getString("Menu.Levelling.Item.Next.Displayname")))) {
playerData1.setPage(playerData1.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
soundManager.playSound(player, Sounds.CHICKEN_EGG_POP.bukkitSound(), 1.0F, 1.0F);

60
src/main/java/me/goodandevil/skyblock/menus/Members.java
View File

@ -119,13 +119,8 @@ public class Members {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, (Members.Type) playerData.getType(),
(Members.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 1L);
} else if ((is.getType() == Material.PAINTING) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Members.Item.Statistics.Displayname"))))) {
@ -146,25 +141,15 @@ public class Members {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, (Members.Type) playerData.getType(),
(Members.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 1L);
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
'&', configLoad.getString("Menu.Members.Item.Next.Displayname")))) {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, (Members.Type) playerData.getType(),
(Members.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 1L);
} else {
String playerName = ChatColor.stripColor(is.getItemMeta().getDisplayName());
UUID playerUUID;
@ -189,27 +174,17 @@ public class Members {
"island demote " + playerName);
}
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, (Members.Type) playerData.getType(),
(Members.Sort) playerData.getSort());
}
}, 3L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 3L);
return;
} else if (event.getClick() == ClickType.RIGHT) {
Bukkit.getServer().dispatchCommand(player, "island kick " + playerName);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, (Members.Type) playerData.getType(),
(Members.Sort) playerData.getSort());
}
}, 3L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 3L);
return;
}
@ -217,14 +192,9 @@ public class Members {
&& island.getSetting(IslandRole.Operator, "Kick").getStatus()) {
Bukkit.getServer().dispatchCommand(player, "island kick " + playerName);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, (Members.Type) playerData.getType(),
(Members.Sort) playerData.getSort());
}
}, 3L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 3L);
return;
}

100
src/main/java/me/goodandevil/skyblock/menus/Ownership.java
View File

@ -23,7 +23,7 @@ import me.goodandevil.skyblock.placeholder.Placeholder;
import me.goodandevil.skyblock.playerdata.PlayerData;
import me.goodandevil.skyblock.playerdata.PlayerDataManager;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.item.SkullUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEvent;
@ -108,24 +108,20 @@ public class Ownership {
configLoad.getString("Menu.Ownership.Item.Assign.Displayname"))))) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, new AnvilGUI.AnvilClickEventHandler() {
@Override
public void onAnvilClick(final AnvilGUI.AnvilClickEvent event) {
if (event.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (playerDataManager.hasPlayerData(player)) {
Island island = islandManager.getIsland(player);
Island island1 = islandManager.getIsland(player);
if (island == null) {
if (island1 == null) {
messageManager.sendMessage(player, configLoad
.getString("Command.Island.Ownership.Owner.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(),
1.0F, 1.0F);
return;
} else if (!island.hasRole(IslandRole.Owner,
} else if (!island1.hasRole(IslandRole.Owner,
player.getUniqueId())) {
messageManager.sendMessage(player, configLoad
.getString("Command.Island.Ownership.Role.Message"));
@ -135,29 +131,22 @@ public class Ownership {
return;
}
Bukkit.getScheduler().runTask(skyblock, new Runnable() {
@Override
public void run() {
Bukkit.getServer().dispatchCommand(player,
"island ownership " + event.getName());
}
});
Bukkit.getScheduler().runTask(skyblock, () -> Bukkit.getServer().dispatchCommand(player,
"island ownership " + event1.getName()));
}
} else {
event.setWillClose(false);
event.setWillDestroy(false);
}
event1.setWillClose(false);
event1.setWillDestroy(false);
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is1 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is1.getItemMeta();
im.setDisplayName(configLoad.getString("Menu.Ownership.Item.Assign.Word.Enter"));
is.setItemMeta(im);
is1.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is1);
gui.open();
}
}, 1L);
} else if ((is.getType() == Materials.LEGACY_EMPTY_MAP.getPostMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
@ -174,26 +163,16 @@ public class Ownership {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
return;
} else if (event.getClick() == ClickType.RIGHT) {
island.setPassword(null);
soundManager.playSound(player, Sounds.EXPLODE.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
return;
} else if (event.getClick() != ClickType.LEFT) {
@ -206,24 +185,20 @@ public class Ownership {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, new AnvilGUI.AnvilClickEventHandler() {
@Override
public void onAnvilClick(final AnvilGUI.AnvilClickEvent event) {
if (event.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event12 -> {
if (event12.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (playerDataManager.hasPlayerData(player)) {
Island island = islandManager.getIsland(player);
Island island12 = islandManager.getIsland(player);
if (island == null) {
if (island12 == null) {
messageManager.sendMessage(player, configLoad
.getString("Command.Island.Ownership.Owner.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(),
1.0F, 1.0F);
return;
} else if (!island.hasRole(IslandRole.Owner,
} else if (!island12.hasRole(IslandRole.Owner,
player.getUniqueId())) {
messageManager.sendMessage(player, configLoad
.getString("Command.Island.Ownership.Role.Message"));
@ -233,35 +208,28 @@ public class Ownership {
return;
}
island.setPassword(
event.getName().replace("&", "").replace(" ", ""));
island12.setPassword(
event12.getName().replace("&", "").replace(" ", ""));
soundManager.playSound(player, Sounds.ANVIL_USE.bukkitSound(), 1.0F,
1.0F);
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock, () -> open(player), 1L);
}
} else {
event.setWillClose(false);
event.setWillDestroy(false);
}
event12.setWillClose(false);
event12.setWillDestroy(false);
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is12 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is12.getItemMeta();
im.setDisplayName(
configLoad.getString("Menu.Ownership.Item.Password.Hidden.Word.Enter"));
is.setItemMeta(im);
is12.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is12);
gui.open();
}
}, 1L);
}
}

192
src/main/java/me/goodandevil/skyblock/menus/Settings.java
View File

@ -26,7 +26,7 @@ import me.goodandevil.skyblock.message.MessageManager;
import me.goodandevil.skyblock.placeholder.Placeholder;
import me.goodandevil.skyblock.playerdata.PlayerDataManager;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.item.nInventoryUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEvent;
import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEventHandler;
@ -117,12 +117,7 @@ public class Settings {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Coop, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, IslandRole.Coop, null), 1L);
} else if ((is.hasItemMeta()) && (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Settings.Categories.Item.Visitor.Displayname"))))) {
@ -140,12 +135,7 @@ public class Settings {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Visitor, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, IslandRole.Visitor, null), 1L);
} else if ((is.getType() == Material.PAINTING) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
@ -164,12 +154,7 @@ public class Settings {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Member, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, IslandRole.Member, null), 1L);
} else if ((is.getType() == Material.ITEM_FRAME) && (is.hasItemMeta()) && (is.getItemMeta()
.getDisplayName().equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Settings.Categories.Item.Operator.Displayname"))))) {
@ -186,12 +171,7 @@ public class Settings {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Operator, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, IslandRole.Operator, null), 1L);
} else if ((is.getType() == Materials.OAK_SAPLING.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
@ -210,12 +190,7 @@ public class Settings {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Owner, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, IslandRole.Owner, null), 1L);
}
}
}
@ -307,35 +282,20 @@ public class Settings {
"Menu.Settings." + role.name() + ".Item.Return.Displayname"))))) {
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Categories, null, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Categories, null, null), 1L);
} else if ((is.getType() == Material.PAPER) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Settings.Visitor.Item.Signature.Displayname"))))) {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Panel, null, Settings.Panel.Signature);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Panel, null, Panel.Signature), 1L);
} else if ((is.hasItemMeta()) && (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Settings.Visitor.Item.Welcome.Displayname"))))) {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Panel, null, Settings.Panel.Welcome);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Panel, null, Panel.Welcome), 1L);
} else if ((is.getType() == Material.PAINTING) && (is.hasItemMeta()) && (is.getItemMeta()
.getDisplayName().equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Settings.Visitor.Item.Statistics.Displayname"))))) {
@ -347,12 +307,7 @@ public class Settings {
soundManager.playSound(player, Sounds.DOOR_OPEN.bukkitSound(), 1.0F, 1.0F);
}
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Visitor, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, IslandRole.Visitor, null), 1L);
} else if (is.hasItemMeta()) {
String roleName = getRoleName(role);
@ -390,12 +345,7 @@ public class Settings {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, role, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, role, null), 1L);
}
}
}
@ -1115,13 +1065,8 @@ public class Settings {
"Menu.Settings.Visitor.Panel.Welcome.Item.Return.Displayname"))))) {
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Visitor, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, Type.Role, IslandRole.Visitor, null), 1L);
} else if ((is.getType() == Material.PAINTING) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString(
@ -1134,13 +1079,8 @@ public class Settings {
soundManager.playSound(player, Sounds.DOOR_OPEN.bukkitSound(), 1.0F, 1.0F);
}
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Visitor, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, Type.Role, IslandRole.Visitor, null), 1L);
} else if ((is.hasItemMeta()) && (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString(
"Menu.Settings.Visitor.Panel.Welcome.Item.Message.Displayname"))))) {
@ -1162,12 +1102,10 @@ public class Settings {
} else {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
Island island1 = islandManager.getIsland(player);
if (island1 == null) {
@ -1242,16 +1180,11 @@ public class Settings {
}
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player,
Settings.Type.Panel,
.runTaskLater(skyblock,
() -> open(player,
Type.Panel,
null,
Settings.Panel.Welcome);
}
}, 1L);
Panel.Welcome), 1L);
event1.setWillClose(true);
event1.setWillDestroy(true);
@ -1261,15 +1194,14 @@ public class Settings {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is1 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is1.getItemMeta();
im.setDisplayName(configLoad.getString(
"Menu.Settings.Visitor.Panel.Welcome.Item.Line.Add.Word.Enter"));
is.setItemMeta(im);
is1.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is1);
gui.open();
}
}, 1L);
}
} else if ((is.getType() == Material.ARROW) && (is.hasItemMeta()) && (is.getItemMeta()
@ -1289,13 +1221,8 @@ public class Settings {
island.getMessageAuthor(IslandMessage.Welcome), welcomeMessage);
soundManager.playSound(player, Sounds.EXPLODE.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Panel, null, Settings.Panel.Welcome);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, Type.Panel, null, Panel.Welcome), 1L);
}
}
}
@ -1397,13 +1324,8 @@ public class Settings {
"Menu.Settings.Visitor.Panel.Signature.Item.Return.Displayname"))))) {
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Visitor, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, Type.Role, IslandRole.Visitor, null), 1L);
} else if ((is.getType() == Material.PAINTING) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString(
@ -1416,13 +1338,8 @@ public class Settings {
soundManager.playSound(player, Sounds.DOOR_OPEN.bukkitSound(), 1.0F, 1.0F);
}
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, IslandRole.Visitor, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, Type.Role, IslandRole.Visitor, null), 1L);
} else if ((is.hasItemMeta()) && (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString(
"Menu.Settings.Visitor.Panel.Signature.Item.Message.Displayname"))))) {
@ -1444,12 +1361,10 @@ public class Settings {
} else {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
Island island1 = islandManager.getIsland(player);
if (island1 == null) {
@ -1524,16 +1439,11 @@ public class Settings {
}
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player,
Settings.Type.Panel,
.runTaskLater(skyblock,
() -> open(player,
Type.Panel,
null,
Settings.Panel.Signature);
}
}, 1L);
Panel.Signature), 1L);
event1.setWillClose(true);
event1.setWillDestroy(true);
@ -1543,15 +1453,14 @@ public class Settings {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is12 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is12.getItemMeta();
im.setDisplayName(configLoad.getString(
"Menu.Settings.Visitor.Panel.Signature.Item.Line.Add.Word.Enter"));
is.setItemMeta(im);
is12.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is12);
gui.open();
}
}, 1L);
}
} else if ((is.getType() == Material.ARROW) && (is.hasItemMeta()) && (is.getItemMeta()
@ -1571,14 +1480,9 @@ public class Settings {
island.getMessageAuthor(IslandMessage.Signature), signatureMessage);
soundManager.playSound(player, Sounds.EXPLODE.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Panel, null,
Settings.Panel.Signature);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, Type.Panel, null,
Panel.Signature), 1L);
}
}
}

109
src/main/java/me/goodandevil/skyblock/menus/Upgrade.java
View File

@ -113,13 +113,8 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades = upgradeManager
.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Speed);
@ -137,13 +132,8 @@ public class Upgrade {
island.setUpgrade(player,
me.goodandevil.skyblock.upgrade.Upgrade.Type.Speed, true);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Upgrade.Money.Message"));
@ -178,13 +168,8 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades = upgradeManager
.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Jump);
@ -202,13 +187,8 @@ public class Upgrade {
island.setUpgrade(player, me.goodandevil.skyblock.upgrade.Upgrade.Type.Jump,
true);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Upgrade.Money.Message"));
@ -239,12 +219,7 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades = upgradeManager
.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Crop);
@ -262,13 +237,8 @@ public class Upgrade {
island.setUpgrade(player, me.goodandevil.skyblock.upgrade.Upgrade.Type.Crop,
true);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Upgrade.Money.Message"));
@ -300,12 +270,7 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades = upgradeManager
.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Fly);
@ -325,13 +290,8 @@ public class Upgrade {
islandManager.updateFlightAtIsland(island);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Upgrade.Money.Message"));
@ -362,12 +322,7 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades = upgradeManager
.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Drops);
@ -385,13 +340,8 @@ public class Upgrade {
island.setUpgrade(player, me.goodandevil.skyblock.upgrade.Upgrade.Type.Drops,
true);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Upgrade.Money.Message"));
@ -438,13 +388,8 @@ public class Upgrade {
island.getAPIWrapper(), player, APIUtil.fromImplementation(
me.goodandevil.skyblock.upgrade.Upgrade.Type.Size)));
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Upgrade.Money.Message"));
@ -481,12 +426,7 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades = upgradeManager
.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Spawner);
@ -504,13 +444,8 @@ public class Upgrade {
island.setUpgrade(player, me.goodandevil.skyblock.upgrade.Upgrade.Type.Spawner,
true);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Upgrade.Money.Message"));

50
src/main/java/me/goodandevil/skyblock/menus/Visit.java
View File

@ -116,12 +116,7 @@ public class Visit {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, (Visit.Type) playerData.getType(), (Visit.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(), (Sort) playerData.getSort()), 1L);
} else if ((is.getType() == Material.BARRIER) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Visit.Item.Nothing.Displayname"))))) {
@ -135,23 +130,13 @@ public class Visit {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, (Visit.Type) playerData.getType(), (Visit.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(), (Sort) playerData.getSort()), 1L);
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Visit.Item.Next.Displayname")))) {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, (Visit.Type) playerData.getType(), (Visit.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(), (Sort) playerData.getSort()), 1L);
} else {
String targetPlayerName = ChatColor.stripColor(is.getItemMeta().getDisplayName());
UUID targetPlayerUUID;
@ -214,14 +199,9 @@ public class Visit {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F,
1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, (Visit.Type) playerData.getType(),
(Visit.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Visit.Vote.Island.Message"));
@ -264,14 +244,9 @@ public class Visit {
targetPlayerName));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player, (Visit.Type) playerData.getType(),
(Visit.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player, (Type) playerData.getType(),
(Sort) playerData.getSort()), 1L);
}
return;
@ -281,12 +256,7 @@ public class Visit {
.replace("%player", targetPlayerName));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, (Visit.Type) playerData.getType(), (Visit.Sort) playerData.getSort());
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(), (Sort) playerData.getSort()), 1L);
}
}
}

21
src/main/java/me/goodandevil/skyblock/menus/Visitors.java
View File

@ -105,23 +105,13 @@ public class Visitors {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
'&', configLoad.getString("Menu.Visitors.Item.Next.Displayname")))) {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
boolean isOperator = island.hasRole(IslandRole.Operator, player.getUniqueId()),
isOwner = island.hasRole(IslandRole.Owner, player.getUniqueId()),
@ -164,12 +154,7 @@ public class Visitors {
}
}
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}

21
src/main/java/me/goodandevil/skyblock/menus/Weather.java
View File

@ -122,12 +122,7 @@ public class Weather {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if ((is.getType() == Material.GHAST_TEAR) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Weather.Item.Weather.Displayname"))))) {
@ -145,12 +140,7 @@ public class Weather {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if ((is.getType() == Material.TRIPWIRE_HOOK) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Weather.Item.Synchronised.Displayname"))))) {
@ -177,12 +167,7 @@ public class Weather {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}

478
src/main/java/me/goodandevil/skyblock/menus/admin/Creator.java
View File

@ -29,7 +29,7 @@ import me.goodandevil.skyblock.playerdata.PlayerDataManager;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.structure.Structure;
import me.goodandevil.skyblock.structure.StructureManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.item.SkullUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil;
import me.goodandevil.skyblock.utils.version.Materials;
@ -320,12 +320,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
return;
}
@ -334,8 +329,8 @@ public class Creator implements Listener {
configLoad.getString("Menu.Admin.Creator.Browse.Item.Information.Displayname"))))) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.creator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -378,12 +373,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
event1.setWillClose(true);
@ -399,7 +389,7 @@ public class Creator implements Listener {
im.setDisplayName(configLoad.getString("Menu.Admin.Creator.Browse.Item.Information.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
return;
@ -419,20 +409,15 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
String name = ((Creator.Viewer) playerData.getViewer()).getName();
if (structureManager.containsStructure(name)) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.creator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -446,13 +431,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if (!structureManager.containsStructure(name)) {
messageManager.sendMessage(player,
configLoad.getString("Island.Admin.Creator.Exist.Message"));
@ -460,13 +440,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
Structure structure = structureManager.getStructure(name);
structure.setDisplayname(event1.getName());
@ -474,34 +449,26 @@ public class Creator implements Listener {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
Config config = fileManager.getConfig(
() -> {
Config config1 = fileManager.getConfig(
new File(skyblock.getDataFolder(), "structures.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
FileConfiguration configLoad1 = config1.getFileConfiguration();
configLoad.set(
configLoad1.set(
"Structures." + structure.getName() + ".Displayname",
event1.getName());
try {
configLoad.save(config.getFile());
configLoad1.save(config1.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
}
event1.setWillClose(true);
@ -518,7 +485,7 @@ public class Creator implements Listener {
configLoad.getString("Menu.Admin.Creator.Options.Item.Displayname.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
} else {
playerData.setViewer(null);
@ -529,12 +496,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
@ -549,12 +511,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
String name = ((Creator.Viewer) playerData.getViewer()).getName();
@ -566,33 +523,25 @@ public class Creator implements Listener {
structure.removeLine(structure.getDescription().size() - 1);
soundManager.playSound(player, Sounds.EXPLODE.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
Config config = fileManager
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, () -> {
Config config12 = fileManager
.getConfig(new File(skyblock.getDataFolder(), "structures.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
FileConfiguration configLoad12 = config12.getFileConfiguration();
configLoad.set("Structures." + structure.getName() + ".Description",
configLoad12.set("Structures." + structure.getName() + ".Description",
structure.getDescription());
try {
configLoad.save(config.getFile());
configLoad12.save(config12.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
return;
} else if (event.getClick() != ClickType.LEFT) {
@ -602,8 +551,8 @@ public class Creator implements Listener {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.creator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -617,13 +566,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if (!structureManager.containsStructure(name)) {
messageManager.sendMessage(player,
configLoad.getString("Island.Admin.Creator.Exist.Message"));
@ -631,47 +575,34 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
structure.addLine(event1.getName());
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
Config config = fileManager.getConfig(
() -> {
Config config13 = fileManager.getConfig(
new File(skyblock.getDataFolder(), "structures.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
FileConfiguration configLoad13 = config13.getFileConfiguration();
configLoad.set(
configLoad13.set(
"Structures." + structure.getName() + ".Description",
structure.getDescription());
try {
configLoad.save(config.getFile());
configLoad13.save(config13.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
}
event1.setWillClose(true);
@ -688,7 +619,7 @@ public class Creator implements Listener {
configLoad.getString("Menu.Admin.Creator.Options.Item.Description.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
} else {
playerData.setViewer(null);
@ -699,12 +630,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
@ -719,12 +645,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
String name = ((Creator.Viewer) playerData.getViewer()).getName();
@ -736,33 +657,25 @@ public class Creator implements Listener {
structure.removeCommand(structure.getCommands().size() - 1);
soundManager.playSound(player, Sounds.EXPLODE.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
Config config = fileManager
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, () -> {
Config config14 = fileManager
.getConfig(new File(skyblock.getDataFolder(), "structures.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
FileConfiguration configLoad14 = config14.getFileConfiguration();
configLoad.set("Structures." + structure.getName() + ".Commands",
configLoad14.set("Structures." + structure.getName() + ".Commands",
structure.getCommands());
try {
configLoad.save(config.getFile());
configLoad14.save(config14.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
return;
} else if (event.getClick() != ClickType.LEFT) {
@ -772,8 +685,8 @@ public class Creator implements Listener {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.creator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -787,13 +700,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if (!structureManager.containsStructure(name)) {
messageManager.sendMessage(player,
configLoad.getString("Island.Admin.Creator.Exist.Message"));
@ -801,47 +709,34 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
structure.addCommand(event1.getName());
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
Config config = fileManager.getConfig(
() -> {
Config config15 = fileManager.getConfig(
new File(skyblock.getDataFolder(), "structures.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
FileConfiguration configLoad15 = config15.getFileConfiguration();
configLoad.set(
configLoad15.set(
"Structures." + structure.getName() + ".Commands",
structure.getCommands());
try {
configLoad.save(config.getFile());
configLoad15.save(config15.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
}
event1.setWillClose(true);
@ -858,7 +753,7 @@ public class Creator implements Listener {
configLoad.getString("Menu.Admin.Creator.Options.Item.Commands.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
} else {
playerData.setViewer(null);
@ -869,12 +764,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
@ -890,12 +780,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
String name = ((Creator.Viewer) playerData.getViewer()).getName();
@ -910,32 +795,24 @@ public class Creator implements Listener {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
Config config = fileManager
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, () -> {
Config config16 = fileManager
.getConfig(new File(skyblock.getDataFolder(), "structures.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
FileConfiguration configLoad16 = config16.getFileConfiguration();
configLoad.set("Structures." + structure.getName() + ".Permission",
configLoad16.set("Structures." + structure.getName() + ".Permission",
structure.isPermission());
try {
configLoad.save(config.getFile());
configLoad16.save(config16.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
playerData.setViewer(null);
@ -945,12 +822,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
@ -967,20 +839,15 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
String name = ((Creator.Viewer) playerData.getViewer()).getName();
if (structureManager.containsStructure(name)) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.creator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -994,13 +861,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else if (!structureManager.containsStructure(name)) {
messageManager.sendMessage(player,
configLoad.getString("Island.Admin.Creator.Exist.Message"));
@ -1008,13 +870,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
if (fileManager.isFileExist(
new File(skyblock.getDataFolder().toString() + "/structures",
@ -1027,26 +884,23 @@ public class Creator implements Listener {
1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
Config config = fileManager.getConfig(
() -> {
Config config17 = fileManager.getConfig(
new File(skyblock.getDataFolder(),
"structures.yml"));
FileConfiguration configLoad = config
FileConfiguration configLoad17 = config17
.getFileConfiguration();
configLoad.set(
configLoad17.set(
"Structures." + structure.getName()
+ ".File.Overworld",
event1.getName());
try {
configLoad.save(config.getFile());
configLoad17.save(config17.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
} else if (event.getClick() == ClickType.MIDDLE) {
Structure structure = structureManager.getStructure(name);
@ -1056,24 +910,21 @@ public class Creator implements Listener {
1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
Config config = fileManager.getConfig(
() -> {
Config config18 = fileManager.getConfig(
new File(skyblock.getDataFolder(),
"structures.yml"));
FileConfiguration configLoad = config
FileConfiguration configLoad18 = config18
.getFileConfiguration();
configLoad.set("Structures." + structure.getName()
configLoad18.set("Structures." + structure.getName()
+ ".File.Nether", event1.getName());
try {
configLoad.save(config.getFile());
configLoad18.save(config18.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
} else {
Structure structure = structureManager.getStructure(name);
@ -1083,24 +934,21 @@ public class Creator implements Listener {
1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
Config config = fileManager.getConfig(
() -> {
Config config19 = fileManager.getConfig(
new File(skyblock.getDataFolder(),
"structures.yml"));
FileConfiguration configLoad = config
FileConfiguration configLoad19 = config19
.getFileConfiguration();
configLoad.set("Structures." + structure.getName()
configLoad19.set("Structures." + structure.getName()
+ ".File.End", event1.getName());
try {
configLoad.save(config.getFile());
configLoad19.save(config19.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
}
} else {
@ -1112,13 +960,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
}
event1.setWillClose(true);
@ -1135,7 +978,7 @@ public class Creator implements Listener {
configLoad.getString("Menu.Admin.Creator.Options.Item.File.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
} else {
playerData.setViewer(null);
@ -1146,12 +989,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}
@ -1167,12 +1005,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
Creator.Viewer viewer = (Viewer) playerData.getViewer();
String name = viewer.getName();
@ -1197,12 +1030,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}
@ -1218,20 +1046,15 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
String name = ((Creator.Viewer) playerData.getViewer()).getName();
if (structureManager.containsStructure(name)) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.creator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -1247,13 +1070,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
return;
} else if (!structureManager.containsStructure(name)) {
@ -1263,13 +1081,8 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
return;
} else if (!(event1.getName().matches("[0-9]+")
@ -1309,13 +1122,8 @@ public class Creator implements Listener {
}
});
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
} else {
event1.setWillClose(false);
event1.setWillDestroy(false);
@ -1328,7 +1136,7 @@ public class Creator implements Listener {
configLoad.getString("Menu.Admin.Creator.Options.Item.DeletionCost.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
} else {
playerData.setViewer(null);
@ -1339,12 +1147,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
@ -1396,12 +1199,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
playerData.setViewer(null);
@ -1411,12 +1209,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
return;
@ -1434,12 +1227,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if (event.getClick() == ClickType.RIGHT) {
structureManager.removeStructure(structureList);
@ -1448,31 +1236,23 @@ public class Creator implements Listener {
.replace("%structure", structureList.getName()));
soundManager.playSound(player, Sounds.IRONGOLEM_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
Config config = fileManager
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, () -> {
Config config110 = fileManager
.getConfig(new File(skyblock.getDataFolder(), "structures.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
FileConfiguration configLoad110 = config110.getFileConfiguration();
configLoad.set("Structures." + structureList.getName(), null);
configLoad110.set("Structures." + structureList.getName(), null);
try {
configLoad.save(config.getFile());
configLoad110.save(config110.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
return;
@ -1484,12 +1264,7 @@ public class Creator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}
@ -1515,8 +1290,7 @@ public class Creator implements Listener {
}
}
if (inventoryName.equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Creator.Title")))) {
if (inventoryName.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Creator.Title")))) {
PlayerDataManager playerDataManager = skyblock.getPlayerDataManager();
if (playerDataManager.hasPlayerData(player)) {

70
src/main/java/me/goodandevil/skyblock/menus/admin/Generator.java
View File

@ -9,7 +9,7 @@ import me.goodandevil.skyblock.message.MessageManager;
import me.goodandevil.skyblock.placeholder.Placeholder;
import me.goodandevil.skyblock.playerdata.PlayerData;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.item.SkullUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil;
import me.goodandevil.skyblock.utils.version.Materials;
@ -251,12 +251,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
return;
}
@ -265,8 +260,8 @@ public class Generator implements Listener {
configLoad.getString("Menu.Admin.Generator.Browse.Item.Information.Displayname"))))) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.generator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -308,12 +303,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
event1.setWillClose(true);
@ -329,7 +319,7 @@ public class Generator implements Listener {
im.setDisplayName(configLoad.getString("Menu.Admin.Generator.Browse.Item.Information.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
return;
@ -345,7 +335,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
String name = ((Generator.Viewer) playerData.getViewer()).getName();
@ -377,12 +367,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
playerData.setViewer(null);
@ -392,12 +377,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
@ -421,12 +401,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
return;
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
@ -436,12 +411,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
return;
}
@ -467,8 +437,8 @@ public class Generator implements Listener {
if (event.getClick() == ClickType.LEFT) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.generator")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -545,7 +515,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
.runTaskLater(skyblock, () -> open(player), 1L);
}
}
@ -563,7 +533,7 @@ public class Generator implements Listener {
.getString("Menu.Admin.Generator.Generator.Item.Material.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
} else if (event.getClick() == ClickType.RIGHT) {
generator.getGeneratorMaterials().remove(generatorMaterialList);
@ -592,7 +562,7 @@ public class Generator implements Listener {
soundManager.playSound(player, Sounds.IRONGOLEM_HIT.bukkitSound(), 1.0F, 1.0F);
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
}
@ -654,7 +624,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
return;
@ -667,7 +637,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
return;
@ -684,7 +654,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if (event.getClick() == ClickType.RIGHT) {
generatorManager.removeGenerator(generatorList);
@ -709,7 +679,7 @@ public class Generator implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, () -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
return;

57
src/main/java/me/goodandevil/skyblock/menus/admin/Levelling.java
View File

@ -27,7 +27,7 @@ import me.goodandevil.skyblock.message.MessageManager;
import me.goodandevil.skyblock.placeholder.Placeholder;
import me.goodandevil.skyblock.playerdata.PlayerData;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.NumberUtil;
import me.goodandevil.skyblock.utils.item.MaterialUtil;
import me.goodandevil.skyblock.utils.item.SkullUtil;
@ -213,8 +213,8 @@ public class Levelling implements Listener {
event.setCancelled(true);
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.level")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -248,12 +248,7 @@ public class Levelling implements Listener {
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else {
messageManager.sendMessage(player,
configLoad.getString("Island.Admin.Levelling.Numerical.Message"));
@ -273,7 +268,7 @@ public class Levelling implements Listener {
im.setDisplayName(configLoad.getString("Menu.Admin.Levelling.Item.Information.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
return;
@ -294,12 +289,7 @@ public class Levelling implements Listener {
playerData.setPage(playerData.getPage() - 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
return;
} else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
@ -310,12 +300,7 @@ public class Levelling implements Listener {
playerData.setPage(playerData.getPage() + 1);
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
return;
}
@ -332,8 +317,8 @@ public class Levelling implements Listener {
if (event.getClick() == ClickType.LEFT) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.level")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -353,33 +338,25 @@ public class Levelling implements Listener {
1.0F);
player.closeInventory();
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> open(player), 1L);
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
Config config = fileManager.getConfig(new File(
() -> {
Config config1 = fileManager.getConfig(new File(
skyblock.getDataFolder(), "levelling.yml"));
FileConfiguration configLoad = config
FileConfiguration configLoad1 = config1
.getFileConfiguration();
configLoad.set(
configLoad1.set(
"Materials." + materials.name() + ".Points",
materialPoints);
try {
configLoad.save(config.getFile());
configLoad1.save(config1.getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
});
} else {
messageManager.sendMessage(player, configLoad
@ -407,7 +384,7 @@ public class Levelling implements Listener {
configLoad.getString("Menu.Admin.Levelling.Item.Material.Word.Enter"));
is.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.open();
} else if (event.getClick() == ClickType.RIGHT) {
levellingManager.removeMaterial(materialList);

54
src/main/java/me/goodandevil/skyblock/menus/admin/Settings.java
View File

@ -72,57 +72,32 @@ public class Settings {
.getString("Menu.Admin.Settings.Categories.Item.Visitor.Displayname"))))) {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, me.goodandevil.skyblock.island.IslandRole.Visitor);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, me.goodandevil.skyblock.island.IslandRole.Visitor), 1L);
} else if ((is.getType() == Material.PAINTING) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Admin.Settings.Categories.Item.Member.Displayname"))))) {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, me.goodandevil.skyblock.island.IslandRole.Member);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, me.goodandevil.skyblock.island.IslandRole.Member), 1L);
} else if ((is.getType() == Material.ITEM_FRAME) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Admin.Settings.Categories.Item.Operator.Displayname"))))) {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, me.goodandevil.skyblock.island.IslandRole.Operator);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, me.goodandevil.skyblock.island.IslandRole.Operator), 1L);
} else if ((is.getType() == Material.NAME_TAG) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Admin.Settings.Categories.Item.Coop.Displayname"))))) {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, me.goodandevil.skyblock.island.IslandRole.Coop);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, me.goodandevil.skyblock.island.IslandRole.Coop), 1L);
} else if ((is.getType() == Materials.OAK_SAPLING.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Admin.Settings.Categories.Item.Owner.Displayname"))))) {
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, me.goodandevil.skyblock.island.IslandRole.Owner);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, me.goodandevil.skyblock.island.IslandRole.Owner), 1L);
}
}
});
@ -201,12 +176,7 @@ public class Settings {
configLoad.getString("Menu.Admin.Settings.Owner.Item.Return.Displayname"))))) {
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Categories, null);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Categories, null), 1L);
} else if (is.hasItemMeta()) {
String roleName = getRoleName(role);
@ -225,9 +195,7 @@ public class Settings {
settingsConfigLoad.set("Settings." + role.name() + "." + settingList, true);
}
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
Bukkit.getServer().getScheduler().runTaskAsynchronously(skyblock, () -> {
try {
Config config = skyblock.getFileManager()
.getConfig(new File(skyblock.getDataFolder(), "settings.yml"));
@ -235,7 +203,6 @@ public class Settings {
} catch (IOException e) {
e.printStackTrace();
}
}
});
break;
@ -244,12 +211,7 @@ public class Settings {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player, Settings.Type.Role, role);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, Type.Role, role), 1L);
}
}
});

179
src/main/java/me/goodandevil/skyblock/menus/admin/Upgrade.java
View File

@ -26,7 +26,7 @@ import me.goodandevil.skyblock.playerdata.PlayerData;
import me.goodandevil.skyblock.playerdata.PlayerDataManager;
import me.goodandevil.skyblock.sound.SoundManager;
import me.goodandevil.skyblock.upgrade.UpgradeManager;
import me.goodandevil.skyblock.utils.AnvilGUI;
import me.goodandevil.skyblock.utils.AbstractAnvilGUI;
import me.goodandevil.skyblock.utils.NumberUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil;
import me.goodandevil.skyblock.utils.item.nInventoryUtil.ClickEvent;
@ -122,12 +122,7 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if ((is.getType() == Materials.SPAWNER.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad
@ -147,20 +142,13 @@ public class Upgrade {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if (event.getClick() == ClickType.RIGHT) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.upgrade")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -188,9 +176,9 @@ public class Upgrade {
me.goodandevil.skyblock.upgrade.Upgrade.Type upgradeType = ((Viewer) playerDataManager
.getPlayerData(player).getViewer()).getUpgrade();
me.goodandevil.skyblock.upgrade.Upgrade upgrade = upgradeManager
me.goodandevil.skyblock.upgrade.Upgrade upgrade1 = upgradeManager
.getUpgrades(upgradeType).get(0);
upgrade.setCost(upgradeCost);
upgrade1.setCost(upgradeCost);
soundManager.playSound(player, Sounds.NOTE_PLING.bukkitSound(),
1.0F, 1.0F);
@ -200,15 +188,15 @@ public class Upgrade {
public void run() {
Config config = fileManager.getConfig(new File(
skyblock.getDataFolder(), "upgrades.yml"));
FileConfiguration configLoad = config
FileConfiguration configLoad1 = config
.getFileConfiguration();
configLoad.set(
configLoad1.set(
"Upgrades." + upgradeType.name() + ".Cost",
upgradeCost);
try {
configLoad.save(config.getFile());
configLoad1.save(config.getFile());
} catch (IOException e) {
e.printStackTrace();
}
@ -216,12 +204,7 @@ public class Upgrade {
});
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock, () -> open(player), 1L);
}
event1.setWillClose(true);
@ -232,15 +215,14 @@ public class Upgrade {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is1 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is1.getItemMeta();
im.setDisplayName(
configLoad.getString("Menu.Admin.Upgrade.Upgrades.Item.Word.Enter"));
is.setItemMeta(im);
is1.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is1);
gui.open();
}
}, 1L);
} else {
event.setWillClose(false);
@ -384,12 +366,7 @@ public class Upgrade {
playerData.setViewer(new Upgrade.Viewer(Upgrade.Viewer.Type.Upgrades, null));
soundManager.playSound(player, Sounds.ARROW_HIT.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
} else if ((is.getType() == Material.PAINTING) && (is.hasItemMeta()) && (is.getItemMeta()
.getDisplayName().equals(ChatColor.translateAlternateColorCodes('&', configLoad
.getString("Menu.Admin.Upgrade.Size.Item.Information.Displayname"))))) {
@ -406,12 +383,10 @@ public class Upgrade {
} else {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (playerDataManager.hasPlayerData(player)
&& playerDataManager
.getPlayerData(player) != null) {
@ -428,11 +403,11 @@ public class Upgrade {
return;
} else {
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades = upgradeManager
List<me.goodandevil.skyblock.upgrade.Upgrade> upgrades1 = upgradeManager
.getUpgrades(
me.goodandevil.skyblock.upgrade.Upgrade.Type.Size);
if (upgrades != null && upgrades.size() >= 5) {
if (upgrades1 != null && upgrades1.size() >= 5) {
messageManager.sendMessage(player,
configLoad.getString(
"Island.Admin.Upgrade.Tier.Limit.Message"));
@ -441,13 +416,8 @@ public class Upgrade {
1.0F);
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock,
() -> open(player), 1L);
return;
}
@ -490,13 +460,8 @@ public class Upgrade {
size);
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock,
() -> open(player), 1L);
}
event1.setWillClose(true);
@ -507,15 +472,14 @@ public class Upgrade {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is12 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is12.getItemMeta();
im.setDisplayName(configLoad
.getString("Menu.Admin.Upgrade.Size.Item.Word.Size.Enter"));
is.setItemMeta(im);
is12.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is12);
gui.open();
}
}, 1L);
}
} else if ((is.getType() == Materials.BLACK_STAINED_GLASS_PANE.parseMaterial())
@ -538,12 +502,10 @@ public class Upgrade {
if (event.getClick() == ClickType.LEFT) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.upgrade")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -583,13 +545,8 @@ public class Upgrade {
1.0F);
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock,
() -> open(player), 1L);
return;
}
@ -638,13 +595,8 @@ public class Upgrade {
size);
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock,
() -> open(player), 1L);
}
event1.setWillClose(true);
@ -655,15 +607,14 @@ public class Upgrade {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is13 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is13.getItemMeta();
im.setDisplayName(configLoad.getString(
"Menu.Admin.Upgrade.Size.Item.Word.Size.Enter"));
is.setItemMeta(im);
is13.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is13);
gui.open();
}
}, 1L);
return;
@ -674,12 +625,10 @@ public class Upgrade {
} else if (event.getClick() == ClickType.RIGHT) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
AnvilGUI gui = new AnvilGUI(player, event1 -> {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock,
() -> {
AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
if (event1.getSlot() == AbstractAnvilGUI.AnvilSlot.OUTPUT) {
if (!(player.hasPermission("fabledskyblock.admin.upgrade")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.*"))) {
@ -721,13 +670,8 @@ public class Upgrade {
1.0F);
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock,
() -> open(player), 1L);
return;
}
@ -748,13 +692,8 @@ public class Upgrade {
cost);
Bukkit.getServer().getScheduler()
.runTaskLaterAsynchronously(skyblock,
new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
.runTaskLater(skyblock,
() -> open(player), 1L);
}
event1.setWillClose(true);
@ -765,15 +704,14 @@ public class Upgrade {
}
});
ItemStack is = new ItemStack(Material.NAME_TAG);
ItemMeta im = is.getItemMeta();
ItemStack is14 = new ItemStack(Material.NAME_TAG);
ItemMeta im = is14.getItemMeta();
im.setDisplayName(configLoad.getString(
"Menu.Admin.Upgrade.Size.Item.Word.Cost.Enter"));
is.setItemMeta(im);
is14.setItemMeta(im);
gui.setSlot(AnvilGUI.AnvilSlot.INPUT_LEFT, is);
gui.setSlot(AbstractAnvilGUI.AnvilSlot.INPUT_LEFT, is14);
gui.open();
}
}, 1L);
return;
@ -785,12 +723,7 @@ public class Upgrade {
}
}
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@Override
public void run() {
open(player);
}
}, 1L);
Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
}
}
}

283
src/main/java/me/goodandevil/skyblock/utils/AbstractAnvilGUI.java Normal file
View File

@ -0,0 +1,283 @@
package me.goodandevil.skyblock.utils;
import me.goodandevil.skyblock.SkyBlock;
import me.goodandevil.skyblock.utils.version.NMSUtil;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
public class AbstractAnvilGUI {
private static Class<?> BlockPositionClass;
private static Class<?> PacketPlayOutOpenWindowClass;
private static Class<?> IChatBaseComponentClass;
private static Class<?> ICraftingClass;
private static Class<?> ContainerAnvilClass;
private static Class<?> ChatMessageClass;
private static Class<?> EntityHumanClass;
private static Class<?> ContainerClass;
private static Class<?> ContainerAccessClass;
private static Class<?> WorldClass;
private static Class<?> PlayerInventoryClass;
private static Class<?> ContainersClass;
private Player player;
private Map<AnvilSlot, ItemStack> items = new HashMap<>();
private Inventory inv;
private Listener listener;
static {
BlockPositionClass = NMSUtil.getNMSClass("BlockPosition");
PacketPlayOutOpenWindowClass = NMSUtil.getNMSClass("PacketPlayOutOpenWindow");
IChatBaseComponentClass = NMSUtil.getNMSClass("IChatBaseComponent");
ICraftingClass = NMSUtil.getNMSClass("ICrafting");
ContainerAnvilClass = NMSUtil.getNMSClass("ContainerAnvil");
EntityHumanClass = NMSUtil.getNMSClass("EntityHuman");
ChatMessageClass = NMSUtil.getNMSClass("ChatMessage");
ContainerClass = NMSUtil.getNMSClass("Container");
WorldClass = NMSUtil.getNMSClass("World");
PlayerInventoryClass = NMSUtil.getNMSClass("PlayerInventory");
if (NMSUtil.getVersionNumber() > 13) {
ContainerAccessClass = NMSUtil.getNMSClass("ContainerAccess");
ContainersClass = NMSUtil.getNMSClass("Containers");
}
}
public AbstractAnvilGUI(final Player player, final AnvilClickEventHandler handler) {
this.player = player;
this.listener = new Listener() {
@EventHandler(priority = EventPriority.LOWEST)
public void onInventoryClick(InventoryClickEvent event) {
if (event.getWhoClicked() instanceof Player) {
if (event.getInventory().equals(inv)) {
event.setCancelled(true);
ItemStack item = event.getCurrentItem();
int slot = event.getRawSlot();
String name = "";
if (item != null) {
if (item.hasItemMeta()) {
ItemMeta meta = item.getItemMeta();
if (meta != null && meta.hasDisplayName()) {
name = meta.getDisplayName();
}
}
}
AnvilClickEvent clickEvent = new AnvilClickEvent(AnvilSlot.bySlot(slot), name);
handler.onAnvilClick(clickEvent);
if (clickEvent.getWillClose()) {
event.getWhoClicked().closeInventory();
}
if (clickEvent.getWillDestroy()) {
destroy();
}
}
}
}
@EventHandler(priority = EventPriority.LOWEST)
public void onInventoryClose(InventoryCloseEvent event) {
if (event.getPlayer() instanceof Player) {
Inventory inv = event.getInventory();
player.setLevel(player.getLevel() - 1);
if (inv.equals(inv)) {
inv.clear();
destroy();
}
}
}
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerQuit(PlayerQuitEvent event) {
if (event.getPlayer().equals(getPlayer())) {
player.setLevel(player.getLevel() - 1);
destroy();
}
}
};
Bukkit.getPluginManager().registerEvents(listener, SkyBlock.getInstance());
}
public Player getPlayer() {
return player;
}
public void setSlot(AnvilSlot slot, ItemStack item) {
items.put(slot, item);
}
public void open() {
player.setLevel(player.getLevel() + 1);
try {
Object craftPlayer = NMSUtil.getCraftClass("entity.CraftPlayer").cast(player);
Method getHandleMethod = craftPlayer.getClass().getMethod("getHandle");
Object entityPlayer = getHandleMethod.invoke(craftPlayer);
Object playerInventory = NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "inventory", false));
Object world = NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "world", false));
Object blockPosition = BlockPositionClass.getConstructor(int.class, int.class, int.class).newInstance(0, 0, 0);
Object container;
if (NMSUtil.getVersionNumber() > 13) {
container = ContainerAnvilClass
.getConstructor(int.class, PlayerInventoryClass, ContainerAccessClass)
.newInstance(7, playerInventory, ContainerAccessClass.getMethod("at", WorldClass, BlockPositionClass).invoke(null, world, blockPosition));
} else {
container = ContainerAnvilClass
.getConstructor(PlayerInventoryClass, WorldClass, BlockPositionClass, EntityHumanClass)
.newInstance(playerInventory, world, blockPosition, entityPlayer);
}
NMSUtil.getField(ContainerClass, "checkReachable", true).set(container, false);
Method getBukkitViewMethod = container.getClass().getMethod("getBukkitView");
Object bukkitView = getBukkitViewMethod.invoke(container);
Method getTopInventoryMethod = bukkitView.getClass().getMethod("getTopInventory");
inv = (Inventory) getTopInventoryMethod.invoke(bukkitView);
for (AnvilSlot slot : items.keySet()) {
inv.setItem(slot.getSlot(), items.get(slot));
}
Method nextContainerCounterMethod = entityPlayer.getClass().getMethod("nextContainerCounter");
int c = (int) nextContainerCounterMethod.invoke(entityPlayer);
Constructor<?> chatMessageConstructor = ChatMessageClass.getConstructor(String.class, Object[].class);
Object inventoryTitle = chatMessageConstructor.newInstance("Repairing", new Object[]{});
Object packet;
if (NMSUtil.getVersionNumber() > 13) {
packet = PacketPlayOutOpenWindowClass
.getConstructor(int.class, ContainersClass, IChatBaseComponentClass)
.newInstance(c, ContainersClass.getField("ANVIL").get(null), inventoryTitle);
} else {
packet = PacketPlayOutOpenWindowClass
.getConstructor(int.class, String.class, IChatBaseComponentClass, int.class)
.newInstance(c, "minecraft:anvil", inventoryTitle, 0);
}
NMSUtil.sendPacket(player, packet);
Field activeContainerField = NMSUtil.getField(EntityHumanClass, "activeContainer", true);
if (activeContainerField != null) {
activeContainerField.set(entityPlayer, container);
NMSUtil.getField(ContainerClass, "windowId", true).set(activeContainerField.get(entityPlayer), c);
Method addSlotListenerMethod = activeContainerField.get(entityPlayer).getClass().getMethod("addSlotListener", ICraftingClass);
addSlotListenerMethod.invoke(activeContainerField.get(entityPlayer), entityPlayer);
if (NMSUtil.getVersionNumber() > 13) {
ContainerClass.getMethod("setTitle", IChatBaseComponentClass).invoke(container, inventoryTitle);
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
public void destroy() {
player = null;
items = null;
HandlerList.unregisterAll(listener);
listener = null;
}
public enum AnvilSlot {
INPUT_LEFT(0),
INPUT_RIGHT(1),
OUTPUT(2);
private int slot;
AnvilSlot(int slot) {
this.slot = slot;
}
public static AnvilSlot bySlot(int slot) {
for (AnvilSlot anvilSlot : values()) {
if (anvilSlot.getSlot() == slot) {
return anvilSlot;
}
}
return null;
}
public int getSlot() {
return slot;
}
}
@FunctionalInterface
public interface AnvilClickEventHandler {
void onAnvilClick(AnvilClickEvent event);
}
public class AnvilClickEvent {
private AnvilSlot slot;
private String name;
private boolean close = true;
private boolean destroy = true;
public AnvilClickEvent(AnvilSlot slot, String name) {
this.slot = slot;
this.name = name;
}
public AnvilSlot getSlot() {
return slot;
}
public String getName() {
return name;
}
public boolean getWillClose() {
return close;
}
public void setWillClose(boolean close) {
this.close = close;
}
public boolean getWillDestroy() {
return destroy;
}
public void setWillDestroy(boolean destroy) {
this.destroy = destroy;
}
}
}

276
src/main/java/me/goodandevil/skyblock/utils/AnvilGUI.java
View File

@ -1,276 +0,0 @@
package me.goodandevil.skyblock.utils;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import me.goodandevil.skyblock.SkyBlock;
import me.goodandevil.skyblock.utils.version.NMSUtil;
public class AnvilGUI {
private Player player;
private Class<?> BlockPosition;
private Class<?> PacketPlayOutOpenWindow;
private Class<?> ContainerAnvil;
private Class<?> ChatMessage;
private Class<?> EntityHuman;
private Map<AnvilSlot, ItemStack> items = new HashMap<>();
private Inventory inv;
private Listener listener;
private void loadClasses() {
BlockPosition = NMSUtil.getNMSClass("BlockPosition");
PacketPlayOutOpenWindow = NMSUtil.getNMSClass("PacketPlayOutOpenWindow");
ContainerAnvil = NMSUtil.getNMSClass("ContainerAnvil");
EntityHuman = NMSUtil.getNMSClass("EntityHuman");
ChatMessage = NMSUtil.getNMSClass("ChatMessage");
}
public AnvilGUI(final Player player, final AnvilClickEventHandler handler) {
loadClasses();
this.player = player;
this.listener = new Listener() {
@EventHandler
public void onInventoryClick(InventoryClickEvent event) {
if (event.getWhoClicked() instanceof Player) {
if (event.getInventory().equals(inv)) {
event.setCancelled(true);
ItemStack item = event.getCurrentItem();
int slot = event.getRawSlot();
String name = "";
if (item != null) {
if (item.hasItemMeta()) {
ItemMeta meta = item.getItemMeta();
if (meta.hasDisplayName()) {
name = meta.getDisplayName();
}
}
}
AnvilClickEvent clickEvent = new AnvilClickEvent(AnvilSlot.bySlot(slot), name);
handler.onAnvilClick(clickEvent);
if (clickEvent.getWillClose()) {
event.getWhoClicked().closeInventory();
}
if (clickEvent.getWillDestroy()) {
destroy();
}
}
}
}
@EventHandler
public void onInventoryClose(InventoryCloseEvent event) {
if (event.getPlayer() instanceof Player) {
Inventory inv = event.getInventory();
player.setLevel(player.getLevel() - 1);
if (inv.equals(AnvilGUI.this.inv)) {
inv.clear();
destroy();
}
}
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
if (event.getPlayer().equals(getPlayer())) {
player.setLevel(player.getLevel() - 1);
destroy();
}
}
};
Bukkit.getPluginManager().registerEvents(listener, SkyBlock.getInstance());
}
public Player getPlayer() {
return player;
}
public void setSlot(AnvilSlot slot, ItemStack item) {
items.put(slot, item);
}
public void open() {
player.setLevel(player.getLevel() + 1);
try {
Object craftPlayer = NMSUtil.getCraftClass("entity.CraftPlayer").cast(player);
Method getHandleMethod = craftPlayer.getClass().getMethod("getHandle", new Class<?>[0]);
Object entityPlayer = getHandleMethod.invoke(craftPlayer, new Object[0]);
Object container;
if (NMSUtil.getVersionNumber() == 7) {
container = ContainerAnvil
.getConstructor(
new Class[] { NMSUtil.getNMSClass("PlayerInventory"), NMSUtil.getNMSClass("World"),
Integer.TYPE, Integer.TYPE, Integer.TYPE, EntityHuman })
.newInstance(new Object[] {
NMSUtil.getFieldObject(entityPlayer,
NMSUtil.getField(entityPlayer.getClass(), "inventory", false)),
NMSUtil.getFieldObject(entityPlayer,
NMSUtil.getField(entityPlayer.getClass(), "world", false)),
Integer.valueOf(0), Integer.valueOf(0), Integer.valueOf(0), entityPlayer });
} else {
container = ContainerAnvil
.getConstructor(NMSUtil.getNMSClass("PlayerInventory"), NMSUtil.getNMSClass("World"),
BlockPosition, EntityHuman)
.newInstance(
NMSUtil.getFieldObject(entityPlayer,
NMSUtil.getField(entityPlayer.getClass(), "inventory", false)),
NMSUtil.getFieldObject(entityPlayer,
NMSUtil.getField(entityPlayer.getClass(), "world", false)),
BlockPosition.getConstructor(int.class, int.class, int.class).newInstance(0, 0, 0),
entityPlayer);
}
NMSUtil.getField(NMSUtil.getNMSClass("Container"), "checkReachable", true).set(container, false);
Method getBukkitViewMethod = container.getClass().getMethod("getBukkitView", new Class<?>[0]);
Object bukkitView = getBukkitViewMethod.invoke(container);
Method getTopInventoryMethod = bukkitView.getClass().getMethod("getTopInventory", new Class<?>[0]);
inv = (Inventory) getTopInventoryMethod.invoke(bukkitView);
for (AnvilSlot slot : items.keySet()) {
inv.setItem(slot.getSlot(), items.get(slot));
}
Method nextContainerCounterMethod = entityPlayer.getClass().getMethod("nextContainerCounter",
new Class<?>[0]);
int c = (int) nextContainerCounterMethod.invoke(entityPlayer);
Constructor<?> chatMessageConstructor = ChatMessage.getConstructor(String.class, Object[].class);
Object packet;
if (NMSUtil.getVersionNumber() == 7) {
packet = PacketPlayOutOpenWindow
.getConstructor(new Class[] { Integer.TYPE, Integer.TYPE, String.class, Integer.TYPE,
Boolean.TYPE, Integer.TYPE })
.newInstance(new Object[] { Integer.valueOf(c), Integer.valueOf(8), "Repairing",
Integer.valueOf(0), Boolean.valueOf(true), Integer.valueOf(0) });
} else {
packet = PacketPlayOutOpenWindow
.getConstructor(int.class, String.class, NMSUtil.getNMSClass("IChatBaseComponent"), int.class)
.newInstance(c, "minecraft:anvil",
chatMessageConstructor.newInstance("Repairing", new Object[] {}), 0);
}
NMSUtil.sendPacket(player, packet);
Field activeContainerField = NMSUtil.getField(EntityHuman, "activeContainer", true);
if (activeContainerField != null) {
activeContainerField.set(entityPlayer, container);
NMSUtil.getField(NMSUtil.getNMSClass("Container"), "windowId", true)
.set(activeContainerField.get(entityPlayer), c);
Method addSlotListenerMethod = activeContainerField.get(entityPlayer).getClass()
.getMethod("addSlotListener", NMSUtil.getNMSClass("ICrafting"));
addSlotListenerMethod.invoke(activeContainerField.get(entityPlayer), entityPlayer);
}
} catch (Exception e) {
e.printStackTrace();
}
}
public void destroy() {
player = null;
items = null;
HandlerList.unregisterAll(listener);
listener = null;
}
public enum AnvilSlot {
INPUT_LEFT(0), INPUT_RIGHT(1), OUTPUT(2);
private int slot;
private AnvilSlot(int slot) {
this.slot = slot;
}
public static AnvilSlot bySlot(int slot) {
for (AnvilSlot anvilSlot : values()) {
if (anvilSlot.getSlot() == slot) {
return anvilSlot;
}
}
return null;
}
public int getSlot() {
return slot;
}
}
public interface AnvilClickEventHandler {
void onAnvilClick(AnvilClickEvent event);
}
public class AnvilClickEvent {
private AnvilSlot slot;
private String name;
private boolean close = true;
private boolean destroy = true;
public AnvilClickEvent(AnvilSlot slot, String name) {
this.slot = slot;
this.name = name;
}
public AnvilSlot getSlot() {
return slot;
}
public String getName() {
return name;
}
public boolean getWillClose() {
return close;
}
public void setWillClose(boolean close) {
this.close = close;
}
public boolean getWillDestroy() {
return destroy;
}
public void setWillDestroy(boolean destroy) {
this.destroy = destroy;
}
}
}

1
src/main/java/me/goodandevil/skyblock/utils/item/nInventoryUtil.java
View File

@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import me.goodandevil.skyblock.utils.version.NMSUtil;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;