EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-03 18:43:43 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@@ -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

4
pom.xml
View File

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

14
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@@ -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 :

9
src/main/java/com/gmail/nossr50/util/ItemUtils.java
View File

@@ -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;