EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity
4,672 Commits 231 Branches 71 Tags 86 MiB
8fc9e0b13f
Commit Graph

1890 Commits

Author SHA1 Message Date
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
Hannes Greule
9b086b3f2a Insert missing keys into message files 2020-08-17 00:29:53 +02:00
N0tMyFaultOG
f9d7d2d1dd Fix clickable messages 2020-08-16 19:43:27 +02:00
N0tMyFaultOG
e9efa3f2d3 Fix some translation issues 2020-08-16 18:24:54 +02:00
dordsor21
665a72a08f
Fill out a lot more JavaDoc. 
I've left DB stuff alone
 2020-08-16 13:22:49 +01:00
Alexander Söderberg
a4c9ed90b7
Fix startup issues and make messages send properly 2020-08-16 13:49:16 +02:00
dordsor21
12def37194
clean up some javadoc stuff 2020-08-16 11:34:08 +01:00
Alexander Söderberg
ed2302e545
Remove illegal import 2020-08-16 12:10:19 +02:00
N0tMyFaultOG
618adb913d Update license and remove dead module entries 2020-08-15 19:17:29 +02:00
N0tMyFaultOG
4a220f9bfb Update license header 2020-08-15 14:59:29 +02:00
NotMyFault
300abd868a
Merge pull request #2888 from IntellectualSites/fix-conversion 
Fix problem with config creation
 2020-08-14 18:36:57 +02:00
Alexander Söderberg
87f0b1fc97
Add service system and rewrite Auto to use the service system 2020-08-14 17:24:34 +02:00
NotMyFault
5b27b652e7
Fix color tag 2020-08-14 12:52:00 +02:00
N0tMyFaultOG
5e20c871a5 Fix metrics setting 2020-08-14 11:36:17 +02:00
NotMyFault
56fb892818
Fix brackets 2020-08-14 00:37:06 +02:00
N0tMyFaultOG
7f104c249a Permission cleanup 
- Removed plotme perms
- Fixed incorrect permission for "/plot flag remove"
- Fixed incorrect administrative unlink node
- Removed compat alias from "/plot set alias" command

I've documented all removed permission packages and fixed permissions in detail on the v6 page. So it's easy to go-by when updating.
 2020-08-13 23:32:13 +02:00
N0tMyFaultOG
0eeface374 Remove old translations 2020-08-13 21:37:28 +02:00
N0tMyFaultOG
ffe1e1e40d Core is Core 2020-08-13 21:25:17 +02:00
N0tMyFaultOG
5efdef19cf Remove dead asset setting 2020-08-13 21:16:30 +02:00
N0tMyFaultOG
c9fae6a070 Remove old translation setup and move commands to templates 2020-08-13 21:11:07 +02:00
N0tMyFaultOG
2b17f730d4 Merge v5 into v6 2020-08-12 18:20:37 +02:00
Luca
64181c6ab8
Update de-DE.yml 
adjusted grammar
 2020-08-11 19:29:40 +02:00
JunTVDE
987d9a267c added german translation for flag-descriptions to de-DE.yml 2020-08-09 13:05:40 +02:00
EinDev
b46a19f5ca Keep player names, so they don't have to be looked up again. 
That way the lookup function MainUtil#getName won't get called which would throw an exception if called in the Bukkit Thread.
As the player enters the Name, we don't have to look it up again.

Fixes PS-96
 2020-08-08 18:07:49 +02:00
dordsor21
7bad242944
Merge branch 'v6' into feature/v6/json. It builds! 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Area.java
#	Core/src/main/java/com/plotsquared/core/command/Clear.java
#	Core/src/main/java/com/plotsquared/core/command/Debug.java
#	Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
#	Core/src/main/java/com/plotsquared/core/command/Relight.java
#	Core/src/main/java/com/plotsquared/core/command/Set.java
#	Core/src/main/java/com/plotsquared/core/command/Template.java
#	Core/src/main/java/com/plotsquared/core/command/Trim.java
#	Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
#	Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
#	Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
#	Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
#	Core/src/main/java/com/plotsquared/core/util/EntityUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegionManager.java
#	Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
#	Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
#	build.gradle
 2020-08-08 13:20:30 +01:00
