Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-16 19:51:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix LeaderHeads support and more '/is level' stuff in 1.12-

Browse Source
This commit is contained in:
Esophose 2019-02-28 00:30:25 -07:00
parent d3b1426143
commit f694724031
4 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/goodandevil/skyblock/leaderboard/leaderheads/TopLevel.java
View File

@ -23,7 +23,7 @@ public class TopLevel extends DataCollector {
private final SkyBlock skyblock;
public TopLevel(SkyBlock skyblock) {
super("toplevels", "SkyBlock", BoardType.DEFAULT, "&bTop Level", "toplevel",
super("toplevels", skyblock.getDescription().getName(), BoardType.DEFAULT, "&bTop Level", "toplevel",
Arrays.asList(ChatColor.DARK_GRAY + "-=+=-", ChatColor.AQUA + "{name}",
ChatColor.WHITE + "{amount} Level", ChatColor.DARK_GRAY + "-=+=-"),
true, UUID.class);

2
src/main/java/me/goodandevil/skyblock/leaderboard/leaderheads/TopVotes.java
View File

@ -22,7 +22,7 @@ public class TopVotes extends DataCollector {
private final SkyBlock skyblock;
public TopVotes(SkyBlock skyblock) {
super("topvotes", "SkyBlock", BoardType.DEFAULT, "&bTop Votes", "topvotes",
super("topvotes", skyblock.getDescription().getName(), BoardType.DEFAULT, "&bTop Votes", "topvotes",
Arrays.asList(ChatColor.DARK_GRAY + "-=+=-", ChatColor.AQUA + "{name}",
ChatColor.WHITE + "{amount} Votes", ChatColor.DARK_GRAY + "-=+=-"),
true, UUID.class);

2
src/main/java/me/goodandevil/skyblock/levelling/LevellingManager.java
View File

@ -127,7 +127,7 @@ public class LevellingManager {
if (blockMaterial != materialList.getItemStack().getType()) continue;
if (NMSVersion < 13) {
if (!(blockData == is.getDurability())) {
if (blockData != is.getData().getData()) {
continue;
}
}

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

@ -10,18 +10,18 @@ import org.bukkit.inventory.ItemStack;
public enum Materials {
ACACIA_BOAT("BOAT_ACACIA", 0),
ACACIA_BUTTON("WOOD_BUTTON", 0),
ACACIA_BUTTON("WOOD_BUTTON", 0, true),
ACACIA_DOOR("ACACIA_DOOR", 0),
ACACIA_FENCE("ACACIA_FENCE", 0),
ACACIA_FENCE_GATE("ACACIA_FENCE_GATE", 0),
ACACIA_LEAVES("LEAVES_2", 0),
ACACIA_LOG("LOG_2", 0),
ACACIA_PLANKS("WOOD", 4),
ACACIA_PRESSURE_PLATE("WOOD_PLATE", 0),
ACACIA_PRESSURE_PLATE("WOOD_PLATE", 0, true),
ACACIA_SAPLING("SAPLING", 4),
ACACIA_SLAB("WOOD_STEP", 4),
ACACIA_STAIRS("ACACIA_STAIRS", 4),
ACACIA_TRAPDOOR("TRAP_DOOR", 0),
ACACIA_TRAPDOOR("TRAP_DOOR", 0, true),
ACACIA_WOOD("LOG_2", 0),
ACTIVATOR_RAIL("ACTIVATOR_RAIL", 0),
AIR("AIR", 0),
@ -45,18 +45,18 @@ public enum Materials {
BEETROOT_SEEDS("BEETROOT_SEEDS", 0),
BEETROOT_SOUP("BEETROOT_SOUP", 0),
BIRCH_BOAT("BOAT_BIRCH", 0),
BIRCH_BUTTON("WOOD_BUTTON", 0),
BIRCH_BUTTON("WOOD_BUTTON", 0, true),
BIRCH_DOOR("BIRCH_DOOR", 0),
BIRCH_FENCE("BIRCH_FENCE", 0),
BIRCH_FENCE_GATE("BIRCH_FENCE_GATE", 0),
BIRCH_LEAVES("LEAVES", 2),
BIRCH_LOG("LOG", 2),
BIRCH_PLANKS("WOOD", 2),
BIRCH_PRESSURE_PLATE("WOOD_PLATE", 0),
BIRCH_PRESSURE_PLATE("WOOD_PLATE", 0, true),
BIRCH_SAPLING("SAPLING", 2),
BIRCH_SLAB("WOOD_STEP", 2),
BIRCH_STAIRS("BIRCH_WOOD_STAIRS", 0),
BIRCH_TRAPDOOR("TRAP_DOOR", 0),
BIRCH_TRAPDOOR("TRAP_DOOR", 0, true),
BIRCH_WOOD("LOG", 2),
BLACK_BANNER("BANNER", 0),
BLACK_BED("BED", 15),
@ -79,7 +79,7 @@ public enum Materials {
BLUE_CONCRETE("CONCRETE", 11),
BLUE_CONCRETE_POWDER("CONCRETE_POWDER", 11),
BLUE_GLAZED_TERRACOTTA("BLUE_GLAZED_TERRACOTTA", 0),
BLUE_ICE("PACKED_ICE", 0),
BLUE_ICE("PACKED_ICE", 0, true),
BLUE_ORCHID("RED_ROSE", 1),
BLUE_SHULKER_BOX("BLUE_SHULKER_BOX", 0),
BLUE_STAINED_GLASS("STAINED_GLASS", 11),
@ -136,7 +136,7 @@ public enum Materials {
CARROT_ON_A_STICK("CARROT_STICK", 0),
CARVED_PUMPKIN("PUMPKIN", 0),
CAULDRON("CAULDRON", 0),
CAVE_AIR("AIR", 0),
CAVE_AIR("AIR", 0, true),
CAVE_SPIDER_SPAWN_EGG("MONSTER_EGG", 0),
CHAINMAIL_BOOTS("CHAINMAIL_BOOTS", 0),
CHAINMAIL_CHESTPLATE("CHAINMAIL_CHESTPLATE", 0),
@ -211,18 +211,18 @@ public enum Materials {
DANDELION("YELLOW_FLOWER", 0),
DANDELION_YELLOW("INK_SACK", 11),
DARK_OAK_BOAT("BOAT_DARK_OAK", 0),
DARK_OAK_BUTTON("WOOD_BUTTON", 0),
DARK_OAK_BUTTON("WOOD_BUTTON", 0, true),
DARK_OAK_DOOR("DARK_OAK_DOOR", 0),
DARK_OAK_FENCE("DARK_OAK_FENCE", 0),
DARK_OAK_FENCE_GATE("DARK_OAK_FENCE_GATE", 0),
DARK_OAK_LEAVES("LEAVES_2", 1),
DARK_OAK_LOG("LOG_2", 1),
DARK_OAK_PLANKS("WOOD", 5),
DARK_OAK_PRESSURE_PLATE("WOOD_PLATE", 0),
DARK_OAK_PRESSURE_PLATE("WOOD_PLATE", 0, true),
DARK_OAK_SAPLING("SAPLING", 5),
DARK_OAK_SLAB("WOOD_STEP", 0),
DARK_OAK_STAIRS("DARK_OAK_STAIRS", 0),
DARK_OAK_TRAPDOOR("TRAP_DOOR", 0),
DARK_OAK_TRAPDOOR("TRAP_DOOR", 0, true),
DARK_OAK_WOOD("LOG_2", 1),
DARK_PRISMARINE("PRISMARINE", 2),
DARK_PRISMARINE_SLAB("STONE", 0, true),
@ -407,18 +407,18 @@ public enum Materials {
JACK_O_LANTERN("JACK_O_LANTERN", 0),
JUKEBOX("JUKEBOX", 0),
JUNGLE_BOAT("BOAT_JUNGLE", 0),
JUNGLE_BUTTON("WOOD_BUTTON", 0),
JUNGLE_BUTTON("WOOD_BUTTON", 0, true),
JUNGLE_DOOR("JUNGLE_DOOR", 0),
JUNGLE_FENCE("JUNGLE_FENCE", 0),
JUNGLE_FENCE_GATE("JUNGLE_FENCE_GATE", 0),
JUNGLE_LEAVES("LEAVES", 3),
JUNGLE_LOG("LOG", 3),
JUNGLE_PLANKS("WOOD", 3),
JUNGLE_PRESSURE_PLATE("WOOD_PLATE", 0),
JUNGLE_PRESSURE_PLATE("WOOD_PLATE", 0, true),
JUNGLE_SAPLING("SAPLING", 3),
JUNGLE_SLAB("WOOD_STEP", 3),
JUNGLE_STAIRS("JUNGLE_WOOD_STAIRS", 0),
JUNGLE_TRAPDOOR("TRAP_DOOR", 0),
JUNGLE_TRAPDOOR("TRAP_DOOR", 0, true),
JUNGLE_WOOD("LOG", 3),
KELP("STONE", 0, true),
KELP_PLANT("STONE", 0, true),
@ -533,7 +533,7 @@ public enum Materials {
MOSSY_STONE_BRICKS("SMOOTH_BRICK", 1),
MOVING_PISTON("PISTON_MOVING_PIECE", 0),
MULE_SPAWN_EGG("MONSTER_EGG", 0),
MUSHROOM_STEM("BROWN_MUSHROOM", 0),
MUSHROOM_STEM("BROWN_MUSHROOM", 0, true),
MUSHROOM_STEW("MUSHROOM_SOUP", 0),
MUSIC_DISC_11("GOLD_RECORD", 0),
MUSIC_DISC_13("GREEN_RECORD", 0),
@ -634,27 +634,27 @@ public enum Materials {
POTATO("POTATO_ITEM", 0),
POTATOES("POTATO", 0),
POTION("POTION", 0),
POTTED_ACACIA_SAPLING("FLOWER_POT", 0),
POTTED_ALLIUM("FLOWER_POT", 0),
POTTED_AZURE_BLUET("FLOWER_POT", 0),
POTTED_BIRCH_SAPLING("FLOWER_POT", 0),
POTTED_BLUE_ORCHID("FLOWER_POT", 0),
POTTED_BROWN_MUSHROOM("FLOWER_POT", 0),
POTTED_CACTUS("FLOWER_POT", 0),
POTTED_DANDELION("FLOWER_POT", 0),
POTTED_DARK_OAK_SAPLING("FLOWER_POT", 0),
POTTED_DEAD_BUSH("FLOWER_POT", 0),
POTTED_FERN("FLOWER_POT", 0),
POTTED_JUNGLE_SAPLING("FLOWER_POT", 0),
POTTED_OAK_SAPLING("FLOWER_POT", 0),
POTTED_ORANGE_TULIP("FLOWER_POT", 0),
POTTED_OXEYE_DAISY("FLOWER_POT", 0),
POTTED_PINK_TULIP("FLOWER_POT", 0),
POTTED_POPPY("FLOWER_POT", 0),
POTTED_RED_MUSHROOM("FLOWER_POT", 0),
POTTED_RED_TULIP("FLOWER_POT", 0),
POTTED_SPRUCE_SAPLING("FLOWER_POT", 0),
POTTED_WHITE_TULIP("FLOWER_POT", 0),
POTTED_ACACIA_SAPLING("FLOWER_POT", 0, true),
POTTED_ALLIUM("FLOWER_POT", 0, true),
POTTED_AZURE_BLUET("FLOWER_POT", 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_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_OAK_SAPLING("FLOWER_POT", 0, true),
POTTED_ORANGE_TULIP("FLOWER_POT", 0, true),
POTTED_OXEYE_DAISY("FLOWER_POT", 0, true),
POTTED_PINK_TULIP("FLOWER_POT", 0, true),
POTTED_POPPY("FLOWER_POT", 0, true),
POTTED_RED_MUSHROOM("FLOWER_POT", 0, true),
POTTED_RED_TULIP("FLOWER_POT", 0, true),
POTTED_SPRUCE_SAPLING("FLOWER_POT", 0, true),
POTTED_WHITE_TULIP("FLOWER_POT", 0, true),
POWERED_RAIL("POWERED_RAIL", 0),
PRISMARINE("PRISMARINE", 0),
PRISMARINE_BRICKS("PRISMARINE", 1),
@ -773,18 +773,18 @@ public enum Materials {
SPLASH_POTION("SPLASH_POTION", 0),
SPONGE("SPONGE", 0),
SPRUCE_BOAT("BOAT_SPRUCE", 0),
SPRUCE_BUTTON("WOOD_BUTTON", 0),
SPRUCE_BUTTON("WOOD_BUTTON", 0, true),
SPRUCE_DOOR("SPRUCE_DOOR", 0),
SPRUCE_FENCE("SPRUCE_FENCE", 0),
SPRUCE_FENCE_GATE("SPRUCE_FENCE_GATE", 0),
SPRUCE_LEAVES("LEAVES", 1),
SPRUCE_LOG("LOG", 1),
SPRUCE_PLANKS("WOOD", 1),
SPRUCE_PRESSURE_PLATE("WOOD_PLATE", 0),
SPRUCE_PRESSURE_PLATE("WOOD_PLATE", 0, true),
SPRUCE_SAPLING("SAPLING", 1),
SPRUCE_SLAB("WOOD_STEP", 1),
SPRUCE_STAIRS("SPRUCE_WOOD_STAIRS", 0),
SPRUCE_TRAPDOOR("TRAP_DOOR", 0),
SPRUCE_TRAPDOOR("TRAP_DOOR", 0, true),
SPRUCE_WOOD("LOG", 1),
SQUID_SPAWN_EGG("MONSTER_EGG", 0),
STICK("STICK", 0),
@ -839,14 +839,14 @@ public enum Materials {
TUBE_CORAL_BLOCK("STONE", 0, true),
TUBE_CORAL_FAN("STONE", 0, true),
TUBE_CORAL_WALL_FAN("STONE", 0, true),
TURTLE_EGG("MONSTER_EGG", 0),
TURTLE_EGG("STONE", 0, true),
TURTLE_HELMET("STONE", 0, true),
TURTLE_SPAWN_EGG("MONSTER_EGG", 0),
VEX_SPAWN_EGG("MONSTER_EGG", 0),
VILLAGER_SPAWN_EGG("MONSTER_EGG", 0),
VINDICATOR_SPAWN_EGG("MONSTER_EGG", 0),
VINE("VINE", 0),
VOID_AIR("AIR", 0),
VOID_AIR("AIR", 0, true),
WALL_SIGN("WALL_SIGN", 0),
WALL_TORCH("TORCH", 1),
WATER("WATER", 0),