1535 Commits

Author	SHA1	Message	Date
dordsor21	97b1a60ae8	Move comments to ChunkCoordinator, remove Range annotations	2020-07-28 08:44:16 +01:00
dordsor21	3288721259	Better constructor error handling in QueueProvider. ... Add back default constructor requiring world to QueueCoordinator to indicate extents require this constructor	2020-07-28 08:34:14 +01:00
NotMyFault	240362a16d	Update zh-CN.yml	2020-07-26 17:08:58 +02:00
dordsor21	b3ddabda29	Fix DelegateQueueCoordinator	2020-07-24 18:20:26 +01:00
dordsor21	b8b3e1e72a	Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/build.gradle # Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java	2020-07-24 18:18:42 +01:00
dordsor21	221d299052	Fix a few remaining merge issues (+1 squashed commits) ... Squashed commits: [8c6b55dd4] Fix a few remaining merge issues	2020-07-24 17:57:16 +01:00
dordsor21	3180d2ddf2	Merge branch 'v5' into v6 ... # Conflicts: # Bukkit/build.gradle # 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/placeholder/Placeholders.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/generator/ClassicPlotManager.java # Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java # Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java # build.gradle	2020-07-24 17:15:58 +01:00
dordsor21	7aaa075ba8	Javadoc, some cleanup	2020-07-24 17:00:08 +01:00
Alexander Söderberg	4fb590889a	Remove all permission related errors	2020-07-24 17:44:47 +02:00
Alexander Söderberg	115ca903b2	Remove unused stuff	2020-07-24 17:36:48 +02: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
dordsor21	1d0760c630	Formatting, mark nonnull, nullable etc	2020-07-24 16:24:53 +01:00
Alexander Söderberg	af44fe74ff	Add namespaces for translations	2020-07-24 17:19:25 +02:00
dordsor21	72c0021306	A couple of reworks ... - Redo how regeneration works a little to also take a cuboid region for regeneration off-chunk plots - Fix a couple of cases where we were writing to the queue instead of the world in the ChunkConsumer (dum) - this seems to be working.	2020-07-24 15:17:42 +01:00
dordsor21	18918eb3a3	Fix a couple more Guice issues. Refactor read chunks to be a list of chunks rather than CuboidRegion	2020-07-24 14:36:50 +01:00
dordsor21	416e181992	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 13:10:11 +01:00
Alexander Söderberg	d7a49e3316	This is not my fault	2020-07-24 14:08:40 +02:00
dordsor21	cf13f13fbf	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 13:03:42 +01:00
Alexander Söderberg	f53a8d3b06	Fix permissionprofile initialisation order	2020-07-24 14:02:49 +02:00
dordsor21	8c5c1922c9	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 12:34:41 +01:00
Alexander Söderberg	97a2ccbfe0	make sure the PlayerMetaDataKeys keys are loaded	2020-07-24 13:32:46 +02:00
dordsor21	e53c53bb4a	Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java # Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java	2020-07-24 12:21:40 +01:00
dordsor21	d906a85095	Fix some issues I caused with Guice	2020-07-24 12:18:36 +01:00
Alexander Söderberg	dc1f669a1f	Remove permission caching	2020-07-24 13:01:38 +02:00
Alexander Söderberg	fe7a57b2b7	Remove mainutil cache workaround	2020-07-24 12:48:45 +02:00
Alexander Söderberg	c9c62a1083	Remove dumb permission mess.	2020-07-24 12:44:04 +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	722361aedb	Implement suggestions from PR comments	2020-07-24 12:15:25 +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
Alexander Söderberg	6a63e5bb51	Expose the player's lock repository	2020-07-24 12:15:25 +02:00
Alexander Söderberg	ad40ab7e1e	Grant plots to the correct player	2020-07-24 12:15:25 +02:00
Alexander Söderberg	05ce67fbfe	Trick the compiler	2020-07-24 12:15:25 +02:00
Alexander Söderberg	555860cf83	Add managed persistent meta data access	2020-07-24 12:15:25 +02:00
Alexander Söderberg	2575787bd0	Add LockRepository	2020-07-24 12:15:25 +02:00
dordsor21	2cfb646065	Javadoc no fun	2020-07-23 18:11:52 +01:00
dordsor21	a1da452c41	Fix build properly	2020-07-23 18:09:37 +01:00
dordsor21	420e38bead	idek?	2020-07-23 18:07:23 +01:00
dordsor21	c3322021d0	mavenLocal, poms	2020-07-23 18:02:29 +01:00
dordsor21	45cc88091e	Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java	2020-07-23 17:33:05 +01:00
dordsor21	27498f68fb	Many Much ... - Add readregions to queues for when we're setting our own consumer (usually meaning the queue writes its own blocks, so it doesn't know which chunks to actually load) - Finish removing chunk/regionTasks - Allow the queue to not remove tickets from chunks (useful for swapping chunks so they don't unload needlessly) - Remove a lot of unused methods - Implement entities to queues - Remove chunk unloading (the server should really handle it)	2020-07-23 17:30:23 +01:00
N0tMyFaultOG	a7de76d150	Fix dependencies	2020-07-23 15:03:57 +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	bfbb81030f	Start working on the new permission system	2020-07-23 15:03:57 +02:00
Alexander Söderberg	87285e08dc	Fix plot ID issues	2020-07-23 14:11:34 +02:00
Alexander Söderberg	32a0765484	Force more compilation errors	2020-07-22 21:09:38 +02:00
Alexander Söderberg	c5e1b87c61	Fix small issues	2020-07-22 21:06:23 +02:00
N0tMyFaultOG	603d1ee9bb	Even more ... Ok seriously, I stop here	2020-07-22 20:38:46 +02:00
Alexander Söderberg	86a0816b26	Merge remote-tracking branch 'origin/feature/v6/json' into feature/v6/json	2020-07-22 19:55:03 +02:00
Alexander Söderberg	287cb0f5ad	Fix minor issues	2020-07-22 19:54:35 +02:00
N0tMyFaultOG	3009db3aa7	Update FlagCommand.java	2020-07-22 19:47:58 +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	da2fa24e74	Merge remote-tracking branch 'origin/v6' into v6	2020-07-22 12:05:50 +02:00
N0tMyFaultOG	8d04728ebc	More work	2020-07-22 00:08:51 +02:00
N0tMyFaultOG	2aa5c276c9	Some more work done towards json	2020-07-21 21:39:52 +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	5f76cc4f7b	Give ConsolePlayer the same treatment	2020-07-21 13:07:33 +02:00
Alexander Söderberg	186a810bf6	Bring back PAPI placeholders and raw colour formatting	2020-07-21 13:05:40 +02:00
dordsor21	207e56969b	Remove ChunkManager#chunkTask	2020-07-19 16:03:40 +01:00
dordsor21	94b6a27cf3	add missing license headers	2020-07-19 16:02:30 +01:00
dordsor21	21693e344c	Switch from MainUtil	2020-07-19 14:37:42 +01:00
dordsor21	d2443f6de8	Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java # Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java # Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.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/world/SinglePlotManager.java # Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java	2020-07-19 14:29:08 +01: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	335cf5d2e9	Fix issues	2020-07-19 14:34:42 +02: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	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
dordsor21	656700b5be	Start reimplementing chunk generation. ... This would either need to be one WorldEdit operation or (preferable) WorldEdit allows Extents (including EditSessions) into the regenerate adapter method	2020-07-19 13:12:27 +01:00
dordsor21	3e84f3b3a4	Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java # Core/src/main/java/com/plotsquared/core/plot/Plot.java # Core/src/main/java/com/plotsquared/core/util/WorldUtil.java	2020-07-18 15:27:52 +01: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
dordsor21	03983e8886	Allow forcing of queues down pipelines to ensure whenDone runnables are called correctly ... Also remove autoQueue since it's never used and would be a bad idea	2020-07-18 13:55:54 +01:00
dordsor21	57af50ed49	Continue implementation of new queue system ... - Move ChunkCoordinatorBuild to Core - Add core ChunkCoordinator - Add Factories for ChunkCoordinator and its Builder - Reimplement refreshChunk but in WorldUtil - Allow custom Consumers to be used by the Queue when sent to the ChunkCoordinator - Start switching ChunkTasks to use the new ChunkCoordinator system - Replace GlobalBlockQueue's "empty task" system with normal sync TaskManager - Remove lombok from the queue system - Add back forceSync and chunkObject from LocalBlockQueue	2020-07-18 12:07:56 +01: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
dordsor21	66b94ab9f1	Start switching to WorldEdit Worlds	2020-07-17 17:21:32 +01:00
dordsor21	74c6fc954e	Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Core/src/main/java/com/plotsquared/core/command/Trim.java # Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java # Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java	2020-07-17 17:16:49 +01: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
dordsor21	9fefe57c90	Switch to using QueueCoordinators everywhere	2020-07-17 15:41:06 +01:00
dordsor21	ed77522c08	Add wna block setting, use WorldEdit worlds rather than Strings.	2020-07-17 14:38:50 +01:00
dordsor21	def9a1bcf8	begin new block setting/chunk pipeline ... This will ultimately replace both the GlobalBlockQueue and the ChunkTask stuff	2020-07-17 13:22:33 +01:00
N0tMyFaultOG	01ff9a34c2	Merge branch 'features/v5/placeholders' into v5	2020-07-16 18:48:45 +02:00
Hannes Greule	2d9cf8b759	Get placeholders working	2020-07-16 18:04:17 +02:00
Alexander Söderberg	32b28a4ca5	Turn all UUID messages into debug messages	2020-07-15 22:42:58 +02:00
NotMyFault	e5963a8590	Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners ... Clean up bukkit listeners by splitting them up	2020-07-15 13:35:38 +02:00