2988ad6b11
Address style violations
2021-08-18 11:58:18 +02:00
f4552e358d
Fixes #3027
...
- Ditch slf4j in favor of log4j. slf4j is (unfortunately) very much unmaintained at this time and future versions of MC (1.17+) will use log4j version 2.14.1 onwards over some ancient sfl4j version.
- Using log4j reduces our jar size as well, because we don't need to bridge it as the game provides it natively.
2021-06-03 12:40:27 +02:00
57fc51d013
Initial annotation usage cleanup + EditorConfig
2021-01-09 22:28:41 +01:00
e8642df674
Update licenses to 2021
...
Happy new year 🎆
2021-01-01 00:19:45 +01:00
c3069a425d
Format licence headers
2020-10-08 14:02:08 +02:00
9b1dc7d42e
She compiles!
2020-10-08 14:02:08 +02:00
ec23fcdd75
Rewrite build scripts
...
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com >
2020-10-08 14:02:08 +02:00
352136f0c6
Cleanup logging system
2020-08-18 15:50:28 +02:00
4a220f9bfb
Update license header
2020-08-15 14:59:29 +02:00
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
193054f1fc
Move shit out of MainUtil into more appropriate classes
2020-07-19 14:23:55 +02:00
33b6ef66d6
Delombok + import organisation
2020-07-17 17:24:45 +02:00
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
510ea56431
Finalize DI stuff
2020-07-14 18:49:40 +02:00
1dc4da8beb
Fix issues from previous merge
2020-07-14 13:21:59 +02:00
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
b36c6427d1
Split failed UUID batches into individual requests in order to identify the invalid UUIDs
2020-07-09 20:37:14 +02:00
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
159b35c717
Fix OfflinePlayerUUIDService breaking when no worlds have been loaded.
2020-06-24 08:05:06 +02:00
3e2e61d2be
Re-introduce online mode
2020-06-13 15:53:03 +02:00
98322d5d11
Add BungeePerms UUID service. This should probably work.
2020-05-24 14:32:34 +02:00
cc168d5ae9
Fix SQLite table creation statement and add legacy SQLite uuids as a provider
2020-05-24 04:48:19 +02:00
75dbc2db98
Fix offline mode UUIDs
2020-05-24 04:27:20 +02:00
2875b050c5
Add plugin UUID services. They probably work.
2020-05-23 19:43:32 +02:00
2417dace2d
Add UUID caching
2020-05-20 15:12:09 +02:00
a47527857c
Fix wonky annotation placement in SQLiteUUIDService
2020-05-17 23:58:39 +02:00
67bf90e92f
Create the SQLite UUID service and cache
2020-05-17 23:41:59 +02:00
64cfe240f9
Port OfflinePlayerUUIDService to the new system
2020-05-17 17:36:12 +02:00
29f2863cf4
Progress
2020-05-17 17:26:48 +02:00
b0348cfc34
Update packages. This will not be appreciated 🐱
2018-08-10 17:53:15 +02:00
1646cd0f5a
Reformat code
2018-08-10 17:01:11 +02:00
3039331976
Add account age expiry filter
2018-06-19 03:29:14 +10:00
538e2a6002
Varios
...
Fixes #1697
Fixes #1689
2017-08-18 12:37:26 +10:00
a0640a1e66
Fixes #1536
2017-03-13 18:12:38 +11:00
4d4950090d
Fix 1.7 block placer
2017-03-10 07:07:50 +11:00
686a6c499f
Fixes #1502
2017-01-11 07:53:53 +11:00
1f341e6ba9
Merge remote-tracking branch 'origin/master' into 3.4.5
...
# Conflicts:
# Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
# Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
# Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
# Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
# Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
# build.gradle
2016-07-29 12:25:11 -04:00
ffddf5c187
Fix sponge generator cast
2016-07-29 12:12:28 +10:00
0b5177f192
Minor uuid cache changes
2016-07-25 22:23:49 -04:00
4e019ab796
UUID cache changes
2016-07-25 22:23:19 -04:00
770b9be160
Minor uuid cache changes
2016-07-25 09:23:20 +10:00
07977ac2ce
UUID cache changes
2016-07-25 07:44:47 +10:00
98e865cdf0
Make debug output useful
2016-07-23 12:50:39 +02:00
185352d3cf
Fixes #1229
2016-06-29 15:23:10 +10:00
237a0d8b6b
Always cache * uuid
2016-06-05 20:11:02 +10:00
951a6b82a2
simplify config / multiple expiry tasks / block cache fix
2016-06-05 17:28:43 +10:00
cee970e3d9
Tweaked some things
2016-06-02 13:42:32 -04:00
7ae5042c32
Recover from bad data file
...
Closes #1122
2016-05-22 01:16:04 +10:00
0958b57e46
Tidy code.
2016-05-12 17:09:35 -04:00
421203a27d
Bug Fix and Cleanup
2016-04-29 18:14:12 -04:00
