Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-28 22:47:26 +02:00
Code Issues Projects Releases Wiki Activity

1.14 support

Browse Source
This commit is contained in:
Esophose 2019-04-23 22:38:43 -06:00
parent b45446d13c
commit a903b722c0
25 changed files with 641 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle
View File

@ -2,7 +2,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
apply plugin: 'java'
group 'com.songoda.fabledskyblock'
version 'Build-73'
version 'Build-74'
sourceCompatibility = 1.8
@ -15,6 +15,11 @@ repositories {
}
}
configurations {
shade
compile.extendsFrom shade
}
dependencies {
// PlaceholderAPI
implementation (group: 'be.maximvdw', name: 'placeholderapi', version: '2.5.1')
@ -32,8 +37,12 @@ dependencies {
// WildStacker
implementation (group: 'com.bgsoftware', name: 'wildstacker-api', version: 'b14')
// Apache Commons
shade (group: 'org.apache.commons', name: 'commons-lang3', version: '3.0')
shade (group: 'commons-io', name: 'commons-io', version: '2.5')
// Spigot
implementation (group: 'org.spigotmc', name: 'spigot', version: '1.13.2')
implementation (group: 'org.spigotmc', name: 'spigot', version: '1.14-pre5-2')
}
processResources {
@ -41,4 +50,13 @@ processResources {
include '**/*.yml'
filter ReplaceTokens, tokens: ["version": project.property("version")]
}
}
}
jar {
configurations.shade.each { dep ->
from (project.zipTree(dep)) {
exclude '**/*.yml'
exclude 'META-INF', 'META-INF/**'
}
}
}

2
src/main/java/me/goodandevil/skyblock/api/event/island/IslandCreateEvent.java
View File

