EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 21:56:47 +01:00
Code Issues Projects Releases Wiki Activity
5,378 Commits 48 Branches 45 Tags 34 MiB
be8a2a4b07
Commit Graph

4031 Commits

Author SHA1 Message Date
nossr50
b1be43154a Roll & Gracefull Roll have sounds now 2019-01-20 02:23:18 -08:00
nossr50
87f84a5f66 Fixed a bug where Retro mode made you 10x luckier 2019-01-20 02:08:26 -08:00
nossr50
e962f645b6 Skill Unlock notifications now have sounds 2019-01-20 01:21:33 -08:00
nossr50
6ad9c8e664 Readying a Tool now has a sound 2019-01-20 00:46:33 -08:00
nossr50
b8a146f8bd Fixed a sync problem where XP bars were 1-step behind 2019-01-19 20:30:19 -08:00
nossr50
b7b0ff13e7 Fixing some redundancy 2019-01-19 19:18:29 -08:00
nossr50
96742e6c42 mcMMO now alerts you when you progress in a skill 2019-01-19 18:51:18 -08:00
nossr50
8c5ea484eb XP Bars will no longer update for party xp or vampirism xp 2019-01-19 15:10:42 -08:00
t00thpick1
eb1f097d18 Fix chorus blocks ignoring blockstore. 2019-01-19 17:02:24 -05:00
t00thpick1
a073984621 This should not be here. 2019-01-19 15:52:53 -05:00
t00thpick1
34fc9725b9 Listen for block multiplace 2019-01-19 15:41:33 -05: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
66878d72bf mcMMO will now start properly with scoreboards off 2019-01-18 14:24:37 -08:00
nossr50
29befac27e Scoreboards are now OFF by default 
I don't like them.
 2019-01-18 14:20:31 -08:00
nossr50
f5590ce334 XP Bars now can have custom titles (edit the locale) 2019-01-18 13:46:03 -08:00
nossr50
43da10a855 Levels now start at 1 (configurable advanced.yml) 2019-01-18 13:10:45 -08:00
nossr50
9ae58fd2f7 Whoops I forgot to push these 2019-01-18 12:42:05 -08:00
nossr50
cf6d95b575 More config options for XP bars 2019-01-18 12:41:38 -08:00
nossr50
92b8d13c71 Added XP Bars 2019-01-18 11:21:25 -08:00
nossr50
6888a082fc Child Skill commands don't look so bad now 2019-01-17 11:44:01 -08:00
nossr50
1585d8157e Some color tweaks 2019-01-17 10:45:16 -08:00
nossr50
126e1c5942 All skills should be on the new rank system now 2019-01-17 08:46:10 -08:00
nossr50
a59907fcec Shake sends custom damagecause 2019-01-16 11:07:11 -08:00
nossr50
f1feeed670 bstats 2019-01-16 11:05:43 -08:00
nossr50
12af9af902 Fixes #3672, Fixes #3316, Fixes #3288, Fixes #2434, Fixes #1732, Fixes #1726, Fixes #1597, Fixes #941 2019-01-15 07:19:00 -08:00
nossr50
6ce44b7ce8 Cleaning up Herbalism & Mining Skill Command 2019-01-15 05:56:49 -08:00
nossr50
52355b2757 Fixing error in Farmer's Diet 2019-01-15 05:39:25 -08:00
nossr50
13a3e9a790 Adding ranks to Fisherman/Farmer's Diet and Green Thumb 2019-01-15 05:35:41 -08:00
nossr50
4e1f535fe2 Coral Plants & Blue Ice now give XP 2019-01-15 04:36:35 -08:00
nossr50
5e3a72b30d XP event now uses titles for ending and fixed negative number bug 2019-01-15 03:50:12 -08:00
nossr50
f5b3cf4350 The remaining skills now hide stats until unlocked 2019-01-15 03:39:06 -08:00
nossr50
d48295bd72 Mining & Herbalism stats are hidden until unlock 2019-01-15 03:31:34 -08:00
nossr50
1aa4df01f9 Fishing stats are now hidden until skill is unlocked 2019-01-15 03:16:21 -08:00
nossr50
427d8c3b21 Excavation hides stats until skills are unlocked 2019-01-15 03:05:42 -08:00
nossr50
61d87eff10 Axe skill stats are hidden unless unlocked 2019-01-15 02:59:00 -08:00
nossr50
086e29c4ac Archery skills do not show stats until unlocked 2019-01-15 02:54:51 -08:00
nossr50
6cc6de6e82 Alchemy stats are now hidden until the appropriate skills are unlocked 2019-01-15 02:53:33 -08:00
nossr50
4a30fcc2de 2.1.0 is probably playable now, but not unfinished 2019-01-15 02:43:44 -08:00
nossr50
0acde4a8af Why are these empty part 2 2019-01-15 01:11:33 -08:00
nossr50
d6fea9a2df Why was this catch empty? 2019-01-15 01:08:11 -08:00
nossr50
4fcf0b0519 Reducing the amount of config confusion for retro mode 
This is to avoid confusion, if you want this kind of customization I'll add it in but disassociate it with retro mode.
 2019-01-14 22:48:37 -08:00
nossr50
da6b6841b7 Prevent commands from setting players to negative levels 2019-01-14 22:21:33 -08:00
nossr50
95d60e646d Diminishing returns now has an optional minimum gains setting 2019-01-14 22:11:58 -08:00
nossr50
9f8c9db4bc Setting SSL to false will now squelch MySQL warnings 2019-01-14 20:37:30 -08:00
nossr50
918b94b1ff Fixing Graceful Roll in the new system. 2019-01-14 18:35:37 -08:00
nossr50
d9dd4ea016 XP events now use the Title API 
Configurable in advanced.yml
 2019-01-14 02:32:02 -08:00
