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
