Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-14 10:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,103 Commits 14 Branches 68 Tags 88 MiB
11906ef1c9
Commit Graph

2082 Commits

Author SHA1 Message Date
SirYwell
cb342de934 Check merge status from correct plot 2021-06-04 13:39:03 +02:00
SirYwell
ea0342f100 Enqueue on unlink 2021-06-04 13:39:03 +02:00
NotMyFault
cd57741a51
Fix typo introduced in f4552e358d 2021-06-03 12:53:47 +02:00
NotMyFault
f4552e358d
Fixes #3027 
- Ditch slf4j in favor of log4j. slf4j is (unfortunately) very much unmaintained at this time and future versions of MC (1.17+) will use log4j version 2.14.1 onwards over some ancient sfl4j version.
- Using log4j reduces our jar size as well, because we don't need to bridge it as the game provides it natively.
 2021-06-03 12:40:27 +02:00
NotMyFault
5a5d1f5e62
Fixes #3063 2021-06-01 21:54:00 +02:00
NotMyFault
21214814b7
Fixes #3032 2021-05-31 21:59:15 +02:00
NotMyFault
3ac93dcfca
Enhance /plot target & expiry confirm message 2021-05-28 20:21:41 +02:00
NotMyFault
c509882a18
Enhance alias message with placeholders 2021-05-28 11:37:13 +02:00
Orlaando
c146d6207d
Make /plot pardon an alias of Plot Remove (#3071) 
* Make /plot pardon an alias of /plot undeny

* Make Remove state more clearly what it does

* Lazily target v6
 2021-05-28 11:01:42 +02:00
NotMyFault
dc7e6010cb
Fixes #3073 
- Also add new caption if attempting to clear an empty alias
 2021-05-27 17:06:04 +02:00
NotMyFault
b1fc17e045
Remove scripting from javadocs 2021-05-25 20:51:26 +02:00
NotMyFault
daf0e6e1ba
Use same creation message for templates like for setup 2021-05-25 11:02:37 +02:00
NotMyFault
6f263735f0
Move notification-as-actionbar into the Chat config block 
- Move titles alongside all its new options into its own config block
- Move `titles-as-actionbar` into the new titles block
- Enhance notification about removed config entries
 2021-05-24 21:52:27 +02:00
NotMyFault
1d2aa74e51
Add actionbar message for notification flags 
- Move title_as_actionbar boolean into enabled_components
 2021-05-24 13:49:00 +02:00
Glare
a69b1d895c
Implemented the ability to change titles to actionbar on plot entry (#3060) 
* Implemented the ability to change titles to actionbar on plot entry

* Fixed typo in action

* Updated explanation in Javadoc

* Implemented suggestions

* Remove excess import

* Implemented PR suggestions

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-05-23 17:28:03 +02:00
NotMyFault
399d77c60f
Component-ify plot setup wizard 
Touches #3068
 2021-05-22 19:49:22 +02:00
NotMyFault
b768ee6d41
Don't send teleport message before the teleportation is initiated 2021-05-22 18:15:34 +02:00
NotMyFault
58faffed6d
Remove chat.interactive option 
Whether the chat is interactive or not can be declared in the strings.json by using MMs <click:_action_:_value_> type.
 2021-05-22 13:22:44 +02:00
NotMyFault
87706d471b
Add option for legacy sign material 
Follow up to cde27899dd
 2021-05-22 12:34:04 +02:00
Glare
eb7eb15ee7
Implemented tab completion for /plot help (#3053) 
Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-05-22 02:23:54 +02:00
NotMyFault
a17085bb18
Remove dead imports 2021-05-21 20:56:44 +02:00
NotMyFault
cde27899dd
Fixes #3064 2021-05-21 19:14:13 +02:00
NotMyFault
93ff778de0
Add administrative override for /plot components 2021-05-21 17:54:26 +02:00
NotMyFault
17f91c8eb9
Make /plot rate GUI items customizable 
Bye bye legacy items :)
 2021-05-21 16:48:34 +02:00
NotMyFault
7775cd0073
Do not rely on a static file path 
Doing so will cause issues with the `--plugins` flag.
E.g. `java -jar server.jar --plugins /path/to/plugins/`
 2021-05-21 00:35:19 +02:00
NotMyFault
cc48f273c0
Fixes #3057 
Actually execute a kick from server if ordered
 2021-05-20 21:59:05 +02:00
NotMyFault
c8406681d7
Notify the kicked person over the actor 2021-05-20 21:22:00 +02:00
NotMyFault
a05dd19986
Fixes #3058 
- Anonymize meta data keys
 2021-05-20 21:04:07 +02:00
NotMyFault
aae350c1b3
Enhance flag tutorial message 2021-05-20 19:57:06 +02:00
NotMyFault
9c59bfde52
Rephrase message if user has no access to sub-command help pages 2021-05-19 23:48:32 +02:00
Patrick "IPat" Hein
eb9d7e97d9
Bug through last Economy PR - Withdrawn money for non-affordable plots (#3036) 
* Replaced economy supported (Vault) check within cost condition with a pre-eliminating if-guard

* Negate mob-place flag debug message

* Actually prevent purchase of plots if they can't afford it (whoops)

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-05-19 17:44:45 +02:00
SirYwell
a2b8e4493f Fix infinite loop on multi auto (fixes #3022) 2021-05-18 22:30:40 +02:00
NotMyFault
e97bc25fb8
Log plot chat to console 
- Fix plot music removal template
- Fix debug args
 2021-05-17 10:35:09 +02:00
NotMyFault
9dc0396411
Fix plot list coloring 2021-05-16 22:47:02 +02:00
NotMyFault
3748d8e246
Minor cleanup in favor of Java 16 
- Addressing a few command deprecations during the major release superseded by toggles
- Don't swallow SQL warnings in loggers behind debug, as it's often set to false
- Deleted JavaVersionCheck, it's part of ServerLib.
 2021-05-15 20:39:16 +02:00
NotMyFault
0341111f8f
Add lectern-read-book flag 
Fixes https://github.com/IntellectualSites/PlotSquared/issues/2980
 2021-05-14 18:22:02 +02:00
NotMyFault
a7c4b40fcc
Add no-portals and deny-portal-travel flag 2021-05-14 15:51:20 +02:00
Aurélien
6fd55b47c2 Fix typo 2021-05-13 21:41:10 +01:00
NotMyFault
3d7c191d1c
Make the plot jukebox gui translatable 
Fixes https://github.com/IntellectualSites/PlotSquared-Translations/issues/2
 2021-05-13 20:21:19 +02:00
NotMyFault
9344e1ca79
Make /plot setup header translatable 
- Document a couple of permission nodes
 2021-05-13 13:32:34 +02:00
Patrick "IPat" Hein
68eb5cd74f
Replaced economy supported (Vault) check within cost condition with a pre-eliminating if-guard (#3014) 2021-05-12 19:00:14 +02:00
NotMyFault
3a280f3b6a
Fix a few typos 2021-05-11 19:26:39 +02:00
NotMyFault
19cea0e129
Un-stringify plot id calls 
- PlotId#toString() already stringifies IDs, no need to call String.valueOf()
- Add tab completion to `/plot debugroadregen`
- Add `plots.flag.notify-leave.bypass` permission separating from notify-enter
- Add message notifying the player if the attempt to enter a plot they are denied from
 2021-05-11 18:50:37 +02:00
Patrick "IPat" Hein
2c40648a60
Fixed feedback recipient for notify flags (Owner instead of entering / leaving player) (#3011) 2021-05-11 18:26:24 +02:00
NotMyFault
48815649a8
Clarify native dependency versions 2021-05-07 22:12:14 +02:00
NotMyFault
b37ad79e50
Beautify empty /plot caps output 
Also strip prefix from empty plot description
 2021-05-07 09:59:17 +02:00
NotMyFault
a990205d41
Fix empty templates when vault not found 2021-05-07 01:53:18 +02:00
NotMyFault
891230c78e
Fix /plot sethome returning usage message & working on unclaimed plots 2021-05-07 01:27:11 +02:00
NotMyFault
8bfdf8ecf2
Fix /plot cluster sethome triggering usage message 
Enhance cluster messages a bit
 2021-05-07 01:18:33 +02:00
NotMyFault
78655102b9
Fix flag exception coloring 2021-05-06 19:06:50 +02:00
NotMyFault
491a171409
Fix invalid backup messages & component prefix & update minimessage 2021-05-06 10:30:04 +02:00
NotMyFault
b3aec8f839
Fix empty default flag message 2021-05-02 20:31:23 +02:00
NotMyFault
0106a4222d
Address a few deprecations 2021-05-01 18:33:02 +02:00
NotMyFault
11af33f2d5
Fixup inbox javadocs 2021-04-30 19:04:44 +02:00
NotMyFault
812442fbbc
Don't double color the inbox 2021-04-30 13:22:00 +02:00
NotMyFault
1750dd3b97
Opt in future proof gradle features 🚀 (#2950) 
* Opt in future proof gradle features

* Resolve merge conflicts
 2021-04-30 09:50:22 +02:00
NotMyFault
ffe298710d
Lazy merge v5/v6 2021-04-28 20:17:10 +02:00
NotMyFault
5cdb7e76fd
Update wiki and issue links 2021-04-28 20:06:19 +02:00
NotMyFault
de597391dc
Fix keep-inventory flag & adjust disallowed-blocks translation 2021-04-21 11:03:14 +02:00
NotMyFault
e1fb8c1ae5
Take building min height also into consideration 2021-04-11 10:12:37 +02:00
Hannes Greule
a5c43bb823 Suggest flag name instead of value 2021-04-10 09:34:53 +02:00
NotMyFault
050cf3edb3
Update a few dependencies 2021-04-04 13:30:09 +02:00
NotMyFault
84d5ebfa41
Make use of because args 2021-04-03 23:15:40 +02:00
NotMyFault
6bc4e5b45c
Re add per-world-teleport 2021-04-03 22:34:43 +02:00
NotMyFault
496fe09f78
Merge branch 'v5' into v6 2021-04-03 22:31:54 +02:00
Hannes Greule
74a9c2f6b4 Reimplement per-world-visit 2021-04-03 21:48:21 +02:00
NotMyFault
dd9edb68b2
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/23 2021-04-02 23:48:16 +02:00
NotMyFault
b02177e1d0
Add tab completion for gamemode flag 2021-04-02 23:20:39 +02:00
NotMyFault
600d38d3e2
Add flag placeholders to flag commands 2021-04-02 17:50:37 +02:00
NotMyFault
07fd7e497f
Strip commands from translation files 2021-04-02 14:04:17 +02:00
NotMyFault
567f1d4247
Fix backup captions and add placeholders to copy/move/swap 2021-03-30 13:44:04 +02:00
Hannes Greule
3f05dfe4bf
Sort plots for /plot home the same as for /plot visit, fixes PS-188 2021-03-30 11:19:43 +02:00
NotMyFault
fbebcf57c1
Fix exporting all plots 2021-03-29 17:07:58 +02:00
NotMyFault
30d3a458e2
Addressing more issues 2021-03-28 17:39:02 +02:00
NotMyFault
7591d88d00
Fixes PS-229 
Closes #2948

Co-Authored-By: Benjamin Govaerts <17101059+BenjaminGoGurts@users.noreply.github.com>
 2021-03-23 23:44:27 +01:00
NotMyFault
22baabf751
Don't fail on Java 17 (and higher) 2021-03-23 10:39:17 +01:00
NotMyFault
0cdda8b0ae
Fix a few issues with debugexec 2021-03-12 15:05:25 +01:00
NotMyFault
295a63087f
Strip lesser used debug commands 2021-03-12 14:45:43 +01:00
NotMyFault
797d3ed362
Don't invert the debug status message 2021-03-04 21:43:16 +01:00
NotMyFault
31de7de385
Cover a couple of NPEs 2021-03-01 16:21:12 +01:00
NotMyFault
3833d2cd83
Restrict a few more commands from plot world plots 
And add missing tab completion for debug commands
 2021-02-24 23:21:54 +01:00
Hannes Greule
38b60205e8 Use javax for Nullable + guice, hope I didn't miss anything 2021-02-24 20:35:38 +01:00
NotMyFault
027456fd77
Add crop-grow flag 2021-02-24 18:41:36 +01:00
Hannes Greule
10e2d65221
Remove scripting-related stuff (#2947) 
* Remove scripting-related stuff

* Cleanup

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-02-24 09:53:55 +01:00
Hannes Greule
d9b5dc5dd7 Sort plots for /plot home the same as for /plot visit, fixes PS-188 2021-02-24 08:46:16 +01:00
NotMyFault
da45813a06 Add new metrics pies 2021-02-22 15:18:20 +01:00
NotMyFault
6cc9b5c62b
Remove eol config entries 2021-02-22 13:24:46 +01:00
Hannes Greule
1172e02f1b Fix several issues with debug command 2021-02-21 12:34:14 +01:00
Hannes Greule
46fbc05040 Don't fail to load when moving components file 2021-02-20 19:41:58 +01:00
NotMyFault
fee1ffa2e9
Switch to vanity url 2021-02-17 00:50:50 +01:00
NotMyFault
22be81b5cb
Switch to vanity url 2021-02-16 23:50:53 +01:00
NotMyFault
12d260ca82
Fixes https://issues.intellectualsites.com/issue/PS-23 2021-02-09 18:20:50 +01:00
NotMyFault
82e90553bc Enhance continue message 2021-02-03 15:44:18 +01:00
NotMyFault
18c1a0e4f6
Remove duplicated translation strings 2021-02-02 16:48:01 +01:00
NotMyFault
aca2d2e510
Fixes https://issues.intellectualsites.com/issue/PS-186 2021-01-31 11:44:22 +01:00
Alexander Söderberg
8292ed9e31
More annotation work 2021-01-10 00:01:48 +01:00
Alexander Söderberg
57fc51d013 Initial annotation usage cleanup + EditorConfig 2021-01-09 22:28:41 +01:00
dordsor21
8b332adbe7 Address comments 2021-01-09 21:34:42 +01:00
dordsor21
ae0ee1ebdd fix teleport to "*" 2021-01-09 21:34:42 +01:00
dordsor21
3cea734b9b Fix singleworlds 2021-01-09 21:34:42 +01:00
dordsor21
7ac3f7ca03 Fix sync tasks not being sync 2021-01-09 20:39:25 +01:00
N0tMyFaultOG
0a5c73478d
Fix improper missing permission message on /plot list world 2021-01-08 17:16:38 +01:00
N0tMyFaultOG
495952acb0
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/129 2021-01-08 16:46:57 +01:00
N0tMyFaultOG
25a8f1522a
Move creation date up in plot header 2021-01-08 16:08:42 +01:00
N0tMyFaultOG
f13f7ce129
Disable destructive operations for plot world plots 2021-01-08 16:06:15 +01:00
dordsor21
cc90127af9
fix two <> errors in lang 2021-01-07 13:45:01 +00:00
dordsor21
ec8bdc9af6
Actually place the debugroadregen blocks 2021-01-04 19:23:31 +00:00
dordsor21
9598416932
handle cancellation properly in DefaultProgressSubscriber 2021-01-04 18:23:45 +00:00
dordsor21
4c0bc79e49
Allow over/undersizes schematics to be saved and pasted (#2944) 
Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-01-03 23:46:53 +01:00
Hannes Greule
01dd2d8097 Should be code, not link 
Co-authored-by: Alexander Söderberg <4096670+Citymonstret@users.noreply.github.com>
 2021-01-03 23:42:32 +01:00
Hannes Greule
e09444d94f code style 2021-01-03 23:42:32 +01:00
Hannes Greule
0c76833997 Implement CaptionLoader API to be used by third party plugins/addons 
This allows to load resources from other classloaders than the P2 one. Therefore, we can use this in addons too to manage messages the same way.
 2021-01-03 23:42:32 +01:00
Hannes Greule
ad99ca1723
Use WE Expressions instead of js evaluation (#2941) 
* Implement thread-safe expression evaluation

* Update `{args}` to `plot` automatically

* Stringify more money/balance/price occurrences with EconHandler#format
 2021-01-02 16:32:07 +00:00
N0tMyFaultOG
4f60da292a
Add leaf-decay flag 
Stop leaves from decaying.
 2021-01-01 21:47:09 +01:00
N0tMyFaultOG
bf79639d07
Update license to 2021 
Happy new year 🎆
 2021-01-01 00:46:30 +01:00
N0tMyFaultOG
e8642df674
Update licenses to 2021 
Happy new year 🎆
 2021-01-01 00:19:45 +01:00
N0tMyFaultOG
3702caa25f
Replace toggle permission with plots.toggle 2020-12-28 16:06:24 +01:00
N0tMyFaultOG
4200bbfd0a
Update permission range declaration 2020-12-28 15:38:42 +01:00
N0tMyFaultOG
0fcca4c141
Use hasPermissionRange to check for trust and add limits 2020-12-28 15:36:00 +01:00
dordsor21
ef215b1b0c
fix debugpaste with multiverse 2020-12-28 12:31:51 +00:00
dordsor21
1d0721034d
fix debugpaste with multiverse 2020-12-28 12:30:53 +00:00
Hannes Greule
ce23c153ee Fix added_list and denied_list placeholders 2020-12-28 12:15:34 +01:00
Hannes Greule
019da4d2f4 Expose legacy serializer for placeholders 2020-12-28 11:21:35 +01:00
Hannes Greule
ffc31f565b Use builder for flags component 2020-12-28 00:05:33 +01:00
N0tMyFaultOG
7f01f2d716
Rename placeholders matching more appropriately 2020-12-27 19:37:09 +01:00
N0tMyFaultOG
bf20b0dd79
Beautify placeholder output for '*' permission 2020-12-27 19:16:26 +01:00
N0tMyFaultOG
867826759b
Make placeholders translatable 2020-12-26 13:50:00 +01:00
dordsor21
3be370071c
fix purge <owner> 2020-12-23 14:13:50 +00:00
dordsor21
67a7211b77
use correct UUID pipeline methods in purge command 2020-12-23 13:52:47 +00:00
N0tMyFaultOG
7f1baca872
Add database type to debugpaste 2020-12-22 17:55:37 +01:00
N0tMyFaultOG
8c3a0a8275
Fix compiling 2020-12-21 20:33:49 +01:00
N0tMyFaultOG
eba6043d26
Update paster 2020-12-21 15:59:12 +01:00
N0tMyFaultOG
397692d113
Update Paster 2020-12-21 15:58:34 +01:00
N0tMyFaultOG
bb52301200
Merge remote-tracking branch 'origin/renovate/configure' into v6 2020-12-20 22:38:35 +01:00
dordsor21
e4a8459798
Switch to IncendoPaster "library" 2020-12-19 16:20:44 +00:00
dordsor21
14fa738fbe
switch to InvendoPaster "library" 2020-12-19 16:00:13 +00:00
dordsor21
cbc599cb20
don't double-up schematic x/z offsets 2020-12-16 12:13:39 +00:00
dordsor21
09c84e25bf
don't double-up schematic x/z offsets 2020-12-16 12:07:36 +00:00
dordsor21
e8e116312a
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Deny.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-12-14 15:15:27 +00:00
dordsor21
5e88cabb4b
compare UUID to UUID, not UUIDMapping 
fix PS-182
 2020-12-14 14:32:34 +00:00
dordsor21
6d71177394
Don't save corrupt schematics so that when they load, they work. 2020-12-13 21:09:05 +00:00
N0tMyFaultOG
edd9ae5118
Fix more flag message issues. 2020-12-12 22:46:37 +01:00
Hannes Greule
23ae3b5830 Use builder for flag list message 2020-12-12 21:19:28 +01:00
Hannes Greule
6746aab7ef Improve /plot info formatting 2020-12-12 18:56:19 +01:00
dordsor21
cf70efabb0
we want throwable to be null 2020-12-11 16:51:13 +00:00
dordsor21
18f13b7d15
Merge branch 'v5' into v6 2020-12-10 21:28:28 +00:00
dordsor21
0bb959d26a
Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6 2020-12-10 21:15:51 +00:00
dordsor21
b4f3e85001
allow "owned" road mobs to be killed as well 
(those that are leashed, being ridden, etc)
 2020-12-10 21:14:32 +00:00
Hannes Greule
25100c46f7 Don't unclaim claimed plots with /p claim 2020-12-10 22:13:13 +01:00
dordsor21
540f4c0958
fix info for server-plots 2020-12-10 21:05:50 +00:00
dordsor21
8930ebe572
Relight command is pointless as we'd just use FAWE for it anyway. 2020-12-10 18:06:32 +00:00
dordsor21
8f93f2b6d2
Revert "Allow "Server" owner" as that has its own UUID 
This reverts commit 9ba91889e0.
 2020-12-10 18:02:38 +00:00
dordsor21
9ba91889e0
Allow "Server" owner 2020-12-10 17:58:00 +00:00
dordsor21
67683fbddb
Ensure not to parse null parameters into templates for titles 2020-12-10 17:56:22 +00:00
Hannes Greule
824f9d7ad0 Add missing returns to /plot cluster 2020-12-09 23:14:52 +01:00
Hannes Greule
3e99f90eb1 Don't spit NPEs on NonNull values 2020-12-09 22:45:47 +01:00
N0tMyFaultOG
bc1d3ddd5d
Fix spelling 2020-12-07 21:25:32 +01:00
N0tMyFaultOG
bf7b75b619
Make titles duration configurable 2020-12-07 21:23:38 +01:00
N0tMyFaultOG
469d6ab907
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/77 2020-12-07 14:46:16 +01:00
N0tMyFaultOG
a4dd5bb62f
Add tab completion to like/dislike and fix more messages 2020-12-07 12:51:14 +01:00
N0tMyFaultOG
60859de0bd
Add an option to teleport the player on plot clearing or deletion 2020-12-07 10:55:34 +01:00
Hannes Greule
ff70d5db14
Feature/v6/arkitektonika (#2916) 
* Start working on Arkitektonika support

* Progress on Arkitektonika

* Add license headers

* Some QoL and javadocs

* Fix maximum calculation

* Fix minor formatting

* Reimplement legacy webinterface support

* Add documentation and fix deletion link

* Resolve conflicts/gradle stuff

* Fix links

* Make message readable

* Do not allow download of merged plots
 2020-12-05 19:50:41 +01:00
Alexander Söderberg
c8ad936d26
Clean up PlotPlatform a bit and make the placeholder registry injectible 2020-12-05 18:41:41 +01:00
Hannes Greule
14ec7fb816 Fix PlotRangeIterator 2020-12-05 18:03:24 +01:00
N0tMyFaultOG
b4ea230ff1
Minor translation changes 2020-12-05 15:35:33 +01:00
N0tMyFaultOG
410879d154
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/141 2020-12-05 15:20:19 +01:00
N0tMyFaultOG
f14121e99c
Initiate placeholder registry 2020-12-05 15:08:27 +01:00
N0tMyFaultOG
19d7444946
Fix flag description 2020-12-04 19:27:34 +01:00
N0tMyFaultOG
d9aaed0035
Update dependencies 2020-12-04 18:07:59 +01:00
N0tMyFaultOG
cfd3c159f9
Follow up to 4ff50525ed 
Skipping deprecation here, this exists for so long and and has been superseded by permissions now.
 2020-12-04 17:33:41 +01:00
N0tMyFaultOG
4ff50525ed
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/110 2020-12-04 17:30:11 +01:00
NotMyFault
ec683cdf88
Update ClassicPlotWorld.java 2020-11-29 17:48:59 +01:00
N0tMyFaultOG
39feed6fac
Improve wording of generation steps 2020-11-29 17:35:41 +01:00
N0tMyFaultOG
209d52e920
Update adventure 2020-11-26 11:35:46 +01:00
N0tMyFaultOG
be9d9264ae Make use of Permission class in tab completion 
Plus document a few more permission nodes
 2020-11-19 22:29:44 +01:00
N0tMyFaultOG
eec369ea4f Improve tab completion, adjust permissions and more v6 changes 2020-11-19 21:53:27 +01:00
N0tMyFaultOG
abed07b613 Add tab completion for /plot area 2020-11-19 21:24:23 +01:00
N0tMyFaultOG
6cfdedb823 Don't collapse imports 2020-11-19 21:13:35 +01:00
N0tMyFaultOG
12861f6c07 Add tab completion for /plot setowner 2020-11-19 17:39:58 +01:00
N0tMyFaultOG
52065b8313 Add tab completion for /plot schematic 2020-11-19 17:36:14 +01:00
N0tMyFaultOG
f6ff843cfb Send message when attempting to leave an own plot 
This is a temporary workaround for the todo addressed below.
 2020-11-19 17:30:26 +01:00
N0tMyFaultOG
aedf402c17 Fix /plot leave requiring an arg when none is needed 2020-11-19 17:10:01 +01:00
N0tMyFaultOG
0745b03271 Add tab completion for /plot cluster 2020-11-19 17:00:21 +01:00
N0tMyFaultOG
bb5c0de367 Fix /plot download world not being clickable 2020-11-19 16:39:44 +01:00
N0tMyFaultOG
9478251d44 Fix /plot buy message and enhance it with player balance 2020-11-19 16:32:30 +01:00
N0tMyFaultOG
ce7ceccc1c Merge branch 'v6' into feature/v6/generify-perms 2020-11-16 10:25:48 +01:00
dordsor21
5d4cf3b705
setowner should allow null UUIDs 2020-11-10 17:24:37 +00:00
N0tMyFaultOG
0ff8abcd6f Update town template for schem 2 v2 2020-11-08 15:22:31 +01:00
N0tMyFaultOG
092690e9f0 Update permission in regards of https://github.com/IntellectualSites/PlotSquared/pull/2932 2020-11-03 15:44:07 +00:00
N0tMyFaultOG
5b11175cf3 Add plots.visit.denied permission 2020-11-03 15:44:07 +00:00
N0tMyFaultOG
7a203a12a3 Merge branch 'v6' of https://github.com/IntellectualSites/PlotSquared into v6 2020-11-03 16:43:48 +01:00
N0tMyFaultOG
f7dd8af35e Enhance plot claim message 2020-11-03 15:43:28 +00:00
N0tMyFaultOG
7a9b3442d2 1.16.4 2020-11-03 16:43:18 +01:00
N0tMyFaultOG
b66e2359d1 Update to 1.16.4 
- Bump WorldEdit to 7.2.0 release
 2020-11-03 15:58:17 +01:00
N0tMyFaultOG
81c72ee5d9 Finish up permissions 2020-11-02 21:03:46 +01:00
N0tMyFaultOG
fed7f89f96 Fix compiling 2020-11-02 11:58:07 +01:00
N0tMyFaultOG
aefa629509 Generify permissions thru Permission class 
- Fixed a few improper permissions
- Fixed a couple of typos
 2020-11-02 00:55:58 +01:00
N0tMyFaultOG
bc32581cbd Improve empty global flag list message 2020-11-02 00:00:38 +01:00
dordsor21
ee9b2e8bf8
Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/resources/lang/messages_en.json
 2020-11-01 18:58:24 +00:00
dordsor21
0b968abfe4
fix merging conflicts 2020-11-01 17:45:38 +00:00
dordsor21
7e9a9e14c7 Fix various instances where Adventure is being used incorrectly 2020-10-25 22:38:00 +00:00
Mariell Hoversholm
333493f351 adventure v4.1.0; project now compiles 2020-10-17 21:10:02 +01:00
dordsor21
a1bfc1cb26
correctly handle road flags 2020-10-11 19:24:50 +01:00
dordsor21
cfd432886d
Correctly handle road flags 2020-10-11 19:19:17 +01:00
N0tMyFaultOG
aeeae7c167 Fix links not being clickable 2020-10-11 12:47:49 +02:00
N0tMyFaultOG
08c7d4d15e Remove dead imports 2020-10-09 21:03:23 +02:00
N0tMyFaultOG
29b92659c7 Fix typos 2020-10-09 20:50:12 +02:00
N0tMyFaultOG
4622f4b51d Fix plot leave 2020-10-09 20:21:02 +02:00
dordsor21
4d51dc9b6c
Switch to translateable captions 2020-10-09 17:47:51 +01:00
dordsor21
76b992509b
use format not silly round stuff 2020-10-09 17:29:05 +01:00
dordsor21
925978db8f
change default lighting to 1 2020-10-09 17:26:52 +01:00
dordsor21
c0e90ddb33
increase interval of progress notify 2020-10-09 17:25:48 +01:00
dordsor21
a7a29eaf97
Correctly cancel notify tasks and add notifications to commands 2020-10-09 17:24:59 +01:00
dordsor21
a451d2d6f2
Fix the injection 2020-10-09 16:34:59 +01:00
dordsor21
914429ab4f
Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-10-09 15:23:09 +01:00
N0tMyFaultOG
0d89125a8e Replace sys out with logger factory 2020-10-08 20:52:02 +02:00
N0tMyFaultOG
6b37d678df Fix plot template tab completion 2020-10-08 20:47:43 +02:00
N0tMyFaultOG
02698b3a0e Fix plot grant tab completion 2020-10-08 20:42:17 +02:00
N0tMyFaultOG
6f0512c18c Fix plot set tab completions 2020-10-08 20:16:29 +02:00
N0tMyFaultOG
e46b38b301 Fix plot set values 2020-10-08 19:51:42 +02:00
N0tMyFaultOG
5841817fb5 Missing space 2020-10-08 19:29:09 +02:00
N0tMyFaultOG
e28fb49015 Add override permission for /plot music 2020-10-08 19:27:05 +02:00
N0tMyFaultOG
841eef6a52 Fix done message on backup and add done message to grant 2020-10-08 18:57:11 +02:00
Mariell Hoversholm
54a8482a88 Minecraft does not always provide slf4j 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
e15b5a07fb It runs! And it's small! 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
c3069a425d Format licence headers 2020-10-08 14:02:08 +02:00
N0tMyFaultOG
ec23fcdd75 Rewrite build scripts 
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
 2020-10-08 14:02:08 +02:00
dordsor21
544d57c720
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
#	Core/src/main/java/com/plotsquared/core/command/Grant.java
#	build.gradle
 2020-10-07 12:20:32 +01:00
N0tMyFaultOG
a210f523a5 Add more information to debugpaste 2020-10-04 18:19:29 +02:00
Aurora
e6237d68d0 Also remove BungeePerms from the config 2020-10-04 13:26:56 +02:00
dordsor21
95f509d337
Stop forcing loiwercase world names 2020-10-02 15:08:14 +01:00
dordsor21
f80e8c8d11
For sake of allowing v5 -> v6 2020-09-25 20:08:28 +01:00
dordsor21
ff83931a3f
Fix plot grant 2020-09-20 19:42:13 +01:00
Hannes Greule
4e835ed3ff Add missing command description 2020-09-20 00:51:54 +02:00
dordsor21
41f494fbff
Remove jetbrains annotations 2020-09-18 12:45:26 +01:00
dordsor21
e974fe5dc7
Merge branch 'v6' into features/v6/queue-features 2020-09-18 12:22:32 +01:00
dordsor21
85a23442cc
bump minimessage version to fix build 2020-09-18 12:22:01 +01:00
dordsor21
819902c24e
Fix licenses 2020-09-14 22:00:09 +01:00
dordsor21
554efbb057
Merge branch 'v5' into v6 
# Conflicts:
#	.github/CODEOWNERS
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Core/src/main/java/com/plotsquared/core/command/Alias.java
#	Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
#	Core/src/main/java/com/plotsquared/core/command/Music.java
#	Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
#	build.gradle
 2020-09-11 15:44:04 +01:00
dordsor21
d843d1715d
Allow /plot home [area|world] 2020-09-11 15:03:48 +01:00
dordsor21
1552a8e74b
Add option to change lighting behaviour in queues 2020-09-11 14:18:50 +01:00
dordsor21
f0e9a8c5fe
Implement progress subscribers 2020-09-11 12:59:40 +01:00
dordsor21
a98b23af02
progress subscriber 2020-09-11 11:20:38 +01:00
NotMyFault
5463f15633
Add pigstep music disc 2020-09-11 01:16:57 +02:00
Hannes Greule
f2355a76d6 Add default namespace when wrapping block categories by their ids 2020-09-06 23:36:36 +02:00
Alexander Söderberg
0aeca40137
Take player visibility into account when sending notify-enter and notify-leave messages. Fixes PS-103. 2020-09-05 18:48:58 +02:00
Hannes Greule
babad3ab6d Don't validate plot aliases with offline players (Fixes PS-126) 2020-09-04 14:49:02 +02:00
N0tMyFaultOG
b12e9832c9 Update pom.xml 2020-09-02 17:20:54 +02:00
N0tMyFaultOG
0f9554c717 Merge branch 'v5' into v6 2020-09-02 17:19:12 +02:00
N0tMyFaultOG
7a529e156d Add deb for onBlockIgnite event 2020-09-02 17:03:56 +02:00
N0tMyFaultOG
cba2474df7 Merge v5/v6 2020-09-02 16:44:18 +02:00
NotMyFault
03c889383b
Merge pull request #2908 from IntellectualSites/dependabot/gradle/v5/org.yaml-snakeyaml-1.26 
Bump snakeyaml from 1.25 to 1.26
 2020-09-02 16:15:26 +02:00
dependabot[bot]
7c53bfc870
Bump snakeyaml from 1.25 to 1.26 
Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.25 to 1.26.
- [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.26..snakeyaml-1.25)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
dependabot[bot]
32a8dcd411
Bump annotations from 20.0.0 to 20.1.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
N0tMyFaultOG
b3c77ef099 Merge branch 'dependabot/gradle/v5/org.jetbrains.kotlin-kotlin-stdlib-1.4.0' into v5 2020-09-02 12:57:05 +02:00
N0tMyFaultOG
97e34844b4 Add option to opt-out MvDW Placeholder API 2020-09-02 12:13:23 +02:00
N0tMyFaultOG
e924a1920e Add message to rgar 2020-09-01 00:02:56 +02:00
Hannes Greule
311a2ddc75 Replace null checks with NullEconHandler 2020-08-25 12:41:03 +02:00
Hannes Greule
551d1d9f1a Add NullEconHandler to avoid verbose null checks 2020-08-25 12:41:03 +02:00
N0tMyFaultOG
a5dea9e7f6 Permission cleanup 2020-08-24 20:51:23 +02:00
N0tMyFaultOG
02bd83bd90 Merge v5 into v6 2020-08-24 14:33:53 +02:00
Hannes Greule
c42d5390a4 Allow teleporting to merged plots with multiple owners using /p home 2020-08-24 13:37:12 +02:00
Hannes Greule
31ea7297c2 Generate signs by default 2020-08-24 13:30:50 +02:00
Hannes Greule
c53cffb745 Generate signs by default 2020-08-24 13:17:15 +02:00
N0tMyFaultOG
26a99a122a Minor permission fix 2020-08-23 19:34:22 +02:00
dependabot-preview[bot]
acb0bd95f2
Bump kotlin-stdlib from 1.3.72 to 1.4.0 
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.72 to 1.4.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.0/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.72...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-22 23:05:56 +00:00
NotMyFault
5d73b17415
Merge pull request #2899 from IntellectualSites/dependabot/gradle/v5/org.jetbrains-annotations-20.0.0 
Bump annotations from 19.0.0 to 20.0.0
 2020-08-23 01:04:40 +02:00
N0tMyFaultOG
e93d7feb2c Fixes PS-114 2020-08-22 11:48:03 +02:00
N0tMyFaultOG
116b870152 Apply missing license header 2020-08-22 11:44:34 +02:00
Alexander Söderberg
45e75cc06e
Merge branch 'v6' into features/v6/services 2020-08-21 23:02:52 +02:00
NotMyFault
b2ac67692e
Merge pull request #2892 from TimonMi/v5 
[Bugfix] No chat message confirmation on /p add /p trust, etc.
 2020-08-21 18:28:05 +02:00
Hannes Greule
1064d777c2 Clean up unused code 2020-08-21 00:02:07 +02:00
Hannes Greule
62f675adbe Allow visiting all owners of merged plots 2020-08-21 00:01:53 +02:00
Hannes Greule
cee0bbb805 Revert target usage 2020-08-20 23:29:51 +02:00
Hannes Greule
77eb75fcc6 Adapt adventure changes 2020-08-20 23:28:42 +02:00
Hannes Greule
55211907f2 Use command descriptions from translations 2020-08-20 23:16:15 +02:00
Alexander Söderberg
e1e7cd1479
Add missing license headers 2020-08-20 17:11:12 +02:00
Alexander Söderberg
2d3c729215
Extract plot modifications to external class 2020-08-20 17:10:50 +02:00
Alexander Söderberg
f391cfd432
Extract comment logic from the plot class 2020-08-20 16:03:06 +02:00
N0tMyFaultOG
352136f0c6 Cleanup logging system 2020-08-18 15:50:28 +02:00
N0tMyFaultOG
b6e7f90f6a Fix logger.info format 2020-08-18 15:34:43 +02:00
N0tMyFaultOG
86cfeb76b6 More json stuff 2020-08-18 12:22:26 +02:00
NotMyFault
d91357a807
Update messages_en.json 2020-08-18 10:59:44 +02:00
N0tMyFaultOG
3c8d7a808b Prefix changes and others 2020-08-17 23:21:18 +02:00
N0tMyFaultOG
d6a80c7ea5 More json stuff, fixes and enhancements 2020-08-17 22:26:01 +02:00
N0tMyFaultOG
05a15ac689 Fix a few typos and spaces 2020-08-17 19:39:43 +02:00
N0tMyFaultOG
580cc359e5 fabb9b6fd7 (r41530745) 2020-08-17 18:56:27 +02:00
N0tMyFaultOG
630284e7ae More json fixes 2020-08-17 18:42:42 +02:00
N0tMyFaultOG
cc562033e7 Fix console requirement 2020-08-17 18:29:51 +02:00
N0tMyFaultOG
fabb9b6fd7 More json stuff 2020-08-17 18:15:29 +02:00
Hannes Greule
aacf15757f Use less confusing variable name 2020-08-17 15:32:17 +02:00
Hannes Greule
4789327378 Encapsulate fields 2020-08-17 15:17:40 +02:00
N0tMyFaultOG
c6a368d6f2 More json fixes 2020-08-17 13:24:15 +02:00
dependabot-preview[bot]
869a579655
Bump annotations from 19.0.0 to 20.0.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 19.0.0 to 20.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/19.0.0...20.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-17 09:08:30 +00:00
Alexander Söderberg
7cd1e8ea76
Fix command registration 2020-08-17 04:39:59 +02:00
Alexander Söderberg
351ae1b2c7
Synchronize auto queries 2020-08-17 01:27:45 +02:00
Hannes Greule
457f3e25cc resolve rebase issue 2020-08-17 01:10:46 +02:00
Hannes Greule
41c670450b Remove PlotFilter 2020-08-17 01:10:46 +02:00
Hannes Greule
f636db49f7 Remove SetupObject 2020-08-17 01:10:46 +02:00
Hannes Greule
505bba7612 Fix recursive call 2020-08-17 00:53:39 +02:00