Commit Graph

81 Commits

Author SHA1 Message Date
nossr50
29835a3316 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-05-03 03:46:28 -07:00
nossr50
f61917e8fe 2.1.52 2019-05-03 01:08:29 -07:00
nossr50
986162803b Merge 2.1.50 2019-04-28 05:46:49 -07:00
Zed-I
43d08ec21d
Added some missing blocks to Herbalism/Mining
Added some missing entries to herbalism mining and one to combat.
Reasoning for each xp below:

bamboo - 10 Cant grow nearly as tall as kelp
cornflower - 150 same as the other 1 high tall flowers (excluding poppy, dandelion and allium)
lily_of_the_valley - 150 same as the other 1 high tall flowers (excluding poppy, dandelion and allium)
wither_rose - 500. Quite hard to harvest. You need a wither to kill a mob and have the block not get destroyed by the wither blast. If the block where to get destroyed the flower just drops instead and you dont get any xp.

The whole stone brick family get the same xp as nether brick, 50
stone_bricks
cracked_stone_bricks
mossy_stone_bricks
chiseled_stone_bricks

The rest of the prismarine family continue with the same xp as their main block, 70
prismarine_bricks
dark_prismarine
sea_lantern

wandering_trader  - 1.0 same as normal villagers
2019-04-26 18:08:12 +02:00
nossr50
8efee39f7e Add sweet berrys to Herbalism XP tables (update configs) 2019-04-25 18:54:41 -07:00
nossr50
176b5db83e 2.1.48 2019-04-24 17:17:14 -07:00
nossr50
c07a29ba86 mcMMO should work on both 1.13 and 1.14 now 2019-04-23 08:20:00 -07:00
nossr50
372ad1fac3 Experience settings for 114 are now under Experience_114 in experience.yml 2019-04-23 03:37:43 -07:00
nossr50
0b26d6c72c Fixed error related to Bleed, fixed missing default XP values for Herbalism and Woodcutting 2019-04-19 14:55:07 -07:00
nossr50
2ef10afce3 Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable
# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
2019-04-09 17:49:56 -07:00
nossr50
f1204f8a2a 2.1.39 - Added Seagrass/Tall_Seagrass to experience tables
Salvage should sound a bit different to Repair now
Fixes #3863 #3862
2019-04-09 16:34:38 -07:00
nossr50
6cad982969 Merge conflicts 2019-04-04 00:24:34 -07:00
nossr50
ac10261803 Blast Mining uses Pickaxe + Missing Taming XP entries 2019-04-03 21:54:49 -07:00
nossr50
8991c2bf2c Fixing merge conflicts 2019-04-03 17:25:18 -07:00
nossr50
f3837265db 2.1.33 2019-04-02 23:03:48 -07:00
nossr50
5647eebe99 Multiplier to camelcase 2019-03-28 23:47:20 -07:00
nossr50
78f0a42ec1 new config system part 4 2019-03-28 23:30:10 -07:00
nossr50
dece43429d Added an option to turn off fishing exploit detection as a band-aid fix until the config update is done 2019-03-20 07:04:05 -07:00
nossr50
2f0a58b968 2.1.18 - It turns out Kelp is actually made up of 2 blocks mixed together 2019-03-16 20:26:26 -07:00
nossr50
68e43e3641 Mycellium removed from XP tables for woodcutting 2019-03-09 17:23:17 -08:00
nossr50
93458aa355 Kelp added to Herbalism XP tables 2019-03-09 17:18:04 -08:00
nossr50
63d3a328c4 EndStone now gives the same XP as stone
Update your experience.yml
2019-02-05 20:43:56 -08:00
nossr50
d609b45e68 Correcting a bug with the new Enderman Endermite farm exploit fix and making it toggleable for servers that wish to allow it! 2019-01-31 14:40:37 -08:00
nossr50
8ad9419240 Endermen back to 1.0 2019-01-29 08:13:41 -08:00
nossr50
1871c1ec63 endermen and witches give 0.1x modifiers 2019-01-29 07:47:48 -08:00
nossr50
7a721c3229 Tweaking mob XP Values
Phantom added and set to 4.0
Witch is now set to 1.0 instead of 0.0
Ender Dragon is now set to 1.0 instead of 0.0
2019-01-29 07:13:06 -08:00
nossr50
7b38658310 Adding mushroom stems to Tree Feller 2019-01-27 18:28:14 -08:00
nossr50
d81c3d06c5 XP Gains now report sources, added some config options regarding XP bars
Fixed some issues with Roll
Fixes https://github.com/mcMMO-Dev/mcMMO/issues/3732
2019-01-27 18:11:51 -08:00
nossr50
ec1e7b044c Accidentally made extra details on by default 2019-01-20 02:49:00 -08:00
nossr50
df8f050cf1 Child Skills will not trigger XP bars (for now) 2019-01-18 17:21:05 -08:00
nossr50
e74bc9fd95 XP bars can now be toggled off 2019-01-18 16:18:29 -08:00
nossr50
f5590ce334 XP Bars now can have custom titles (edit the locale) 2019-01-18 13:46:03 -08:00
nossr50
9ae58fd2f7 Whoops I forgot to push these 2019-01-18 12:42:05 -08:00
nossr50
92b8d13c71 Added XP Bars 2019-01-18 11:21:25 -08:00
nossr50
4137cc0d3d Fish now give XP based on their rarity 2019-01-15 04:55:44 -08:00
nossr50
8a57bbb5d9 Coral Blocks now give Mining XP 2019-01-15 04:44:55 -08:00
nossr50
f09fed465a Dolphins now give combat XP 2019-01-15 04:39:11 -08:00
nossr50
4e1f535fe2 Coral Plants & Blue Ice now give XP 2019-01-15 04:36:35 -08:00
nossr50
f15f25a3df Drowned now count for combat XP 2019-01-15 04:13:55 -08:00
nossr50
95d60e646d Diminishing returns now has an optional minimum gains setting 2019-01-14 22:11:58 -08:00
nossr50
ee765a0d30 Fix for mushrooms not counting as Logs for Tree Feller
Server admins will need to update their experience.yml manually (or delete it to make a new one)
2019-01-07 12:37:16 -08:00
Andrewkm
dd82fa0791 Duplicate shulker entry (#3623) 2018-11-26 23:30:08 -05:00
t00thpick1
d778616b2c Herbalism was the one that actually needed to remain blockdata. 2018-10-13 17:06:54 -04:00
András Marczinkó
090cf82a39 Fix Terracotta and stained Terracotta names (#3580) 2018-09-22 12:50:25 -04:00
András Marczinkó
b8078e4730 Fix Mycelium name (#3579) 2018-09-22 12:21:23 -04:00
András Marczinkó
e08fe64db2 Fix End Stone name (#3578) 2018-09-22 12:21:13 -04:00
Sean Porter
2b576568a7
QUARTZ_ORE was renamed to NETHER_QUARTZ_ORE. 2018-09-16 18:47:15 -07:00
nemba246
6619ca1d22 update excavation on experience.yml (#3551)
In 1.13, the name of the grass block changed from "grass" to "grass_block". This caused no experience to be given while using a shovel on grass. This change was part of something mojang called the flattening and could possibly be the cause of some other experience related issues. 
https://minecraft.gamepedia.com/1.13/Flattening
2018-08-30 22:37:01 -04:00
Devon Palma
2f2a80e1ce 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
2018-08-05 10:15:12 -04:00
t00thpick1
f287b6d8a7 Update fishing experience config 2018-07-27 22:30:57 -04:00