1.14 Compatibility (this build won't run on 1.13 anymore)

This commit is contained in:
nossr50 2019-04-22 23:54:02 -07:00
parent b41637fbf8
commit 1c490cd463
4 changed files with 23 additions and 7 deletions

View File

@ -7,6 +7,9 @@ Key:
! Change ! Change
- Removal - Removal
Version 2.1.48
1.14 Support
Version 2.1.47 Version 2.1.47
Fix NPE when party leader is offline and players grab a party list Fix NPE when party leader is offline and players grab a party list

View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.1.47</version> <version>2.1.48-SNAPSHOT</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm> <scm>
@ -167,7 +167,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version> <version>1.14-pre5-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -116,7 +116,18 @@ public final class BlockUtils {
case JUNGLE_TRAPDOOR: case JUNGLE_TRAPDOOR:
case OAK_TRAPDOOR: case OAK_TRAPDOOR:
case SPRUCE_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 CRAFTING_TABLE:
case BEACON : case BEACON :
case ANVIL : case ANVIL :
@ -218,7 +229,6 @@ public final class BlockUtils {
case JUNGLE_TRAPDOOR: case JUNGLE_TRAPDOOR:
case OAK_TRAPDOOR: case OAK_TRAPDOOR:
case SPRUCE_TRAPDOOR: case SPRUCE_TRAPDOOR:
case WALL_SIGN :
case CRAFTING_TABLE: case CRAFTING_TABLE:
case BEACON : case BEACON :
case ANVIL : case ANVIL :

View File

@ -552,6 +552,7 @@ public final class ItemUtils {
* @return true if the item is a mining drop, false otherwise * @return true if the item is a mining drop, false otherwise
*/ */
public static boolean isMiningDrop(ItemStack item) { public static boolean isMiningDrop(ItemStack item) {
//TODO: 1.14 This needs to be updated
switch (item.getType()) { switch (item.getType()) {
case COAL: case COAL:
case COAL_ORE: case COAL_ORE:
@ -582,6 +583,7 @@ public final class ItemUtils {
* @return true if the item is a herbalism drop, false otherwise * @return true if the item is a herbalism drop, false otherwise
*/ */
public static boolean isHerbalismDrop(ItemStack item) { public static boolean isHerbalismDrop(ItemStack item) {
//TODO: 1.14 This needs to be updated
switch (item.getType()) { switch (item.getType()) {
case WHEAT: case WHEAT:
case WHEAT_SEEDS: case WHEAT_SEEDS:
@ -594,8 +596,8 @@ public final class ItemUtils {
case NETHER_WART: case NETHER_WART:
case BROWN_MUSHROOM: case BROWN_MUSHROOM:
case RED_MUSHROOM: case RED_MUSHROOM:
case ROSE_RED: case ROSE_BUSH:
case DANDELION_YELLOW: case DANDELION:
case CACTUS: case CACTUS:
case SUGAR_CANE: case SUGAR_CANE:
case MELON: case MELON:
@ -620,6 +622,7 @@ public final class ItemUtils {
* @return true if the item is a mob drop, false otherwise * @return true if the item is a mob drop, false otherwise
*/ */
public static boolean isMobDrop(ItemStack item) { public static boolean isMobDrop(ItemStack item) {
//TODO: 1.14 This needs to be updated
switch (item.getType()) { switch (item.getType()) {
case STRING: case STRING:
case FEATHER: case FEATHER:
@ -661,7 +664,7 @@ public final class ItemUtils {
case ROTTEN_FLESH: case ROTTEN_FLESH:
case GOLD_NUGGET: case GOLD_NUGGET:
case EGG: case EGG:
case ROSE_RED: case ROSE_BUSH:
case COAL: case COAL:
return true; return true;