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
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
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
dordsor21
21693e344c
Switch from MainUtil
2020-07-19 14:37:42 +01:00
dordsor21
d2443f6de8
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
2020-07-19 14:29:08 +01:00
dordsor21
ed27422e69
Move IJ/xyz cache out of MainUItil to its own class
2020-07-19 14:21:52 +01:00
Alexander Söderberg
2d518dfe2b
Clean up BlockUtil
2020-07-19 14:49:26 +02:00
Alexander Söderberg
f357fa74f3
Remove unused files
2020-07-19 14:37:53 +02:00
Alexander Söderberg
335cf5d2e9
Fix issues
2020-07-19 14:34:42 +02:00
Alexander Söderberg
ed3eedd238
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Add.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Buy.java
# Core/src/main/java/com/plotsquared/core/command/Template.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
# Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java
# Core/src/main/java/com/plotsquared/core/plot/PlotId.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
# Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/PlayerManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
# Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java
# Core/src/main/java/com/plotsquared/core/util/query/SearchPlotProvider.java
2020-07-19 14:32:31 +02:00
Alexander Söderberg
23783b8b0b
add deprecations
2020-07-19 14:24:42 +02:00
Alexander Söderberg
193054f1fc
Move shit out of MainUtil into more appropriate classes
2020-07-19 14:23:55 +02:00
dordsor21
656700b5be
Start reimplementing chunk generation.
...
This would either need to be one WorldEdit operation or (preferable) WorldEdit allows Extents (including EditSessions) into the regenerate adapter method
2020-07-19 13:12:27 +01:00
dordsor21
3e84f3b3a4
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-18 15:27:52 +01:00
Alexander Söderberg
5360df6012
Add PlotRangeIterator for the many places where it'll be used. All one of them, in fact. This was not a waste of time. I am very happy I did this. This was worthwhile. Yup.
2020-07-18 16:19:12 +02:00
Alexander Söderberg
39fdaa367c
Make PlotQuery iterable
2020-07-18 16:18:23 +02:00
Hannes Greule
7e0cdb12d7
Replace some common messages
2020-07-18 15:06:51 +02:00
dordsor21
03983e8886
Allow forcing of queues down pipelines to ensure whenDone runnables are called correctly
...
Also remove autoQueue since it's never used and would be a bad idea
2020-07-18 13:55:54 +01:00
dordsor21
57af50ed49
Continue implementation of new queue system
...
- Move ChunkCoordinatorBuild to Core
- Add core ChunkCoordinator
- Add Factories for ChunkCoordinator and its Builder
- Reimplement refreshChunk but in WorldUtil
- Allow custom Consumers to be used by the Queue when sent to the ChunkCoordinator
- Start switching ChunkTasks to use the new ChunkCoordinator system
- Replace GlobalBlockQueue's "empty task" system with normal sync TaskManager
- Remove lombok from the queue system
- Add back forceSync and chunkObject from LocalBlockQueue
2020-07-18 12:07:56 +01:00
Alexander Söderberg
e80ade65c7
Clean up PlotId
2020-07-18 11:05:16 +02:00
Alexander Söderberg
4d24112ec7
Fix merge issues
2020-07-17 23:06:40 +02:00
Alexander Söderberg
1a269a1227
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-17 23:05:45 +02:00
Alexander Söderberg
d077fafd29
Some random bukkitutil/worldutil improvements
2020-07-17 23:00:09 +02:00
Alexander Söderberg
5478e70576
Fix some more captions
2020-07-17 21:46:15 +02:00
dordsor21
66b94ab9f1
Start switching to WorldEdit Worlds
2020-07-17 17:21:32 +01:00
dordsor21
74c6fc954e
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Core/src/main/java/com/plotsquared/core/command/Trim.java
# Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java
# Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java
2020-07-17 17:16:49 +01:00
Alexander Söderberg
22bd2eb238
Super minor issues from previous merges
2020-07-17 18:06:38 +02:00
Alexander Söderberg
2a72f274c9
Fix failed merge
2020-07-17 18:00:08 +02:00
Alexander Söderberg
3a1b56494a
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/Condense.java
# Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
# Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java
# Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java
# Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java
2020-07-17 17:58:14 +02:00
Alexander Söderberg
932052772c
Fix edge cases for time conversion
2020-07-17 17:53:30 +02:00
Alexander Söderberg
43d058d3db
Address comments
2020-07-17 17:53:30 +02:00
Alexander Söderberg
020b030667
More fixes
2020-07-17 17:53:30 +02:00
Alexander Söderberg
5a3eacde0b
Replace method synchronization logic
2020-07-17 17:53:30 +02:00
Alexander Söderberg
7f412f5472
Begin work on the task system
2020-07-17 17:53:30 +02:00
Alexander Söderberg
33b6ef66d6
Delombok + import organisation
2020-07-17 17:24:45 +02:00
dordsor21
9fefe57c90
Switch to using QueueCoordinators everywhere
2020-07-17 15:41:06 +01:00
dordsor21
ed77522c08
Add wna block setting, use WorldEdit worlds rather than Strings.
2020-07-17 14:38:50 +01:00
dordsor21
def9a1bcf8
begin new block setting/chunk pipeline
...
This will ultimately replace both the GlobalBlockQueue and the ChunkTask stuff
2020-07-17 13:22:33 +01:00
N0tMyFaultOG
01ff9a34c2
Merge branch 'features/v5/placeholders' into v5
2020-07-16 18:48:45 +02:00
Hannes Greule
2d9cf8b759
Get placeholders working
2020-07-16 18:04:17 +02:00
Alexander Söderberg
32b28a4ca5
Turn all UUID messages into debug messages
2020-07-15 22:42:58 +02:00
NotMyFault
e5963a8590
Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners
...
Clean up bukkit listeners by splitting them up
2020-07-15 13:35:38 +02:00
Alexander Söderberg
5d2d4ac12b
fix language issue
2020-07-14 20:47:15 +02:00
Alexander Söderberg
64f5580edd
Fix code styling issue
2020-07-14 20:46:52 +02:00
dordsor21
2e4c43c251
Add config option to disable placing top wall blocks
2020-07-14 19:10:53 +01:00
Alexander Söderberg
c0a0d36e5d
Remove remaining jetbrains imports
2020-07-14 19:40:47 +02:00
Alexander Söderberg
b68d7150f1
Manually fix some merge conflicts
2020-07-14 19:34:44 +02:00
Alexander Söderberg
198bcfdf4d
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/build.gradle
# 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/Add.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/Command.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/configuration/Caption.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/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-14 19:25:14 +02:00
Alexander Söderberg
8eb903ad72
Merge branch 'v5' into v6
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-14 19:18:08 +02:00
Alexander Söderberg
0294397021
Manually resolve a bunch of merge issues
2020-07-14 19:10:52 +02:00
Alexander Söderberg
97fed21811
Merge branch 'v6' into feature/v6/platform
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java
# Core/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/Debug.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Purge.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/database/SQLManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
# Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.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/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java
# Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java
# Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
# Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegionManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
2020-07-14 19:05:05 +02:00
Alexander Söderberg
510ea56431
Finalize DI stuff
2020-07-14 18:49:40 +02:00
Alexander Söderberg
f9e5fd714d
Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform
2020-07-14 17:07:03 +02:00
Alexander Söderberg
55eefd09da
Merge branch 'v6' into feature/v6/json
2020-07-14 16:52:40 +02:00
Alexander Söderberg
0ce1f3e0f6
Send special message when caption cannot be found
2020-07-14 16:36:13 +02:00
Alexander Söderberg
99be181aea
Migrate some more captions
2020-07-14 16:31:58 +02:00
Alexander Söderberg
fbf6a3517d
Add back title method that somehow went missing and add a template utility class to make templates less annoying to work with
2020-07-14 15:04:31 +02:00
Alexander Söderberg
1dc4da8beb
Fix issues from previous merge
2020-07-14 13:21:59 +02:00
Alexander Söderberg
af7db08036
Add new placeholder system
2020-07-14 13:14:02 +02:00
Alexander Söderberg
33f2ff7e6d
Merge branch 'v6' into feature/v6/slf4j
2020-07-13 23:11:40 +02:00
Alexander Söderberg
6664d49928
Prefix all log messages
2020-07-13 23:04:27 +02:00
Alexander Söderberg
a1f262b5b2
Fix gradle setup and replace all debug calls
2020-07-13 22:51:57 +02:00
Alexander Söderberg
e84d82315c
Add log4j config (this might work :p)
2020-07-13 20:39:52 +02:00
N0tMyFaultOG
c6962ef4d2
Shift a few more messages to debug
2020-07-13 19:56:34 +02:00
N0tMyFaultOG
f93714a44e
Properly add prefixes to messages
2020-07-13 13:01:13 +02:00
Hannes Greule
564efd77f7
Fix some messages
2020-07-12 22:11:23 +02:00
Hannes Greule
5442c7cc2e
Start moving commands to new message system
2020-07-12 22:06:07 +02:00
Alexander Söderberg
0fa5a16cd0
replace remaining debug calls
2020-07-12 21:49:05 +02:00
N0tMyFaultOG
1881cdc9ab
Revert "Add prefix"
...
This reverts commit fb2aa44f78
2020-07-12 21:28:38 +02:00
N0tMyFaultOG
fb2aa44f78
Add prefix
2020-07-12 21:25:22 +02:00
N0tMyFaultOG
ac8841447c
6cf2c0ad97 (r40542418)
2020-07-12 17:11:25 +02:00
Alexander Söderberg
6cf2c0ad97
Disable the paper uuid service for offline mode servers and add toggles for all third party uuid services
2020-07-12 17:04:30 +02:00
dordsor21
c045ef698c
Add license headers and fix method change in PlotSquared.java
2020-07-12 11:42:45 +01:00
Alexander Söderberg
5cdb3f4fd5
Add missing injection points
2020-07-12 12:25:44 +02:00
Alexander Söderberg
5a5c5721cc
fix compiler crashing
2020-07-12 07:38:57 +02:00
dordsor21
3a11ffc77a
Clean up bukkit listeners by splitting them up
2020-07-11 19:03:55 +01:00
Alexander Söderberg
916675fb08
Guice progress
2020-07-11 17:19:19 +02:00
dordsor21
a2ec404014
Fix /plot target nearest
2020-07-11 13:40:22 +01:00
Alexander Söderberg
6f6cb4b630
More DI progress
2020-07-11 05:29:41 +02:00
Alexander Söderberg
c0f69f321d
Guice progress
2020-07-10 22:12:37 +02:00
Alexander Söderberg
55bf41d2da
Remove dumdum static access
2020-07-10 19:25:05 +02:00
Alexander Söderberg
7687d7705b
Fix merge issue
2020-07-10 18:38:14 +02:00
Alexander Söderberg
21ad9a36c8
Merge branch 'v6' into feature/v6/platform
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
2020-07-10 18:37:18 +02:00
Alexander Söderberg
d00dc658df
Inject EventDispatcher and PlotListener
2020-07-10 18:17:44 +02:00
Alexander Söderberg
2dab7c8dda
Inject PlotAreaManager
2020-07-10 17:32:07 +02:00
Alexander Söderberg
5341015cb1
Finalize immutable locations and add a platform world implementation
2020-07-10 12:21:29 +02:00
dordsor21
2fb76e6636
Split road and plot paste-on-top settings
2020-07-09 22:39:06 +01:00
dordsor21
55139eb134
Do not respect paste on top for road schematics.
2020-07-09 22:19:23 +01:00
Alexander Söderberg
cf1b027db9
Start making locations immutable
2020-07-09 22:28:46 +02:00
Traks
63c308971b
Update location block vector on add and subtract
2020-07-09 20:14:06 +02:00
Alexander Söderberg
89cb6450fb
Fix issue where PlotPlayer#getLocation returns a mutable location
2020-07-09 20:04:00 +02:00
Alexander Söderberg
6b07f38cff
Send teleportation cancellation message immediately on movement, rather than after the timer has finished. This fixes PS-33.
2020-07-09 16:45:25 +02:00
Alexander Söderberg
904f5485ab
Merge remote-tracking branch 'origin/v5' into v5
2020-07-09 16:38:53 +02:00
Alexander Söderberg
e05d817482
Fix plot owner placeholder. Fixes PS-62.
2020-07-09 16:38:46 +02:00
Alexander Söderberg
db37077af7
Make signs able to use captions
2020-07-09 12:58:28 +02:00
Hannes Greule
d652225f36
Let players teleport to their merged plots
2020-07-08 19:33:58 +02:00
Alexander Söderberg
3fa532a3c0
Move message sending into PlotPlayer to make it platform independent
2020-07-08 15:35:58 +02:00
dordsor21
d267d1bb98
Start expiry tasks
2020-07-08 14:35:46 +01:00
Alexander Söderberg
9792d4cc4b
Remove style.yml
2020-07-08 15:23:33 +02:00
Alexander Söderberg
090bd69be5
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
2020-07-08 15:22:02 +02:00
Alexander Söderberg
c36e311520
Continue cleaning up PlotSquared.java
2020-07-08 15:09:25 +02:00
Alexander Söderberg
f2191cb731
Save style.yml again
2020-07-08 13:59:31 +02:00
Alexander Söderberg
265c10ec1c
Remove commands.yml
2020-07-08 13:59:31 +02:00
Alexander Söderberg
51bd21a464
Merge branch 'v6' into feature/v6/platform
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
2020-07-08 13:57:33 +02:00
Hannes Greule
57127537f7
Add permission check for /plot home
2020-07-07 20:45:52 +02:00
Hannes Greule
3476522c00
Allow /p v <alias>
2020-07-07 20:45:52 +02:00
Hannes Greule
3d087b1bbe
Fix tab completion and usage
2020-07-07 20:45:52 +02:00
Hannes Greule
c058614fcc
Split visit command into home and visit
2020-07-07 20:45:52 +02:00
dordsor21
e826836c36
Merge branch 'v5' into features/v5/road-respect-flags
2020-07-07 17:48:46 +01:00
Alexander Söderberg
196df855ac
Clean up PlotAreaManager and move a bunch of plot area related logic out of PlotSquared
2020-07-07 13:37:03 +02:00
Alexander Söderberg
d76c9dad52
Remove access to PlotSquared#IMP and rename IPlotMain to PlotPlatform, then rename PlotSquared#imp() to PlotSquared#platform()
2020-07-07 12:56:43 +02:00
Alexander Söderberg
298e65a394
Replace remaining references to PlotSquared#log
2020-07-06 17:17:46 +02:00
Alexander Söderberg
078b776f60
Implement console messages
2020-07-05 18:14:29 +02:00
Alexander Söderberg
4d61a345c6
Small documentation fixes
2020-07-05 18:06:10 +02:00
Alexander Söderberg
42d648e338
Use adventure for titles
2020-07-05 17:57:58 +02:00
Alexander Söderberg
f287cc34e7
Remove json message stuff
2020-07-05 13:46:25 +02:00
Alexander Söderberg
c8a8806e7d
Component progress. The plugin is **very** broken right now.
2020-07-05 13:41:40 +02:00
Alexander Söderberg
d061f728bd
Merge remote-tracking branch 'origin/feature/v5/json' into feature/v5/json
2020-07-05 12:44:25 +02:00
Hannes Greule
6bf5bc60d1
Update messages_en.json with new placeholders
2020-07-04 18:57:56 +02:00
Alexander Söderberg
c784c69eb3
progress
2020-07-04 18:53:03 +02:00
Alexander Söderberg
e3759d059a
Fixing missing license headers.
2020-07-04 18:03:47 +02:00
Alexander Söderberg
429f5e55c3
Add option to disable background caching
2020-07-03 13:50:12 +02:00
dordsor21
ad1ec42b12
Add new clear pipeline to hpw and make some stuff read access as required.
2020-07-02 14:33:22 +01:00
dordsor21
b71de856a8
allow plugins extending and replacing RegionManager to be notified of, and "accept" plot clear "requests".
...
.
.
.
.
.
FAWE
2020-07-01 21:49:53 +01:00
Hannes Greule
35cff29917
Add license header
2020-07-01 17:24:47 +02:00
dordsor21
2910176b97
Add road flag container
2020-07-01 14:53:57 +01:00
dordsor21
82a887fd3b
Merge branch 'v5' into features/v5/road-respect-flags
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
2020-07-01 14:12:16 +01:00
Hannes Greule
f80cadcd7f
Draft of Caption resolving
2020-06-29 21:33:57 +02:00
Hannes Greule
fa2ad8ab22
Improve plot alias command (tab complete, admin permission) fixes PS-63
2020-06-29 13:48:37 +02:00
N0tMyFaultOG
600f757046
Finish messages
2020-06-29 12:34:09 +02:00
N0tMyFaultOG
a2aaa3633a
More work
2020-06-28 16:56:42 +02:00
MeFisto94
bd9bdc9e03
Separate the Vault Permission Handling from the Economy Handling
2020-06-28 14:28:11 +02:00
N0tMyFaultOG
3b793929d8
Initialize messages_en.json
2020-06-28 13:51:57 +02:00
Hannes Greule
e139550949
Make cache expiration configurable
2020-06-27 23:07:20 +02:00
Carter
74876f9e64
Get biome data from correct schematic for intersections (Fixes PS-50)
2020-06-27 20:44:46 +01:00
dordsor21
02f3c3ef50
Fix my stupid mistake of using lamdas not creating nested classes when creating schematics. "this" doesn't work like that. Cheers Java.
2020-06-27 20:38:55 +01:00
MeFisto94
9c3d2cfb02
Move the caching and static accessors from EconHandler to PlotMain
2020-06-27 06:26:00 +02:00
Hannes Greule
38425a1eae
Update world border on Plot#claim (Fixes PS-13)
2020-06-26 13:49:17 +02:00
Alexander Söderberg
4b997d42df
Some slf4j progress
2020-06-26 11:03:42 +02:00
Alexander Söderberg
f64026af1a
Only initialise EconHandler when economy is enabled and stop accessing the static instance directly.
2020-06-24 15:26:06 +02:00
Alexander Söderberg
efab6e92f7
Lower tab completion cache time and fix "Invalid player" message for /plot kick
2020-06-24 13:44:06 +02:00
Alexander Söderberg
f6f26c6102
Fix issue where numbers were sometimes parsed as usernames when they shouldn't be. This commit also fixes an issue where "Not a valid plot ID" was sent twice.
2020-06-24 08:31:23 +02:00
Alexander Söderberg
55cf34508a
Fix issue where old player objects were not cleaned up properly.
...
This is caused by an issue with the event order in Spigot (and Spigot derivatives), so the fix is rather hacky.
2020-06-23 18:36:53 +02:00
Alexander Söderberg
f4724a3c87
Fix expiration flag commands
2020-06-23 11:45:04 +02:00
Alexander Söderberg
2b4e2fc793
Add plot debugging and make tab completable aliases configurable
2020-06-23 11:39:45 +02:00
Alexander Söderberg
2d6e6ceaeb
Improve documentation of BukkitMain#wrapPlayer and improve generic types
2020-06-22 15:45:57 +02:00
Alexander Söderberg
1dcf8d3995
Progress on the debug logging API
2020-06-21 15:50:49 +02:00
Hannes Greule
d07d32e28b
Generate plot blocks on correct height when removing intersection
...
Fixes PS-46
2020-06-20 00:14:04 +02:00
Hannes Greule
6259287dff
Add tab completion for /plot <deny|kick|remove>
2020-06-13 15:54:38 +02:00
Hannes Greule
a3586791b5
Remove unused code and use less aggressive colors
2020-06-11 01:01:00 +02:00
Hannes Greule
bb298ab660
Remove leftover TODO
2020-06-11 01:01:00 +02:00
Hannes Greule
8c0f581ff0
Add missing license headers to new files
2020-06-11 01:01:00 +02:00
Hannes Greule
033b87deb5
Resolve TODOs
2020-06-11 01:01:00 +02:00
Hannes Greule
e3fbb32399
Formatting and documentation
2020-06-11 01:01:00 +02:00
Hannes Greule
67b80bb8e8
Fix /plot setup back
2020-06-11 01:01:00 +02:00
Hannes Greule
ae1427b189
Remove usage of SetupObject
2020-06-11 01:01:00 +02:00
Hannes Greule
5165c439fc
Add tab completion and fix minor bugs
2020-06-11 01:01:00 +02:00
Hannes Greule
b15c48e074
Implement setup steps
2020-06-11 01:01:00 +02:00
Hannes Greule
c5bfde330f
First draft of redesigned setup processing
2020-06-11 01:01:00 +02:00
N0tMyFaultOG
f1b79a3b0d
Add more documentation to the settings.yml
...
Apparently gradle wants to update the poms so here we go
2020-05-27 22:20:13 +02:00
Alexander Söderberg
6442922d86
Implement some more generic types to make the player objects easier to work with and also create wrapper objects for fake players (NPCs). Potentially fixes PS-27
2020-05-27 14:08:48 +02:00
Alexander Söderberg
b9b0d89b5f
Replace the R-tree library with PRTree. Fix SquirrelID shading issues. Bump the version to 5.12.0
2020-05-25 15:13:31 +02:00
Alexander Söderberg
52b90b6757
Merge pull request #2841 from IntellectualSites/features/v5/uuid
2020-05-25 01:40:35 +02:00
dordsor21
31b71ade69
* :D
2020-05-24 23:43:15 +01:00
dordsor21
0021b114de
Revert "Slow down queue a bit because 1.13+ performance is bad"
...
This reverts commit bbde2f5e06
2020-05-24 23:24:27 +01:00
Alexander Söderberg
28a7d027f6
Merge branch 'v5' into features/v5/uuid
2020-05-24 21:14:56 +02:00
Alexander Söderberg
e32a2e2723
Merge pull request #2847 from IntellectualSites/features/v5/single-area
2020-05-24 21:13:51 +02:00
Alexander Söderberg
46b68e489d
Tab complete /p list
2020-05-24 21:08:11 +02:00
Alexander Söderberg
2436a6a402
remove debug, whoops
2020-05-24 20:54:10 +02:00
Alexander Söderberg
862467c0fa
Tab complete /plot visit
2020-05-24 20:53:16 +02:00
Alexander Söderberg
69cfb431b1
Unstupidify Visit
2020-05-24 20:18:02 +02:00
Alexander Söderberg
172bd6f0f2
This should hopefully fix that broken merge. Maybe. Possibly. Idk.
2020-05-24 19:05:09 +02:00
Alexander Söderberg
a882555d1b
Merge branch 'v5' into features/v5/uuid
...
# Conflicts:
# Bukkit/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/command/Visit.java
2020-05-24 19:00:21 +02:00
NotMyFault
0b12c4e5b2
Update issue link
2020-05-24 18:48:15 +02:00
Alexander Söderberg
0ac6383c2c
Use PlotQuery in Visit
2020-05-24 18:35:32 +02:00
Alexander Söderberg
76913d4a78
immutable -> mutable
2020-05-24 18:35:32 +02:00
Alexander Söderberg
a0d1da3274
fix dum typo
2020-05-24 18:35:32 +02:00
Alexander Söderberg
1aa144e47d
Deprecate old PlotFilter class
2020-05-24 18:35:32 +02:00
Alexander Söderberg
6b31743fb3
add missing javadoc
2020-05-24 18:35:32 +02:00
Alexander Söderberg
508fdce704
Add missing methods to PlotQuery and use PlotQuery in ListCmd
2020-05-24 18:35:32 +02:00
Alexander Söderberg
e912909aad
Add plot query system
2020-05-24 18:35:32 +02:00
Alexander Söderberg
7b97130af7
Add option to disable legacy cache, also add an option to return "Unknown" when a request cannot be fulfilled (old behaviour)
...
This should fix issues where lowercase offline mode UUIDs don't have access to their old cache.
2020-05-24 05:00:36 +02:00
Alexander Söderberg
6c6c2b57a1
Add options to disable tab completion and extend username completion, also limit the total number of username suggestions to 200 per request
2020-05-23 17:20:09 +02:00
Alexander Söderberg
113da81f29
Actually save the schematic
2020-05-23 16:15:48 +02:00
Alexander Söderberg
4dd2613f2f
Add missing caption
2020-05-23 15:02:53 +02:00
Alexander Söderberg
8c37cc5340
Fix minor issues
2020-05-23 15:02:31 +02:00
Alexander Söderberg
47c74cfa6d
Set correct region height
2020-05-23 14:39:28 +02:00
Alexander Söderberg
32a55127f1
Fix partial area regeneration when using PlotSquared generation.
...
Also fix issues with region height and road width.
2020-05-23 14:32:02 +02:00
Alexander Söderberg
6d0458281b
Merge remote-tracking branch 'origin/v5' into features/v5/single-area
2020-05-23 02:30:45 +02:00
Alexander Söderberg
93619b3988
Don't access tree until it has been created
2020-05-22 22:04:46 +02:00
Alexander Söderberg
dd4c5014fc
Get rid of unused field
2020-05-22 22:04:46 +02:00
Alexander Söderberg
1e3379b00a
Fix up the plot area nightmare
2020-05-22 22:04:46 +02:00
dordsor21
bbde2f5e06
Slow down queue a bit because 1.13+ performance is bad
2020-05-22 10:44:51 +01:00
Alexander Söderberg
b61dfd6f97
Single plot area progress
2020-05-22 03:20:11 +02:00
Alexander Söderberg
9752e5f62b
Start working on single plot areas
2020-05-22 02:48:32 +02:00
Alexander Söderberg
38a7c771be
Don't access tree until it has been created
2020-05-21 20:23:36 +02:00
Alexander Söderberg
1c6075df2b
Get rid of unused field
2020-05-21 20:06:37 +02:00
Alexander Söderberg
3ede0447b0
Fix up the plot area nightmare
2020-05-21 20:06:04 +02:00
Alexander Söderberg
f01b242e4a
For sign updating to be scheduled asynchronously.
...
It then forces it back on the main thread, so it's fine, but this way we can safely wait for the UUID mapping to be fetched.
2020-05-20 15:26:20 +02:00
Alexander Söderberg
2417dace2d
Add UUID caching
2020-05-20 15:12:09 +02:00
Alexander Söderberg
f82a111518
Merge branch 'v5' into features/v5/uuid
...
# Conflicts:
# Bukkit/pom.xml
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
2020-05-20 11:27:11 +02:00
dordsor21
0160c2bb55
Add setCuboids method to RegionManager
...
- Allow FAWE to take charge of big operations like /plot set all
2020-05-20 08:43:58 +01:00
Alexander Söderberg
ea41c842bc
Fix a bunch of minor issues
2020-05-20 00:31:59 +02:00
Alexander Söderberg
8efc78e1c9
IT COMPILES!
2020-05-19 23:05:36 +02:00
Alexander Söderberg
973c18623f
Port more commands and add more tab completion utilities
2020-05-19 19:34:33 +02:00
dordsor21
7aba70ea65
Make plot clears/sets less crashy.
...
There's still the issue of Spigot's (or paper's) terrible GC that does nothing and stores everything in PS old gen memory so the server just numpties itself though.
2020-05-19 16:54:12 +01:00
Alexander Söderberg
123ca8efe9
Update more commands and add proper request timeouts
2020-05-19 17:33:59 +02:00
dordsor21
22c26fe962
Add PlotArea#getFlag
2020-05-19 13:07:50 +01:00
dordsor21
761803f777
Add option for roads to respect a plot area's flags and implement to PlayerEvents
2020-05-19 12:41:51 +01:00
dordsor21
d5d18a60fb
Fix #2836
...
getCompoundTag can also be in Core since we're using WorldEdit.
2020-05-19 11:53:18 +01:00
Alexander Söderberg
37b065a097
Progress.
2020-05-19 00:28:52 +02:00
Alexander Söderberg
31c84ab18f
Basic pipeline setup
2020-05-18 00:22:34 +02:00
Alexander Söderberg
12f2cb0d58
Add a cache uuid service
2020-05-17 23:57:40 +02:00
Alexander Söderberg
b5f92f5003
Add sync catcher to the blocking pipeline methods
2020-05-17 23:26:19 +02:00
Alexander Söderberg
58989c9311
Add some missing methods to the pipeline
2020-05-17 23:20:36 +02:00
Alexander Söderberg
736004d88b
Don't fill in stacktrace for ServiceError
2020-05-17 18:03:04 +02:00
Alexander Söderberg
49f51f24f7
Don't loop services when all mappings have been found
2020-05-17 18:02:26 +02:00
Alexander Söderberg
95df62e59b
Add missing consumer API methods
2020-05-17 17:48:42 +02:00
Alexander Söderberg
29f2863cf4
Progress
2020-05-17 17:26:48 +02:00
Alexander Söderberg
792fa1f11d
Improve design
2020-05-17 12:55:07 +02:00
Alexander Söderberg
7591c440c2
Begin working on the new UUID service API
2020-05-17 12:40:25 +02:00
Alexander Söderberg
29e0479081
Fix preset initialization
2020-05-16 21:37:14 +02:00
