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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
d141b040d6
|
Fix relocations
|
2020-07-13 20:45:04 +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 |
|
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 |
|
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 |
|