Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-17 11:06:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,216 Commits 14 Branches 68 Tags 88 MiB
311a2ddc75
Commit Graph

1574 Commits

Author SHA1 Message Date
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
Alexander Söderberg
32a0765484 Force more compilation errors 2020-07-22 21:09:38 +02:00
Alexander Söderberg
c5e1b87c61 Fix small issues 2020-07-22 21:06:23 +02:00
N0tMyFaultOG
603d1ee9bb Even more 
Ok seriously, I stop here
 2020-07-22 20:38:46 +02:00
Alexander Söderberg
86a0816b26 Merge remote-tracking branch 'origin/feature/v6/json' into feature/v6/json 2020-07-22 19:55:03 +02:00
Alexander Söderberg
287cb0f5ad Fix minor issues 2020-07-22 19:54:35 +02:00
N0tMyFaultOG
3009db3aa7 Update FlagCommand.java 2020-07-22 19:47:58 +02:00
N0tMyFaultOG
32e095ce15 More progress 
I need a break, if something is missing, feel free to exchange that. K thx 🙏
 2020-07-22 19:42:22 +02:00
Alexander Söderberg
da2fa24e74 Merge remote-tracking branch 'origin/v6' into v6 2020-07-22 12:05:50 +02:00
N0tMyFaultOG
8d04728ebc More work 2020-07-22 00:08:51 +02:00
N0tMyFaultOG
2aa5c276c9 Some more work done towards json 2020-07-21 21:39:52 +02:00
Alexander Söderberg
6040e1bb5e
remove mainutil 2020-07-21 13:14:55 +02:00
Alexander Söderberg
20e9d13f60
Merge branch 'v6' into feature/v6/json 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/OperationUtil.java
 2020-07-21 13:13:10 +02:00
Alexander Söderberg
5f76cc4f7b
Give ConsolePlayer the same treatment 2020-07-21 13:07:33 +02:00
Alexander Söderberg
186a810bf6
Bring back PAPI placeholders and raw colour formatting 2020-07-21 13:05:40 +02:00
dordsor21
207e56969b
Remove ChunkManager#chunkTask 2020-07-19 16:03:40 +01:00
dordsor21
94b6a27cf3
add missing license headers 2020-07-19 16:02:30 +01:00