Alexander Söderberg
|
da2fa24e74
|
Merge remote-tracking branch 'origin/v6' into v6
|
2020-07-22 12:05:50 +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
|
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
|
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 |
|
Alexander Söderberg
|
e80ade65c7
|
Clean up PlotId
|
2020-07-18 11:05:16 +02:00 |
|
Alexander Söderberg
|
d077fafd29
|
Some random bukkitutil/worldutil improvements
|
2020-07-17 23:00:09 +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
|
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
|
c853147635
|
Merge pull request #2870 from IntellectualSites/feature/v6/platform
|
2020-07-14 19:13:00 +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
|
7897d78f0d
|
Merge pull request #2868 from IntellectualSites/feature/v6/slf4j
|
2020-07-14 18:49:34 +02:00 |
|
Alexander Söderberg
|
25a58a5c46
|
Merge branch 'v6' into feature/v6/platform
|
2020-07-14 17:45:33 +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
|
1dc4da8beb
|
Fix issues from previous merge
|
2020-07-14 13:21:59 +02:00 |
|
NotMyFault
|
e72ce9c90e
|
Update gradle.yml
|
2020-07-14 12:44:11 +02:00 |
|
NotMyFault
|
32264ae5e3
|
Update gradle.yml
|
2020-07-14 12:43:45 +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
|
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 |
|
Alexander Söderberg
|
a1f262b5b2
|
Fix gradle setup and replace all debug calls
|
2020-07-13 22:51:57 +02:00 |
|
Alexander Söderberg
|
b109b76120
|
Nevermind, it doesn't allow for relocations
|
2020-07-13 20:50:49 +02:00 |
|
N0tMyFaultOG
|
1388f280e6
|
Update module poms
|
2020-07-13 20:46:34 +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 |
|
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
|
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 |
|
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 |
|