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
dordsor21
d24c89405a
Switch to using a Clipboard for regen in preparation for WE changes
2020-07-19 14:17:38 +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
N0tMyFaultOG
87a8ff742f
5.13.1
2020-07-19 14:16:13 +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
09aca839a8
Add back changes to ChunkCoordinator
2020-07-17 14:00:01 +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
dordsor21
57435fdf34
verbosely ensure items cannot be duplicated when keeping inventory on death
...
Seemingly there's duplication issues on some servers (and apparently even when only PlotSquared is installed). Likely a Spigot issue, but there's nothing to be done for Spigot on 1.13/14/15
2020-07-16 23:24:11 +01:00
N0tMyFaultOG
01ff9a34c2
Merge branch 'features/v5/placeholders' into v5
2020-07-16 18:48:45 +02:00
N0tMyFaultOG
ff3a94933a
Bump version
2020-07-16 18:43:52 +02:00
Hannes Greule
97a356c4a0
Very attentive reviewers, can recommend
2020-07-16 18:13:02 +02:00
Hannes Greule
10ab28c1ec
Add missing license headers
2020-07-16 18:08:00 +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
N0tMyFaultOG
4996d8bcd1
Remove left over debugs
2020-07-15 14:05:15 +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
N0tMyFaultOG
e8c155763b
Register placeholders
2020-07-15 12:44:07 +02:00
