1
0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-02 07:23:29 +01:00
Commit Graph

957 Commits

Author SHA1 Message Date
montlikadani
3fc2487bfd Revert some things to prevent data losing 2020-04-16 18:55:32 +02:00
montlikadani
2113e3441c Fixed when the TAME action not works 2020-04-16 18:41:17 +02:00
montlikadani
4115bf727a Now the command boost works again 2020-04-16 18:05:09 +02:00
montlikadani
47280b04d0 Improve database loading 2020-04-13 17:44:14 +02:00
montlikadani
a9c94d36d8 Correct cows milking 2020-04-13 15:58:11 +02:00
montlikadani
7cd0423647 Added milking mushroom cow with bowl
Closes #740
2020-04-13 15:53:03 +02:00
montlikadani
e1d22533d1 Only count the jobIds from database to prevent workers are set to 1 if there is no workers 2020-04-13 14:56:12 +02:00
montlikadani
c4d0d0101a Do not show the exp result when less than 0
Closes #737
2020-04-12 19:26:16 +02:00
montlikadani
423248105b Fixed issue when enchants not works 2020-04-09 19:36:48 +02:00
montlikadani
93bec7e234 Fix issue when the jobs guis not opened 2020-04-05 12:13:01 +02:00
montlikadani
58b045f5e3 Fix another initializer error when the #getName method is not exists in some softwares 2020-04-03 20:57:58 +02:00
montlikadani
d081da693d yes 2020-04-03 13:26:17 +02:00
montlikadani
297a89126d Move permission names to another string
- Exclude some projects in maven from other plugins
2020-04-03 13:25:29 +02:00
Zrips
fb5fad2a6c Lets show more informative bossbar 2020-04-02 18:07:38 +03:00
Zrips
a40698f543 Fixing material translations 2020-04-02 17:42:28 +03:00
Zrips
55e3eb8214 gtop command pagination fix
additional fix for sign updates after adding new sign
2020-04-02 17:22:20 +03:00
Zrips
d1d467bc0d Tamed entity should be alive... 2020-04-02 16:46:21 +03:00
montlikadani
2ba71946ca Updated locale files 2020-04-02 15:28:14 +02:00
Zrips
823f89707d Fixing broken sign updates 2020-04-02 16:24:39 +03:00
Zrips
891bca964a Fixing issue with same quest not being able to handle same material for
different actions
2020-04-02 15:36:31 +03:00
montlikadani
22d7b482b5 Temporary remove boost timers
- Fix issue when the quest does not contains "," char will not added the correct values to the list
2020-04-02 13:50:42 +02:00
montlikadani
5177ee2213 Fixed slow data loading error
The slowness was caused by saving to a continuous database, so a method ran multiple times
2020-03-30 11:52:37 +02:00
montlikadani
5a090c4242 Improve connecting to database 2020-03-29 18:28:21 +02:00
montlikadani
d81bdfcc1c Now you can fill the gui with air 2020-03-29 16:30:31 +02:00
montlikadani
9f932db63a Delete a column from jobNames before inserting to prevent errors 2020-03-29 13:44:16 +02:00
montlikadani
be9af51dc7 Another fix for total workers 2020-03-28 19:14:18 +01:00
montlikadani
825d2ecfdc Fix bossbar progress is higher than 1.0 2020-03-26 19:27:31 +01:00
montlikadani
f55be69ad2 Fixed issue when not calculated correctly the total workers (again) 2020-03-26 15:42:36 +01:00
montlikadani
f4c24d2e26 Drop jobs config table, we don't need anymore 2020-03-26 15:26:55 +01:00
montlikadani
53824f1851 Fix NPE on death event 2020-03-26 12:08:25 +01:00
montlikadani
40648f2701 Use getOrDefault in some cases to make less code 2020-03-26 11:21:44 +01:00
montlikadani
06db89af5e Fixed signs merging issue 2020-03-26 10:27:17 +01:00
montlikadani
9e006ebe89 Improved baking action doesn't pay enough when items are on another block
- Removed some deprecated methods
2020-03-26 09:12:39 +01:00
Zrips
83377ddee0 Better way to fire everyone from every job
fireall all needs a console check
2020-03-25 16:42:00 +02:00
Zrips
b6e4b9cfb2 This is continue and not return 2020-03-25 16:08:23 +02:00
Zrips
f4011043d7 Extra comments 2020-03-25 16:01:12 +02:00
Zrips
843b07b176 Lets allow to disable each job separately in specific worlds 2020-03-25 14:08:33 +02:00
montlikadani
e4085da71c Fix error in jobs give command
- Fixed error on startup where the Enchantmnt#getKey is null.
2020-03-24 14:08:37 +01:00
Zrips
ac40c2e266 Lets allow to click on stats line to show information about job 2020-03-24 14:56:32 +02:00
montlikadani
f6bd87fe4c Update all signs on player doing something in a job 2020-03-21 15:13:47 +01:00
montlikadani
9fa5dfb2aa Fix NPE on mythicmobs 2020-03-21 13:18:27 +01:00
montlikadani
42969fb8b3 Added bypass permission for taxes 2020-03-21 12:57:16 +01:00
montlikadani
f9f745e63a Fix NPE when the jobs player are null during exploring chunks 2020-03-15 14:36:52 +01:00
montlikadani
15f72e6b38 Some formats 2020-03-13 17:18:36 +01:00
montlikadani
5745ad65a0 Properly fix issue with boost commands 2020-03-13 16:54:29 +01:00
montlikadani
fad0fcee55 Removed some redundant null checks and methods 2020-03-13 16:12:46 +01:00
montlikadani
d5c942363e Fix issue when the world is not exists and throws errors 2020-03-08 14:12:29 +01:00
montlikadani
4f39da6db4 Added sub-command to fire all players from all job 2020-03-06 16:32:58 +01:00
Brian
381253eaf3
Fixed issue when the player is not online and sent to him the payment (#686)
- Fix issue when sending an invalid page sender on playerinfo command.
2020-03-03 21:56:50 +01:00
montlikadani
f8d9862a8b Fix NPE when getting quest 2020-03-03 19:47:53 +01:00
montlikadani
ab3ea2e77d Fix income spam when clicked with empty bottles on the bee blocks 2020-03-03 18:42:26 +01:00
montlikadani
ef054e5a30 Lets allow 4 bytes of utf-8 chars 2020-03-01 19:15:21 +01:00
montlikadani
02178fc719 Add Boss support 2020-03-01 14:19:40 +01:00
montlikadani
f649b004cd Lets start working on boost time 2020-03-01 13:10:16 +01:00
montlikadani
41e2056910 Lets try to fix issue with signs merging
- Fixed issue when the name of the player splitted if the name os longer than 10.
2020-02-24 19:44:52 +01:00
montlikadani
2177261786 Lets save the jobs points after bought an item from jobs shop 2020-02-23 10:31:19 +01:00
montlikadani
ea3cc04998 Improve furnace and hopper saving
- Fixed database syntax issue when getting the global top list
2020-02-22 12:43:02 +01:00
montlikadani
f1b1ba48e4 Lets update the database if have changes for points 2020-02-21 18:41:11 +01:00
montlikadani
d43817520f Should be fixed issue when the gui size is not higher than 54 2020-02-20 16:47:06 +01:00
montlikadani
5f4713a68a Fix NPE when someone removed the section from shop file 2020-02-20 16:27:07 +01:00
montlikadani
204b506868 Fixed issue when not counted the total workers of that jobs 2020-02-18 19:13:26 +01:00
Zrips
1f627d1ae4 ReFix 2020-02-15 18:50:10 +02:00
Zrips
28d93733d7 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2020-02-15 18:43:49 +02:00
Zrips
d9791c51fa Fixing name translation and material recognition in some particular
situations
2020-02-15 18:33:18 +02:00
montlikadani
6c06ba6191 Fix when the user job placeholder not work 2020-02-15 17:25:23 +01:00
montlikadani
368417d59e Correct some material ids 2020-02-15 16:55:57 +01:00
Zrips
c38fe742b4 Correcting income when we have same materials but different data values 2020-02-15 17:48:22 +02:00
Zrips
a707bf8155 Fixing jobs browse on older versions 2020-02-15 17:33:11 +02:00
Zrips
7e78a43094 Good old fashion way to get target block which seem to be working on
older versions
2020-02-15 16:41:23 +02:00
Zrips
85cdfe1193 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2020-02-15 15:53:26 +02:00
Zrips
11bcc004e5 Lets use PageInfo if we want to have correct pagination for top and gtop 2020-02-15 15:52:01 +02:00
montlikadani
44cfb5d808 Update translations from crowdin 2020-02-15 14:06:07 +01:00
montlikadani
09fe31dba1 Added option to separate quest objectives with comma ","
... to prevent creating many rows

- Minor code clean up
2020-02-15 13:34:23 +01:00
montlikadani
a1c2274b1b Temporary fix when the user have a lot of jobs and throws error
This temporary fix the ArrayIndexOutOfBoundsException when the user have a lot of jobs in the file and opens the GUI, will crash it. #666
2020-02-11 19:19:05 +01:00
montlikadani
7271bda0c5 Fixed issue when not calculated correctly the jobs workers
- Fix NPE when getting all jobs and a job not found by id
2020-02-10 21:05:59 +01:00
Valtn
1cb12c1a46 Remove duplicate item keys from jobConfig.yml 2020-02-06 22:35:47 -05:00
montlikadani
079b0db08d Added option to disable joining to job through gui 2020-02-06 18:48:20 +01:00
montlikadani
118b6d8459 Fixed issue when used permissions option and contains "." char, will changes the config, so it not works 2020-02-06 18:35:27 +01:00
montlikadani
a4c75ac575 Added option to define per-permission leave from job
- Some integer placeholders should returns 0 if the player have no jobs.
2020-02-05 16:54:43 +01:00
montlikadani
975dd3cd87 Option to filter hidden players from tab-complete
This is incomplete...
2020-02-03 21:16:09 +01:00
deadcutlass2
87902519c9
fixed income and points progression equations (#660)
added a missing portion of the equations so it functions as intended of reducing payment by a percentage of the baseincome and the baseincome per level
2020-02-02 14:34:10 +01:00
montlikadani
8eb27047f0 Fix build and code clean up 2020-02-01 16:38:15 +01:00
deadcutlass2
cdb91e0cce
Added 2 placeholders to show the original number of exp and the formatted (#659)
fix a discrepency between formatting of jexp and jmaxexp as well as adding unformatted versions for math
2020-02-01 16:21:15 +01:00
montlikadani
cef180c00b Added option to change the disabled worlds behaviour 2020-01-29 17:24:02 +01:00
montlikadani
b461fda5f6 Fixed MySQLSyntaxErrorException when the limit value less than 0
https://pastebin.com/hK1LnPi9
2020-01-29 16:53:46 +01:00
montlikadani
d5752453dd Fixed NPE when class instance is null 2020-01-28 18:25:14 +01:00
montlikadani
a521ac7b5a Finishing the exp saving in double format 2020-01-28 18:15:51 +01:00
montlikadani
0d684ea41c Update job not found message 2020-01-28 18:05:10 +01:00
montlikadani
892c91cdf0 Fixed issue when buying items from shop and not setting enchants to item 2020-01-28 18:00:42 +01:00
montlikadani
5aa4f0b763 Fixed NPE when MythicMobs plugin not found on plugin reload 2020-01-28 17:23:47 +01:00
montlikadani
8f067f4646 Fixed FileNotFoundException when using "en" locale 2020-01-28 17:18:13 +01:00
Zrips
8e08543d83 Fix for MythicMobs not working after jobs reload 2020-01-27 17:52:25 +02:00
Zrips
33c14e474c Lets initialize only when we need them. 2020-01-27 16:19:12 +02:00
Zrips
66fae7ed39 Fixing pagination 2020-01-27 12:50:42 +02:00
Zrips
0d4123b20f None job should be more None 2020-01-27 12:17:50 +02:00
Zrips
50a63b90fa Lets not check mythycMobs if plugin is not present 2020-01-27 12:14:27 +02:00
montlikadani
0b43b7e91a Reworked the initialization of dependencies 2020-01-26 17:48:23 +01:00
montlikadani
066c0dd2b6 Remove bossbar on server shutdown 2020-01-26 13:41:34 +01:00
montlikadani
e6a128d876 Added ability to change the colors of required jobs, levels 2020-01-26 13:04:51 +01:00
montlikadani
643cfcbb0d Add support for future version of actionbar 2020-01-26 12:17:59 +01:00
montlikadani
12b262b6b4 Fixed some Exception issues
- Fixed IllegalArgumentException when generating TranslatableWords files
- Fixed NPE when the quest section not found
- Fixing version check (from 70bc47773e)
2020-01-22 18:59:02 +01:00
montlikadani
1e2a2473b0 Do not ignore deprecated and not used methods
For developers are needed if not updating the Jobs
2020-01-21 17:30:29 +01:00
Zrips
c343407223 Deprecating points methods and moving everything into player object 2020-01-20 23:18:50 +02:00
montlikadani
28a8d28818 Use double for saving the experience 2020-01-14 17:25:27 +01:00
montlikadani
acc22ea436 Added messages to log commands to show the total amount of money, exp & points 2020-01-13 20:45:40 +01:00
montlikadani
95c3ae3578 Fixed issue when the RequiredJobLevels not works correctly 2020-01-13 15:56:25 +01:00
montlikadani
1ecffe1895 Fixed NPE when loading the chunks from database
- Fixed NPE when getting the quests and null
- Removed some deprecated methods
2020-01-08 17:51:40 +01:00
Zrips
9555d2d79a Lets recreate comments and default fields in jobconfig file
slab type should be in string format for backwards compatibility
2020-01-06 18:19:56 +02:00
Zrips
b54f85a5a3 Fixing Bake and Collect word translations 2020-01-06 16:01:49 +02:00
Zrips
c3d70a4ccf This should be done in sync. Low frequency task, we can afford it. 2020-01-05 17:00:10 +02:00
Zrips
1a1ce2fa59 Correct ravager ID 2020-01-05 16:45:48 +02:00
Zrips
8c4ae9dcf5 Lets allow custom names for MythicMobs 2020-01-03 17:12:29 +02:00
Zrips
ca8ea40f7f Optimizing chunk explore methods to have better performance and use less
memory. Option to compact database
2020-01-03 13:57:45 +02:00
Zrips
4d0ed50e2b Fix for issue with smoker and blast furnace not removing ownership on
hopper fillups when you have PreventHopperFillUps set to true
2020-01-03 13:03:20 +02:00
montlikadani
79d3511b67 Added bee_nest and beehive as a collect action 2019-12-31 17:16:58 +01:00
montlikadani
6a017df07f Just some optimizations 2019-12-24 12:08:11 +01:00
montlikadani
db987fb532 Lets make database asynchronously when joining 2019-12-23 10:33:20 +01:00
montlikadani
3e0ed72a3f Fix NPE when a job not found with that id
WeakHashMap is not safe for saving datas, because it will clears the whole data from it and the database will crash it. Described here: https://www.baeldung.com/java-weakhashmap#overview

- Fixed issue when the bone meal still acts as placed block
2019-12-23 09:43:49 +01:00
montlikadani
5585637258 Remove deprecated class & final modifiers 2019-12-21 17:50:49 +01:00
montlikadani
f3ee53d7ca Lets use CMI configreader 2019-12-21 17:21:47 +01:00
montlikadani
e1665f55d4 Bonus output colors can now be changed from config 2019-12-14 18:08:43 +01:00
montlikadani
d30f0d578d Fixed issue when used a dev-build of papi 2019-12-13 17:07:42 +01:00
montlikadani
26748a4ac7 These entities have an internal id 2019-12-12 14:43:23 +01:00
Zrips
390b1a47ba Initial 1.15 support 2019-12-12 11:39:42 +02:00
montlikadani
834da89d10 Fixed when the boost commands are not worked 2019-12-07 14:58:34 +01:00
montlikadani
04fda3bb86 10x faster material recognition
From 34ddd20a0a
2019-12-02 17:35:37 +01:00
montlikadani
d590153222 Move & remove some methods to decrease the file size 2019-11-26 20:08:37 +01:00
montlikadani
6319c69c29 Lets generate translations folder before creating file when updating from old versions 2019-11-26 19:31:13 +01:00
montlikadani
7c359c6749 Fixed exception if the enchantment level is null
- Add max reconnects to prevent server slow loading
2019-11-23 13:38:03 +01:00
montlikadani
92e9e9d15b Adding and taking exp should calculating correctly 2019-11-17 12:56:13 +01:00
montlikadani
5fe7df1bc5 Fixed SQLException when inserting a job 2019-11-10 12:50:41 +01:00
montlikadani
cdd95e2a9b Added cost for skipping quests 2019-11-09 19:50:09 +01:00
Zrips
389424fbb8 Vacuum is our friend 2019-11-06 11:04:27 +02:00
montlikadani
ecf07433df Lets fix quest description showing in list 2019-11-05 19:03:14 +01:00
Zrips
e52be093d6 Version up 2019-11-04 16:30:15 +02:00
Zrips
e7c49d9006 Lets allow quest skipping 2019-11-04 16:27:09 +02:00
Zrips
c598b45fc7 Fixing daily quest resets 2019-11-04 14:54:00 +02:00
Zrips
0ece576f58 Correct way to switch buttons 2019-11-04 12:41:57 +02:00
montlikadani
4033ae1074 Temporary fix for button click options 2019-11-03 16:19:26 +01:00
montlikadani
3a7eb65472 Fixed jobs GUI when opened showing the same action names
- Optimized the shooting of firework random
2019-11-02 15:32:53 +01:00
Zrips
14d60ff63d Convert data back to previous state, just in case 2019-10-31 11:08:37 +02:00
Zrips
caf1dde0b9 Correct sign update 2019-10-31 10:39:59 +02:00
Zrips
965b74b45a Lets keep backwards compatability for time being 2019-10-31 10:32:08 +02:00
Zrips
633ad3dcc3 No go on sign updates on regular intervals... 2019-10-31 10:29:39 +02:00
Zrips
b142d68c63 Lets move BlockProtection save into player save thread and schedule it 2019-10-30 11:12:43 +02:00
Zrips
f83f9c8547 Lets record empty fields instead of keeping NULL for sqlite systems
which cant handle them until future updates
2019-10-30 11:01:39 +02:00
Zrips
35f530ddc4 NPE for title name 2019-10-30 10:39:37 +02:00
Zrips
4cf033618b lets not add into cache when loading data 2019-10-30 10:36:35 +02:00
Zrips
536eac2613 Lets move shop gui to CMI handling type one
We have to re register events for GUI
2019-10-30 10:29:59 +02:00
Zrips
7a0295b410 Lets check for NPE 2019-10-30 09:55:31 +02:00
Zrips
eccd0f506a Extra information when material is not a desired block 2019-10-29 16:05:04 +02:00
montlikadani
ec383bb28a Merge branch 'master' of https://github.com/Zrips/Jobs 2019-10-29 15:00:34 +01:00
montlikadani
9932ef47e5 Ignore deprecated methods usage 2019-10-29 15:00:16 +01:00
Zrips
1932648fd5 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-10-29 15:59:24 +02:00
Zrips
3b961ab9a3 Lets allow integers for item boosts 2019-10-29 15:58:35 +02:00
montlikadani
e03c0812ff Remove unnecessarry class register for browse 2019-10-29 14:54:00 +01:00
Zrips
64bbc0fe29 Limiting top list to defined amount 2019-10-29 15:50:40 +02:00
Zrips
eed6e56840 Allow leaving job by using middle mouse click 2019-10-29 15:39:18 +02:00
Zrips
804da86dc1 Lets use CMI Gui handling instead of messy old one 2019-10-29 15:37:31 +02:00
Zrips
184430f4f6 In case locale is a string list and not a string line 2019-10-28 14:09:17 +02:00
Zrips
0a7072ffab Fixaru for multiserver compatibility issue 2019-10-28 13:55:18 +02:00
Zrips
0b1c035c4b Lets clear out block protection by set days limit on plugin load 2019-10-28 13:02:52 +02:00
Zrips
8e7a959f39 Lets switch autocommit when commiting in case its in true state 2019-10-28 12:49:09 +02:00
Zrips
9efaa425f2 Fix for new placeholderAPI hook not working correctly 2019-10-28 12:33:26 +02:00
Zrips
ebe321fc42 Missing locale for itembonus when you are not in that job
Lets allow to not apply bonus to a negative income, this will change
previous default behavior and will not add bonus to negative income from
now on unless changed in config file
2019-10-28 12:20:04 +02:00
Zrips
9f8d525fbc If MythicMobs are not present, lets return raw name 2019-10-28 11:36:02 +02:00
Zrips
db00657c89 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-10-28 11:31:46 +02:00
Zrips
adc3f8b385 This was a test code... 2019-10-28 11:31:36 +02:00
montlikadani
02a6a11cb7 Lets update translations 2019-10-28 10:00:23 +01:00
Zrips
7a52b9c94d Lets recalculate limits after levelup 2019-10-28 10:58:24 +02:00
montlikadani
d98bb4aaf9 Bake income should work now 2019-10-26 12:06:21 +02:00
montlikadani
c825a2de56 Rename cook to bake
Correct English
2019-10-26 11:37:40 +02:00
montlikadani
c36df666be Lets start working on Cook action 2019-10-26 11:30:58 +02:00
montlikadani
d740b534c3 Fixed server crash when adding block protections 2019-10-20 17:57:26 +02:00
montlikadani
558a0abfad Fix issue for other versions the getView() is not existent 2019-10-20 17:13:42 +02:00
Zrips
fb4f80c341 Updated words_ru file by Lexon2 2019-10-20 13:21:21 +03:00
montlikadani
e2629b4ea6 Better handling for jobs GUI interact
- Minor loading improvement speed for connecting to the database
2019-10-18 17:01:18 +02:00
montlikadani
c2e0dcd366 Lets try to fix inventory dragging issue on jobs browse 2019-10-17 19:06:00 +02:00
montlikadani
65d0b9a811 Change logic for reload 2019-10-16 20:21:50 +02:00
montlikadani
3b8ad58d05 Lets make async for convert sub-command
- Some null checks
2019-10-16 20:19:05 +02:00
montlikadani
d9beab45da Nothing 2019-10-06 17:51:11 +02:00
silas lankford
51742dc97d Fixed issue for beetroots when does not worked correctly in default config (#552) 2019-10-03 17:27:08 +02:00
montlikadani
020367fc5e Fixed issue for sign updates 2019-09-30 19:51:05 +02:00
montlikadani
f48e6dcec4 Speed up the version checking of papi 2019-09-26 20:44:20 +02:00
montlikadani
ac9bfcc0b0 Do not hide the item from shop 2019-09-26 20:07:26 +02:00
montlikadani
f894a6aa09 Added option to jobs shop to hide icon if a player there are no enough points 2019-09-25 19:08:48 +02:00
Zrips
6dfd0d94e8 Table conversion to use ID's 2019-09-24 12:27:32 +03:00
montlikadani
865ad64c18 EditQuests sub-command should work now 2019-09-23 18:14:02 +02:00
Yiğit Duman
0057bd3aba Fixed issue when used 1.12 and lower versions then some materials not work correctly (#550) 2019-09-23 17:43:53 +02:00
montlikadani
f0ce3fcdc4 Re-add deprecated pointsData method to prevent issue from plugins 2019-09-23 15:32:43 +02:00
Zrips
9a73f1eb0d Don't force economy to be done in sync... 2019-09-22 11:51:07 +03:00
Zrips
5c7c4621e5 SqLite has different syntax for unique column definition 2019-09-22 11:28:46 +03:00
Zrips
b568195624 Lets check NPE 2019-09-22 11:19:54 +03:00
Zrips
f02902fb1e Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-09-22 11:18:57 +03:00
Zrips
e1cddfa8c8 Extra update 2019-09-22 11:18:43 +03:00
montlikadani
5600b3af6f Quest objective amount is now optional (default 1)
- Some fixes for saving quest objectives
2019-09-20 21:23:27 +02:00
montlikadani
1513e32afc Added option to leave from job in jobs GUI 2019-09-20 16:20:43 +02:00
montlikadani
5d856f0fbc Jobs toggles will not be saved from now instantly when get income 2019-09-19 20:22:07 +02:00
montlikadani
2cfff7a53b Lets update locales 2019-09-19 18:29:32 +02:00
montlikadani
71fe75c884 Lets add editquests strings and fix some issues 2019-09-19 18:12:36 +02:00