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,047 Commits 48 Branches 45 Tags 34 MiB
11c8374f6c
Commit Graph

4128 Commits

Author SHA1 Message Date
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
351abae475 Fixing Missing Locale Strings 2019-01-13 00:21:21 -08:00
nossr50
c1c249372a snake yaml demands 4 spaces 2019-01-13 00:10:13 -08:00
nossr50
6f77bb206d Refactoring + adding a new skillranks config (not functional yet) 2019-01-12 23:54:53 -08:00
nossr50
0beabbf1ec Added more missing strings 2019-01-12 22:45:54 -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
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
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
7581425f87 reducing linecount since crowdin charges by linecount 2019-01-04 09:53:44 -08: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
164d429acc Reverting a change regarding level caps 2018-12-28 10:12:21 -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
f9f2a0d691 Scaling skills from 0-1000 to 1-100 pt. II 2018-12-27 03:12:38 -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
6ec61ecb76 Fireworks from ability activation will be Opt-In, updates to strings 2018-12-24 19:05:46 -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
LogGits
96f06ca812 Fixed plugin.yml mistake (#3639) 
Accidentally forgot to add the ":" to some of the permissions.
 2018-12-09 22:59:16 -05:00
Fabrizio La Rosa
685f6d76a8 Corrected a word (#3629) 2018-12-09 18:29:40 -05:00
LogGits
840cfbe94d Updated plugin.yml to include command permissions (#3637) 
This will stop people from seeing the commands in tabcomplete for 1.13.2 if they dont have the permission for it. Should fix #3625.
 2018-12-09 18:26:09 -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
71c72045b9 Revert "Update locale_zh_CN.properties (#3541)" 
This reverts commit eb930883fa.
 2018-12-02 23:28:36 -05:00
Ghost_chu
eb930883fa Update locale_zh_CN.properties (#3541) 2018-12-02 23:27:39 -05:00
CNAmira
30ed18eb95 Update Simplified Chinese localization (#3617) 2018-12-02 23:27:19 -05:00
Fabrizio La Rosa
8508f5b8b8 Bug fix for italian locale (#3616) 
Fixed the command "/mctop Tiro con l'Arco" that with spaces was not recognized (/mctop archery is not usable if the English locale is not selected).
Now is "/mctop Arco".

That should fix also "/Tiro con l'Arco".
 2018-12-02 23:26:58 -05:00
ゆき
dfab223eb2 Fix locale_ja_JP.properties colors (#3628) 2018-12-02 23:26:38 -05:00
Andrewkm
dd82fa0791 Duplicate shulker entry (#3623) 2018-11-26 23:30:08 -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
András Marczinkó
592c3a2142 Fix woodcutting double drop item names (#3585) 2018-09-23 14:43:38 -04:00
András Marczinkó
e9ca341476 End_Bricks renamed to End_Stone (#3584) 2018-09-23 11:52:48 -04:00
Captain Justin
76617c8a61 German spelling fix (#3576) 2018-09-23 11:52:35 -04:00
András Marczinkó
10ff097232 Fix config item names (#3583) 2018-09-22 13:45:25 -04:00
Sean Porter
1e043d481a
Merge pull request #3582 from andris155/patch-7 
Wood renamed to Wooden
 2018-09-22 09:54:39 -07:00
Sean Porter
7f8c670dc1
Merge pull request #3581 from andris155/patch-6 
QUARTZ_ORE was renamed to NETHER_QUARTZ_ORE
 2018-09-22 09:54:24 -07:00
András Marczinkó
0e536a2cb3
Wood renamed to Wooden 2018-09-22 18:53:08 +02:00
András Marczinkó
090cf82a39 Fix Terracotta and stained Terracotta names (#3580) 2018-09-22 12:50:25 -04:00
András Marczinkó
6e60f39f82
QUARTZ_ORE was renamed to NETHER_QUARTZ_ORE 2018-09-22 18:49:02 +02: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
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
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
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
t00thpick1
f287b6d8a7 Update fishing experience config 2018-07-27 22:30:57 -04:00
Leomixer17
9082658357 Update locale_it.properties (#3509) 2018-07-27 18:28:44 -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
shanedrgn
6296a6adde Updated configs 
Signed-off-by: t00thpick1 <t00thpick1dirko@gmail.com>
 2018-07-25 20:20:31 -04:00
Leomixer17
99f6192965 Update locale_it.properties (#3502) 2018-07-25 19:53:23 -04:00
t00thpick1
bff454f397 Wood is not planks. 2018-07-24 20:50:17 -04:00
t00thpick1
8216dbe355 This is kinda important 2018-07-23 22:38:05 -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
906ead53dd Merge branch 'patch-1' of github.com:ChrisLane/mcMMO 2018-05-11 10:09:37 -07:00
Glitchfinder
c87b410823 Merge branch 'anvil_unbreakables' of github.com:GiovanH/mcMMO 2018-05-11 10:07:53 -07:00
Glitchfinder
0a447f68c6 Merge branch 'patch-2' of github.com:GiovanH/mcMMO 2018-05-11 10:06:58 -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
6c474c8838
Added nether bricks to mining 
As per https://github.com/mcMMO-Dev/mcMMO/issues/3426
 2018-04-30 20:38:01 -05: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