nossr50
43aad43bf3 Vampirism/Hardcore mode now use the ActionBar 2019-01-14 01:25:06 -08:00
nossr50
ed2c3975d8 ActionBar messages can now have copies sent to chat 2019-01-14 01:22:14 -08:00
nossr50
ee04bebcd9 All skills now use the ActionBar 2019-01-14 00:56:07 -08:00
nossr50
1769df98dc Archery now uses the ActionBar 2019-01-14 00:54:42 -08:00
nossr50
ca2eebf022 Axes now use the ActionBar 2019-01-14 00:52:25 -08:00
nossr50
4101f16580 Fishing now uses the ActionBar 2019-01-14 00:50:13 -08:00
nossr50
655a31d556 Herbalism now uses the ActionBar 2019-01-13 23:23:48 -08:00
nossr50
e1576e8d1c Repair now used the ActionBar 2019-01-13 23:16:24 -08:00
nossr50
2605235f2a Salvage now uses the ActionBar 2019-01-13 22:56:48 -08:00
nossr50
6bba647250 Woodcutting now uses the ActionBar 2019-01-13 22:47:27 -08:00
nossr50
79ae49a6d1 Unarmed now uses the ActionBar 2019-01-13 22:45:16 -08:00
nossr50
f007114753 Swords now use the ActionBar 2019-01-13 22:42:55 -08:00
nossr50
dad3e76c7c Taming now uses Action Bar 2019-01-13 22:32:35 -08:00
nossr50
ba5428ff12 Adding more combat messages to Action Bar 2019-01-13 22:21:16 -08:00
nossr50
1cf1c6fab8 ChimaeraWing now uses the action bar 2019-01-13 22:09:54 -08:00
nossr50
14ca84fa97 Holiday strings added to locale + some JSON integration for April Fools Day 2019-01-13 21:48:38 -08:00
nossr50
4a00758b6b Added locale strings for chatspy and moved some more party messages to action bar 2019-01-13 21:27:56 -08:00
nossr50
e817dbe081 Don't allow players to accept party invites if the party is full 2019-01-13 00:45:17 -08:00
nossr50
c3bacd8de6 Minor config change 2019-01-13 00:31:58 -08:00
nossr50
6f77bb206d Refactoring + adding a new skillranks config (not functional yet) 2019-01-12 23:54:53 -08:00
nossr50
51ab8d4b25 Child Skill commands work again (UGLY tho) 2019-01-12 22:41:06 -08:00
nossr50
a21b4585c5 Classic Scaling is now Retro Mode to avoid confusion 2019-01-12 22:14:23 -08:00
nossr50
cde11b64ed You will only gain shared party XP if you are visible to the player gaining XP 2019-01-12 21:51:31 -08:00
nossr50
d3c47935d4 Some refactoring 2019-01-12 19:56:54 -08:00
nossr50
c8ee5099e0 TextComponents will no longer use a cache 
This will increase the cost of TextComponents by a negligible amount but in exchange I will be able to put player-specific data into them.
 2019-01-12 19:29:06 -08:00
nossr50
85fd0a79bc Sounds volume and pitch are now configurable in the new sounds.yml file 2019-01-12 19:08:54 -08:00
nossr50
4cfb7a5f4b mcMMO now supports SSL and tries to use it by default for MySQL (turn this off in config.yml MySQL.Server.SSL) 
this fixes a lot of console spam from default mysql installs
 2019-01-12 17:26:17 -08:00
nossr50
1f2e6cd5f5 Fixed grabbing colors from the wrong file 2019-01-12 15:58:35 -08:00
nossr50
b38c589125 I guess I'm bad at git 2019-01-12 14:44:16 -08:00
nossr50
7f40b4294f mcMMO now fires many new custom events relating to scoreboards 2019-01-12 14:42:30 -08:00
nossr50
bfc26dc892 Reverting the scoreboard changes 
Due to a naive understand of how scoreboards worked I made some incorrect assumptions and will be reverting this change
 2019-01-12 13:26:54 -08:00
nossr50
b572c0aea9 Fixing some issues with scoreboards, it's getting late so I'll take a better look at them in the morning. 2019-01-11 10:27:11 -08:00
nossr50
1d62f8b177 Added some missing config items 2019-01-11 07:31:17 -08:00
nossr50
d141a28747 Most things that print to your chat will now print to action bar 2019-01-11 07:11:17 -08:00
nossr50
19c38f0cb1 Parties can now have max size limits (configurable), by default party sizes are unlimited. 2019-01-11 06:17:07 -08:00
nossr50
c7a49dd283 tool fix 2019-01-11 05:42:58 -08:00
nossr50
f11b98c29d Players need to have unique objectives 2019-01-11 05:26:05 -08:00
nossr50
adc83d29a7 The new URL links can now be disabled in config.yml 2019-01-11 02:24:11 -08:00
nossr50
1e8d950767 Converting from MySQL -> FlatFile now accounts for users that don't exist yet in mcmmo.users 
Fixes #3130
 2019-01-11 02:17:03 -08:00
nossr50
3dca32a226 mcMMO is now a lot more compatible with plugins that use scoreboards 
Citizens 2 for example
 2019-01-11 02:05:54 -08:00
