N0tMyFaultOG
|
0d89125a8e
|
Replace sys out with logger factory
|
2020-10-08 20:52:02 +02:00 |
|
Mariell Hoversholm
|
c3069a425d
|
Format licence headers
|
2020-10-08 14:02:08 +02:00 |
|
N0tMyFaultOG
|
ec23fcdd75
|
Rewrite build scripts
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
|
2020-10-08 14:02:08 +02:00 |
|
dordsor21
|
544d57c720
|
Merge branch 'v5' into v6
# Conflicts:
# Bukkit/build.gradle
# Bukkit/pom.xml
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
# Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
# Core/src/main/java/com/plotsquared/core/PlotPlatform.java
# Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
# Core/src/main/java/com/plotsquared/core/command/Grant.java
# build.gradle
|
2020-10-07 12:20:32 +01:00 |
|
dordsor21
|
554efbb057
|
Merge branch 'v5' into v6
# Conflicts:
# .github/CODEOWNERS
# Bukkit/pom.xml
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Core/src/main/java/com/plotsquared/core/command/Alias.java
# Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
# Core/src/main/java/com/plotsquared/core/command/Music.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/flag/types/BlockTypeWrapper.java
# build.gradle
|
2020-09-11 15:44:04 +01:00 |
|
Hannes Greule
|
551d1d9f1a
|
Add NullEconHandler to avoid verbose null checks
|
2020-08-25 12:41:03 +02:00 |
|
N0tMyFaultOG
|
02bd83bd90
|
Merge v5 into v6
|
2020-08-24 14:33:53 +02:00 |
|
N0tMyFaultOG
|
352136f0c6
|
Cleanup logging system
|
2020-08-18 15:50:28 +02:00 |
|
N0tMyFaultOG
|
05a15ac689
|
Fix a few typos and spaces
|
2020-08-17 19:39:43 +02:00 |
|
Alexander Söderberg
|
a4c9ed90b7
|
Fix startup issues and make messages send properly
|
2020-08-16 13:49:16 +02:00 |
|
Alexander Söderberg
|
28d6d4db92
|
Fix shading mess and make the plugin start
|
2020-08-16 12:44:10 +02:00 |
|
N0tMyFaultOG
|
4a220f9bfb
|
Update license header
|
2020-08-15 14:59:29 +02:00 |
|
NotMyFault
|
556ff0baf4
|
Fix line break
|
2020-08-14 12:27:38 +02:00 |
|
NotMyFault
|
8cc536b20f
|
Fix spelling
|
2020-08-14 11:57:37 +02:00 |
|
N0tMyFaultOG
|
5e20c871a5
|
Fix metrics setting
|
2020-08-14 11:36:17 +02:00 |
|
dordsor21
|
7bad242944
|
Merge branch 'v6' into feature/v6/json. It builds!
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
# Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Clear.java
# Core/src/main/java/com/plotsquared/core/command/Debug.java
# Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
# Core/src/main/java/com/plotsquared/core/command/Relight.java
# Core/src/main/java/com/plotsquared/core/command/Set.java
# Core/src/main/java/com/plotsquared/core/command/Template.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/generator/ClassicPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
# Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java
# Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
# Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
# Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
# Core/src/main/java/com/plotsquared/core/util/EntityUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegionManager.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
# build.gradle
|
2020-08-08 13:20:30 +01:00 |
|
dordsor21
|
74a5c48214
|
Finish up core and bukkit json
|
2020-08-08 12:16:48 +01:00 |
|
N0tMyFaultOG
|
c31c4b4286
|
More work
|
2020-08-07 18:52:45 +02: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
|
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 |
|
Alexander Söderberg
|
e90170a384
|
Merge remote-tracking branch 'origin/v6' into feature/v6/json
# Conflicts:
# 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/player/BukkitOfflinePlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
# Core/pom.xml
# Core/src/main/java/com/plotsquared/core/PlotAPI.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/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
# Core/src/main/java/com/plotsquared/core/command/Command.java
# Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Grant.java
# Core/src/main/java/com/plotsquared/core/command/Inbox.java
# Core/src/main/java/com/plotsquared/core/command/Load.java
# Core/src/main/java/com/plotsquared/core/command/Save.java
# Core/src/main/java/com/plotsquared/core/command/Setup.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/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
# Core/src/main/java/com/plotsquared/core/util/BlockUtil.java
# Core/src/main/java/com/plotsquared/core/util/Permissions.java
|
2020-07-24 17:28:52 +02:00 |
|
dordsor21
|
1d0760c630
|
Formatting, mark nonnull, nullable etc
|
2020-07-24 16:24:53 +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
|
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 |
|
Alexander Söderberg
|
d8e80daa93
|
Fix annoying guice injection issue
|
2020-07-23 15:40:43 +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
|
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
|
6ae1d28f80
|
Fix WorldManager injection
|
2020-07-23 14:56:06 +02:00 |
|
Alexander Söderberg
|
c5e1b87c61
|
Fix small issues
|
2020-07-22 21:06:23 +02:00 |
|
Alexander Söderberg
|
186a810bf6
|
Bring back PAPI placeholders and raw colour formatting
|
2020-07-21 13:05:40 +02: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 |
|
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
|
193054f1fc
|
Move shit out of MainUtil into more appropriate classes
|
2020-07-19 14:23:55 +02: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
|
e80ade65c7
|
Clean up PlotId
|
2020-07-18 11:05:16 +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 |
|
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
|
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
|
020b030667
|
More fixes
|
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 |
|
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 |
|