890 Commits

Author	SHA1	Message	Date
N0tMyFaultOG	11af906c79	Fix a little oopsie	2020-08-07 18:55:22 +02:00
N0tMyFaultOG	c31c4b4286	More work	2020-08-07 18:52:45 +02:00
dordsor21	7f29b5d1e8	ComponentPreset inventory to json	2020-08-07 13:22:10 +01:00
dordsor21	21a97863ac	Refactor Captions to Permission, reimplement message list in debug command	2020-08-07 11:53:32 +01:00
dordsor21	d3fe1d3b2b	Fix plot info, sign usage in Plot.class	2020-08-04 15:07:07 +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
Alexander Söderberg	f53a8d3b06	Fix permissionprofile initialisation order	2020-07-24 14:02:49 +02:00
Alexander Söderberg	dc1f669a1f	Remove permission caching	2020-07-24 13:01:38 +02:00
Alexander Söderberg	5608c5a901	Merge branch 'v6' into features/v6/permissions ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java # Core/src/main/java/com/plotsquared/core/command/Auto.java # Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java # Core/src/main/java/com/plotsquared/core/util/Permissions.java	2020-07-24 12:20:45 +02:00
Alexander Söderberg	d2f40612f4	Switch from Class<T> to TypeLiteral, and implement managed meta access for temporary meta	2020-07-24 12:15:25 +02:00
dordsor21	d8e5daf12b	Fix missing Main->Chunk Util change	2020-07-23 18:04:01 +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	b302bb9379	Make VaultPermissionHandler extent BukkitPermissionHandler	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
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