nossr50
7c024314b7 Classic mode setting is now UseOldLevelScaling to lessen confusion 2019-01-11 01:52:16 -08:00
nossr50
f828084246 Added config option to easily disable all scoreboards 2019-01-11 01:47:36 -08:00
nossr50
626890ed95 Chimaera Wing exploit fix 2019-01-10 23:52:11 -08:00
nossr50
00a14ccb17 no more abusing the ice kids 2019-01-10 21:27:50 -08:00
nossr50
400e15b559 Party member list will only contain players visible to the player 2019-01-10 21:06:51 -08:00
nossr50
d5a4103858 new mmoinfo command and JSON click events 2019-01-10 01:17:47 -08:00
nossr50
0cb9bbb530 Overhaul Era MOTD 2019-01-09 18:25:37 -08:00
nossr50
362d036b16 4 days of work and I'm still not done ;_; 2019-01-08 19:52:52 -08:00
t00thpick1
8aa919f834 should fix inspecting offline players 
(cherry picked from commit ad715f51c6b8b87e3a78c18c7daaf4cdf7c10a8e)
 2019-01-05 19:21:45 -05:00
t00thpick1
77c12dcc20 Tridents are tools too 
(cherry picked from commit 1b74c0bd920cf32499ecdb2c285917f2e41cef44)
 2019-01-05 12:13:46 -05:00
nossr50
01a7aa4d12 Reworked the relationship between SubSkill and Locale keys 2019-01-04 07:58:39 -08:00
nossr50
6dc75760d0 JSON hover objects now follow different templates based on the subskill's properties 2019-01-03 07:16:05 -08:00
nossr50
fe90f1e7eb Fixing a bug with Axe Mastery rank requirements 2019-01-03 04:59:56 -08:00
nossr50
54cf356b71 converting more SubSkills to be JSON friendly 
AxeMaster & SkillShot
 2019-01-03 04:32:46 -08:00
nossr50
4669e3e54d Starting to convert existing subskills to be JSON friendly 
So far only a few have been converted
 2019-01-03 03:42:11 -08:00
nossr50
f4ead570d4 Fixed some logic errors with the new mcchatspy command 2019-01-03 02:14:31 -08:00
nossr50
b34f3a1779 Fixing the message for when you toggle mcchatspy 2019-01-03 01:44:29 -08:00
nossr50
85e1f2eb7e mcchatspy is now a command based instead of permission node based 2019-01-03 01:26:08 -08:00
nossr50
6136e82ec6 mcmmo.admin.chatspy to spy on party chat 2019-01-03 00:52:24 -08:00
nossr50
ebec5d6f70 Added some JSON, much more to come. 2019-01-02 08:06:18 -08:00
nossr50
bec088c969 Some work on milestones is done 2018-12-31 10:10:00 -08:00
nossr50
0d260a74c9 Refactoring to make my life easier 2018-12-29 05:24:55 -08:00
nossr50
35368db05d I forgot the imports like a dumbo 2018-12-28 11:28:26 -08:00
nossr50
5e6e8d7248 I don't think Jenkins likes @Nullable atm 2018-12-28 10:56:41 -08:00
nossr50
a316bb7bd2 Not much work was done today because of testing & research 
The real work begins soon
 2018-12-28 06:29:08 -08:00
