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
Alexander Söderberg
bfbb81030f
Start working on the new permission system
2020-07-23 15:03:57 +02:00
Alexander Söderberg
63ce3292aa
Fix PlayerManager injection
2020-07-23 15:03:27 +02:00
Alexander Söderberg
b9a8846ee9
Fix WorldManager injection
2020-07-23 14:56:53 +02:00
Alexander Söderberg
6ae1d28f80
Fix WorldManager injection
2020-07-23 14:56:06 +02:00
Alexander Söderberg
17d358f8fe
Fix plot ID issues
2020-07-23 14:14:15 +02:00
Alexander Söderberg
cfd71457d2
Clean up BlockUtil
2020-07-23 14:14:15 +02:00
Alexander Söderberg
87285e08dc
Fix plot ID issues
2020-07-23 14:11:34 +02:00
N0tMyFaultOG
b3a63123fd
Fix dependencies
2020-07-23 14:03:56 +02:00
Alexander Söderberg
7fc8238fb0
Remove construction of fake player entities for offline players.
2020-07-23 12:47:00 +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
9d6744ec15
Get rid of PermHandler
2020-07-22 12:35:48 +02:00
Alexander Söderberg
532f2caa37
Make VaultPermissionHandler extent BukkitPermissionHandler
2020-07-22 12:06:56 +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
6dba31b257
Start working on the new permission system
2020-07-21 14:28:54 +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
73e3572c72
Fix the redstone flag on roads
2020-07-21 13:11:28 +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
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
