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
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
66b94ab9f1
Start switching to WorldEdit Worlds
2020-07-17 17:21:32 +01:00
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
932052772c
Fix edge cases for time conversion
2020-07-17 17:53:30 +02:00
43d058d3db
Address comments
2020-07-17 17:53:30 +02:00
020b030667
More fixes
2020-07-17 17:53:30 +02:00
5a3eacde0b
Replace method synchronization logic
2020-07-17 17:53:30 +02:00
7f412f5472
Begin work on the task system
2020-07-17 17:53:30 +02:00
9fefe57c90
Switch to using QueueCoordinators everywhere
2020-07-17 15:41:06 +01:00
ed77522c08
Add wna block setting, use WorldEdit worlds rather than Strings.
2020-07-17 14:38:50 +01:00
09aca839a8
Add back changes to ChunkCoordinator
2020-07-17 14:00:01 +01:00
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
8eb903ad72
Merge branch 'v5' into v6
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-14 19:18:08 +02:00
c853147635
Merge pull request #2870 from IntellectualSites/feature/v6/platform
2020-07-14 19:13:00 +02:00
0294397021
Manually resolve a bunch of merge issues
2020-07-14 19:10:52 +02:00
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
510ea56431
Finalize DI stuff
2020-07-14 18:49:40 +02:00
7897d78f0d
Merge pull request #2868 from IntellectualSites/feature/v6/slf4j
2020-07-14 18:49:34 +02:00
25a58a5c46
Merge branch 'v6' into feature/v6/platform
2020-07-14 17:45:33 +02:00
f9e5fd714d
Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform
2020-07-14 17:07:03 +02:00
1dc4da8beb
Fix issues from previous merge
2020-07-14 13:21:59 +02:00
e72ce9c90e
Update gradle.yml
2020-07-14 12:44:11 +02:00
32264ae5e3
Update gradle.yml
2020-07-14 12:43:45 +02:00
33f2ff7e6d
Merge branch 'v6' into feature/v6/slf4j
2020-07-13 23:11:40 +02:00
6664d49928
Prefix all log messages
2020-07-13 23:04:27 +02:00
d648a6d3db
Merge remote-tracking branch 'origin/feature/v6/slf4j' into feature/v6/slf4j
...
# Conflicts:
# Bukkit/pom.xml
# Core/pom.xml
2020-07-13 22:52:10 +02:00
a1f262b5b2
Fix gradle setup and replace all debug calls
2020-07-13 22:51:57 +02:00
b109b76120
Nevermind, it doesn't allow for relocations
2020-07-13 20:50:49 +02:00
1388f280e6
Update module poms
2020-07-13 20:46:34 +02:00
d141b040d6
Fix relocations
2020-07-13 20:45:04 +02:00
e84d82315c
Add log4j config (this might work :p)
2020-07-13 20:39:52 +02:00
c6962ef4d2
Shift a few more messages to debug
2020-07-13 19:56:34 +02:00
0fa5a16cd0
replace remaining debug calls
2020-07-12 21:49:05 +02:00
e88da3cea9
Add chunk coordinator
2020-07-12 20:58:48 +02:00
ac8841447c
6cf2c0ad97 (r40542418)
2020-07-12 17:11:25 +02:00
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
5cdb3f4fd5
Add missing injection points
2020-07-12 12:25:44 +02:00
5a5c5721cc
fix compiler crashing
2020-07-12 07:38:57 +02:00
916675fb08
Guice progress
2020-07-11 17:19:19 +02:00
a2ec404014
Fix /plot target nearest
2020-07-11 13:40:22 +01:00
6f6cb4b630
More DI progress
2020-07-11 05:29:41 +02:00
c0f69f321d
Guice progress
2020-07-10 22:12:37 +02:00
55bf41d2da
Remove dumdum static access
2020-07-10 19:25:05 +02:00
7687d7705b
Fix merge issue
2020-07-10 18:38:14 +02:00
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
afb72aa102
Don't include eggs with spawn*_eggs*
2020-07-10 17:31:46 +01:00
d00dc658df
Inject EventDispatcher and PlotListener
2020-07-10 18:17:44 +02:00
2dab7c8dda
Inject PlotAreaManager
2020-07-10 17:32:07 +02:00
c37cc40ad9
Move annotation in BukkitWorld
2020-07-10 12:27:26 +02:00