nossr50
3831ca6b0f Burn it with fire 2018-12-27 03:04:55 -08:00
nossr50
93d10c0739 Starting work on converting skills to use the new 100-scale system 2018-12-26 23:59:43 -08:00
nossr50
55a69006bf Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO 2018-12-24 17:53:03 -08:00
nossr50
8a02230fd2 Updating strings relating to the project. 2018-12-24 17:52:39 -08:00
t00thpick1
2a26b016d9 Only stop monitoring LOG To LOG transitions, there are a ton of non-air block placements we want to monitor 2018-12-24 19:33:26 -05:00
nossr50
7be5b4ecbd Monitor only blocks that replace air. This fixes the TreeFeller interaction with stripped wood. 2018-12-24 00:21:13 -08:00
t00thpick1
565fb35217
Update McmmoCommand.java 2018-12-23 16:40:57 -05:00
LogGits
d2b8c527ad Use dropItem instead of dropItemNaturally (#3644) 
This could possibly eliminate a few issues.
 2018-12-14 19:51:44 -05:00
LogGits
2cdb17d64f Use dropItem instead of dropItemNaturally (#3645) 
Should fix #3641 and #3638
 2018-12-14 19:51:38 -05:00
Josh
605535ed60 fix memory leak (#3631) 
on servers with lots of spawner farms this metadata won't get GC'd unless removed, line 436 its added but never removed as far as I can tell
 2018-12-06 22:05:55 -05:00
t00thpick1
af8d2dc2c7 Tridents are enchantable 2018-11-26 23:28:15 -05:00
t00thpick1
9f9529debf Has this ever not happened??? I don't understand why it only showed up in 1.13..... Fixes #3564 2018-11-26 23:10:51 -05:00
t00thpick1
495c4a33e5 Store skill totals rather than calculating them on the fly for faster leaderboard queries. 2018-11-14 20:31:57 -05:00
t00thpick1
203d3749ee Fix herbalism XP again 2018-10-14 21:27:55 -04:00
t00thpick1
1fcecbd3e7 Replant only the fully grown plants. 2018-10-13 17:09:08 -04:00
t00thpick1
d778616b2c Herbalism was the one that actually needed to remain blockdata. 2018-10-13 17:06:54 -04:00
t00thpick1
ab2a031ee0 Missed file in commit 2018-10-09 21:56:47 -04:00
t00thpick1
5663b71387 Some of these should not have been blockdata, also this should check age of crops. 2018-10-09 21:52:23 -04:00
ProfLuz
2a43bce849 Fix spectators being affected by a combat ability (#3591) 
* Fix spectators being affected by a combat ability
 2018-10-01 22:21:22 -04:00
t00thpick1
e2edbaad34 Update herbalism permissions for new block names. Should fix replanting crops. 2018-09-14 22:44:21 -04:00
t00thpick1
184b98bbdc BREAKING CHANGE - Fix typo in secondary skill enum...... Fixes #2891 2018-09-14 22:36:47 -04:00
t00thpick1
7cc604dbdb Update potions.yml to reflect 1.13 potions and material names. 2018-09-14 20:50:28 -04:00
t00thpick1
44ed35825f more cleanup in the TreasureConfig. 2018-08-30 23:59:55 -04:00
t00thpick1
22833eea6c Slightly delay recipe loading because apparently spigot broke doing that on enable....... 2018-08-30 23:57:29 -04:00
t00thpick1
64dfc1e3d3 Fix hylian drops 2018-08-30 23:28:48 -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
Aaron Karras
fa1bbd2031 Updated SkillUtils to no longer use BlockData (#3533) 2018-08-03 18:21:13 -04:00
R4zorax
a39a77f89e Fix fishing in 1.13 (#3528) 
* Fix fishing to use Material instead of BlockData (that was AIR)
 2018-08-02 20:27:15 -04:00
R4zorax
7800e48f61 Make BiomeAdaptor support Bukkit 1.13 and bump java-version to 1.8 (#3526) 2018-08-01 21:23:29 -04:00
Shane Robertson
63378ae4c1 Updated herbalism (crop replaced by ageable) (#3523) 
* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain

* Removed debug prints

* Updated configs

* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain & updated wooden_tools

* ACTAULLY removed debug prints

* [WIP] Replacing bukkit treespecies 

This feature has been unofficially deprecated, (not yet fixed/marked in bukkit)
Also updated config.yml to match changes

* Updated configs

* [WIP] Replacing MaterialData with Blockdata

* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain

* Fixed most block based experience gain & updated wooden_tools

* Removed debug prints

* ACTAULLY removed debug prints

* [WIP] Replacing bukkit treespecies 

This feature has been unofficially deprecated, (not yet fixed/marked in bukkit)
Also updated config.yml to match changes

* Fixed greenterra

Replaced deprecated features
 2018-07-31 21:35:45 -04:00
t00thpick1
fecf83c79c Don't break on double drops for woodcutting. 2018-07-30 20:44:10 -04:00
Shane Robertson
4bda175328 Removed misc, print statements (#3508) 
* ACTAULLY removed debug prints
 2018-07-26 20:47:45 -04:00
Shane Robertson
ee324c77a9 Fixed errors with block-based skill experience (#3506) 
* Updated configs

* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain

* Fixed most block based experience gain & updated wooden_tools

* Removed debug prints
 2018-07-26 19:53:29 -04:00
Jamie Sinn
210b418e44 Get string before format. (#3507) 2018-07-26 19:52:15 -04:00
t00thpick1
b73eced36f Remove sound adapter 2018-07-25 20:29:40 -04:00
t00thpick1
bff454f397 Wood is not planks. 2018-07-24 20:50:17 -04:00
t00thpick1
fbe26af2d7 Merge remote-tracking branch 'origin/master' 2018-07-23 22:14:44 -04:00
t00thpick1
0a1559511a Quick and dirty 1.13 update. I.e. it now compiles for 1.13. 2018-07-23 22:13:57 -04:00
Jamie Sinn
aee60f2c09 Mctop Cooldown message correction. Closes https://github.com/mcMMO-Dev/mcMMO/issues/3470 (#3481) 2018-07-15 10:08:52 -04:00
FabioZumbi12
9ce850f84f Re-added handlersList to event. (#3234) 2018-06-13 20:50:46 -04:00
t00thpick1
cbff8482ce
Merge pull request #3427 from joblo2213/master 
Add McMMOPlayerSalvageCheckEvent
 2018-06-09 11:50:32 -04:00
joblo.2213
0035762a71
Add McMMOPlayerSalvageCheckEvent 2018-06-09 09:46:06 +02:00
Glitchfinder
e77801f3c1 Ensure all entity types function in experience.yml 
Fixes #3443
 2018-05-16 08:07:07 -07:00
Glitchfinder
c83d011faa Don't convert raw salmon to raw fish when summoning ocelots. 
Fixes #3366
 2018-05-15 19:40:48 -07:00
Glitchfinder
5aa4949baa Allow experience on crops grown with bonemeal. 2018-05-15 11:31:52 -07:00
Glitchfinder
c87b410823 Merge branch 'anvil_unbreakables' of github.com:GiovanH/mcMMO 2018-05-11 10:07:53 -07:00
Glitchfinder
e98d241452 Merge branch 'master' of github.com:ProgrammingAtDawn/mcMMO 2018-05-11 10:04:14 -07:00
GiovanH
421455224f Codebase! 2018-05-10 04:54:35 +01:00
t00thpick1
29c55312a5 Don't allow these commands on child skills. 2018-05-01 23:12:06 -04:00
Gio
2c6543da9e
More descriptive text. 2018-04-30 13:30:41 -05:00
Gio
20bbdfc4ab
Check playerdata for corruption 
Fixed a null pointer exception that would occur if the offlinePlayer object did not have a defined string for .getName();
 2018-04-30 12:54:35 -05:00
Glitchfinder
5b2ebf4aa8 Prevent shulker boxes from activating abilities. 
Fixes #3438.
 2018-04-29 23:09:52 -07:00
t00thpick1
2b159adefd
Merge pull request #3330 from hoorigan/ench-book-fixes 
Enchanted book fixes
 2018-04-28 20:04:06 -04:00
Glitchfinder
be2de1d487 Fix a duping bug that uses a coordinate error. Fixes #2979 and fixes #3429. 2018-04-15 10:19:31 -07:00
t00thpick1
6876f192de Deflag blocks when they grow, Fixes #3311, #3207 2018-04-07 13:41:20 -04:00
t00thpick1
875db44afd Don't active skills on shulker blocks Fixes #3423 2018-04-07 13:33:28 -04:00
ezeiger92
feeb17d6f0 Scale fishing drop chance by lure rather than subtracting 1 
Fixes mcMMO-Dev/mcMMO#3383
Added config option for lure enchantment modifier
Fixes lure enchantment having no effect on drops from offhand
 2018-02-15 15:48:21 -08:00
ezeiger92
6d2003d577 Remove offhand fishing rod if not in main hand 
Fixes mcMMO-Dev/mcMMO#3342
Fixed style error in last commit
 2018-02-15 13:59:10 -08:00
ezeiger92
40b609ccd8 Respect unbreakable tag on items when attempting durability changes 
Fixes mcMMO-Dev/mcMMO#3327
Fixes mcMMO-Dev/mcMMO#3391
 2018-02-15 13:38:10 -08:00
ProgrammingAtDawn
d64399df49 Calculate experience gain before processing green thumb. 2018-01-24 20:53:59 +01:00
t00thpick1
d4f2f0e11b Use new recipe constructor to avoid deprecation errors. 2017-12-17 13:31:30 -05:00
hoorigan
916d9a7c8a
ItemUtils: add ENCHANTED_BOOK to isEnchantable() 
This will (hopefully) make mcMMO aware that ENCHATED_BOOK can have an enchantment.
 2017-10-31 16:47:46 -04:00
hoorigan
6d5ab0edda
FishingManager: force enchant on enchanted book 
Added a small conditional to ensure that enchanted books get an enchantment.
 2017-10-31 16:45:08 -04:00
t00thpick1
307d483323 Dont do diminishing returns on command caused xp gains Fixes #3312 2017-10-27 20:30:56 -04:00
t00thpick1
eb4960f307 Merge pull request #3300 from EasyMFnE/master 
Add automatic Alchemy potion colorization and custom color config
 2017-10-05 19:44:47 -04:00
t00thpick1
9df72e61a2 Mob Health bars global toggle 2017-10-03 23:32:54 -04:00
EasyMFnE
fcb6391ba3 Remove leftover debug code. 2017-09-28 11:44:15 -04:00
EasyMFnE
16a77f281e Add automatic Alchemy potion colorization and custom color configuration. 2017-09-23 15:35:38 -04:00
t00thpick1
87ebf7023f Additional changes that are less important but related to the dupe fix. 2017-09-12 20:01:09 -04:00
t00thpick1
028f87653a Check length of the Y dimension of the array, not the x dimension, which will only be 16 2017-09-08 23:16:41 -04:00
t00thpick1
0e51983819 Y, not Z, very very important. 2017-09-06 00:23:35 -04:00
t00thpick1
f1f02fd005 Don't fail out of saves just because a single player fails. 2017-09-01 00:45:22 -04:00
t00thpick1
f279a979e3 Also handle bottom of world 2017-09-01 00:44:37 -04:00
t00thpick1
e0bbe9cea4 Fix error with pistons retracting near top of world. Fixes #3172 2017-09-01 00:43:11 -04:00
t00thpick1
d3cc23f6a0 Fix smelting vanilla xp boost. Fixes #3270 2017-09-01 00:32:11 -04:00
t00thpick1
4c3f3ee4e2 Dont use named seeds in replanting. Fixes #3273 2017-08-31 23:47:28 -04:00
Erik
60aa32d003 Patches! 
* Update bukkit version
* Default vanilla  exp modifier for fishing is now 1
* Fixed beetroot permission for herbalism
 2017-08-15 12:20:09 -07:00
Erik
0e7ee41444 Follow spacing convention 2017-08-05 11:53:38 -07:00
Erik
b5f6b1d97f Fix for 3250 - HashSet<Byte> to HashSet<Material> for getTargetBlock 2017-08-05 11:50:24 -07:00
t00thpick1
f1ac5739e4 [bugfix] Resolve issues with Herbalism exp. 
Due to flaws the previous changes to the configuration system combined with some bad lines in the experience.config that I mistakenly recommended, herbalism was not granting experience in most cases, as it was marking newly planted crops and such as player placed no exp granting blocks, rather than ignoring them as it should.
block types now are evaluated in 3 steps:
1: Explicit Name  i.e. ("Crops|4", "Crops|0"), Which is the material name then data value
2: "friendly name"  i.e. ("Crops_Ripe", "Crops_Ungrown"), Which is a typically data valueless name,  some of which I make up in mcMMO, but most of which are just the Material name
3: Wildcard name  i.e. ("Crops|*") Which is any block with that block value, regardless of data value

In order to be sure herbalism grants exp for you once again, make sure your configuration for herbalism looks similar to this:
https://github.com/mcMMO-Dev/mcMMO/blob/master/src/main/resources/experience.yml#L151

In terms of which blocks are listed there.  Specifically, there should be no blocks marked "ungrown"
 2017-08-01 01:33:02 -04:00
t00thpick1
8cbb57df97 Fix herbalism I think 2017-07-23 18:06:45 -04:00
wysohn
f718741044 HandlerList should be present in every Events. (It's static you know) 2017-06-17 20:16:09 -07:00
t00thpick1
c054ff851a Fix excavation treasures 2017-06-14 21:14:09 -04:00
t00thpick1
755787f9ee Add sapling types 2017-06-10 14:30:06 -04:00
t00thpick1
24f8b2fbd5 More configuration for hylian luck 2017-06-10 14:16:31 -04:00
t00thpick1
ee02a19e9a Add more configuration to shake treasures 2017-06-10 13:59:49 -04:00
t00thpick1
cb5d38c11f Leftover debug 2017-06-10 13:49:19 -04:00
t00thpick1
15436b44da Update configurations and skill block checks to be more configurable. 2017-06-10 13:47:20 -04:00
t00thpick1
fda625b235 Merge pull request #3185 from nathanprocks/master 
Add shaking from shulkers
 2017-06-07 21:22:30 -04:00
Nathan Piercy
95167f44f1 Add shaking from shulkers 2017-06-04 16:34:48 +10:00
Luck
789b51fd05
Fix for removed methods in Bukkit 1.12 2017-05-14 16:36:31 +01:00
t00thpick1
7d05c9d8e6 Add some more defaults into the config. Remove the parts that delete keys, I don't maintain config files well enough to have them remove unknown keys. 2017-04-15 00:24:39 -04:00
t00thpick1
a43ae4178a Some cleanups to mob related XP code 2017-04-15 00:04:07 -04:00
t00thpick1
c9c2c483fa Remove unneccessary code. 2017-04-14 23:34:54 -04:00
TheComputerGeek2
d6a00eaf00 Prevent disarming, bleed, and axe passives when dealing thorns damage 2017-03-06 18:03:15 -08:00
t00thpick1
69151f0855 Forgot to actually add the funfetti 2017-02-22 00:01:39 -05:00
t00thpick1
bb27d753b1 I think this should stop my fireworks from damaging people 2017-02-22 00:00:47 -05:00
t00thpick1
37ce29a5e8 Merge pull request #3094 from SupaHam/fix-chimaera-tp-cancel 
Set TeleportCommenceLocation to null after Chimaera cancellation.
 2017-01-15 22:19:51 -05:00
kanesada2
2e7f56eeb5 fix shake for WITHER-SKELETON. avoid to use getSkeltonType() 2017-01-13 14:10:55 +09:00
Ali Moghnieh
7e46d5ca08
Set TeleportCommenceLocation to null after Chimaera cancellation. 
This makes the item usable once again, as the prechecks check to make sure the location is null.
 2016-12-26 21:26:38 +00:00
t00thpick1
a2bcce9ab1 I believe this resolves berserk allowing you to take drops into your equipment slots. 2016-12-17 17:32:16 -05:00
t00thpick1
789aaec186 I should probably compile before committing in the future. 2016-12-04 21:42:26 -05:00
t00thpick1
6c5fb5f398 Fix entity kill xp 2016-12-04 20:53:51 -05:00
t00thpick1
e238ec8fc6 Merge pull request #3067 from TheBentoBox/master 
Fix 1.11 brewing, remove health bar from armor stands
 2016-12-01 00:54:39 -05:00
t00thpick1
9689f55e5c Merge pull request #3055 from jjm223/bugfix/fuel 
Rapid fuel consumption fix
 2016-12-01 00:54:32 -05:00
Jake Ben-Tovim
5f9f3e8167 Fix 1.11 brewing, remove health bar from armor stands 
This fixes brewing on the newest Spigot API builds. The Alchemy skill was completely broken due to a change in the Spigot BrewEvent constructor, which this fixes via the changes to FakeBrewEvent.java and AlchemyPotionBrewer.java. This also adds a check in EntityListener.java for armor stands, so that health bars aren't displayed for them. The health bars never really displayed properly (armor stand health acts differently from most entities), and it allowed players to punch invisible armor stands server admins may have been intentionally hiding to temporarily reveal them via a health bar, which is an issue.
 2016-11-28 21:28:05 -05:00
Jacob Martin
6388246418 Fix an issue where brewing stands will consume two fuel units for vanilla ingredients. 2016-11-13 10:26:29 -06:00
RoboMWM
86432eb426 Don't handle item pickups when Items_As_Unarmed is set to true 
If `unarmed.Items_As_Unarmed` is set to true in config, then there's no
need to be manually handling item pickups.
 2016-10-23 22:38:31 -07:00
t00thpick1
01a8a199d2 Fix a dupe bug that resulted from yet another change to piston code a couple mc patches ago. Oh well. 2016-08-20 21:47:29 -04:00
Sid Shakal
b3e1acc563 Correcting conditions related to "ghost block" mitigation. 
If radius is 1 (as it is when called elsewhere in the class), the loop
conditions fail to refresh some of the neighboring chunks, allowing for
ghost blocks to continue to occur on eastern and southern edges of the
chunk the player is in.

This commit fixes the loop conditions.

= Chunk diagram of old behavior =
-----
-RR--
-RP--
-----
-----

= Chunk diagram of new behavior =
-----
-RRR-
-RPR-
-RRR-
-----

= Legend =
P: the chunk the player is in
R and P: chunks that are refreshed
-: chunks that do not get refreshed
 2016-08-07 17:32:34 -05:00
t00thpick1
8901db4e18 Add Beetroot to herbalism skill 
Merge pull request #2918 from isokissa3/master

His was better.

(cherry picked from commit 3ed0fdf330)
 2016-06-26 17:14:19 -04:00
t00thpick1
e73e628051 Merge pull request #2951 from minoneer/brewing-fuel 
Fix brewing stands consuming all remaining fuel items
 2016-06-25 12:53:20 -04:00
t00thpick1
3bb920f22c This is completely untested but it probably works. Maybe Fixes #2966 2016-06-23 21:22:40 -04:00
t00thpick1
2bed26f18a Fix scoreboard numbering being off 2016-06-19 17:47:38 -04:00
t00thpick1
315b713005 These should definently not be hard coded in the future... but allow rabbits and guardians to be shaken down 2016-06-19 17:41:18 -04:00
t00thpick1
70de0ba00b Enable Beetroot I think 2016-06-19 17:33:43 -04:00
minoneer
25cad3afc6 Fix brewing stands consuming all remaining fuel items when the fuel bar is refilled 2016-06-09 02:10:27 +02:00
isokissa3
d0e8bb3174 Fixed spacing 2016-04-27 13:45:26 +03:00
isokissa3
6b03108052 Fixed formatting 2016-04-26 15:26:50 +03:00
isokissa3
34447ef874 Exploit fix, turning spawned pigs into zombie pigmans using lightning stike allows you gain XP 2016-04-25 18:47:15 +03:00
t00thpick1
dcd79e87e1 This command probably works 2016-04-23 00:32:04 -04:00
t00thpick1
8822b4edae Fix typo 2016-04-03 00:25:50 -04:00
t00thpick1
a24d6ff018 Missed removals 2016-03-27 11:46:00 -05:00
t00thpick1
707195f237 I honestly forgot this was in here. Fixes #2863 2016-03-27 11:12:16 -05:00
t00thpick1
4c4df60b81 Was in a second location as well. 2016-03-20 17:52:21 -05:00
t00thpick1
d1cf08c6ba Null check. Fixes #2840 #2842 2016-03-20 12:47:27 -05:00
t00thpick1
e091a8eb55 Fix material validation errors. 2016-03-20 12:42:16 -05:00
t00thpick1
d579c9a2af Merge pull request #2829 from DorCoMaNdO/master 
Stop duplicate messages from abilities.
 2016-03-17 19:38:55 -05:00
Dor
a711d3a3e3 Stop duplicate messages from abilities. 2016-03-18 02:18:40 +02:00
t00thpick1
fd3d60d112 Merge pull request #2828 from SidShakal/master 
Moved center of block drops to block center. Fixes #2544.
 2016-03-17 11:16:24 -05:00
Sid Shakal
60bfabb097 Moved salvaged material spawn center to center of top face of anvil. 
My fix for the central spawn points of various block-based item drops
moved them from the low corner of the block to the center of the block.
In the case of the salvaged materials, this moved the central spawn
point from the low corner of the top face of the anvil block to the
center of the block above the anvil block. This felt unnatural, so the
point has been moved to the center of the top face of the anvil block.
 2016-03-17 02:06:19 -05:00
Sid Shakal
2d4cf76825 ... (completing the previous style fix) 
Not sure how I missed this one. (Well, sure I do. I used the GitHub
editor for the re-casing of the variable name. Noob mistake.)
 2016-03-16 20:38:24 -05:00
Sid
4cb4a6224b Added javadoc for Misc.getBlockCenter(BlockState) 
And camel-cased the parameter name to conform to style.
 2016-03-16 15:47:24 -05:00
Sid Shakal
a6e445b7ef Minor formatting adjustments to keep my commit to code style. 
Whoops. Eclipse removed a line in imports, and I placed a brace on the
wrong line. Fixed.
 2016-03-16 12:01:52 -05:00
Sid Shakal
123a139e43 Moving the center of block drops to block center. Fixes #2544. 2016-03-16 11:47:40 -05:00
Dor
4054315c19 Custom potion brewing now consume fuel from the brewing stand. 
Fixed a glitch that let players remove the ingredient of a custom potion
from the brewing stand without cancelling the brewing task (this doesn't
seem to have caused any duplicates, once the task finished nothing
happened).
 2016-03-16 15:16:48 +02:00
t00thpick1
ec774b590b Fix potions. Fixes #2813, #2814 2016-03-16 00:39:36 -05:00
t00thpick1
1488946fc5 Merge pull request #2694 from Maximvdw/patch-1 
Fixed NPE when skill is not in config
 2016-03-12 17:56:40 -05:00
t00thpick1
4924391ae8 Merge pull request #2726 from JamieSinn/master 
If sender is console, strip colours for mctop
 2016-03-12 17:55:59 -05:00
Dor
98511136ee Fix Shroom Thumb not removing the item held. 2016-03-12 20:35:19 +02:00
Dor
40c61149cf Treat grass paths as grass. 2016-03-12 08:12:27 +02:00
t00thpick1
f3a8208425 Add new enchants and fallback to bukkit enchant name map 2016-03-11 22:55:01 -05:00
t00thpick1
cbf2f34f93 Update Treasures for potions 2016-03-11 22:42:55 -05:00
Dor
eaa1a8edca Chorus plant experience reward is now 1 instead of 2. 
Sneaking is required if the player has an item in the off hand and
they're not in a vehicle.
 2016-03-12 05:31:11 +02:00
t00thpick1
e1cf4c0c67 Merge pull request #2800 from DorCoMaNdO/master 
Fix config auto update.
 2016-03-11 22:21:59 -05:00
Dor
529c43b0e6 Fix config auto update. 2016-03-12 05:10:41 +02:00
t00thpick1
376abdf49e Merge pull request #2799 from DorCoMaNdO/patch-3 
Use getItemInMainHand()
 2016-03-11 22:09:08 -05:00
t00thpick1
11a744a772 Properly calculate potionstage 2016-03-11 22:07:27 -05:00
t00thpick1
001b11efc6 Better Auto-Update config loader, still cannot handle multiple options with the exact same name and spacing, but will not break configs anymore in those situations, just mis-comment. 2016-03-11 21:54:57 -05:00
t00thpick1
a08016647a Update to new Potions API, still supports old config options 2016-03-11 21:08:10 -05:00
Dor
a557fc7d3c Use getItemInMainHand() 
Add 1.9 blocks to be detected for experience rewards.
Add experience rewards for the Chorus plant.
Add experience rewards for the Shulker mob.
 2016-03-11 16:20:23 +02:00
t00thpick1
9bc97c6dd3 I think this fixes the auto update config function when a config file has two similar keys. (reverted from commit 52f1e33052) 2016-03-08 08:09:48 -05:00
t00thpick1
52f1e33052 I think this fixes the auto update config function when a config file has two similar keys. 2016-03-07 18:41:49 -05:00
t00thpick1
272e99d41f Master volume config option 2016-03-06 16:48:56 -05:00
t00thpick1
77b67d5a79 Merge pull request #2781 from Tslat/patch-1 
Fix infinite GreenThumb & ShroomThumb usage bug

-Not sure if this is the correct way to fix this, but it is A way, and that will due in the meantime.
 2016-03-05 23:57:25 -05:00
Tslat
5f960fd80a Update ability blacklist to include 1.8 fence[gate] types 2016-03-06 14:36:21 +10:00
Tslat
bddca30668 Fix infinite GreenThumb & ShroomThumb usage bug 2016-03-05 20:39:16 +10:00
t00thpick1
28a2b9668d I think preserve potions backwards compatability and also update documentation. 2016-03-01 17:16:59 -05:00
t00thpick1
f52d9feef8 Update Alchemy for 1.9 Configuration style has changed, but theoretically old version should still work I think. 2016-03-01 17:05:58 -05:00
t00thpick1
f77ae6ee15 Biome needs to be in the enum compatability as well. 2016-03-01 13:25:51 -05:00
t00thpick1
88b99a3835 I *think* this should be backwards compatible, I may be wrong and it could break both. 2016-03-01 13:08:11 -05:00
t00thpick1
8d16af8770 Why is my local compiler missing thigns the CI hits? 2016-03-01 12:42:26 -05:00
t00thpick1
fde9ba86a2 Actually update all sounds 2016-03-01 12:39:05 -05:00
t00thpick1
c9356f9ef5 Update for 1.9 Sound enum changes. Now only compatible with 1.9+ 2016-03-01 12:21:00 -05:00
t00thpick1
6a0529f02d Fully remove metrics. 2016-01-28 15:20:36 -05:00
t00thpick1
760178c061 Give custom perk boost the highest priority. 2016-01-28 13:37:21 -05:00
t00thpick1
0bb2642d24 Remove metrics 2016-01-11 14:12:54 -05:00
Jamie Sinn
0e34202d4d Curly braces as toothpick requested 
@andrewkm
 2015-12-20 23:05:48 -05:00
JamieSinn
3a9c55a9ea Remove ternary operators and use if/else 2015-12-12 00:04:23 -05:00
JamieSinn
2dd1775d9a Remove regex replace, does nothing 2015-12-11 23:52:14 -05:00
JamieSinn
a0635eeb08 Remove escape character at EOL 2015-12-11 23:45:17 -05:00
JamieSinn
9677653c54 If sender is console, strip colours for mctop 
Ugly ugly colours.
 2015-12-11 23:30:21 -05:00
t00thpick1
420559efec Append to existing lore when crafting Flux Pickaxes. Fixes #2557 2015-11-12 19:13:27 -05:00
t00thpick1
f4b6d7845e Add config option to auto-truncate player skill levels that exceed the configured max level. Adds #2512 
Also removes a good bit of magic numbering from FlatFileDatabaseManager
 2015-11-12 19:10:30 -05:00
JamieSinn
9c7b83a52e Strip colours from party chat when logging to console. 2015-11-12 16:06:43 -05:00
t00thpick1
ac9447d439 This is actually not correct. 2015-11-04 16:31:30 -05:00
t00thpick1
a5bcc3ce58 Correctly identify tree species. Fixes #2667 2015-11-04 16:06:28 -05:00
t00thpick1
a020890244 Remove hardcoded nerf to treefeller. Fixes #2666 2015-11-04 15:53:38 -05:00
t00thpick1
616200f20f Fix compile 2015-11-04 15:48:42 -05:00
t00thpick1
aaa69adb0c Merge pull request #2663 from MinelinkNetwork/fix-child-skill-level 
Remove hardcoded limit for parent skill levels when calculating child…
 2015-11-04 15:45:00 -05:00
t00thpick1
982ee13631 Merge pull request #2697 from SilverCory/master 
Monitor falling blocks.
 2015-11-04 15:44:45 -05:00
t00thpick1
8927e16b1f Fix skillreset argument validation. Fixes #2651 2015-11-04 15:43:07 -05:00
t00thpick1
dd01504111 Treat nether portal spawned mobs as spawner mobs. Fixes #2662 2015-11-04 15:37:17 -05:00
t00thpick1
50e727d591 Fix salvaging to return more than 1 item. Fixes #2627 2015-11-04 15:35:22 -05:00
t00thpick1
f84e98d836 Simulate block break for flux mining. Fixes #2668 2015-11-04 15:27:03 -05:00
t00thpick1
7e92905618 Comments so I don't forget why I did it like this again 2015-11-04 13:48:29 -05:00
t00thpick1
9b24dd306c Actually use Hylian Treasure config values. Fixes #2688 2015-11-04 13:35:25 -05:00
t00thpick1
aa796266a7 Don't remember what this is for, but it was in my repo so its probably important 2015-11-04 13:26:47 -05:00