Various Fixes (#3537)

* Updated ItemUtils, added isBlock check to smelt functions

+ added a check in ItemUtils.isSmeltable() and ItemUtils.isSmelted() to make sure the Item type was a block to prevent an error occuring mentioned in https://github.com/mcMMO-Dev/mcMMO/issues/3536

* Fixed Green Thumb replant issue

see https://github.com/mcMMO-Dev/mcMMO/issues/3535

HerbalismManager
= fixed names of netherwart
= fixed handleBlockState, and slightly altered it
StringUtils
= fixed name of netherwart

* Fixes to herbalism skill

Herbalism
= fixed material name for grass in green terra block conversion
= fixed material name for grass in shroom thumb block conversion
EntityListener
= fixed material name for melon in food level change
experience config
= updated name for melon and sugar cane

* Minor Name Updates

experience config
= removed Stone|*
= added Stone, Granite, Adesite, Diorite
MaterialTypes
= updated material reference for wood

* Small fishing change

PlayerListener
= made it so COD, TROPICAL_FISH, and PUFFERFISH are no longer overwritten, so players can now catch these
This commit is contained in:
Devon Palma
2018-08-05 08:15:12 -06:00
committed by t00thpick1
parent fa1bbd2031
commit 2f2a80e1ce
8 changed files with 36 additions and 33 deletions

View File

@ -168,7 +168,7 @@ Experience:
Wheat_Ripe: 50
Dead_Bush: 30
Lilac: 50
Melon_Block: 20
Melon: 20
Nether_Wart_Ripe: 50
Orange_Tulip: 150
Oxeye_Daisy: 150
@ -182,7 +182,7 @@ Experience:
Rose_Bush: 50
Fern: 10
Grass: 10
Sugar_Cane_Block: 30
Sugar_Cane: 30
Sunflower: 50
Tall_Grass: 50
Large_Fern: 50
@ -210,7 +210,10 @@ Experience:
Redstone_Ore: 150
Sandstone: 30
Stained_Clay|*: 50
Stone|*: 30
Stone: 30
Granite: 30
Andesite: 30
Diorite: 30
Red_Sandstone: 100
Prismarine: 70
Purpur_Block: 200