@ -12,7 +12,7 @@ public class IslandCreateEvent extends IslandEvent {
private final Player player;
public IslandCreateEvent(Island island, Player player) {
super(island);
super(island, true);
this.player = player;
}

5
src/main/java/me/goodandevil/skyblock/api/event/island/IslandEvent.java
View File

@ -12,6 +12,11 @@ public abstract class IslandEvent extends Event {
this.island = island;
}
protected IslandEvent(Island island, boolean async) {
super(async);
this.island = island;
}
public Island getIsland() {
return island;
}

2
src/main/java/me/goodandevil/skyblock/api/event/island/IslandLevelChangeEvent.java
View File

@ -12,7 +12,7 @@ public class IslandLevelChangeEvent extends IslandEvent {
private final IslandLevel level;
public IslandLevelChangeEvent(Island island, IslandLevel level) {
super(island);
super(island, true);
this.level = level;
}

2
src/main/java/me/goodandevil/skyblock/api/event/island/IslandLocationChangeEvent.java
View File

@ -12,7 +12,7 @@ public class IslandLocationChangeEvent extends IslandEvent {
private final IslandLocation location;
public IslandLocationChangeEvent(Island island, IslandLocation location) {
super(island);
super(island, true);
this.location = location;
}

6
src/main/java/me/goodandevil/skyblock/api/event/player/PlayerEvent.java
View File

@ -15,6 +15,12 @@ public abstract class PlayerEvent extends Event {
this.island = island;
}
protected PlayerEvent(Player player, Island island, boolean async) {
super(async);
this.player = player;
this.island = island;
}
public Player getPlayer() {
return player;
}

289
src/main/java/me/goodandevil/skyblock/command/CommandManager.java
View File

@ -106,162 +106,157 @@ public class CommandManager implements CommandExecutor, TabCompleter {
@Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (command.getName().equalsIgnoreCase("island")) {
new BukkitRunnable() {
@Override
public void run() {
MessageManager messageManager = skyblock.getMessageManager();
SoundManager soundManager = skyblock.getSoundManager();
FileManager fileManager = skyblock.getFileManager();
MessageManager messageManager = skyblock.getMessageManager();
SoundManager soundManager = skyblock.getSoundManager();
FileManager fileManager = skyblock.getFileManager();
Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "language.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "language.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
Player player = null;
Player player = null;
if (sender instanceof Player) {
player = (Player) sender;
}
if (sender instanceof Player) {
player = (Player) sender;
}
if (args.length == 0) {
if (player == null) {
sendConsoleHelpCommands(sender);
} else {
if (skyblock.getIslandManager().getIsland(player) == null) {
Bukkit.getServer().getScheduler().runTask(skyblock, () -> Bukkit.getServer().dispatchCommand(sender, "island create"));
} else {
boolean canUseControlPanel = player.hasPermission("fabledskyblock.*")
|| player.hasPermission("fabledskyblock.island.*")
|| player.hasPermission("fabledskyblock.island.controlpanel");
if (!canUseControlPanel) {
messageManager.sendMessage(player, configLoad.getString("Command.PermissionDenied.Island.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return;
}
ControlPanel.getInstance().open(player);
soundManager.playSound(player, Sounds.CHEST_OPEN.bukkitSound(), 1.0F, 1.0F);
}
}
return;
}
SubCommand subCommand;
boolean isAdmin;
if (args[0].equalsIgnoreCase("help")) {
if (player == null) {
sendConsoleHelpCommands(sender);
} else {
boolean canUseHelp = player.hasPermission("fabledskyblock.*")
|| player.hasPermission("fabledskyblock.island.*")
|| player.hasPermission("fabledskyblock.island.help");
if (!canUseHelp) {
messageManager.sendMessage(player, configLoad.getString("Command.PermissionDenied.Island.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return;
}
int page = -1;
if (!fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Command.Help.List")) {
page = 1;
if (args.length == 2) {
if (args[1].matches("[0-9]+")) {
page = Integer.valueOf(args[1]);
} else {
messageManager.sendMessage(player,
configLoad.getString("Command.Island.Help.Integer.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return;
}
}
}
sendPlayerIslandHelpCommands(player, page);
}
return;
} else if (args[0].equalsIgnoreCase("admin")) {
if (args.length == 1 || args[1].equalsIgnoreCase("help")) {
if (player == null) {
sendConsoleHelpCommands(sender);
} else {
boolean canUseHelp = player.hasPermission("fabledskyblock.*")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.admin.help");
if (!canUseHelp) {
messageManager.sendMessage(player, configLoad.getString("Command.PermissionDenied.Admin.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return;
}
int page = -1;
if (!fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Command.Help.List")) {
page = 1;
if (args.length == 3) {
if (args[2].matches("[0-9]+")) {
page = Integer.valueOf(args[2]);
} else {
messageManager.sendMessage(player,
configLoad.getString("Command.Island.Help.Integer.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F,
1.0F);
return;
}
}
}
sendPlayerAdminHelpCommands(player, page);
}
return;
}
subCommand = getAdminSubCommand(args[1]);
isAdmin = true;
if (args.length == 0) {
if (player == null) {
sendConsoleHelpCommands(sender);
} else {
if (skyblock.getIslandManager().getIsland(player) == null) {
Bukkit.getServer().getScheduler().runTask(skyblock, () -> Bukkit.getServer().dispatchCommand(sender, "island create"));
} else {
subCommand = getIslandSubCommand(args[0]);
isAdmin = false;
}
boolean canUseControlPanel = player.hasPermission("fabledskyblock.*")
|| player.hasPermission("fabledskyblock.island.*")
|| player.hasPermission("fabledskyblock.island.controlpanel");
if (subCommand == null) {
messageManager.sendMessage(sender, configLoad.getString("Command.Island.Argument.Unrecognised.Message"));
soundManager.playSound(sender, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F);
return;
}
if (!canUseControlPanel) {
messageManager.sendMessage(player, configLoad.getString("Command.PermissionDenied.Island.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return true;
}
if (!subCommand.hasPermission(sender, isAdmin)) {
messageManager.sendMessage(sender, configLoad.getString("Command.PermissionDenied." + (isAdmin ? "Admin" : "Island") + ".Message"));
soundManager.playSound(sender, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return;
}
List<String> arguments = new ArrayList<>(Arrays.asList(args));
arguments.remove(args[0]);
if (adminCommands.contains(subCommand)) {
arguments.remove(args[1]);
}
if (sender instanceof Player) {
subCommand.onCommandByPlayer(player, arguments.toArray(new String[0]));
} else if (sender instanceof ConsoleCommandSender) {
subCommand.onCommandByConsole((ConsoleCommandSender) sender,
arguments.toArray(new String[0]));
ControlPanel.getInstance().open(player);
soundManager.playSound(player, Sounds.CHEST_OPEN.bukkitSound(), 1.0F, 1.0F);
}
}
}.runTaskAsynchronously(skyblock);
return true;
}
SubCommand subCommand;
boolean isAdmin;
if (args[0].equalsIgnoreCase("help")) {
if (player == null) {
sendConsoleHelpCommands(sender);
} else {
boolean canUseHelp = player.hasPermission("fabledskyblock.*")
|| player.hasPermission("fabledskyblock.island.*")
|| player.hasPermission("fabledskyblock.island.help");
if (!canUseHelp) {
messageManager.sendMessage(player, configLoad.getString("Command.PermissionDenied.Island.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return true;
}
int page = -1;
if (!fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Command.Help.List")) {
page = 1;
if (args.length == 2) {
if (args[1].matches("[0-9]+")) {
page = Integer.valueOf(args[1]);
} else {
messageManager.sendMessage(player,
configLoad.getString("Command.Island.Help.Integer.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return true;
}
}
}
sendPlayerIslandHelpCommands(player, page);
}
return true;
} else if (args[0].equalsIgnoreCase("admin")) {
if (args.length == 1 || args[1].equalsIgnoreCase("help")) {
if (player == null) {
sendConsoleHelpCommands(sender);
} else {
boolean canUseHelp = player.hasPermission("fabledskyblock.*")
|| player.hasPermission("fabledskyblock.admin.*")
|| player.hasPermission("fabledskyblock.admin.help");
if (!canUseHelp) {
messageManager.sendMessage(player, configLoad.getString("Command.PermissionDenied.Admin.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return true;
}
int page = -1;
if (!fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Command.Help.List")) {
page = 1;
if (args.length == 3) {
if (args[2].matches("[0-9]+")) {
page = Integer.valueOf(args[2]);
} else {
messageManager.sendMessage(player,
configLoad.getString("Command.Island.Help.Integer.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F,
1.0F);
return true;
}
}
}
sendPlayerAdminHelpCommands(player, page);
}
return true;
}
subCommand = getAdminSubCommand(args[1]);
isAdmin = true;
} else {
subCommand = getIslandSubCommand(args[0]);
isAdmin = false;
}
if (subCommand == null) {
messageManager.sendMessage(sender, configLoad.getString("Command.Island.Argument.Unrecognised.Message"));
soundManager.playSound(sender, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F);
return true;
}
if (!subCommand.hasPermission(sender, isAdmin)) {
messageManager.sendMessage(sender, configLoad.getString("Command.PermissionDenied." + (isAdmin ? "Admin" : "Island") + ".Message"));
soundManager.playSound(sender, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return true;
}
List<String> arguments = new ArrayList<>(Arrays.asList(args));
arguments.remove(args[0]);
if (adminCommands.contains(subCommand)) {
arguments.remove(args[1]);
}
if (sender instanceof Player) {
subCommand.onCommandByPlayer(player, arguments.toArray(new String[0]));
} else if (sender instanceof ConsoleCommandSender) {
subCommand.onCommandByConsole((ConsoleCommandSender) sender,
arguments.toArray(new String[0]));
}
}
return true;

4
src/main/java/me/goodandevil/skyblock/listeners/Portal.java
View File

@ -17,9 +17,9 @@ import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityPortalEnterEvent;
import org.bukkit.event.entity.EntityPortalEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import java.io.File;
@ -64,7 +64,7 @@ public class Portal implements Listener {
}
}
@EventHandler
@EventHandler(priority = EventPriority.LOW)
public void onEntityPortalEnter(EntityPortalEnterEvent event) {
if (!(event.getEntity() instanceof Player))
return;

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

@ -144,7 +144,7 @@ public class Border {
}
}, 1L);
}
} else if ((is.getType() == Materials.ROSE_RED.parseMaterial()) && (is.hasItemMeta())
} else if ((is.getType() == Materials.RED_DYE.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName()
.equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Border.Item.Color.Displayname").replace("%color",
@ -225,14 +225,14 @@ public class Border {
}
if (borderColor == WorldBorder.Color.Red) {
nInv.addItem(nInv.createItem(Materials.ROSE_RED.parseItem(),
nInv.addItem(nInv.createItem(Materials.RED_DYE.parseItem(),
configLoad.getString("Menu.Border.Item.Color.Displayname").replace("%color",
configLoad.getString("Menu.Border.Item.Word.Red")),
configLoad.getStringList("Menu.Border.Item.Color.Selected.Lore"),
new Placeholder[] { new Placeholder("%color", configLoad.getString("Menu.Border.Item.Word.Red")) },
null, null), 4);
} else {
nInv.addItem(nInv.createItem(Materials.ROSE_RED.parseItem(),
nInv.addItem(nInv.createItem(Materials.RED_DYE.parseItem(),
configLoad.getString("Menu.Border.Item.Color.Displayname").replace("%color",
configLoad.getString("Menu.Border.Item.Word.Red")),
configLoad.getStringList("Menu.Border.Item.Color.Unselected.Lore"),

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

@ -111,7 +111,7 @@ public class ControlPanel {
Bukkit.getServer().dispatchCommand(player, "island bans");
}
}, 1L);
} else if ((is.getType() == Material.SIGN) && (is.hasItemMeta())
} else if ((is.getType() == Materials.OAK_SIGN.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.ControlPanel.Item.Visitors.Displayname"))))) {
Bukkit.getServer().getScheduler().runTaskLater(skyblock, new Runnable() {
@ -148,7 +148,7 @@ public class ControlPanel {
configLoad.getString("Menu.ControlPanel.Item.Bans.Displayname"),
configLoad.getStringList("Menu.ControlPanel.Item.Bans.Lore"), null, null,
new ItemFlag[] { ItemFlag.HIDE_ATTRIBUTES }), 7);
nInv.addItem(nInv.createItem(new ItemStack(Material.SIGN),
nInv.addItem(nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.ControlPanel.Item.Visitors.Displayname"),
configLoad.getStringList("Menu.ControlPanel.Item.Visitors.Lore"), null, null, null), 8);

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

@ -4,6 +4,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import me.goodandevil.skyblock.utils.version.NMSUtil;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.configuration.file.FileConfiguration;

15
src/main/java/me/goodandevil/skyblock/menus/Rollback.java
View File

@ -4,6 +4,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import me.goodandevil.skyblock.utils.version.NMSUtil;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@ -120,8 +121,18 @@ public class Rollback implements Listener {
Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
if (event.getInventory().getName()
.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Rollback.Title")))) {
String inventoryName = "";
if (NMSUtil.getVersionNumber() > 13) {
inventoryName = event.getView().getTitle();
} else {
try {
inventoryName = (String) Inventory.class.getMethod("getName").invoke(event.getInventory());
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (inventoryName.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Rollback.Title")))) {
event.setCancelled(true);
Island island = islandManager.getIsland(player);

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

@ -221,7 +221,7 @@ public class Settings {
}
});
nInv.addItem(nInv.createItem(new ItemStack(Material.SIGN),
nInv.addItem(nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.Settings.Categories.Item.Visitor.Displayname"),
configLoad.getStringList("Menu.Settings.Categories.Item.Visitor.Lore"), null, null, null), 2);
nInv.addItem(nInv.createItem(new ItemStack(Material.PAINTING),
@ -533,9 +533,9 @@ public class Settings {
10);
nInv.addItemStack(createItem(island, role, "Ban", new ItemStack(Material.IRON_AXE)),
11);
nInv.addItemStack(createItem(island, role, "Unban", Materials.ROSE_RED.parseItem()),
nInv.addItemStack(createItem(island, role, "Unban", Materials.RED_DYE.parseItem()),
12);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
13);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
14);
@ -561,9 +561,9 @@ public class Settings {
10);
nInv.addItemStack(createItem(island, role, "Ban", new ItemStack(Material.IRON_AXE)),
11);
nInv.addItemStack(createItem(island, role, "Unban", Materials.ROSE_RED.parseItem()),
nInv.addItemStack(createItem(island, role, "Unban", Materials.RED_DYE.parseItem()),
12);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
13);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
14);
@ -589,9 +589,9 @@ public class Settings {
11);
nInv.addItemStack(createItem(island, role, "Ban", new ItemStack(Material.IRON_AXE)),
12);
nInv.addItemStack(createItem(island, role, "Unban", Materials.ROSE_RED.parseItem()),
nInv.addItemStack(createItem(island, role, "Unban", Materials.RED_DYE.parseItem()),
13);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
14);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
15);
@ -613,9 +613,9 @@ public class Settings {
11);
nInv.addItemStack(createItem(island, role, "Ban", new ItemStack(Material.IRON_AXE)),
12);
nInv.addItemStack(createItem(island, role, "Unban", Materials.ROSE_RED.parseItem()),
nInv.addItemStack(createItem(island, role, "Unban", Materials.RED_DYE.parseItem()),
13);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
14);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
15);
@ -639,7 +639,7 @@ public class Settings {
createItem(island, role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(island, role, "Kick", new ItemStack(Material.IRON_DOOR)),
11);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
12);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
13);
@ -663,7 +663,7 @@ public class Settings {
createItem(island, role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(island, role, "Kick", new ItemStack(Material.IRON_DOOR)),
11);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
12);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
13);
@ -689,7 +689,7 @@ public class Settings {
createItem(island, role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(island, role, "Kick", new ItemStack(Material.IRON_DOOR)),
11);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
12);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
13);
@ -711,7 +711,7 @@ public class Settings {
createItem(island, role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 9);
nInv.addItemStack(createItem(island, role, "Kick", new ItemStack(Material.IRON_DOOR)),
10);
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Material.SIGN)),
nInv.addItemStack(createItem(island, role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())),
11);
nInv.addItemStack(createItem(island, role, "Member", new ItemStack(Material.PAINTING)),
12);
@ -755,7 +755,7 @@ public class Settings {
nInv.addItemStack(createItem(island, role, "KeepItemsOnDeath",
new ItemStack(Material.ITEM_FRAME)), 15);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 16);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 16);
nInv.addItemStack(
createItem(island, role, "Hunger", new ItemStack(Material.COOKED_BEEF)),
17);
@ -778,7 +778,7 @@ public class Settings {
nInv.addItemStack(createItem(island, role, "KeepItemsOnDeath",
new ItemStack(Material.ITEM_FRAME)), 16);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 17);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 17);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {
@ -841,7 +841,7 @@ public class Settings {
createItem(island, role, "LeafDecay", Materials.OAK_LEAVES.parseItem()),
15);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 16);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 16);
nInv.addItemStack(
createItem(island, role, "Hunger", new ItemStack(Material.COOKED_BEEF)),
17);
@ -862,7 +862,7 @@ public class Settings {
createItem(island, role, "LeafDecay", Materials.OAK_LEAVES.parseItem()),
15);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 16);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 16);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {
@ -923,7 +923,7 @@ public class Settings {
nInv.addItemStack(createItem(island, role, "KeepItemsOnDeath",
new ItemStack(Material.ITEM_FRAME)), 15);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 16);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 16);
nInv.addItemStack(
createItem(island, role, "Hunger", new ItemStack(Material.COOKED_BEEF)),
17);
@ -944,7 +944,7 @@ public class Settings {
nInv.addItemStack(createItem(island, role, "KeepItemsOnDeath",
new ItemStack(Material.ITEM_FRAME)), 15);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 16);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 16);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {
@ -1001,7 +1001,7 @@ public class Settings {
createItem(island, role, "LeafDecay", Materials.OAK_LEAVES.parseItem()),
14);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 15);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 15);
nInv.addItemStack(
createItem(island, role, "Hunger", new ItemStack(Material.COOKED_BEEF)),
16);
@ -1020,7 +1020,7 @@ public class Settings {
createItem(island, role, "LeafDecay", Materials.OAK_LEAVES.parseItem()),
15);
nInv.addItemStack(
createItem(island, role, "Damage", Materials.ROSE_RED.parseItem()), 16);
createItem(island, role, "Damage", Materials.RED_DYE.parseItem()), 16);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {
@ -1322,7 +1322,7 @@ public class Settings {
List<String> itemLore = new ArrayList<>();
itemLore.add(
configLoad.getString("Menu.Settings.Visitor.Panel.Welcome.Item.Message.Word.Empty"));
nInv.addItem(nInv.createItem(new ItemStack(Material.SIGN),
nInv.addItem(nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.Settings.Visitor.Panel.Welcome.Item.Message.Displayname"),
itemLore, null, null, null), 2);
nInv.addItem(nInv.createItem(new ItemStack(Material.ARROW),
@ -1332,7 +1332,7 @@ public class Settings {
"Menu.Settings.Visitor.Panel.Welcome.Item.Line.Remove.None.Lore"),
null, null, null), 3);
} else {
nInv.addItem(nInv.createItem(new ItemStack(Material.SIGN, welcomeMessage.size()),
nInv.addItem(nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial(), welcomeMessage.size()),
configLoad.getString("Menu.Settings.Visitor.Panel.Welcome.Item.Message.Displayname"),
welcomeMessage, null, null, null), 2);
nInv.addItem(nInv.createItem(new ItemStack(Material.ARROW),
@ -1606,7 +1606,7 @@ public class Settings {
List<String> itemLore = new ArrayList<>();
itemLore.add(
configLoad.getString("Menu.Settings.Visitor.Panel.Signature.Item.Message.Word.Empty"));
nInv.addItem(nInv.createItem(new ItemStack(Material.SIGN),
nInv.addItem(nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.Settings.Visitor.Panel.Signature.Item.Message.Displayname"),
itemLore, null, null, null), 2);
nInv.addItem(nInv.createItem(new ItemStack(Material.ARROW),
@ -1616,7 +1616,7 @@ public class Settings {
"Menu.Settings.Visitor.Panel.Signature.Item.Line.Remove.None.Lore"),
null, null, null), 3);
} else {
nInv.addItem(nInv.createItem(new ItemStack(Material.SIGN, signatureMessage.size()),
nInv.addItem(nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial(), signatureMessage.size()),
configLoad.getString("Menu.Settings.Visitor.Panel.Signature.Item.Message.Displayname"),
signatureMessage, null, null, null), 2);
nInv.addItem(nInv.createItem(new ItemStack(Material.ARROW),

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

@ -15,6 +15,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@ -67,7 +68,7 @@ public class Creator implements Listener {
configLoad.getString("Menu.Admin.Creator.Browse.Item.Exit.Displayname"), null, null, null, null), 0,
8);
nInv.addItem(
nInv.createItem(new ItemStack(org.bukkit.Material.SIGN),
nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.Admin.Creator.Browse.Item.Information.Displayname"),
configLoad.getStringList("Menu.Admin.Creator.Browse.Item.Information.Lore"),
new Placeholder[] { new Placeholder("%structures", "" + structures.size()) }, null, null),
@ -273,8 +274,18 @@ public class Creator implements Listener {
Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "language.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
if (event.getInventory().getName().equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Creator.Title")))) {
String inventoryName = "";
if (NMSUtil.getVersionNumber() > 13) {
inventoryName = event.getView().getTitle();
} else {
try {
inventoryName = (String) Inventory.class.getMethod("getName").invoke(event.getInventory());
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (inventoryName.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Creator.Title")))) {
event.setCancelled(true);
PlayerData playerData = skyblock.getPlayerDataManager().getPlayerData(player);
@ -318,7 +329,7 @@ public class Creator implements Listener {
return;
}
} else if ((event.getCurrentItem().getType() == Material.SIGN) && (is.hasItemMeta())
} else if ((event.getCurrentItem().getType() == Materials.OAK_SIGN.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Admin.Creator.Browse.Item.Information.Displayname"))))) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);
@ -1493,7 +1504,18 @@ public class Creator implements Listener {
Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
if (event.getInventory().getName().equals(
String inventoryName = "";
if (NMSUtil.getVersionNumber() > 13) {
inventoryName = event.getView().getTitle();
} else {
try {
inventoryName = (String) Inventory.class.getMethod("getName").invoke(event.getInventory());
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (inventoryName.equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Creator.Title")))) {
PlayerDataManager playerDataManager = skyblock.getPlayerDataManager();

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

@ -24,6 +24,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@ -64,7 +65,7 @@ public class Generator implements Listener {
configLoad.getString("Menu.Admin.Generator.Browse.Item.Exit.Displayname"), null, null, null, null),
0, 8);
nInv.addItem(
nInv.createItem(new ItemStack(org.bukkit.Material.SIGN),
nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.Admin.Generator.Browse.Item.Information.Displayname"),
configLoad.getStringList("Menu.Admin.Generator.Browse.Item.Information.Lore"),
new Placeholder[]{new Placeholder("%generators", "" + generators.size())}, null, null),
@ -191,8 +192,18 @@ public class Generator implements Listener {
Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "language.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
if (!event.getInventory().getName().equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Generator.Title"))))
String inventoryName = "";
if (NMSUtil.getVersionNumber() > 13) {
inventoryName = event.getView().getTitle();
} else {
try {
inventoryName = (String) Inventory.class.getMethod("getName").invoke(event.getInventory());
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (!inventoryName.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Generator.Title"))))
return;
event.setCancelled(true);
@ -249,7 +260,7 @@ public class Generator implements Listener {
return;
}
} else if ((event.getCurrentItem().getType() == Material.SIGN) && (is.hasItemMeta())
} else if ((event.getCurrentItem().getType() == Materials.OAK_SIGN.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Admin.Generator.Browse.Item.Information.Displayname"))))) {
soundManager.playSound(player, Sounds.WOOD_CLICK.bukkitSound(), 1.0F, 1.0F);

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

@ -80,7 +80,7 @@ public class Levelling implements Listener {
configLoad.getString("Menu.Admin.Levelling.Item.Exit.Displayname"), null, null, null, null),
0, 8);
nInv.addItem(
nInv.createItem(new ItemStack(org.bukkit.Material.SIGN),
nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.Admin.Levelling.Item.Information.Displayname"),
configLoad.getStringList("Menu.Admin.Levelling.Item.Information.Lore"),
new Placeholder[] { new Placeholder("%materials", "" + levellingMaterials.size()),
@ -167,8 +167,18 @@ public class Levelling implements Listener {
Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "language.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
if (event.getInventory().getName().equals(
ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Levelling.Title")))) {
String inventoryName = "";
if (NMSUtil.getVersionNumber() > 13) {
inventoryName = event.getView().getTitle();
} else {
try {
inventoryName = (String) Inventory.class.getMethod("getName").invoke(event.getInventory());
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (inventoryName.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Levelling.Title")))) {
PlayerData playerData = skyblock.getPlayerDataManager().getPlayerData(player);
if (!(player.hasPermission("fabledskyblock.admin.level") || player.hasPermission("fabledskyblock.admin.*")
@ -197,7 +207,7 @@ public class Levelling implements Listener {
player.closeInventory();
return;
} else if ((event.getCurrentItem().getType() == Material.SIGN) && (is.hasItemMeta())
} else if ((event.getCurrentItem().getType() == Materials.OAK_SIGN.parseMaterial()) && (is.hasItemMeta())
&& (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
configLoad.getString("Menu.Admin.Levelling.Item.Information.Displayname"))))) {
event.setCancelled(true);

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

@ -127,7 +127,7 @@ public class Settings {
}
});
nInv.addItem(nInv.createItem(new ItemStack(Material.SIGN),
nInv.addItem(nInv.createItem(new ItemStack(Materials.OAK_SIGN.parseMaterial()),
configLoad.getString("Menu.Admin.Settings.Categories.Item.Visitor.Displayname"),
configLoad.getStringList("Menu.Admin.Settings.Categories.Item.Visitor.Lore"), null, null, null), 2);
nInv.addItem(nInv.createItem(new ItemStack(Material.PAINTING),
@ -312,8 +312,8 @@ public class Settings {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 9);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 10);
nInv.addItemStack(createItem(role, "Ban", new ItemStack(Material.IRON_AXE)), 11);
nInv.addItemStack(createItem(role, "Unban", Materials.ROSE_RED.parseItem()), 12);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 13);
nInv.addItemStack(createItem(role, "Unban", Materials.RED_DYE.parseItem()), 12);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 13);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 14);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 15);
nInv.addItemStack(createItem(role, "Coop", new ItemStack(Material.NAME_TAG)), 16);
@ -328,8 +328,8 @@ public class Settings {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 9);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 10);
nInv.addItemStack(createItem(role, "Ban", new ItemStack(Material.IRON_AXE)), 11);
nInv.addItemStack(createItem(role, "Unban", Materials.ROSE_RED.parseItem()), 12);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 13);
nInv.addItemStack(createItem(role, "Unban", Materials.RED_DYE.parseItem()), 12);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 13);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 14);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 15);
nInv.addItemStack(createItem(role, "Coop", new ItemStack(Material.NAME_TAG)), 16);
@ -345,8 +345,8 @@ public class Settings {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 11);
nInv.addItemStack(createItem(role, "Ban", new ItemStack(Material.IRON_AXE)), 12);
nInv.addItemStack(createItem(role, "Unban", Materials.ROSE_RED.parseItem()), 13);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 14);
nInv.addItemStack(createItem(role, "Unban", Materials.RED_DYE.parseItem()), 13);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 14);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 15);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 16);
nInv.addItemStack(createItem(role, "MainSpawn", new ItemStack(Material.EMERALD)), 20);
@ -359,8 +359,8 @@ public class Settings {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 11);
nInv.addItemStack(createItem(role, "Ban", new ItemStack(Material.IRON_AXE)), 12);
nInv.addItemStack(createItem(role, "Unban", Materials.ROSE_RED.parseItem()), 13);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 14);
nInv.addItemStack(createItem(role, "Unban", Materials.RED_DYE.parseItem()), 13);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 14);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 15);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 16);
nInv.addItemStack(createItem(role, "MainSpawn", new ItemStack(Material.EMERALD)), 20);
@ -377,7 +377,7 @@ public class Settings {
if (mainConfig.getFileConfiguration().getBoolean("Island.WorldBorder.Enable")) {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 11);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 12);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 12);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 13);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 14);
nInv.addItemStack(createItem(role, "Coop", new ItemStack(Material.NAME_TAG)), 15);
@ -391,7 +391,7 @@ public class Settings {
} else {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 11);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 12);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 12);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 13);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 14);
nInv.addItemStack(createItem(role, "Coop", new ItemStack(Material.NAME_TAG)), 15);
@ -408,7 +408,7 @@ public class Settings {
if (mainConfig.getFileConfiguration().getBoolean("Island.WorldBorder.Enable")) {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 10);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 11);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 12);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 12);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 13);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 14);
nInv.addItemStack(createItem(role, "MainSpawn", new ItemStack(Material.EMERALD)), 15);
@ -422,7 +422,7 @@ public class Settings {
} else {
nInv.addItemStack(createItem(role, "Invite", Materials.WRITABLE_BOOK.parseItem()), 9);
nInv.addItemStack(createItem(role, "Kick", new ItemStack(Material.IRON_DOOR)), 10);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Material.SIGN)), 11);
nInv.addItemStack(createItem(role, "Visitor", new ItemStack(Materials.OAK_SIGN.parseMaterial())), 11);
nInv.addItemStack(createItem(role, "Member", new ItemStack(Material.PAINTING)), 12);
nInv.addItemStack(createItem(role, "Island", Materials.OAK_SAPLING.parseItem()), 13);
nInv.addItemStack(createItem(role, "MainSpawn", new ItemStack(Material.EMERALD)), 14);
@ -451,7 +451,7 @@ public class Settings {
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 14);
nInv.addItemStack(
createItem(role, "KeepItemsOnDeath", new ItemStack(Material.ITEM_FRAME)), 15);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 16);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 16);
nInv.addItemStack(createItem(role, "Hunger", new ItemStack(Material.COOKED_BEEF)), 17);
} else {
nInv.addItemStack(
@ -465,7 +465,7 @@ public class Settings {
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 15);
nInv.addItemStack(
createItem(role, "KeepItemsOnDeath", new ItemStack(Material.ITEM_FRAME)), 16);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 17);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 17);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {
@ -508,7 +508,7 @@ public class Settings {
nInv.addItemStack(
createItem(role, "FireSpread", new ItemStack(Material.FLINT_AND_STEEL)), 14);
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 15);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 16);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 16);
nInv.addItemStack(createItem(role, "Hunger", new ItemStack(Material.COOKED_BEEF)), 17);
} else {
nInv.addItemStack(
@ -521,7 +521,7 @@ public class Settings {
nInv.addItemStack(
createItem(role, "FireSpread", new ItemStack(Material.FLINT_AND_STEEL)), 14);
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 15);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 16);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 16);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {
@ -564,7 +564,7 @@ public class Settings {
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 14);
nInv.addItemStack(
createItem(role, "KeepItemsOnDeath", new ItemStack(Material.ITEM_FRAME)), 15);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 16);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 16);
nInv.addItemStack(createItem(role, "Hunger", new ItemStack(Material.COOKED_BEEF)), 17);
} else {
nInv.addItemStack(
@ -578,7 +578,7 @@ public class Settings {
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 14);
nInv.addItemStack(
createItem(role, "KeepItemsOnDeath", new ItemStack(Material.ITEM_FRAME)), 15);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 16);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 16);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {
@ -620,7 +620,7 @@ public class Settings {
nInv.addItemStack(
createItem(role, "FireSpread", new ItemStack(Material.FLINT_AND_STEEL)), 13);
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 14);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 15);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 15);
nInv.addItemStack(createItem(role, "Hunger", new ItemStack(Material.COOKED_BEEF)), 16);
} else {
nInv.addItemStack(
@ -632,7 +632,7 @@ public class Settings {
nInv.addItemStack(
createItem(role, "FireSpread", new ItemStack(Material.FLINT_AND_STEEL)), 14);
nInv.addItemStack(createItem(role, "LeafDecay", Materials.OAK_LEAVES.parseItem()), 15);
nInv.addItemStack(createItem(role, "Damage", Materials.ROSE_RED.parseItem()), 16);
nInv.addItemStack(createItem(role, "Damage", Materials.RED_DYE.parseItem()), 16);
}
} else {
if (mainConfig.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")) {

4
src/main/java/me/goodandevil/skyblock/utils/item/MaterialUtil.java
View File

@ -15,8 +15,8 @@ public class MaterialUtil {
material = Material.GRASS;
} else if (material == Materials.LEGACY_NETHER_WARTS.getPostMaterial()) {
material = Materials.LEGACY_NETHER_STALK.getPostMaterial();
} else if (material == Materials.LEGACY_SIGN_POST.getPostMaterial() || material == Material.WALL_SIGN) {
material = Material.SIGN;
} else if (material == Materials.LEGACY_SIGN_POST.getPostMaterial() || material == Materials.OAK_WALL_SIGN.parseMaterial()) {
material = Materials.OAK_SIGN.parseMaterial();
} else if (material == Materials.LEGACY_SUGAR_CANE_BLOCK.getPostMaterial()) {
material = Material.SUGAR_CANE;
} else if (material == Material.TRIPWIRE) {

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

@ -5,6 +5,7 @@ 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;

198
src/main/java/me/goodandevil/skyblock/utils/version/Materials.java
View File

@ -21,13 +21,18 @@ public enum Materials {
ACACIA_PRESSURE_PLATE("WOOD_PLATE", 0, true),
ACACIA_SAPLING("SAPLING", 4),
ACACIA_SLAB("WOOD_STEP", 4),
ACACIA_SIGN("STONE", 0, true),
ACACIA_STAIRS("ACACIA_STAIRS", 4),
ACACIA_TRAPDOOR("TRAP_DOOR", 0, true),
ACACIA_WALL_SIGN("STONE", 0, true),
ACACIA_WOOD("LOG_2", 0),
ACTIVATOR_RAIL("ACTIVATOR_RAIL", 0),
AIR("AIR", 0),
ALLIUM("STONE", 0, true),
ANDESITE("STONE", 5),
ANDESITE_SLAB("STONE", 0, true),
ANDESITE_STAIRS("STONE", 0, true),
ANDESITE_WALL("STONE", 0, true),
ANVIL("ANVIL", 0),
APPLE("APPLE", 0),
ARMOR_STAND("ARMOR_STAND", 0),
@ -36,11 +41,15 @@ public enum Materials {
ATTACHED_PUMPKIN_STEM("PUMPKIN_STEM", 7),
AZURE_BLUET("RED_ROSE", 3),
BAKED_POTATO("BAKED_POTATO", 0),
BAMBOO("STONE", 0, true),
BAMBOO_SAPLING("STONE", 0, true),
BARREL("STONE", 0, true),
BARRIER("BARRIER", 0),
BAT_SPAWN_EGG("MONSTER_EGG", 0),
BEACON("BEACON", 0),
BEDROCK("BEDROCK", 0),
BEEF("RAW_BEEF", 0),
BELL("STONE", 0, true),
BEETROOT("BEETROOT", 0),
BEETROOTS("BEETROOT", 0),
BEETROOT_SEEDS("BEETROOT_SEEDS", 0),
@ -55,15 +64,18 @@ public enum Materials {
BIRCH_PLANKS("WOOD", 2),
BIRCH_PRESSURE_PLATE("WOOD_PLATE", 0, true),
BIRCH_SAPLING("SAPLING", 2),
BIRCH_SIGN("STONE", 0, true),
BIRCH_SLAB("WOOD_STEP", 2),
BIRCH_STAIRS("BIRCH_WOOD_STAIRS", 0),
BIRCH_TRAPDOOR("TRAP_DOOR", 0, true),
BIRCH_WALL_SIGN("STONE", 0, true),
BIRCH_WOOD("LOG", 2),
BLACK_BANNER("BANNER", 0),
BLACK_BED("BED", 15),
BLACK_CARPET("CARPET", 15),
BLACK_CONCRETE("CONCRETE", 15),
BLACK_CONCRETE_POWDER("CONCRETE_POWDER", 15),
BLACK_DYE("STONE", 0, true),
BLACK_GLAZED_TERRACOTTA("BLACK_GLAZED_TERRACOTTA", 0),
BLACK_SHULKER_BOX("BLACK_SHULKER_BOX", 0),
BLACK_STAINED_GLASS("STAINED_GLASS", 15),
@ -71,6 +83,7 @@ public enum Materials {
BLACK_TERRACOTTA("STAINED_CLAY", 15),
BLACK_WALL_BANNER("WALL_BANNER", 0),
BLACK_WOOL("WOOL", 15),
BLAST_FURNACE("STONE", 0, true),
BLAZE_POWDER("BLAZE_POWDER", 0),
BLAZE_ROD("BLAZE_ROD", 0),
BLAZE_SPAWN_EGG("MONSTER_EGG", 0),
@ -79,6 +92,7 @@ public enum Materials {
BLUE_CARPET("CARPET", 11),
BLUE_CONCRETE("CONCRETE", 11),
BLUE_CONCRETE_POWDER("CONCRETE_POWDER", 11),
BLUE_DYE("STONE", 0, true),
BLUE_GLAZED_TERRACOTTA("BLUE_GLAZED_TERRACOTTA", 0),
BLUE_ICE("PACKED_ICE", 0, true),
BLUE_ORCHID("RED_ROSE", 1),
@ -107,11 +121,13 @@ public enum Materials {
BRICKS("BRICK", 0),
BRICK_SLAB("STEP", 4),
BRICK_STAIRS("BRICK_STAIRS", 0),
BRICK_WALL("STONE", 0, true),
BROWN_BANNER("BANNER", 3),
BROWN_BED("BED", 12),
BROWN_CARPET("CARPET", 12),
BROWN_CONCRETE("CONCRETE", 12),
BROWN_CONCRETE_POWDER("CONCRETE_POWDER", 12),
BROWN_DYE("STONE", 0, true),
BROWN_GLAZED_TERRACOTTA("BROWN_GLAZED_TERRACOTTA", 0),
BROWN_MUSHROOM("BROWN_MUSHROOM", 0),
BROWN_MUSHROOM_BLOCK("HUGE_MUSHROOM_1", 0), // UNSURE
@ -130,12 +146,14 @@ public enum Materials {
DEAD_BUBBLE_CORAL_WALL_FAN("STONE", 0, true),
BUCKET("BUCKET", 0),
CACTUS("CACTUS", 0),
CACTUS_GREEN("INK_SACK", 2),
CAKE("CAKE", 0),
CAMPFIRE("STONE", 0, true),
CARROT("CARROT_ITEM", 0),
CARROTS("CARROT", 0),
CARROT_ON_A_STICK("CARROT_STICK", 0),
CARTOGRAPHY_TABLE("STONE", 0, true),
CARVED_PUMPKIN("PUMPKIN", 0),
CAT_SPAWN_EGG("STONE", 0, true),
CAULDRON("CAULDRON", 0),
CAVE_AIR("AIR", 0, true),
CAVE_SPIDER_SPAWN_EGG("MONSTER_EGG", 0),
@ -178,7 +196,9 @@ public enum Materials {
COMMAND_BLOCK_MINECART("COMMAND_MINECART", 0),
COMPARATOR("REDSTONE_COMPARATOR", 0),
COMPASS("COMPASS", 0),
COMPOSTER("STONE", 0, true),
CONDUIT("STONE", 0, true),
CORNFLOWER("STONE", 0, true),
COOKED_BEEF("COOKED_BEEF", 0),
COOKED_CHICKEN("COOKED_CHICKEN", 0),
COOKED_COD("COOKED_FISH", 0),
@ -190,11 +210,15 @@ public enum Materials {
COW_SPAWN_EGG("MONSTER_EGG", 0),
CRACKED_STONE_BRICKS("SMOOTH_BRICK", 2),
CRAFTING_TABLE("WORKBENCH", 0),
CREEPER_BANNER_PATTERN("STONE", 0, true),
CREEPER_HEAD("SKULL", 0),
CREEPER_SPAWN_EGG("MONSTER_EGG", 0),
CREEPER_WALL_HEAD("SKULL", 0),
CROSSBOW("STONE", 0, true),
CUT_RED_SANDSTONE("STONE", 0, true),
CUT_RED_SANDSTONE_SLAB("STONE", 0, true),
CUT_SANDSTONE("STONE", 0, true),
CUT_SANDSTONE_SLAB("STONE", 0, true),
CYAN_BANNER("BANNER", 6),
CYAN_BED("BED", 9),
CYAN_CARPET("CARPET", 9),
@ -210,7 +234,6 @@ public enum Materials {
CYAN_WOOL("WOOL", 9),
DAMAGED_ANVIL("ANVIL", 2),
DANDELION("YELLOW_FLOWER", 0),
DANDELION_YELLOW("INK_SACK", 11),
DARK_OAK_BOAT("BOAT_DARK_OAK", 0),
DARK_OAK_BUTTON("WOOD_BUTTON", 0, true),
DARK_OAK_DOOR("DARK_OAK_DOOR", 0),
@ -221,9 +244,11 @@ public enum Materials {
DARK_OAK_PLANKS("WOOD", 5),
DARK_OAK_PRESSURE_PLATE("WOOD_PLATE", 0, true),
DARK_OAK_SAPLING("SAPLING", 5),
DARK_OAK_SIGN("STONE", 0, true),
DARK_OAK_SLAB("WOOD_STEP", 0),
DARK_OAK_STAIRS("DARK_OAK_STAIRS", 0),
DARK_OAK_TRAPDOOR("TRAP_DOOR", 0, true),
DARK_OAK_WALL_SIGN("STONE", 0, true),
DARK_OAK_WOOD("LOG_2", 1),
DARK_PRISMARINE("PRISMARINE", 2),
DARK_PRISMARINE_SLAB("STONE", 0, true),
@ -253,6 +278,9 @@ public enum Materials {
DIAMOND_SHOVEL("DIAMOND_SPADE", 0),
DIAMOND_SWORD("DIAMOND_SWORD", 0),
DIORITE("STONE", 3),
DIORITE_SLAB("STONE", 0, true),
DIORITE_STAIRS("STONE", 0, true),
DIORITE_WALL("STONE", 0, true),
DIRT("DIRT", 0),
DISPENSER("DISPENSER", 0),
DOLPHIN_SPAWN_EGG("MONSTER_EGG", 0),
@ -285,6 +313,9 @@ public enum Materials {
END_PORTAL_FRAME("ENDER_PORTAL_FRAME", 0),
END_ROD("END_ROD", 0),
END_STONE("ENDER_STONE", 0),
END_STONE_BRICK_SLAB("STONE", 0, true),
END_STONE_BRICK_STAIRS("STONE", 0, true),
END_STONE_BRICK_WALL("STONE", 0, true),
END_STONE_BRICKS("END_BRICKS", 0),
EVOKER_SPAWN_EGG("MONSTER_EGG", 0),
EXPERIENCE_BOTTLE("EXP_BOTTLE", 0),
@ -301,6 +332,9 @@ public enum Materials {
FIRE_CORAL_BLOCK("STONE", 0, true),
FIRE_CORAL_FAN("STONE", 0, true),
FIRE_CORAL_WALL_FAN("STONE", 0, true),
FLETCHING_TABLE("STONE", 0, true),
FLOWER_BANNER_PATTERN("STONE", 0, true),
FOX_SPAWN_EGG("STONE", 0, true),
DEAD_FIRE_CORAL_FAN("STONE", 0, true),
DEAD_FIRE_CORAL_WALL_FAN("STONE", 0, true),
FISHING_ROD("FISHING_ROD", 0),
@ -316,6 +350,7 @@ public enum Materials {
GLASS_BOTTLE("GLASS_BOTTLE", 0),
GLASS_PANE("THIN_GLASS", 0),
GLISTERING_MELON_SLICE("SPECKLED_MELON", 0),
GLOBE_BANNER_PATTERN("STONE", 0, true),
GLOWSTONE("GLOWSTONE", 0),
GLOWSTONE_DUST("GLOWSTONE_DUST", 0),
GOLDEN_APPLE("GOLDEN_APPLE", 0),
@ -335,6 +370,9 @@ public enum Materials {
GOLD_NUGGET("GOLD_NUGGET", 0),
GOLD_ORE("GOLD_ORE", 0),
GRANITE("STONE", 1),
GRANITE_SLAB("STONE", 0, true),
GRANITE_STAIRS("STONE", 0, true),
GRANITE_WALL("STONE", 0, true),
GRASS("GRASS", 0),
GRASS_BLOCK("GRASS", 0),
GRASS_PATH("GRASS_PATH", 0),
@ -357,6 +395,7 @@ public enum Materials {
GREEN_CARPET("CARPET", 13),
GREEN_CONCRETE("CONCRETE", 13),
GREEN_CONCRETE_POWDER("CONCRETE_POWDER", 13),
GREEN_DYE("CACTUS_GREEN", "INK_SACK", 2),
GREEN_GLAZED_TERRACOTTA("GREEN_GLAZED_TERRACOTTA", 0),
GREEN_SHULKER_BOX("GREEN_SHULKER_BOX", 0),
GREEN_STAINED_GLASS("STAINED_GLASS", 13),
@ -364,6 +403,7 @@ public enum Materials {
GREEN_TERRACOTTA("STAINED_CLAY", 13),
GREEN_WALL_BANNER("WALL_BANNER", 0),
GREEN_WOOL("WOOL", 13),
GRINDSTONE("STONE", 0, true),
GUARDIAN_SPAWN_EGG("MONSTER_EGG", 0),
GUNPOWDER("SULPHUR", 0),
HAY_BLOCK("HAY_BLOCK", 0),
@ -406,6 +446,7 @@ public enum Materials {
IRON_TRAPDOOR("IRON_TRAPDOOR", 0),
ITEM_FRAME("ITEM_FRAME", 0),
JACK_O_LANTERN("JACK_O_LANTERN", 0),
JIGSAW("STONE", 0, true),
JUKEBOX("JUKEBOX", 0),
JUNGLE_BOAT("BOAT_JUNGLE", 0),
JUNGLE_BUTTON("WOOD_BUTTON", 0, true),
@ -417,14 +458,17 @@ public enum Materials {
JUNGLE_PLANKS("WOOD", 3),
JUNGLE_PRESSURE_PLATE("WOOD_PLATE", 0, true),
JUNGLE_SAPLING("SAPLING", 3),
JUNGLE_SIGN("STONE", 0, true),
JUNGLE_SLAB("WOOD_STEP", 3),
JUNGLE_STAIRS("JUNGLE_WOOD_STAIRS", 0),
JUNGLE_TRAPDOOR("TRAP_DOOR", 0, true),
JUNGLE_WALL_SIGN("STONE", 0, true),
JUNGLE_WOOD("LOG", 3),
KELP("STONE", 0, true),
KELP_PLANT("STONE", 0, true),
KNOWLEDGE_BOOK("KNOWLEDGE_BOOK", 0),
LADDER("LADDER", 0),
LANTERN("STONE", 0, true),
LAPIS_BLOCK("LAPIS_BLOCK", 0),
LAPIS_LAZULI("INK_SACK", 4),
LAPIS_ORE("LAPIS_ORE", 0),
@ -436,7 +480,9 @@ public enum Materials {
LEATHER_BOOTS("LEATHER_BOOTS", 0),
LEATHER_CHESTPLATE("LEATHER_CHESTPLATE", 0),
LEATHER_HELMET("LEATHER_HELMET", 0),
LEATHER_HORSE_ARMOR("STONE", 0, true),
LEATHER_LEGGINGS("LEATHER_LEGGINGS", 0),
LECTERN("STONE", 0, true),
LEGACY_BED_BLOCK("BED_BLOCK", 0),
LEGACY_BREWING_STAND("BREWING_STAND_ITEM", 0),
LEGACY_BURNING_FURNACE("BURNING_FURNACE", 0),
@ -490,6 +536,7 @@ public enum Materials {
LIGHT_WEIGHTED_PRESSURE_PLATE("GOLD_PLATE", 0),
LILAC("DOUBLE_PLANT", 1),
LILY_PAD("WATER_LILY", 0),
LILY_OF_THE_VALLEY("STONE", 0, true),
LIME_BANNER("BANNER", 10),
LIME_BED("BED", 5),
LIME_CARPET("CARPET", 5),
@ -505,6 +552,7 @@ public enum Materials {
LIME_WOOL("WOOL", 5),
LINGERING_POTION("LINGERING_POTION", 0),
LLAMA_SPAWN_EGG("MONSTER_EGG", 0),
LOOM("STONE", 0, true),
MAGENTA_BANNER("BANNER", 13),
MAGENTA_BED("BED", 2),
MAGENTA_CARPET("CARPET", 2),
@ -528,9 +576,15 @@ public enum Materials {
MELON_STEM("MELON_STEM", 0),
MILK_BUCKET("MILK_BUCKET", 0),
MINECART("MINECART", 0),
MOJANG_BANNER_PATTERN("STONE", 0, true),
MOOSHROOM_SPAWN_EGG("MONSTER_EGG", 0),
MOSSY_COBBLESTONE("MOSSY_COBBLESTONE", 0),
MOSSY_COBBLESTONE_SLAB("STONE", 0, true),
MOSSY_COBBLESTONE_STAIRS("STONE", 0, true),
MOSSY_COBBLESTONE_WALL("COBBLE_WALL", 1),
MOSSY_STONE_BRICK_SLAB("STONE", 0, true),
MOSSY_STONE_BRICK_STAIRS("STONE", 0, true),
MOSSY_STONE_BRICK_WALL("STONE", 0, true),
MOSSY_STONE_BRICKS("SMOOTH_BRICK", 1),
MOVING_PISTON("PISTON_MOVING_PIECE", 0),
MULE_SPAWN_EGG("MONSTER_EGG", 0),
@ -554,6 +608,7 @@ public enum Materials {
NAUTILUS_SHELL("STONE", 0, true),
NETHERRACK("NETHERRACK", 0),
NETHER_BRICK("NETHER_BRICK", 0),
NETHER_BRICK_WALL("STONE", 0, true),
NETHER_BRICKS("NETHER_BRICK", 0),
NETHER_BRICK_FENCE("NETHER_FENCE", 0),
NETHER_BRICK_SLAB("STEP", 6),
@ -574,9 +629,11 @@ public enum Materials {
OAK_PLANKS("WOOD", 0),
OAK_PRESSURE_PLATE("WOOD_PLATE", 0),
OAK_SAPLING("SAPLING", 0),
OAK_SIGN("SIGN", 0),
OAK_SLAB("WOOD_STEP", 0),
OAK_STAIRS("WOOD_STAIRS", 0),
OAK_TRAPDOOR("TRAP_DOOR", 0),
OAK_WALL_SIGN("WALL_SIGN", 0),
OAK_WOOD("LOG", 0),
OBSERVER("OBSERVER", 0),
OBSIDIAN("OBSIDIAN", 0),
@ -598,6 +655,7 @@ public enum Materials {
OXEYE_DAISY("RED_ROSE", 8),
PACKED_ICE("PACKED_ICE", 0),
PAINTING("PAINTING", 0),
PANDA_SPAWN_EGG("STONE", 0, true),
PAPER("PAPER", 0),
PARROT_SPAWN_EGG("MONSTER_EGG", 0),
PEONY("DOUBLE_PLANT", 5),
@ -605,6 +663,7 @@ public enum Materials {
PHANTOM_MEMBRANE("STONE", 0, true),
PHANTOM_SPAWN_EGG("MONSTER_EGG", 0),
PIG_SPAWN_EGG("MONSTER_EGG", 0),
PILLAGER_SPAWN_EGG("STONE", 0, true),
PINK_BANNER("BANNER", 9),
PINK_BED("BED", 6),
PINK_CARPET("CARPET", 6),
@ -627,8 +686,14 @@ public enum Materials {
POISONOUS_POTATO("POISONOUS_POTATO", 0),
POLAR_BEAR_SPAWN_EGG("MONSTER_EGG", 0),
POLISHED_ANDESITE("STONE", 6),
POLISHED_ANDESITE_SLAB("STONE", 0, true),
POLISHED_ANDESITE_STAIRS("STONE", 0, true),
POLISHED_DIORITE("STONE", 4),
POLISHED_DIORITE_SLAB("STONE", 0, true),
POLISHED_DIORITE_STAIRS("STONE", 0, true),
POLISHED_GRANITE("STONE", 2),
POLISHED_GRANITE_SLAB("STONE", 0, true),
POLISHED_GRANITE_STAIRS("STONE", 0, true),
POPPED_CHORUS_FRUIT("CHORUS_FRUIT_POPPED", 0),
POPPY("RED_ROSE", 0),
PORKCHOP("PORK", 0),
@ -638,15 +703,18 @@ public enum Materials {
POTTED_ACACIA_SAPLING("FLOWER_POT", 0, true),
POTTED_ALLIUM("FLOWER_POT", 0, true),
POTTED_AZURE_BLUET("FLOWER_POT", 0, true),
POTTED_BAMBOO("STONE", 0, true),
POTTED_BIRCH_SAPLING("FLOWER_POT", 0, true),
POTTED_BLUE_ORCHID("FLOWER_POT", 0, true),
POTTED_BROWN_MUSHROOM("FLOWER_POT", 0, true),
POTTED_CACTUS("FLOWER_POT", 0, true),
POTTED_CORNFLOWER("STONE", 0, true),
POTTED_DANDELION("FLOWER_POT", 0, true),
POTTED_DARK_OAK_SAPLING("FLOWER_POT", 0, true),
POTTED_DEAD_BUSH("FLOWER_POT", 0, true),
POTTED_FERN("FLOWER_POT", 0, true),
POTTED_JUNGLE_SAPLING("FLOWER_POT", 0, true),
POTTED_LILY_OF_THE_VALLEY("STONE", 0, true),
POTTED_OAK_SAPLING("FLOWER_POT", 0, true),
POTTED_ORANGE_TULIP("FLOWER_POT", 0, true),
POTTED_OXEYE_DAISY("FLOWER_POT", 0, true),
@ -656,6 +724,7 @@ public enum Materials {
POTTED_RED_TULIP("FLOWER_POT", 0, true),
POTTED_SPRUCE_SAPLING("FLOWER_POT", 0, true),
POTTED_WHITE_TULIP("FLOWER_POT", 0, true),
POTTED_WITHER_ROSE("STONE", 0, true),
POWERED_RAIL("POWERED_RAIL", 0),
PRISMARINE("PRISMARINE", 0),
PRISMARINE_BRICKS("PRISMARINE", 1),
@ -665,6 +734,7 @@ public enum Materials {
PRISMARINE_SHARD("PRISMARINE_SHARD", 0),
PRISMARINE_SLAB("STONE", 0, true),
PRISMARINE_STAIRS("STONE", 0, true),
PRISMARINE_WALL("STONE", 0, true),
PUFFERFISH("RAW_FISH", 3),
PUFFERFISH_BUCKET("STONE", 0, true),
PUFFERFISH_SPAWN_EGG("MONSTER_EGG", 0),
@ -700,6 +770,7 @@ public enum Materials {
RABBIT_SPAWN_EGG("MONSTER_EGG", 0),
RABBIT_STEW("RABBIT_STEW", 0),
RAIL("RAILS", 0),
RAVAGER_SPAWN_EGG("STONE", 0, true),
REDSTONE("REDSTONE", 0),
REDSTONE_BLOCK("REDSTONE_BLOCK", 0),
REDSTONE_LAMP("REDSTONE_LAMP_OFF", 0),
@ -712,14 +783,19 @@ public enum Materials {
RED_CARPET("CARPET", 14),
RED_CONCRETE("CONCRETE", 14),
RED_CONCRETE_POWDER("CONCRETE_POWDER", 14),
RED_DYE("ROSE_RED", "INK_SACK", 1),
RED_GLAZED_TERRACOTTA("RED_GLAZED_TERRACOTTA", 0),
RED_MUSHROOM("RED_MUSHROOM", 0),
RED_MUSHROOM_BLOCK("HUGE_MUSHROOM_2", 0),
RED_NETHER_BRICK_SLAB("STONE", 0, true),
RED_NETHER_BRICK_STAIRS("STONE", 0, true),
RED_NETHER_BRICK_WALL("STONE", 0, true),
RED_NETHER_BRICKS("RED_NETHER_BRICK", 0),
RED_SAND("SAND", 1),
RED_SANDSTONE("RED_SANDSTONE", 0),
RED_SANDSTONE_SLAB("STONE_SLAB2", 0),
RED_SANDSTONE_STAIRS("RED_SANDSTONE_STAIRS", 0),
RED_SANDSTONE_WALL("STONE", 0, true),
RED_SHULKER_BOX("RED_SHULKER_BOX", 0),
RED_STAINED_GLASS("STAINED_GLASS", 14),
RED_STAINED_GLASS_PANE("STAINED_GLASS_PANE", 14),
@ -730,7 +806,6 @@ public enum Materials {
REPEATER("DIODE", 0),
REPEATING_COMMAND_BLOCK("COMMAND_REPEATING", 0),
ROSE_BUSH("DOUBLE_PLANT", 4),
ROSE_RED("INK_SACK", 1),
ROTTEN_FLESH("ROTTEN_FLESH", 0),
SADDLE("SADDLE", 0),
SALMON("RAW_FISH", 1),
@ -740,6 +815,8 @@ public enum Materials {
SANDSTONE("SANDSTONE", 0),
SANDSTONE_SLAB("STEP", 1),
SANDSTONE_STAIRS("SANDSTONE_STAIRS", 0),
SANDSTONE_WALL("STONE", 0, true),
SCAFFOLDING("STONE", 0, true),
SCUTE("STONE", 0, true),
SEAGRASS("STONE", 0, true),
SEA_LANTERN("SEA_LANTERN", 0),
@ -750,19 +827,28 @@ public enum Materials {
SHULKER_BOX("PURPLE_SHULKER_BOX", 0),
SHULKER_SHELL("SHULKER_SHELL", 0),
SHULKER_SPAWN_EGG("MONSTER_EGG", 0),
SIGN("SIGN", 0),
SILVERFISH_SPAWN_EGG("MONSTER_EGG", 0),
SKELETON_HORSE_SPAWN_EGG("MONSTER_EGG", 0),
SKELETON_SKULL("SKULL", 0),
SKELETON_SPAWN_EGG("MONSTER_EGG", 0),
SKELETON_WALL_SKULL("SKULL", 0),
SKULL_BANNER_PATTERN("STONE", 0, true),
SLIME_BALL("SLIME_BALL", 0),
SLIME_BLOCK("SLIME_BLOCK", 0),
SLIME_SPAWN_EGG("MONSTER_EGG", 0),
SMITHING_TABLE("STONE", 0, true),
SMOKER("STONE", 0, true),
SMOOTH_QUARTZ("STONE", 0, true),
SMOOTH_QUARTZ_SLAB("STONE", 0, true),
SMOOTH_QUARTZ_STAIRS("STONE", 0, true),
SMOOTH_RED_SANDSTONE("RED_SANDSTONE", 2),
SMOOTH_RED_SANDSTONE_SLAB("STONE", 0, true),
SMOOTH_RED_SANDSTONE_STAIRS("STONE", 0, true),
SMOOTH_SANDSTONE("SANDSTONE", 2),
SMOOTH_SANDSTONE_SLAB("STONE", 0, true),
SMOOTH_SANDSTONE_STAIRS("STONE", 0, true),
SMOOTH_STONE("STEP", 0),
SMOOTH_STONE_SLAB("STONE", 0, true),
SNOW("SNOW", 0),
SNOWBALL("SNOW_BALL", 0),
SNOW_BLOCK("SNOW_BLOCK", 0),
@ -840,24 +926,29 @@ public enum Materials {
SPRUCE_PLANKS("WOOD", 1),
SPRUCE_PRESSURE_PLATE("WOOD_PLATE", 0, true),
SPRUCE_SAPLING("SAPLING", 1),
SPRUCE_SIGN("STONE", 0, true),
SPRUCE_SLAB("WOOD_STEP", 1),
SPRUCE_STAIRS("SPRUCE_WOOD_STAIRS", 0),
SPRUCE_TRAPDOOR("TRAP_DOOR", 0, true),
SPRUCE_WALL_SIGN("STONE", 0, true),
SPRUCE_WOOD("LOG", 1),
SQUID_SPAWN_EGG("MONSTER_EGG", 0),
STICK("STICK", 0),
STICKY_PISTON("PISTON_STICKY_BASE", 0),
STONE("STONE", 0),
STONECUTTER("STONE", 0, true),
STONE_AXE("STONE_AXE", 0),
STONE_BRICKS("SMOOTH_BRICK", 0),
STONE_BRICK_SLAB("STEP", 5),
STONE_BRICK_STAIRS("SMOOTH_STAIRS", 0),
STONE_BRICK_WALL("STONE", 0, true),
STONE_BUTTON("STONE_BUTTON", 0),
STONE_HOE("STONE_HOE", 0),
STONE_PICKAXE("STONE_PICKAXE", 0),
STONE_PRESSURE_PLATE("STONE_PLATE", 0),
STONE_SHOVEL("STONE_SPADE", 0),
STONE_SLAB("STEP", 0),
STONE_STAIRS("STONE", 0, true),
STONE_SWORD("STONE_SWORD", 0),
STRAY_SPAWN_EGG("MONSTER_EGG", 0),
STRING("STRING", 0),
@ -878,6 +969,9 @@ public enum Materials {
SUGAR("SUGAR", 0),
SUGAR_CANE("SUGAR_CANE", 0),
SUNFLOWER("DOUBLE_PLANT", 0),
SUSPICIOUS_STEW("STONE", 0, true),
SWEET_BERRIES("STONE", 0, true),
SWEET_BERRY_BUSH("STONE", 0, true),
TALL_GRASS("DOUBLE_PLANT", 2),
TALL_SEAGRASS("STONE", 0, true),
TERRACOTTA("HARD_CLAY", 0),
@ -886,6 +980,7 @@ public enum Materials {
TNT_MINECART("EXPLOSIVE_MINECART", 0),
TORCH("TORCH", 0),
TOTEM_OF_UNDYING("TOTEM", 0),
TRADER_LLAMA_SPAWN_EGG("STONE", 0, true),
TRAPPED_CHEST("TRAPPED_CHEST", 0),
TRIDENT("STONE", 0, true),
TRIPWIRE("TRIPWIRE", 0),
@ -907,6 +1002,7 @@ public enum Materials {
VOID_AIR("AIR", 0, true),
WALL_SIGN("WALL_SIGN", 0),
WALL_TORCH("TORCH", 1),
WANDERING_TRADER_SPAWN_EGG("STONE", 0, true),
WATER("WATER", 0),
WATER_BUCKET("WATER_BUCKET", 0),
WET_SPONGE("SPONGE", 1),
@ -917,6 +1013,7 @@ public enum Materials {
WHITE_CARPET("CARPET", 0),
WHITE_CONCRETE("CONCRETE", 0),
WHITE_CONCRETE_POWDER("CONCRETE_POWDER", 0),
WHITE_DYE("STONE", 0, true),
WHITE_GLAZED_TERRACOTTA("WHITE_GLAZED_TERRACOTTA", 0),
WHITE_SHULKER_BOX("WHITE_SHULKER_BOX", 0),
WHITE_STAINED_GLASS("STAINED_GLASS", 0),
@ -926,6 +1023,7 @@ public enum Materials {
WHITE_WALL_BANNER("WALL_BANNER", 0),
WHITE_WOOL("WOOL", 0),
WITCH_SPAWN_EGG("MONSTER_EGG", 0),
WITHER_ROSE("STONE", 0, true),
WITHER_SKELETON_SKULL("SKULL", 0),
WITHER_SKELETON_SPAWN_EGG("MONSTER_EGG", 0),
WITHER_SKELETON_WALL_SKULL("SKULL", 0),
@ -942,6 +1040,7 @@ public enum Materials {
YELLOW_CARPET("CARPET", 4),
YELLOW_CONCRETE("CONCRETE", 4),
YELLOW_CONCRETE_POWDER("CONCRETE_POWDER", 4),
YELLOW_DYE("DANDELION_YELLOW", "INK_SACK", 11),
YELLOW_GLAZED_TERRACOTTA("YELLOW_GLAZED_TERRACOTTA", 0),
YELLOW_SHULKER_BOX("YELLOW_SHULKER_BOX", 0),
YELLOW_STAINED_GLASS("STAINED_GLASS", 4),
@ -956,18 +1055,28 @@ public enum Materials {
ZOMBIE_VILLAGER_SPAWN_EGG("MONSTER_EGG", 0),
ZOMBIE_WALL_HEAD("SKULL", 0);
String m;
String old13Mat;
String old12Mat;
int data;
boolean is13only;
boolean is13Plusonly;
Materials(String m, int data) {
this(m, data, false);
Materials(String old13Mat, String old12Mat, int data) {
this(old13Mat, old12Mat, data, false);
}
Materials(String old13Mat, String old12Mat, int data, boolean is13Plusonly) {
this.old13Mat = old13Mat;
this.old12Mat = old12Mat;
this.data = data;
this.is13Plusonly = is13Plusonly;
}
Materials(String old12Mat, int data) {
this(null, old12Mat, data, false);
}
Materials(String m, int data, boolean is13only) {
this.m = m;
this.data = data;
this.is13only = is13only;
Materials(String old12Mat, int data, boolean is13Plusonly) {
this(null, old12Mat, data, is13Plusonly);
}
@SuppressWarnings("deprecation")
@ -1008,7 +1117,7 @@ public enum Materials {
return false;
}
return isNewVersion() || !this.is13only;
return isNewVersion() || !this.is13Plusonly;
}
private static HashMap<String, Materials> cachedSearch = new HashMap<>();
@ -1021,13 +1130,13 @@ public enum Materials {
Materials pmat = null;
for (Materials mat : Materials.values()) {
if (name.toUpperCase().equals(mat.m)) {
if (name.toUpperCase().equals(mat.old12Mat)) {
if (pmat == null) {
pmat = mat;
}
if (((byte) mat.data) == data) {
cachedSearch.put(mat.m + "," + data, mat);
cachedSearch.put(mat.old12Mat + "," + data, mat);
return mat;
}
}
@ -1070,7 +1179,7 @@ public enum Materials {
return Materials.valueOf(mat.toString());
} catch (IllegalArgumentException e) {
for (Materials xmat : Materials.values()) {
if (xmat.m.equals(mat.toString())) {
if (xmat.old12Mat.equals(mat.toString())) {
return xmat;
}
}
@ -1106,35 +1215,22 @@ public enum Materials {
String[] split = type.toString().split("_");
int length = split.length;
switch (split[length - 1]) {
case "HELMET":
return true;
case "CHESTPLATE":
return true;
case "LEGGINGS":
return true;
case "BOOTS":
return true;
case "SWORD":
return true;
case "AXE":
return true;
case "PICKAXE":
return true;
case "SHOVEL":
return true;
case "HOE":
return true;
case "ELYTRA":
return true;
case "TURTLE_HELMET":
return true;
case "TRIDENT":
return true;
case "HORSE_ARMOR":
return true;
case "SHEARS":
return true;
default:
case "HELMET":
case "SHEARS":
case "HORSE_ARMOR":
case "TRIDENT":
case "TURTLE_HELMET":
case "ELYTRA":
case "HOE":
case "SHOVEL":
case "PICKAXE":
case "AXE":
case "SWORD":
case "BOOTS":
case "LEGGINGS":
case "CHESTPLATE":
return true;
default:
return false;
}
}
@ -1149,7 +1245,13 @@ public enum Materials {
return mat;
}
return Material.matchMaterial(m);
if (old13Mat != null)
mat = Material.matchMaterial(old13Mat);
if (mat != null)
return mat;
return Material.matchMaterial(old12Mat);
}
public Material getPostMaterial() {
@ -1159,7 +1261,7 @@ public enum Materials {
Method fromLegacy = unsafe.getClass().getMethod("fromLegacy", Material.class);
if (fromLegacy != null) {
return (Material) fromLegacy.invoke(unsafe, Material.getMaterial("LEGACY_" + m));
return (Material) fromLegacy.invoke(unsafe, Material.getMaterial("LEGACY_" + old12Mat));
}
} catch (Exception e) {
}
@ -1174,7 +1276,7 @@ public enum Materials {
Method fromLegacy = unsafe.getClass().getMethod("fromLegacy", Material.class);
if (fromLegacy != null) {
return new ItemStack((Material) fromLegacy.invoke(unsafe, Material.getMaterial("LEGACY_" + m)));
return new ItemStack((Material) fromLegacy.invoke(unsafe, Material.getMaterial("LEGACY_" + old12Mat)));
}
} catch (Exception e) {
}

2
src/main/java/me/goodandevil/skyblock/utils/world/block/BlockData.java
View File

@ -29,7 +29,7 @@ public class BlockData {
private String commandBlockName = "";
private String entity = EntityType.COW.toString();
private String exitLocation = "";
private String flower = Materials.ROSE_RED.parseMaterial().toString() + ":0";
private String flower = Materials.RED_DYE.parseMaterial().toString() + ":0";
private String playing = Materials.MUSIC_DISC_CHIRP.parseMaterial().toString();
private String[] signLines = {};
private String rotateFace = BlockFace.NORTH.toString();

16
src/main/java/me/goodandevil/skyblock/utils/world/block/BlockUtil.java
View File

@ -60,15 +60,6 @@ public final class BlockUtil {
String secondaryEffectName = beacon.getSecondaryEffect() != null ? beacon.getSecondaryEffect().toString() : "null";
blockData.setPotionEffect(primaryEffectName + ":" + secondaryEffectName);
for (int i = 0; i < beacon.getInventory().getSize(); i++) {
ItemStack is = beacon.getInventory().getItem(i);
if (is != null && is.getType() != Material.AIR) {
blockData.addItem(i, ItemStackUtil.serializeItemStack(is));
}
}
blockData.setStateType(BlockStateType.BEACON.toString());
} else if (blockState instanceof BrewingStand) {
BrewingStand brewingStand = (BrewingStand) blockState;
@ -309,13 +300,6 @@ public final class BlockUtil {
if (!potionEffect[1].equals("null")) {
beacon.setSecondaryEffect(PotionEffectType.getByName(potionEffect[1].toUpperCase()));
}
for (Integer slotList : blockData.getInventory().keySet()) {
if (slotList < beacon.getInventory().getSize()) {
ItemStack is = ItemStackUtil.deserializeItemStack(blockData.getInventory().get(slotList));
beacon.getInventory().setItem(slotList, is);
}
}
} else if (blockTypeState == BlockStateType.BREWINGSTAND) {
BrewingStand brewingStand = (BrewingStand) block.getState();
brewingStand.setBrewingTime(blockData.getBrewingTime());

9
src/main/java/me/goodandevil/skyblock/utils/world/entity/EntityData.java
View File

@ -51,7 +51,6 @@ public class EntityData {
private int llamaStrength;
private int angerLevel;
private int slimeSize;
private int riches;
private int age;
private boolean arms;
@ -449,14 +448,6 @@ public class EntityData {
this.slimeSize = slimeSize;
}
public int getRiches() {
return this.riches;
}
public void setRiches(int riches) {
this.riches = riches;
}
public int getAge() {
return this.age;
}

42
src/main/java/me/goodandevil/skyblock/utils/world/entity/EntityUtil.java
View File

@ -1,8 +1,9 @@
package me.goodandevil.skyblock.utils.world.entity;
import java.util.ArrayList;
import java.util.List;
import me.goodandevil.skyblock.utils.item.ItemStackUtil;
import me.goodandevil.skyblock.utils.item.MaterialUtil;
import me.goodandevil.skyblock.utils.version.NMSUtil;
import me.goodandevil.skyblock.utils.world.block.BlockDegreesType;
import org.bukkit.Art;
import org.bukkit.Bukkit;
import org.bukkit.DyeColor;
@ -10,7 +11,32 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Rotation;
import org.bukkit.TreeSpecies;
import org.bukkit.entity.*;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Bat;
import org.bukkit.entity.Boat;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.Enderman;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Hanging;
import org.bukkit.entity.Horse;
import org.bukkit.entity.IronGolem;
import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Llama;
import org.bukkit.entity.Ocelot;
import org.bukkit.entity.Painting;
import org.bukkit.entity.Parrot;
import org.bukkit.entity.Pig;
import org.bukkit.entity.PigZombie;
import org.bukkit.entity.Rabbit;
import org.bukkit.entity.Sheep;
import org.bukkit.entity.Slime;
import org.bukkit.entity.Snowman;
import org.bukkit.entity.Vehicle;
import org.bukkit.entity.Villager;
import org.bukkit.entity.Zombie;
import org.bukkit.entity.minecart.HopperMinecart;
import org.bukkit.entity.minecart.StorageMinecart;
import org.bukkit.inventory.EntityEquipment;
@ -20,10 +46,8 @@ import org.bukkit.material.Colorable;
import org.bukkit.material.MaterialData;
import org.bukkit.util.EulerAngle;
import me.goodandevil.skyblock.utils.item.ItemStackUtil;
import me.goodandevil.skyblock.utils.item.MaterialUtil;
import me.goodandevil.skyblock.utils.version.NMSUtil;
import me.goodandevil.skyblock.utils.world.block.BlockDegreesType;
import java.util.ArrayList;
import java.util.List;
@SuppressWarnings("deprecation")
public final class EntityUtil {
@ -191,7 +215,6 @@ public final class EntityUtil {
} else if (entity instanceof Villager) {
Villager villager = ((Villager) entity);
entityData.setProfession(villager.getProfession().toString());
entityData.setRiches(villager.getRiches());
List<String> items = new ArrayList<>();
@ -443,7 +466,6 @@ public final class EntityUtil {
}
villager.getInventory().setContents(items.toArray(new ItemStack[0]));
villager.setRiches(entityData.getRiches());
}
if (NMSVersion > 10) {

165
src/main/resources/levelling.yml
View File

@ -25,6 +25,7 @@ Materials:
ACACIA_STAIRS:
Points: 2
ACACIA_TRAPDOOR:
Points: 3
ACACIA_WOOD:
Points: 1
ACTIVATOR_RAIL:
@ -33,6 +34,12 @@ Materials:
Points: 1
ANDESITE:
Points: 1
ANDESITE_SLAB:
Points: 1
ANDESITE_STAIRS:
Points: 1
ANDESITE_WALL:
Points: 1
ANVIL:
Points: 10
ATTACHED_MELON_STEM:
@ -43,12 +50,20 @@ Materials:
Points: 1
BARRIER:
Points: 0
BAMBOO:
Points: 1
BAMBOO_SAPLING:
Points: 1
BARREL:
Points: 1
BEACON:
Points: 500
BEDROCK:
Points: 0
BEETROOTS:
Points: 1
BELL:
Points: 7
BIRCH_BUTTON:
Points: 1
BIRCH_DOOR:
@ -67,12 +82,16 @@ Materials:
Points: 2
BIRCH_SAPLING:
Points: 1
BIRCH_SIGN:
Points: 6
BIRCH_SLAB:
Points: 1
BIRCH_STAIRS:
Points: 2
BIRCH_TRAPDOOR:
Points: 3
BIRCH_WALL_SIGN:
Points: 6
BIRCH_WOOD:
Points: 1
BLACK_BANNER:
@ -99,6 +118,8 @@ Materials:
Points: 2
BLACK_WOOL:
Points: 2
BLAST_FURNACE:
Points: 6
BLUE_BANNER:
Points: 2
BLUE_BED:
@ -147,6 +168,8 @@ Materials:
Points: 3
BRICK_STAIRS:
Points: 5
BRICK_WALL:
Points: 3
BROWN_BANNER:
Points: 2
BROWN_BED:
@ -187,10 +210,14 @@ Materials:
Points: 1
CACTUS:
Points: 1
CAMPFIRE:
Points: 2
CAKE:
Points: 9
CARROTS:
Points: 1
CARTOGRAPHY_TABLE:
Points: 5
CARVED_PUMPKIN:
Points: 2
CAULDRON:
@ -239,8 +266,12 @@ Materials:
Points: 0
COMPARATOR:
Points: 10
COMPOSTER:
Points: 4
CONDUIT:
Points: 1
CORNFLOWER:
Points: 1
CRACKED_STONE_BRICKS:
Points: 2
CRAFTING_TABLE:
@ -251,8 +282,12 @@ Materials:
Points: 1
CUT_RED_SANDSTONE:
Points: 1
CUT_RED_SANDSTONE_SLAB:
Points: 1
CUT_SANDSTONE:
Points: 1
CUT_SANDSTONE_SLAB:
Points: 1
CYAN_BANNER:
Points: 2
CYAN_BED:
@ -299,12 +334,16 @@ Materials:
Points: 2
DARK_OAK_SAPLING:
Points: 1
DARK_OAK_SIGN:
Points: 6
DARK_OAK_SLAB:
Points: 1
DARK_OAK_STAIRS:
Points: 2
DARK_OAK_TRAPDOOR:
Points: 3
DARK_OAK_WALL_SIGN:
Points: 6
DARK_OAK_WOOD:
Points: 1
DARK_PRISMARINE:
@ -355,6 +394,12 @@ Materials:
Points: 1
DIORITE:
Points: 1
DIORITE_SLAB:
Points: 1
DIORITE_STAIRS:
Points: 1
DIORITE_WALL:
Points: 1
DIRT:
Points: 3
DISPENSER:
@ -387,6 +432,12 @@ Materials:
Points: 1
END_STONE:
Points: 1
END_STONE_BRICK_SLAB:
Points: 1
END_STONE_BRICK_STAIRS:
Points: 1
END_STONE_BRICK_WALL:
Points: 1
END_STONE_BRICKS:
Points: 2
FARMLAND:
@ -403,6 +454,8 @@ Materials:
Points: 1
FIRE_CORAL_WALL_FAN:
Points: 1
FLETCHING_TABLE:
Points: 4
FLOWER_POT:
Points: 1
FROSTED_ICE:
@ -421,6 +474,12 @@ Materials:
Points: 1
GRANITE:
Points: 1
GRANITE_SLAB:
Points: 1
GRANITE_STAIRS:
Points: 1
GRANITE_WALL:
Points: 1
GRASS:
Points: 4
GRASS_BLOCK:
@ -477,6 +536,8 @@ Materials:
Points: 2
GREEN_WOOL:
Points: 2
GRINDSTONE:
Points: 4
HAY_BLOCK:
Points: 2
HEAVY_WEIGHTED_PRESSURE_PLATE:
@ -517,6 +578,8 @@ Materials:
Points: 4
JACK_O_LANTERN:
Points: 2
JIGSAW:
Points: 4
JUKEBOX:
Points: 10
JUNGLE_BUTTON:
@ -537,12 +600,16 @@ Materials:
Points: 2
JUNGLE_SAPLING:
Points: 1
JUNGLE_SIGN:
Points: 6
JUNGLE_SLAB:
Points: 1
JUNGLE_STAIRS:
Points: 2
JUNGLE_TRAPDOOR:
Points: 3
JUNGLE_WALL_SIGN:
Points: 6
JUNGLE_WOOD:
Points: 1
KELP:
@ -551,14 +618,16 @@ Materials:
Points: 1
LADDER:
Points: 2
LANTERN:
Points: 3
LAPIS_BLOCK:
Points: 10
LAPIS_ORE:
Points: 1
LARGE_FERN:
Points: 1
LAVA:
Points: 0
LECTERN:
Points: 4
LEVER:
Points: 1
LIGHT_BLUE_BANNER:
@ -613,6 +682,8 @@ Materials:
Points: 3
LILAC:
Points: 1
LILY_OF_THE_VALLEY:
Points: 1
LILY_PAD:
Points: 5
LIME_BANNER:
@ -639,6 +710,8 @@ Materials:
Points: 2
LIME_WOOL:
Points: 2
LOOM:
Points: 4
MAGENTA_BANNER:
Points: 2
MAGENTA_BED:
@ -671,10 +744,20 @@ Materials:
Points: 1
MOSSY_COBBLESTONE:
Points: 1
MOSSY_COBBLESTONE_SLAB:
Points: 1
MOSSY_COBBLESTONE_STAIRS:
Points: 1
MOSSY_COBBLESTONE_WALL:
Points: 1
MOSSY_STONE_BRICK_SLAB:
Points: 1
MOSSY_STONE_BRICK_STAIRS:
Points: 1
MOSSY_STONE_BRICK_WALL:
Points: 1
MOSSY_STONE_BRICKS:
Points: 2
Points: 1
MOVING_PISTON:
Points: 1
MUSHROOM_STEM:
@ -683,6 +766,8 @@ Materials:
Points: 5
NETHERRACK:
Points: 1
NETHER_BRICK_WALL:
Points: 1
NETHER_BRICKS:
Points: 2
NETHER_BRICK_FENCE:
@ -719,12 +804,16 @@ Materials:
Points: 2
OAK_SAPLING:
Points: 1
OAK_SIGN:
Points: 6
OAK_SLAB:
Points: 1
OAK_STAIRS:
Points: 2
OAK_TRAPDOOR:
Points: 3
OAK_WALL_SIGN:
Points: 6
OAK_WOOD:
Points: 1
OBSERVER:
@ -803,10 +892,22 @@ Materials:
Points: 2
POLISHED_ANDESITE:
Points: 1
POLISHED_ANDESITE_SLAB:
Points: 1
POLISHED_ANDESITE_STAIRS:
Points: 1
POLISHED_DIORITE:
Points: 1
POLISHED_DIORITE_SLAB:
Points: 1
POLISHED_DIORITE_STAIRS:
Points: 1
POLISHED_GRANITE:
Points: 1
POLISHED_GRANITE_SLAB:
Points: 1
POLISHED_GRANITE_STAIRS:
Points: 1
POPPY:
Points: 1
POTATOES:
@ -817,6 +918,8 @@ Materials:
Points: 1
POTTED_AZURE_BLUET:
Points: 1
POTTED_BAMBOO:
Points: 1
POTTED_BIRCH_SAPLING:
Points: 1
POTTED_BLUE_ORCHID:
@ -825,6 +928,8 @@ Materials:
Points: 1
POTTED_CACTUS:
Points: 1
POTTED_CORNFLOWER:
Points: 1
POTTED_DANDELION:
Points: 1
POTTED_DARK_OAK_SAPLING:
@ -835,6 +940,8 @@ Materials:
Points: 1
POTTED_JUNGLE_SAPLING:
Points: 1
POTTED_LILY_OF_THE_VALLEY:
Points: 1
POTTED_OAK_SAPLING:
Points: 1
POTTED_ORANGE_TULIP:
@ -853,6 +960,8 @@ Materials:
Points: 1
POTTED_WHITE_TULIP:
Points: 1
POTTED_WITHER_ROSE:
Points: 1
POWERED_RAIL:
Points: 2
PRISMARINE:
@ -867,6 +976,8 @@ Materials:
Points: 1
PRISMARINE_STAIRS:
Points: 2
PRISMARINE_WALL:
Points: 1
PUMPKIN:
Points: 1
PUMPKIN_STEM:
@ -938,7 +1049,13 @@ Materials:
RED_MUSHROOM:
Points: 1
RED_MUSHROOM_BLOCK:
Points:
Points: 1
RED_NETHER_BRICK_SLAB:
Points: 1
RED_NETHER_BRICK_STAIRS:
Points: 1
RED_NETHER_BRICK_WALL:
Points: 1
RED_NETHER_BRICKS:
Points: 2
RED_SAND:
@ -949,6 +1066,8 @@ Materials:
Points: 1
RED_SANDSTONE_STAIRS:
Points: 2
RED_SANDSTONE_WALL:
Points: 1
RED_SHULKER_BOX:
Points: 11
RED_STAINED_GLASS:
@ -977,6 +1096,10 @@ Materials:
Points: 1
SANDSTONE_STAIRS:
Points: 2
SANDSTONE_WALL:
Points: 1
SCAFFOLDING:
Points: 1
SEAGRASS:
Points: 1
SEA_LANTERN:
@ -985,22 +1108,34 @@ Materials:
Points: 1
SHULKER_BOX:
Points: 10
SIGN:
Points: 6
SKELETON_SKULL:
Points: 10
SKELETON_WALL_SKULL:
Points: 10
SLIME_BLOCK:
Points: 10
SMITHING_TABLE:
Points: 4
SMOKER:
Points: 4
SMOOTH_QUARTZ:
Points: 1
SMOOTH_QUARTZ_SLAB:
Points: 1
SMOOTH_QUARTZ_STAIRS:
Points: 1
SMOOTH_RED_SANDSTONE:
Points: 1
SMOOTH_SANDSTONE:
Points: 1
SMOOTH_SANDSTONE_SLAB:
Points: 1
SMOOTH_SANDSTONE_STAIRS:
Points: 1
SMOOTH_STONE:
Points: 1
SMOOTH_STONE_SLAB:
Points: 1
SNOW:
Points: 1
SNOW_BLOCK:
@ -1143,12 +1278,16 @@ Materials:
Points: 2
SPRUCE_SAPLING:
Points: 1
SPRUCE_SIGN:
Points: 6
SPRUCE_SLAB:
Points: 1
SPRUCE_STAIRS:
Points: 2
SPRUCE_TRAPDOOR:
Points: 3
SPRUCE_WALL_SIGN:
Points: 6
SPRUCE_WOOD:
Points: 1
STICKY_PISTON:
@ -1161,12 +1300,18 @@ Materials:
Points: 1
STONE_BRICK_STAIRS:
Points: 2
STONE_BRICK_WALL:
Points: 1
STONE_BUTTON:
Points: 1
STONECUTTER:
Points: 4
STONE_PRESSURE_PLATE:
Points: 2
STONE_SLAB:
Points: 1
STONE_STAIRS:
Points: 1
STRIPPED_ACACIA_LOG:
Points: 0
STRIPPED_ACACIA_WOOD:
@ -1195,6 +1340,8 @@ Materials:
Points: 1
SUNFLOWER:
Points: 1
SWEET_BERRY_BUSH:
Points: 1
TALL_GRASS:
Points: 1
TALL_SEAGRASS:
@ -1225,12 +1372,8 @@ Materials:
Points: 1
VOID_AIR:
Points: 0
WALL_SIGN:
Points: 6
WALL_TORCH:
Points: 1
WATER:
Points: 0
WET_SPONGE:
Points: 10
WHEAT:
@ -1261,6 +1404,8 @@ Materials:
Points: 2
WHITE_WOOL:
Points: 3
WITHER_ROSE:
Points: 1
WITHER_SKELETON_SKULL:
Points: 10
WITHER_SKELETON_WALL_SKULL: