Alexander Söderberg
|
c5e1b87c61
|
Fix small issues
|
2020-07-22 21:06:23 +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
|
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
|
186a810bf6
|
Bring back PAPI placeholders and raw colour formatting
|
2020-07-21 13:05:40 +02:00 |
|
dordsor21
|
ed27422e69
|
Move IJ/xyz cache out of MainUItil to its own class
|
2020-07-19 14:21:52 +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 |
|
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
|
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
|
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
|
55eefd09da
|
Merge branch 'v6' into feature/v6/json
|
2020-07-14 16:52:40 +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 |
|
N0tMyFaultOG
|
c6962ef4d2
|
Shift a few more messages to debug
|
2020-07-13 19:56:34 +02:00 |
|
Alexander Söderberg
|
0fa5a16cd0
|
replace remaining debug calls
|
2020-07-12 21:49:05 +02:00 |
|
Alexander Söderberg
|
e88da3cea9
|
Add chunk coordinator
|
2020-07-12 20:58:48 +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
|
916675fb08
|
Guice progress
|
2020-07-11 17:19:19 +02: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
|
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 |
|
dordsor21
|
afb72aa102
|
Don't include eggs with spawn*_eggs*
|
2020-07-10 17:31:46 +01: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
|
c37cc40ad9
|
Move annotation in BukkitWorld
|
2020-07-10 12:27:26 +02:00 |
|
Alexander Söderberg
|
5341015cb1
|
Finalize immutable locations and add a platform world implementation
|
2020-07-10 12:21:29 +02:00 |
|
dordsor21
|
5e44bb60c6
|
Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5
|
2020-07-09 22:14:38 +01:00 |
|
dordsor21
|
96740fd282
|
Couple of fixes to road flag logic
|
2020-07-09 21:52:51 +01:00 |
|