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
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
615a5212bf
update bukkit pom
2020-07-24 17:57:16 +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
dordsor21
1d0760c630
Formatting, mark nonnull, nullable etc
2020-07-24 16:24:53 +01: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
707559e023
Merge remote-tracking branch 'origin/v6' into v6
2020-07-24 13:33:00 +02:00
Alexander Söderberg
97a2ccbfe0
make sure the PlayerMetaDataKeys keys are loaded
2020-07-24 13:32:46 +02:00
dordsor21
95f2a7a908
fix version
2020-07-24 12:22:13 +01: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
0ea862b572
Merge pull request #2886 from IntellectualSites/features/v6/permissions
...
Permission system fixup
2020-07-24 12:49:37 +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
41c4018a27
Merge branch 'v6' into feature/v6/pipeline-queue
2020-07-23 18:06:45 +01:00
dordsor21
4d4f755607
6.0.0-SUPER-SNAPSHOT
2020-07-23 18:06:14 +01:00
dordsor21
d8e5daf12b
Fix missing Main->Chunk Util change
2020-07-23 18:04:01 +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
Alexander Söderberg
d8e80daa93
Fix annoying guice injection issue
2020-07-23 15:40:43 +02:00
Alexander Söderberg
384a6730a4
Merge remote-tracking branch 'origin/features/v6/permissions' into features/v6/permissions
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-23 15:06:00 +02: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
b302bb9379
Make VaultPermissionHandler extent BukkitPermissionHandler
2020-07-23 15:03:57 +02:00