dordsor21
74a5c48214
Finish up core and bukkit json 2020-08-08 12:16:48 +01:00
N0tMyFaultOG
c31c4b4286 More work 2020-08-07 18:52:45 +02:00
dordsor21
7f29b5d1e8
ComponentPreset inventory to json 2020-08-07 13:22:10 +01:00
dordsor21
6012705e95
Implement Permission#format to replace the CaptionUtility#format method 2020-08-07 12:12:16 +01:00
dordsor21
21a97863ac
Refactor Captions to Permission, reimplement message list in debug command 2020-08-07 11:53:32 +01:00
dordsor21
50cfecb3fd
Several minor progress. Couple of bigger (inboxes and help) 2020-08-07 11:08:03 +01:00
dordsor21
1461804039
Remove last reference to PlotMessage in Core 2020-08-07 10:20:11 +01:00
Timon
dc3f45acd4 Added UseFlag check at Roads 2020-08-07 09:57:02 +01:00
Hannes Greule
6970dfa5f8 More json progress 2020-08-07 02:53:05 +02:00
dordsor21
18f630ba15
Bit more json 2020-08-06 14:06:19 +01:00
dordsor21
f68eb9c778
update plot list 2020-08-06 13:36:15 +01:00
dordsor21
4a960d9f2c
update pagination to new json 2020-08-06 12:23:47 +01:00
Timon
c745b99922 Added UseFlag check at Roads 2020-08-06 12:01:43 +02:00
dordsor21
f1e3902fea
Several more progress 2020-08-05 11:48:10 +01:00
N0tMyFaultOG
41a623a643 More work towards json 2020-08-04 19:01:25 +02:00
dordsor21
d3fe1d3b2b
Fix plot info, sign usage in Plot.class 2020-08-04 15:07:07 +01:00
Hannes Greule
3fd3baaa47 Making progress on messages 2020-08-03 23:59:16 +02:00
N0tMyFaultOG
01d2b0024f Add more information to the debugpaste 2020-07-31 20:33:17 +02:00
N0tMyFaultOG
01e66f8833 Readd skyblock template 2020-07-29 14:53:09 +02:00
N0tMyFaultOG
22a007b514 Revert "Update zh-CN.yml" 
This reverts commit 240362a16d.
 2020-07-28 12:33:04 +02:00
dordsor21
38988b4819
A little spring cleaning 
- Add Javadoc comments for where QueueCoordinator can be given or nulled
 - Add some more Javadoc comments in general
 - Squash methods into one where QueueCoordinator can be given
 - Only use one queue in some places where it makes sense
 2020-07-28 10:18:49 +01:00
dordsor21
704e92c3d0
Use placeholder 2020-07-28 09:38:27 +01:00
dordsor21
97b1a60ae8
Move comments to ChunkCoordinator, remove Range annotations 2020-07-28 08:44:16 +01:00
dordsor21
3288721259
Better constructor error handling in QueueProvider. 
Add back default constructor requiring world to QueueCoordinator to indicate extents require this constructor
 2020-07-28 08:34:14 +01:00
NotMyFault
240362a16d
Update zh-CN.yml 2020-07-26 17:08:58 +02:00
Alexander Söderberg
f2dcbce490
Fix problem where servers created in v5 (not converted from v4) would fail to start properly. 
This is a quite major issue and I hope this fix resolves it. Although, it should be tested with migration from v4 to v5 and then a fresh v5 server.
 2020-07-25 03:16:36 +02:00
dordsor21
b3ddabda29
Fix DelegateQueueCoordinator 2020-07-24 18:20:26 +01:00
dordsor21
b8b3e1e72a
Merge branch 'v6' into feature/v6/pipeline-queue 
# Conflicts:
#	Bukkit/build.gradle
#	Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
 2020-07-24 18:18:42 +01:00
dordsor21
221d299052
Fix a few remaining merge issues (+1 squashed commits) 
Squashed commits:

[8c6b55dd4] Fix a few remaining merge issues
 2020-07-24 17:57:16 +01:00
dordsor21
3180d2ddf2
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
#	Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java
#	Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
#	build.gradle
 2020-07-24 17:15:58 +01:00
dordsor21
7aaa075ba8
Javadoc, some cleanup 2020-07-24 17:00:08 +01:00
Alexander Söderberg
4fb590889a
Remove all permission related errors 2020-07-24 17:44:47 +02:00
Alexander Söderberg
115ca903b2
Remove unused stuff 2020-07-24 17:36:48 +02:00
Alexander Söderberg
e90170a384
Merge remote-tracking branch 'origin/v6' into feature/v6/json 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
#	Core/pom.xml
#	Core/src/main/java/com/plotsquared/core/PlotAPI.java
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Area.java
#	Core/src/main/java/com/plotsquared/core/command/Auto.java
#	Core/src/main/java/com/plotsquared/core/command/Claim.java
#	Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
#	Core/src/main/java/com/plotsquared/core/command/Command.java
#	Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
#	Core/src/main/java/com/plotsquared/core/command/DebugExec.java
#	Core/src/main/java/com/plotsquared/core/command/Grant.java
#	Core/src/main/java/com/plotsquared/core/command/Inbox.java
#	Core/src/main/java/com/plotsquared/core/command/Load.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/command/Setup.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/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
#	Core/src/main/java/com/plotsquared/core/util/BlockUtil.java
#	Core/src/main/java/com/plotsquared/core/util/Permissions.java
 2020-07-24 17:28:52 +02:00
