diff --git a/Changelog.txt b/Changelog.txt index c2263ae74..0591d2583 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -7,6 +7,9 @@ Key: ! Change - Removal +Version 2.1.48 + 1.14 Support + Version 2.1.47 Fix NPE when party leader is offline and players grab a party list diff --git a/pom.xml b/pom.xml index 31f33958d..bf6f5abb2 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.47 + 2.1.48-SNAPSHOT mcMMO https://github.com/mcMMO-Dev/mcMMO @@ -167,7 +167,7 @@ org.spigotmc spigot-api - 1.13.2-R0.1-SNAPSHOT + 1.14-pre5-SNAPSHOT provided diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index 66cef68f3..2ca26ee56 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -116,7 +116,18 @@ public final class BlockUtils { case JUNGLE_TRAPDOOR: case OAK_TRAPDOOR: case SPRUCE_TRAPDOOR: - case WALL_SIGN : + case ACACIA_SIGN: + case ACACIA_WALL_SIGN: + case BIRCH_SIGN: + case BIRCH_WALL_SIGN: + case DARK_OAK_SIGN: + case DARK_OAK_WALL_SIGN: + case JUNGLE_SIGN: + case JUNGLE_WALL_SIGN: + case SPRUCE_SIGN: + case SPRUCE_WALL_SIGN: + case OAK_SIGN: + case OAK_WALL_SIGN: case CRAFTING_TABLE: case BEACON : case ANVIL : @@ -218,7 +229,6 @@ public final class BlockUtils { case JUNGLE_TRAPDOOR: case OAK_TRAPDOOR: case SPRUCE_TRAPDOOR: - case WALL_SIGN : case CRAFTING_TABLE: case BEACON : case ANVIL : diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java index 2ee2f1936..ca1aff840 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java @@ -552,6 +552,7 @@ public final class ItemUtils { * @return true if the item is a mining drop, false otherwise */ public static boolean isMiningDrop(ItemStack item) { + //TODO: 1.14 This needs to be updated switch (item.getType()) { case COAL: case COAL_ORE: @@ -582,6 +583,7 @@ public final class ItemUtils { * @return true if the item is a herbalism drop, false otherwise */ public static boolean isHerbalismDrop(ItemStack item) { + //TODO: 1.14 This needs to be updated switch (item.getType()) { case WHEAT: case WHEAT_SEEDS: @@ -594,8 +596,8 @@ public final class ItemUtils { case NETHER_WART: case BROWN_MUSHROOM: case RED_MUSHROOM: - case ROSE_RED: - case DANDELION_YELLOW: + case ROSE_BUSH: + case DANDELION: case CACTUS: case SUGAR_CANE: case MELON: @@ -620,6 +622,7 @@ public final class ItemUtils { * @return true if the item is a mob drop, false otherwise */ public static boolean isMobDrop(ItemStack item) { + //TODO: 1.14 This needs to be updated switch (item.getType()) { case STRING: case FEATHER: @@ -661,7 +664,7 @@ public final class ItemUtils { case ROTTEN_FLESH: case GOLD_NUGGET: case EGG: - case ROSE_RED: + case ROSE_BUSH: case COAL: return true;