Commit Graph

5271 Commits

Author SHA1 Message Date
nossr50
93a6a73b4e Revert Woodcutting translation forortuguese
Fixes #4568
2021-07-20 18:32:34 -07:00
TheBusyBiscuit
2c849d9cb4
Added a Unit Test for mc version detection (#4560)
* Added a Unit Test for mc version detection

* Merge upstream and update server software string
2021-07-05 16:02:46 -07:00
nossr50
b79d452a6d 2.1.200 2021-07-01 21:02:59 -07:00
TheBusyBiscuit
5255ae846d
Fixed #4556 (#4559) 2021-07-01 16:11:22 -07:00
stepech
e816310da8
Fix mcmmo picking wrong version on builds withou patch number (#4555)
* Fix server versioning

* Switch to regex when getting server version

* add comment

* Poor beginner mistakes

Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>

Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-07-01 16:07:44 -07:00
nossr50
de6ba4fb6a Dodge no longer triggers while blocking
Fixes #4543
2021-06-22 14:59:40 -07:00
TheBusyBiscuit
e35bfe758c
Update to Junit5 and allow for mcMMO to be compiled on Java 16 (#4552)
* Updated all unit tests to Junit5 and removed Powermock

* Some formatting

* I did not mean to commit this file

* Fixed file ending

* We don't need these extra dependencies

* Replaced delegate with Junit5 assertThrows

* Revert this change

* Re-add mockito-core

* A bit more refactoring

* Update surefire and remove failsafe

* Updated Mockito

* Add failsafe back

* Bump Mockito to 3.11.2

They literally just released that.
2021-06-21 09:21:55 -07:00
nossr50
7e28799f94 Fix SQL on 1.17 (hacky) and optimized CompatibilityManager 2021-06-15 14:19:30 -07:00
nossr50
78dc56d263 Update Deepslate Lapis Ore on MaterialMapStore 2021-06-11 14:47:11 -07:00
nossr50
e3dfdfc6ee Fixed Deesplate Lapis Ore not being recognized 2021-06-11 14:46:27 -07:00
nossr50
5f0cc2b09a Fix Smelting not recognizing the new 1.17 smeltables (like raw ores) 2021-06-11 14:22:33 -07:00
nossr50
9bb38e3193 Add more 1.17 blocks 2021-06-06 20:59:43 -07:00
nossr50
551fac84a5 Add Glow Berries to Farmer's Diet 2021-06-06 20:56:14 -07:00
nossr50
0bc25b263b Add support for Glow Berries / Cave Vines 2021-06-06 20:52:27 -07:00
nossr50
fa9a3ae766 Add support for Glow Lichen 2021-06-06 20:44:33 -07:00
nossr50
33df92ea3a Add tuff to super breaker 2021-06-06 20:42:07 -07:00
nossr50
c3d86ba6c5 Add support for Tuff 2021-06-06 20:41:59 -07:00
nossr50
b569b9456e Add support for Mossy Block and Azalea Leaves 2021-06-06 20:37:51 -07:00
nossr50
4e6e58d9ca Add more support for 1.17 (mining related) 2021-06-06 11:18:03 -07:00
nossr50
619eec7667 Add new 'raw' ores to experience values and bonus drops 2021-06-03 14:34:36 -07:00
nossr50
97cfb1cfc7 More 1.17 support 2021-06-03 14:23:19 -07:00
nossr50
c28c8d164a Adding more 1.17 support 2021-06-03 14:20:00 -07:00
nossr50
e74e1e6829 Add Amethyst related blocks to experience.yml and update Super Breaker 2021-06-03 14:04:08 -07:00
nossr50
6dbc7adf48 Add glow_squid, goat, and axolotl to experience.yml 2021-06-03 13:44:56 -07:00
lexikiq
eb10bcbc96
Disable launching from Minecart Anti-AFK (#4508) 2021-05-31 09:08:06 -07:00
nossr50
2875545fa4 Update pt_BR locale 2021-05-31 08:55:10 -07:00
snake
882f6197c6
Update locale_ja_JP.propaties (#4529)
* Update locale_ja_JP.propaties

* Escape non-ASCII characters
2021-05-31 08:34:18 -07:00
nossr50
0d2f370185 Update our dependencies to their latest versions (where possibly)
Also adds Guava as a dependency as version upgrading our dependencies resulted in the loss of the included Guava libraries
2021-04-23 15:08:57 -07:00
nossr50
da1fcfe30a 2.1.196 2021-04-23 11:26:35 -07:00
nossr50
f983f95961 Remove explosion from rupture, and rupture bug fixes and other tweaks 2021-04-23 11:13:59 -07:00
nossr50
989f7fd51b Fix Serrated Strikes not processing Rupture for additional targets 2021-04-23 10:45:19 -07:00
nossr50
e4b8b74987 Optimize imports 2021-04-23 10:37:22 -07:00
nossr50
9e7bb12dc3 Also avoid issues in this test by mocking instead of implementing an ever changing interface 2021-04-23 10:34:00 -07:00
nossr50
95c291d630 Avoid the pitfalls of implementing an everchanging interface from a SNAPSHOT 2021-04-23 10:30:26 -07:00
nossr50
9b4070d971 Don't process null McMMOPlayer events
Fixes #4499
2021-04-23 10:20:20 -07:00
lexikiq
6d0fe4fb58
Add McMMOEntityDamageByRuptureEvent (#4498) 2021-04-20 14:51:57 -07:00
nossr50
5416d1b36e Add crossbows to enchantable items list 2021-04-19 12:43:21 -07:00
nossr50
c8b1a17194 this should fix null connection error with MySQL
Fixes #4497
2021-04-19 12:20:15 -07:00
nossr50
aa562a4710 2.1.194 2021-04-18 17:52:45 -07:00
nossr50
317f966f73 Fix comment
Fixes #4496
2021-04-18 17:31:20 -07:00
nossr50
a844f27093 Fix mistakes 2021-04-18 17:28:27 -07:00
nossr50
2c44590c52 world bounds tweak 2021-04-18 17:21:37 -07:00
nossr50
16f79b9fbc Locale override now uses a specific file instead of weird name matching 2021-04-16 13:50:41 -07:00
nossr50
c29f311f1e More proper fix 2021-04-16 12:24:02 -07:00
nossr50
3d5c8e154a Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2021-04-16 10:06:42 -07:00
Mich3l3k
fee2b93b4b
Update locale_pl.properties (#4486)
* Update locale_pl.properties

Lots of minor bugs fixed and the woodcut has a better translated name (as well as the ability to woodcut etc.)
And all guides have been translated :D

* Update locale_pl.properties

Guides.Salvage.* translated
Fixed few mistakes
And added support to the latest version of plugin (like swords update)
2021-04-16 10:06:30 -07:00
nossr50
76ebd85afa Update changelog 2021-04-16 10:05:21 -07:00
Warrior
7393421607
Some patches (#4494)
Fixed blocks being dropped from blast mining even if yield was set to 0.
Tree feller not working entirely if one fake block break event is cancelled. (Fixes #4189)
Fixes no woodcutting xp being rewarded if a tree is too big while using tree feller.
2021-04-16 10:03:57 -07:00
nossr50
04459f1ea7 Fix leaderboards & fix override locale bug
Fixes #4493 Fixes #4492
2021-04-16 09:55:44 -07:00
nossr50
8fdc611fb0 Add some code to a test to check for user names being updated 2021-04-15 14:48:24 -07:00
nossr50
48de5057a4 Fix another bug where usernames can be saved as null for FlatFileDB 2021-04-15 14:43:37 -07:00
nossr50
e42eeb1dc4 Fix FlatFile leaderboards not working in certain situations + added leaderboards unit test 2021-04-15 11:53:23 -07:00
nossr50
4f5f3aff80 Oops 2021-04-15 10:43:48 -07:00
nossr50
b9201b89b8 Fix block tracking logic 2021-04-15 09:38:30 -07:00
nossr50
c9b0383600 Fix null error in BitSetChunkStore 2021-04-14 18:14:50 -07:00
nossr50
bb57e6d464 actually a radius now.. although not really 2021-04-14 16:38:19 -07:00
nossr50
700a7f4d35 Fix ArrayIndexOutOfBounds for certain events due to spigot API bug
Fixes #4488
2021-04-14 16:34:43 -07:00
nossr50
22b24b4774 JUnit 5 time 2021-04-13 17:25:56 -07:00
nossr50
d9e195f63a Add a newUser test 2021-04-13 15:22:21 -07:00
nossr50
e6239936d2 Add lastlogin tests 2021-04-13 13:40:24 -07:00
nossr50
f7339277f8 Add more tests, fix null name bug 2021-04-13 12:41:23 -07:00
nossr50
5b4af3f9ce Add loadFromFile test 2021-04-12 16:59:35 -07:00
nossr50
9f22cef175 More tests 2021-04-12 13:18:41 -07:00
nossr50
85f3221a60 FlatFileDataProcessor will handle fixing and repairing the data 2021-04-12 12:55:31 -07:00
nossr50
60013c710b Add more tests to FlatFileDatabaseManagerTest 2021-04-12 09:33:43 -07:00
nossr50
aca1d6c0b1 Add test to find duplicate names - FlatFileDatabaseManagerTest 2021-04-12 09:02:50 -07:00
nossr50
834ccc946a FlatFileDatabaseManager refactor + adding tests part 1 2021-04-09 16:45:58 -07:00
nossr50
323f496420 Fix infinite loop 2021-04-09 11:15:07 -07:00
nossr50
be44c0e417 Update SkillTools 2021-04-09 11:13:27 -07:00
nossr50
29613bc324 Add back and deprecate most of the members of PrimarySkillType 2021-04-09 10:46:12 -07:00
nossr50
c1c32cb1fd Fix mcMMO saving copies of config files into the main server directory instead of the correct place 2021-04-09 10:19:34 -07:00
Anseba
6d057c577e
Fixed minor mistakes in locale_de.properties (#4484)
* Update locale_de.properties
2021-04-09 09:37:21 -07:00
lexikiq
e7978a6ad9
Fix deaths from skeletons showing health bars (#4483)
* Fix deaths from skeletons showing health bars

* Ignore human attackers
2021-04-09 07:59:42 -07:00
nossr50
56f9341f8e Add mcMMO_Region_System.Enabled to persistent_data.yml (removed from hidden config) 2021-04-09 07:54:34 -07:00
nossr50
ccf5f30011 Add a test to FlatFileDatabaseManagerTest (more to come) 2021-04-08 13:31:07 -07:00
lexikiq
80aac93fd2
Fix death messages losing formatting (#4482) 2021-04-08 13:25:24 -07:00
nossr50
74d0d2c3f9 Comment these out for now 2021-04-08 13:22:46 -07:00
nossr50
241df06707 Don't need this anymore 2021-04-08 13:22:20 -07:00
nossr50
eec5feb2bf PrimarySkillType refactor and other refactors 2021-04-08 13:21:34 -07:00
nossr50
5080d86e44 Refactoring code part 1 to prep for adding a bunch of unit tests 2021-04-08 10:39:07 -07:00
Mich3l3k
6336101992
Update locale_pl.properties (#4470)
You're welcome :D
I will translate Guides soon
2021-04-07 16:10:50 -07:00
nossr50
10d9aa14f1 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2021-04-06 14:49:05 -07:00
nossr50
44c820089c remove UP warning 2021-04-06 14:48:53 -07:00
TheSummerGrinch
c526208da4
Various improvements to grammar and consistency. (#4479) 2021-04-05 15:50:14 -07:00
nossr50
4c237b2e9c Tweak UP msg, remove debug msg about unused keys 2021-04-05 13:50:27 -07:00
nossr50
2d11b7befc Fixed treasures only requiring level 0 2021-04-05 13:41:37 -07:00
nossr50
c5f4666525 Fixing Shake showing the wrong chance to succeed 2021-04-05 12:47:03 -07:00
nossr50
3b7f416ed9 Up default ShakeChance and remove useless entries 2021-04-05 12:39:49 -07:00
nossr50
db55635f0d Tweak UP warning 2021-04-04 18:23:13 -07:00
nossr50
e8577e4a9e Fix ClassCastException for Rupture
Fixes #4476
2021-04-03 09:46:01 -07:00
nossr50
d25784bf41 Give XP when sneaking for bushes 2021-04-02 20:33:48 -07:00
nossr50
a2ee4be86a Fix some bugs with Rupture and fix a small memory leak 2021-04-02 20:31:19 -07:00
TheBusyBiscuit
002887e244
Sanitize ability buffs when using Item Frames (#4475)
* Remove skill ability buffs from items when placed into Item Frames

* Ensure compatibility on versions before 1.16
2021-04-02 18:47:43 -07:00
nossr50
48afb81174 Another locale tweak 2021-04-02 12:16:40 -07:00
nossr50
a58a3d91dc tweak locale / command output 2021-04-02 12:13:54 -07:00
nossr50
affecfeeeb Added config options for Rupture and updated the Swords command 2021-04-02 12:02:21 -07:00
nossr50
48bf79055a Rupture has been reworked 2021-04-02 11:00:11 -07:00
nossr50
72958bb0f3 Herbalism XP exploit fix 2021-04-02 08:32:56 -07:00
nossr50
a2ba406fe5 Removed April Fools event 2021-03-31 15:14:00 -07:00
nossr50
f01efd92f5 Correct bad default config files 2021-03-31 15:06:59 -07:00