dordsor21
1d0760c630
Formatting, mark nonnull, nullable etc 2020-07-24 16:24:53 +01:00
Alexander Söderberg
af44fe74ff
Add namespaces for translations 2020-07-24 17:19:25 +02:00
dordsor21
72c0021306
A couple of reworks 
- Redo how regeneration works a little to also take a cuboid region for regeneration off-chunk plots
 - Fix a couple of cases where we were writing to the queue instead of the world in the ChunkConsumer (dum)
 - this seems to be working.
 2020-07-24 15:17:42 +01:00
dordsor21
18918eb3a3
Fix a couple more Guice issues. Refactor read chunks to be a list of chunks rather than CuboidRegion 2020-07-24 14:36:50 +01:00
dordsor21
416e181992
Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-24 13:10:11 +01:00
Alexander Söderberg
d7a49e3316
This is not my fault 2020-07-24 14:08:40 +02:00
dordsor21
cf13f13fbf
Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-24 13:03:42 +01:00
Alexander Söderberg
f53a8d3b06
Fix permissionprofile initialisation order 2020-07-24 14:02:49 +02:00
dordsor21
8c5c1922c9
Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-24 12:34:41 +01:00
Alexander Söderberg
97a2ccbfe0 make sure the PlayerMetaDataKeys keys are loaded 2020-07-24 13:32:46 +02:00
dordsor21
e53c53bb4a
Merge branch 'v6' into feature/v6/pipeline-queue 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java
 2020-07-24 12:21:40 +01:00
dordsor21
d906a85095
Fix some issues I caused with Guice 2020-07-24 12:18:36 +01:00
Alexander Söderberg
dc1f669a1f Remove permission caching 2020-07-24 13:01:38 +02:00
Alexander Söderberg
fe7a57b2b7 Remove mainutil cache workaround 2020-07-24 12:48:45 +02:00
Alexander Söderberg
c9c62a1083 Remove dumb permission mess. 2020-07-24 12:44:04 +02:00
Alexander Söderberg
5608c5a901 Merge branch 'v6' into features/v6/permissions 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Core/src/main/java/com/plotsquared/core/command/Auto.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/util/Permissions.java
 2020-07-24 12:20:45 +02:00
Alexander Söderberg
722361aedb Implement suggestions from PR comments 2020-07-24 12:15:25 +02:00
Alexander Söderberg
d2f40612f4 Switch from Class<T> to TypeLiteral, and implement managed meta access for temporary meta 2020-07-24 12:15:25 +02:00
Alexander Söderberg
6a63e5bb51 Expose the player's lock repository 2020-07-24 12:15:25 +02:00
Alexander Söderberg
ad40ab7e1e Grant plots to the correct player 2020-07-24 12:15:25 +02:00
Alexander Söderberg
05ce67fbfe Trick the compiler 2020-07-24 12:15:25 +02:00
Alexander Söderberg
555860cf83 Add managed persistent meta data access 2020-07-24 12:15:25 +02:00
Alexander Söderberg
2575787bd0 Add LockRepository 2020-07-24 12:15:25 +02:00
dordsor21
2cfb646065
Javadoc no fun 2020-07-23 18:11:52 +01:00
dordsor21
a1da452c41
Fix build properly 2020-07-23 18:09:37 +01:00
dordsor21
420e38bead
idek? 2020-07-23 18:07:23 +01:00
dordsor21
c3322021d0
mavenLocal, poms 2020-07-23 18:02:29 +01:00
dordsor21
45cc88091e
Merge branch 'v6' into feature/v6/pipeline-queue 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
 2020-07-23 17:33:05 +01:00
dordsor21
27498f68fb
Many Much 
- Add readregions to queues for when we're setting our own consumer (usually meaning the queue writes its own blocks, so it doesn't know which chunks to actually load)
 - Finish removing chunk/regionTasks
 - Allow the queue to not remove tickets from chunks (useful for swapping chunks so they don't unload needlessly)
 - Remove a lot of unused methods
 - Implement entities to queues
 - Remove chunk unloading (the server should really handle it)
 2020-07-23 17:30:23 +01:00
N0tMyFaultOG
a7de76d150 Fix dependencies 2020-07-23 15:03:57 +02:00
Alexander Söderberg
2154e237ff Remove construction of fake player entities for offline players. 2020-07-23 15:03:57 +02:00
Alexander Söderberg
5fda3e9765 Get rid of PermHandler 2020-07-23 15:03:57 +02:00
Alexander Söderberg
bfbb81030f Start working on the new permission system 2020-07-23 15:03:57 +02:00
Alexander Söderberg
87285e08dc Fix plot ID issues 2020-07-23 14:11:34 +02:00