1010 Commits

Author	SHA1	Message	Date
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
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
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	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	09aca839a8	Add back changes to ChunkCoordinator	2020-07-17 14:00:01 +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
dordsor21	57435fdf34	verbosely ensure items cannot be duplicated when keeping inventory on death ... Seemingly there's duplication issues on some servers (and apparently even when only PlotSquared is installed). Likely a Spigot issue, but there's nothing to be done for Spigot on 1.13/14/15	2020-07-16 23:24:11 +01:00
N0tMyFaultOG	01ff9a34c2	Merge branch 'features/v5/placeholders' into v5	2020-07-16 18:48:45 +02:00
N0tMyFaultOG	ff3a94933a	Bump version	2020-07-16 18:43:52 +02:00
Hannes Greule	97a356c4a0	Very attentive reviewers, can recommend	2020-07-16 18:13:02 +02:00
Hannes Greule	10ab28c1ec	Add missing license headers	2020-07-16 18:08:00 +02:00
Hannes Greule	2d9cf8b759	Get placeholders working	2020-07-16 18:04:17 +02:00
N0tMyFaultOG	4996d8bcd1	Remove left over debugs	2020-07-15 14:05:15 +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
N0tMyFaultOG	e8c155763b	Register placeholders	2020-07-15 12:44:07 +02:00
N0tMyFaultOG	a52249513e	Update MVdW version	2020-07-15 12:05:42 +02:00
Alexander Söderberg	34655b8d41	Add (untested) MVdWPlaceholderAPI support	2020-07-14 20:41:08 +02:00
dordsor21	30327d2fa3	update bukkit pom	2020-07-14 19:11:46 +01: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	1908588fcb	Change expansion author and version	2020-07-14 13:17:21 +02:00
Alexander Söderberg	af7db08036	Add new placeholder system	2020-07-14 13:14:02 +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
Alexander Söderberg	b109b76120	Nevermind, it doesn't allow for relocations	2020-07-13 20:50:49 +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
dordsor21	14b6f84816	fix typos that were c/p over	2020-07-12 18:50:04 +01: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
dordsor21	c045ef698c	Add license headers and fix method change in PlotSquared.java	2020-07-12 11:42:45 +01:00
Alexander Söderberg	5cdb3f4fd5	Add missing injection points	2020-07-12 12:25:44 +02:00
dordsor21	3a11ffc77a	Clean up bukkit listeners by splitting them up	2020-07-11 19:03:55 +01: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	5b260ea8da	update bukkit pom	2020-07-09 22:33:01 +01: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
Alexander Söderberg	b36c6427d1	Split failed UUID batches into individual requests in order to identify the invalid UUIDs	2020-07-09 20:37:14 +02:00
Traks	cfd389883b	Improve piston interaction with area border	2020-07-09 20:14:06 +02:00
Traks	4576cfd961	Improve piston interaction with plot border ... Fixes retracting pistons being able to modify plot borders. Prevents piston heads from sticking outside plots.	2020-07-09 20:14:06 +02:00
Alexander Söderberg	699eb71e2a	Fix kill-road-mobs. Fixes PS-73	2020-07-09 19:46:17 +02:00
Alexander Söderberg	6b07f38cff	Send teleportation cancellation message immediately on movement, rather than after the timer has finished. This fixes PS-33.	2020-07-09 16:45:25 +02:00
Alexander Söderberg	904f5485ab	Merge remote-tracking branch 'origin/v5' into v5	2020-07-09 16:38:53 +02:00
Alexander Söderberg	e05d817482	Fix plot owner placeholder. Fixes PS-62.	2020-07-09 16:38:46 +02:00
Alexander Söderberg	db37077af7	Make signs able to use captions	2020-07-09 12:58:28 +02:00
Traks	61de18190f	More dispense blocking on roads	2020-07-09 12:33:23 +02:00
dordsor21	1310f9470e	5.12.4	2020-07-08 19:34:08 +01:00
dordsor21	2936b806f3	Allow players to interact on their own plot	2020-07-08 17:10:09 +01:00
Alexander Söderberg	3fa532a3c0	Move message sending into PlotPlayer to make it platform independent	2020-07-08 15:35:58 +02:00
Alexander Söderberg	090bd69be5	Merge branch 'v6' into feature/v6/json ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java	2020-07-08 15:22:02 +02:00
Alexander Söderberg	c36e311520	Continue cleaning up PlotSquared.java	2020-07-08 15:09:25 +02:00
Alexander Söderberg	51bd21a464	Merge branch 'v6' into feature/v6/platform ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java	2020-07-08 13:57:33 +02:00
N0tMyFaultOG	5004005c5a	Fixes PS-65 ... EssentialsX uses paperlib 1.0.4 where we compile explicitly against 1.0.2	2020-07-08 12:21:31 +02:00
N0tMyFaultOG	67a49a2ca7	5.12.3	2020-07-07 21:03:30 +02:00
dordsor21	e826836c36	Merge branch 'v5' into features/v5/road-respect-flags	2020-07-07 17:48:46 +01:00
Alexander Söderberg	196df855ac	Clean up PlotAreaManager and move a bunch of plot area related logic out of PlotSquared	2020-07-07 13:37:03 +02:00
Alexander Söderberg	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
Alexander Söderberg	298e65a394	Replace remaining references to PlotSquared#log	2020-07-06 17:17:46 +02:00
Alexander Söderberg	078b776f60	Implement console messages	2020-07-05 18:14:29 +02:00
Alexander Söderberg	4d61a345c6	Small documentation fixes	2020-07-05 18:06:10 +02:00
Alexander Söderberg	dc0358957e	Add prefix replacement to messages and skip sending empty messages	2020-07-05 18:02:43 +02:00
Alexander Söderberg	42d648e338	Use adventure for titles	2020-07-05 17:57:58 +02:00
Alexander Söderberg	1c254984c1	Replace logging references in Bukkitmain	2020-07-05 13:56:54 +02:00
Alexander Söderberg	f287cc34e7	Remove json message stuff	2020-07-05 13:46:25 +02:00
Alexander Söderberg	c8a8806e7d	Component progress. The plugin is **very** broken right now.	2020-07-05 13:41:40 +02:00