2075 Commits

Author	SHA1	Message	Date
NotMyFault	da45813a06	Add new metrics pies	2021-02-22 15:18:20 +01:00
NotMyFault	6cc9b5c62b	Remove eol config entries	2021-02-22 13:24:46 +01:00
Hannes Greule	1172e02f1b	Fix several issues with debug command	2021-02-21 12:34:14 +01:00
Hannes Greule	46fbc05040	Don't fail to load when moving components file	2021-02-20 19:41:58 +01:00
NotMyFault	fee1ffa2e9	Switch to vanity url	2021-02-17 00:50:50 +01:00
NotMyFault	22be81b5cb	Switch to vanity url	2021-02-16 23:50:53 +01:00
NotMyFault	12d260ca82	Fixes https://issues.intellectualsites.com/issue/PS-23	2021-02-09 18:20:50 +01:00
NotMyFault	82e90553bc	Enhance continue message	2021-02-03 15:44:18 +01:00
NotMyFault	18c1a0e4f6	Remove duplicated translation strings	2021-02-02 16:48:01 +01:00
NotMyFault	aca2d2e510	Fixes https://issues.intellectualsites.com/issue/PS-186	2021-01-31 11:44:22 +01:00
Alexander Söderberg	8292ed9e31	More annotation work	2021-01-10 00:01:48 +01:00
Alexander Söderberg	57fc51d013	Initial annotation usage cleanup + EditorConfig	2021-01-09 22:28:41 +01:00
dordsor21	8b332adbe7	Address comments	2021-01-09 21:34:42 +01:00
dordsor21	ae0ee1ebdd	fix teleport to "*"	2021-01-09 21:34:42 +01:00
dordsor21	3cea734b9b	Fix singleworlds	2021-01-09 21:34:42 +01:00
dordsor21	7ac3f7ca03	Fix sync tasks not being sync	2021-01-09 20:39:25 +01:00
N0tMyFaultOG	0a5c73478d	Fix improper missing permission message on /plot list world	2021-01-08 17:16:38 +01:00
N0tMyFaultOG	495952acb0	Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/129	2021-01-08 16:46:57 +01:00
N0tMyFaultOG	25a8f1522a	Move creation date up in plot header	2021-01-08 16:08:42 +01:00
N0tMyFaultOG	f13f7ce129	Disable destructive operations for plot world plots	2021-01-08 16:06:15 +01:00
dordsor21	cc90127af9	fix two <> errors in lang	2021-01-07 13:45:01 +00:00
dordsor21	ec8bdc9af6	Actually place the debugroadregen blocks	2021-01-04 19:23:31 +00:00
dordsor21	9598416932	handle cancellation properly in DefaultProgressSubscriber	2021-01-04 18:23:45 +00:00
dordsor21	4c0bc79e49	Allow over/undersizes schematics to be saved and pasted (#2944) ... Co-authored-by: NotMyFault <mc.cache@web.de>	2021-01-03 23:46:53 +01:00
Hannes Greule	01dd2d8097	Should be code, not link ... Co-authored-by: Alexander Söderberg <4096670+Citymonstret@users.noreply.github.com>	2021-01-03 23:42:32 +01:00
Hannes Greule	e09444d94f	code style	2021-01-03 23:42:32 +01:00
Hannes Greule	0c76833997	Implement CaptionLoader API to be used by third party plugins/addons ... This allows to load resources from other classloaders than the P2 one. Therefore, we can use this in addons too to manage messages the same way.	2021-01-03 23:42:32 +01:00
Hannes Greule	ad99ca1723	Use WE Expressions instead of js evaluation (#2941) ... * Implement thread-safe expression evaluation * Update `{args}` to `plot` automatically * Stringify more money/balance/price occurrences with EconHandler#format	2021-01-02 16:32:07 +00:00
N0tMyFaultOG	4f60da292a	Add leaf-decay flag ... Stop leaves from decaying.	2021-01-01 21:47:09 +01:00
N0tMyFaultOG	bf79639d07	Update license to 2021 ... Happy new year 🎆	2021-01-01 00:46:30 +01:00
N0tMyFaultOG	e8642df674	Update licenses to 2021 ... Happy new year 🎆	2021-01-01 00:19:45 +01:00
N0tMyFaultOG	3702caa25f	Replace toggle permission with plots.toggle	2020-12-28 16:06:24 +01:00
N0tMyFaultOG	4200bbfd0a	Update permission range declaration	2020-12-28 15:38:42 +01:00
N0tMyFaultOG	0fcca4c141	Use hasPermissionRange to check for trust and add limits	2020-12-28 15:36:00 +01:00
dordsor21	ef215b1b0c	fix debugpaste with multiverse	2020-12-28 12:31:51 +00:00
dordsor21	1d0721034d	fix debugpaste with multiverse	2020-12-28 12:30:53 +00:00
Hannes Greule	ce23c153ee	Fix added_list and denied_list placeholders	2020-12-28 12:15:34 +01:00
Hannes Greule	019da4d2f4	Expose legacy serializer for placeholders	2020-12-28 11:21:35 +01:00
Hannes Greule	ffc31f565b	Use builder for flags component	2020-12-28 00:05:33 +01:00
N0tMyFaultOG	7f01f2d716	Rename placeholders matching more appropriately	2020-12-27 19:37:09 +01:00
N0tMyFaultOG	bf20b0dd79	Beautify placeholder output for '*' permission	2020-12-27 19:16:26 +01:00
N0tMyFaultOG	867826759b	Make placeholders translatable	2020-12-26 13:50:00 +01:00
dordsor21	3be370071c	fix purge <owner>	2020-12-23 14:13:50 +00:00
dordsor21	67a7211b77	use correct UUID pipeline methods in purge command	2020-12-23 13:52:47 +00:00
N0tMyFaultOG	7f1baca872	Add database type to debugpaste	2020-12-22 17:55:37 +01:00
N0tMyFaultOG	8c3a0a8275	Fix compiling	2020-12-21 20:33:49 +01:00
N0tMyFaultOG	bb52301200	Merge remote-tracking branch 'origin/renovate/configure' into v6	2020-12-20 22:38:35 +01:00
dordsor21	e4a8459798	Switch to IncendoPaster "library"	2020-12-19 16:20:44 +00:00
dordsor21	14fa738fbe	switch to InvendoPaster "library"	2020-12-19 16:00:13 +00:00
dordsor21	cbc599cb20	don't double-up schematic x/z offsets	2020-12-16 12:13:39 +00:00
dordsor21	09c84e25bf	don't double-up schematic x/z offsets	2020-12-16 12:07:36 +00:00
dordsor21	e8e116312a	Merge branch 'v5' into v6 ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java # Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java # Core/src/main/java/com/plotsquared/core/command/Deny.java # Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java	2020-12-14 15:15:27 +00:00
dordsor21	5e88cabb4b	compare UUID to UUID, not UUIDMapping ... fix PS-182	2020-12-14 14:32:34 +00:00
dordsor21	6d71177394	Don't save corrupt schematics so that when they load, they work.	2020-12-13 21:09:05 +00:00
N0tMyFaultOG	edd9ae5118	Fix more flag message issues.	2020-12-12 22:46:37 +01:00
Hannes Greule	23ae3b5830	Use builder for flag list message	2020-12-12 21:19:28 +01:00
Hannes Greule	6746aab7ef	Improve /plot info formatting	2020-12-12 18:56:19 +01:00
dordsor21	cf70efabb0	we want throwable to be null	2020-12-11 16:51:13 +00:00
dordsor21	18f13b7d15	Merge branch 'v5' into v6	2020-12-10 21:28:28 +00:00
dordsor21	0bb959d26a	Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6	2020-12-10 21:15:51 +00:00
dordsor21	b4f3e85001	allow "owned" road mobs to be killed as well ... (those that are leashed, being ridden, etc)	2020-12-10 21:14:32 +00:00
Hannes Greule	25100c46f7	Don't unclaim claimed plots with /p claim	2020-12-10 22:13:13 +01:00
dordsor21	540f4c0958	fix info for server-plots	2020-12-10 21:05:50 +00:00
dordsor21	8930ebe572	Relight command is pointless as we'd just use FAWE for it anyway.	2020-12-10 18:06:32 +00:00
dordsor21	8f93f2b6d2	Revert "Allow "Server" owner" as that has its own UUID ... This reverts commit 9ba91889e0.	2020-12-10 18:02:38 +00:00
dordsor21	9ba91889e0	Allow "Server" owner	2020-12-10 17:58:00 +00:00
dordsor21	67683fbddb	Ensure not to parse null parameters into templates for titles	2020-12-10 17:56:22 +00:00
Hannes Greule	824f9d7ad0	Add missing returns to /plot cluster	2020-12-09 23:14:52 +01:00
Hannes Greule	3e99f90eb1	Don't spit NPEs on NonNull values	2020-12-09 22:45:47 +01:00
N0tMyFaultOG	bc1d3ddd5d	Fix spelling	2020-12-07 21:25:32 +01:00
N0tMyFaultOG	bf7b75b619	Make titles duration configurable	2020-12-07 21:23:38 +01:00
N0tMyFaultOG	469d6ab907	Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/77	2020-12-07 14:46:16 +01:00
N0tMyFaultOG	a4dd5bb62f	Add tab completion to like/dislike and fix more messages	2020-12-07 12:51:14 +01:00
N0tMyFaultOG	60859de0bd	Add an option to teleport the player on plot clearing or deletion	2020-12-07 10:55:34 +01:00
Hannes Greule	ff70d5db14	Feature/v6/arkitektonika (#2916) ... * Start working on Arkitektonika support * Progress on Arkitektonika * Add license headers * Some QoL and javadocs * Fix maximum calculation * Fix minor formatting * Reimplement legacy webinterface support * Add documentation and fix deletion link * Resolve conflicts/gradle stuff * Fix links * Make message readable * Do not allow download of merged plots	2020-12-05 19:50:41 +01:00
Alexander Söderberg	c8ad936d26	Clean up PlotPlatform a bit and make the placeholder registry injectible	2020-12-05 18:41:41 +01:00
Hannes Greule	14ec7fb816	Fix PlotRangeIterator	2020-12-05 18:03:24 +01:00
N0tMyFaultOG	b4ea230ff1	Minor translation changes	2020-12-05 15:35:33 +01:00
N0tMyFaultOG	410879d154	Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/141	2020-12-05 15:20:19 +01:00
N0tMyFaultOG	f14121e99c	Initiate placeholder registry	2020-12-05 15:08:27 +01:00
N0tMyFaultOG	19d7444946	Fix flag description	2020-12-04 19:27:34 +01:00
N0tMyFaultOG	cfd3c159f9	Follow up to 4ff50525ed ... Skipping deprecation here, this exists for so long and and has been superseded by permissions now.	2020-12-04 17:33:41 +01:00
N0tMyFaultOG	4ff50525ed	Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/110	2020-12-04 17:30:11 +01:00
NotMyFault	ec683cdf88	Update ClassicPlotWorld.java	2020-11-29 17:48:59 +01:00
N0tMyFaultOG	39feed6fac	Improve wording of generation steps	2020-11-29 17:35:41 +01:00
N0tMyFaultOG	be9d9264ae	Make use of Permission class in tab completion ... Plus document a few more permission nodes	2020-11-19 22:29:44 +01:00
N0tMyFaultOG	eec369ea4f	Improve tab completion, adjust permissions and more v6 changes	2020-11-19 21:53:27 +01:00
N0tMyFaultOG	abed07b613	Add tab completion for /plot area	2020-11-19 21:24:23 +01:00
N0tMyFaultOG	6cfdedb823	Don't collapse imports	2020-11-19 21:13:35 +01:00
N0tMyFaultOG	12861f6c07	Add tab completion for /plot setowner	2020-11-19 17:39:58 +01:00
N0tMyFaultOG	52065b8313	Add tab completion for /plot schematic	2020-11-19 17:36:14 +01:00
N0tMyFaultOG	f6ff843cfb	Send message when attempting to leave an own plot ... This is a temporary workaround for the todo addressed below.	2020-11-19 17:30:26 +01:00
N0tMyFaultOG	aedf402c17	Fix /plot leave requiring an arg when none is needed	2020-11-19 17:10:01 +01:00
N0tMyFaultOG	0745b03271	Add tab completion for /plot cluster	2020-11-19 17:00:21 +01:00
N0tMyFaultOG	bb5c0de367	Fix /plot download world not being clickable	2020-11-19 16:39:44 +01:00
N0tMyFaultOG	9478251d44	Fix /plot buy message and enhance it with player balance	2020-11-19 16:32:30 +01:00
N0tMyFaultOG	ce7ceccc1c	Merge branch 'v6' into feature/v6/generify-perms	2020-11-16 10:25:48 +01:00
dordsor21	5d4cf3b705	setowner should allow null UUIDs	2020-11-10 17:24:37 +00:00
N0tMyFaultOG	0ff8abcd6f	Update town template for schem 2 v2	2020-11-08 15:22:31 +01:00
N0tMyFaultOG	092690e9f0	Update permission in regards of https://github.com/IntellectualSites/PlotSquared/pull/2932	2020-11-03 15:44:07 +00:00
N0tMyFaultOG	5b11175cf3	Add plots.visit.denied permission	2020-11-03 15:44:07 +00:00
N0tMyFaultOG	f7dd8af35e	Enhance plot claim message	2020-11-03 15:43:28 +00:00
N0tMyFaultOG	81c72ee5d9	Finish up permissions	2020-11-02 21:03:46 +01:00
N0tMyFaultOG	fed7f89f96	Fix compiling	2020-11-02 11:58:07 +01:00
N0tMyFaultOG	aefa629509	Generify permissions thru Permission class ... - Fixed a few improper permissions - Fixed a couple of typos	2020-11-02 00:55:58 +01:00
N0tMyFaultOG	bc32581cbd	Improve empty global flag list message	2020-11-02 00:00:38 +01:00
dordsor21	ee9b2e8bf8	Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features ... # Conflicts: # Core/src/main/resources/lang/messages_en.json	2020-11-01 18:58:24 +00:00
dordsor21	0b968abfe4	fix merging conflicts	2020-11-01 17:45:38 +00:00
dordsor21	7e9a9e14c7	Fix various instances where Adventure is being used incorrectly	2020-10-25 22:38:00 +00:00
Mariell Hoversholm	333493f351	adventure v4.1.0; project now compiles	2020-10-17 21:10:02 +01:00
dordsor21	a1bfc1cb26	correctly handle road flags	2020-10-11 19:24:50 +01:00
dordsor21	cfd432886d	Correctly handle road flags	2020-10-11 19:19:17 +01:00
N0tMyFaultOG	aeeae7c167	Fix links not being clickable	2020-10-11 12:47:49 +02:00
N0tMyFaultOG	08c7d4d15e	Remove dead imports	2020-10-09 21:03:23 +02:00
N0tMyFaultOG	29b92659c7	Fix typos	2020-10-09 20:50:12 +02:00
N0tMyFaultOG	4622f4b51d	Fix plot leave	2020-10-09 20:21:02 +02:00
dordsor21	4d51dc9b6c	Switch to translateable captions	2020-10-09 17:47:51 +01:00
dordsor21	76b992509b	use format not silly round stuff	2020-10-09 17:29:05 +01:00
dordsor21	925978db8f	change default lighting to 1	2020-10-09 17:26:52 +01:00
dordsor21	c0e90ddb33	increase interval of progress notify	2020-10-09 17:25:48 +01:00
dordsor21	a7a29eaf97	Correctly cancel notify tasks and add notifications to commands	2020-10-09 17:24:59 +01:00
dordsor21	a451d2d6f2	Fix the injection	2020-10-09 16:34:59 +01:00
dordsor21	914429ab4f	Merge branch 'v6' into features/v6/queue-features ... # Conflicts: # Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java # Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java # Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java	2020-10-09 15:23:09 +01:00
N0tMyFaultOG	0d89125a8e	Replace sys out with logger factory	2020-10-08 20:52:02 +02:00
N0tMyFaultOG	6b37d678df	Fix plot template tab completion	2020-10-08 20:47:43 +02:00
N0tMyFaultOG	02698b3a0e	Fix plot grant tab completion	2020-10-08 20:42:17 +02:00
N0tMyFaultOG	6f0512c18c	Fix plot set tab completions	2020-10-08 20:16:29 +02:00
N0tMyFaultOG	e46b38b301	Fix plot set values	2020-10-08 19:51:42 +02:00
N0tMyFaultOG	5841817fb5	Missing space	2020-10-08 19:29:09 +02:00
N0tMyFaultOG	e28fb49015	Add override permission for /plot music	2020-10-08 19:27:05 +02:00
N0tMyFaultOG	841eef6a52	Fix done message on backup and add done message to grant	2020-10-08 18:57:11 +02:00
Mariell Hoversholm	e15b5a07fb	It runs! And it's small!	2020-10-08 14:02:08 +02:00
Mariell Hoversholm	c3069a425d	Format licence headers	2020-10-08 14:02:08 +02:00
N0tMyFaultOG	ec23fcdd75	Rewrite build scripts ... Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>	2020-10-08 14:02:08 +02:00
dordsor21	544d57c720	Merge branch 'v5' into v6 ... # Conflicts: # Bukkit/build.gradle # Bukkit/pom.xml # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java # Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java # Core/src/main/java/com/plotsquared/core/PlotPlatform.java # Core/src/main/java/com/plotsquared/core/command/DebugPaste.java # Core/src/main/java/com/plotsquared/core/command/Grant.java # build.gradle	2020-10-07 12:20:32 +01:00
N0tMyFaultOG	a210f523a5	Add more information to debugpaste	2020-10-04 18:19:29 +02:00
Aurora	e6237d68d0	Also remove BungeePerms from the config	2020-10-04 13:26:56 +02:00
dordsor21	95f509d337	Stop forcing loiwercase world names	2020-10-02 15:08:14 +01:00
dordsor21	f80e8c8d11	For sake of allowing v5 -> v6	2020-09-25 20:08:28 +01:00
dordsor21	ff83931a3f	Fix plot grant	2020-09-20 19:42:13 +01:00
Hannes Greule	4e835ed3ff	Add missing command description	2020-09-20 00:51:54 +02:00
dordsor21	41f494fbff	Remove jetbrains annotations	2020-09-18 12:45:26 +01:00
dordsor21	e974fe5dc7	Merge branch 'v6' into features/v6/queue-features	2020-09-18 12:22:32 +01:00
dordsor21	819902c24e	Fix licenses	2020-09-14 22:00:09 +01:00
dordsor21	554efbb057	Merge branch 'v5' into v6 ... # Conflicts: # .github/CODEOWNERS # Bukkit/pom.xml # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java # Core/src/main/java/com/plotsquared/core/command/Alias.java # Core/src/main/java/com/plotsquared/core/command/HomeCommand.java # Core/src/main/java/com/plotsquared/core/command/Music.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/flag/types/BlockTypeWrapper.java # build.gradle	2020-09-11 15:44:04 +01:00
dordsor21	d843d1715d	Allow /plot home [area|world]	2020-09-11 15:03:48 +01:00
dordsor21	1552a8e74b	Add option to change lighting behaviour in queues	2020-09-11 14:18:50 +01:00
dordsor21	f0e9a8c5fe	Implement progress subscribers	2020-09-11 12:59:40 +01:00
dordsor21	a98b23af02	progress subscriber	2020-09-11 11:20:38 +01:00
NotMyFault	5463f15633	Add pigstep music disc	2020-09-11 01:16:57 +02:00
Hannes Greule	f2355a76d6	Add default namespace when wrapping block categories by their ids	2020-09-06 23:36:36 +02:00
Alexander Söderberg	0aeca40137	Take player visibility into account when sending notify-enter and notify-leave messages. Fixes PS-103.	2020-09-05 18:48:58 +02:00
Hannes Greule	babad3ab6d	Don't validate plot aliases with offline players (Fixes PS-126)	2020-09-04 14:49:02 +02:00
N0tMyFaultOG	cba2474df7	Merge v5/v6	2020-09-02 16:44:18 +02:00
N0tMyFaultOG	97e34844b4	Add option to opt-out MvDW Placeholder API	2020-09-02 12:13:23 +02:00
N0tMyFaultOG	e924a1920e	Add message to rgar	2020-09-01 00:02:56 +02:00
Hannes Greule	311a2ddc75	Replace null checks with NullEconHandler	2020-08-25 12:41:03 +02:00
Hannes Greule	551d1d9f1a	Add NullEconHandler to avoid verbose null checks	2020-08-25 12:41:03 +02:00
N0tMyFaultOG	a5dea9e7f6	Permission cleanup	2020-08-24 20:51:23 +02:00
N0tMyFaultOG	02bd83bd90	Merge v5 into v6	2020-08-24 14:33:53 +02:00
Hannes Greule	c42d5390a4	Allow teleporting to merged plots with multiple owners using /p home	2020-08-24 13:37:12 +02:00
Hannes Greule	31ea7297c2	Generate signs by default	2020-08-24 13:30:50 +02:00
Hannes Greule	c53cffb745	Generate signs by default	2020-08-24 13:17:15 +02:00
N0tMyFaultOG	26a99a122a	Minor permission fix	2020-08-23 19:34:22 +02:00
N0tMyFaultOG	e93d7feb2c	Fixes PS-114	2020-08-22 11:48:03 +02:00
N0tMyFaultOG	116b870152	Apply missing license header	2020-08-22 11:44:34 +02:00
Alexander Söderberg	45e75cc06e	Merge branch 'v6' into features/v6/services	2020-08-21 23:02:52 +02:00
NotMyFault	b2ac67692e	Merge pull request #2892 from TimonMi/v5 ... [Bugfix] No chat message confirmation on /p add /p trust, etc.	2020-08-21 18:28:05 +02:00
Hannes Greule	1064d777c2	Clean up unused code	2020-08-21 00:02:07 +02:00
Hannes Greule	62f675adbe	Allow visiting all owners of merged plots	2020-08-21 00:01:53 +02:00
Hannes Greule	cee0bbb805	Revert target usage	2020-08-20 23:29:51 +02:00
Hannes Greule	77eb75fcc6	Adapt adventure changes	2020-08-20 23:28:42 +02:00
Hannes Greule	55211907f2	Use command descriptions from translations	2020-08-20 23:16:15 +02:00
Alexander Söderberg	e1e7cd1479	Add missing license headers	2020-08-20 17:11:12 +02:00
Alexander Söderberg	2d3c729215	Extract plot modifications to external class	2020-08-20 17:10:50 +02:00
Alexander Söderberg	f391cfd432	Extract comment logic from the plot class	2020-08-20 16:03:06 +02:00
N0tMyFaultOG	352136f0c6	Cleanup logging system	2020-08-18 15:50:28 +02:00
N0tMyFaultOG	b6e7f90f6a	Fix logger.info format	2020-08-18 15:34:43 +02:00
N0tMyFaultOG	86cfeb76b6	More json stuff	2020-08-18 12:22:26 +02:00
NotMyFault	d91357a807	Update messages_en.json	2020-08-18 10:59:44 +02:00
N0tMyFaultOG	3c8d7a808b	Prefix changes and others	2020-08-17 23:21:18 +02:00
N0tMyFaultOG	d6a80c7ea5	More json stuff, fixes and enhancements	2020-08-17 22:26:01 +02:00
N0tMyFaultOG	05a15ac689	Fix a few typos and spaces	2020-08-17 19:39:43 +02:00
N0tMyFaultOG	580cc359e5	fabb9b6fd7 (r41530745)	2020-08-17 18:56:27 +02:00
N0tMyFaultOG	630284e7ae	More json fixes	2020-08-17 18:42:42 +02:00
N0tMyFaultOG	cc562033e7	Fix console requirement	2020-08-17 18:29:51 +02:00
N0tMyFaultOG	fabb9b6fd7	More json stuff	2020-08-17 18:15:29 +02:00
Hannes Greule	aacf15757f	Use less confusing variable name	2020-08-17 15:32:17 +02:00
Hannes Greule	4789327378	Encapsulate fields	2020-08-17 15:17:40 +02:00
N0tMyFaultOG	c6a368d6f2	More json fixes	2020-08-17 13:24:15 +02:00
Alexander Söderberg	7cd1e8ea76	Fix command registration	2020-08-17 04:39:59 +02:00
Alexander Söderberg	351ae1b2c7	Synchronize auto queries	2020-08-17 01:27:45 +02:00
Hannes Greule	457f3e25cc	resolve rebase issue	2020-08-17 01:10:46 +02:00
Hannes Greule	41c670450b	Remove PlotFilter	2020-08-17 01:10:46 +02:00
Hannes Greule	f636db49f7	Remove SetupObject	2020-08-17 01:10:46 +02:00
Hannes Greule	505bba7612	Fix recursive call	2020-08-17 00:53:39 +02:00
Hannes Greule	9b086b3f2a	Insert missing keys into message files	2020-08-17 00:29:53 +02:00
N0tMyFaultOG	f9d7d2d1dd	Fix clickable messages	2020-08-16 19:43:27 +02:00
N0tMyFaultOG	e9efa3f2d3	Fix some translation issues	2020-08-16 18:24:54 +02:00
dordsor21	665a72a08f	Fill out a lot more JavaDoc. ... I've left DB stuff alone	2020-08-16 13:22:49 +01:00
Alexander Söderberg	a4c9ed90b7	Fix startup issues and make messages send properly	2020-08-16 13:49:16 +02:00
dordsor21	12def37194	clean up some javadoc stuff	2020-08-16 11:34:08 +01:00
Alexander Söderberg	ed2302e545	Remove illegal import	2020-08-16 12:10:19 +02:00
N0tMyFaultOG	618adb913d	Update license and remove dead module entries	2020-08-15 19:17:29 +02:00
N0tMyFaultOG	4a220f9bfb	Update license header	2020-08-15 14:59:29 +02:00
NotMyFault	300abd868a	Merge pull request #2888 from IntellectualSites/fix-conversion ... Fix problem with config creation	2020-08-14 18:36:57 +02:00
Alexander Söderberg	87f0b1fc97	Add service system and rewrite Auto to use the service system	2020-08-14 17:24:34 +02:00
NotMyFault	5b27b652e7	Fix color tag	2020-08-14 12:52:00 +02:00
N0tMyFaultOG	5e20c871a5	Fix metrics setting	2020-08-14 11:36:17 +02:00
NotMyFault	56fb892818	Fix brackets	2020-08-14 00:37:06 +02:00
N0tMyFaultOG	7f104c249a	Permission cleanup ... - Removed plotme perms - Fixed incorrect permission for "/plot flag remove" - Fixed incorrect administrative unlink node - Removed compat alias from "/plot set alias" command I've documented all removed permission packages and fixed permissions in detail on the v6 page. So it's easy to go-by when updating.	2020-08-13 23:32:13 +02:00
N0tMyFaultOG	0eeface374	Remove old translations	2020-08-13 21:37:28 +02:00
N0tMyFaultOG	5efdef19cf	Remove dead asset setting	2020-08-13 21:16:30 +02:00
N0tMyFaultOG	c9fae6a070	Remove old translation setup and move commands to templates	2020-08-13 21:11:07 +02:00
N0tMyFaultOG	2b17f730d4	Merge v5 into v6	2020-08-12 18:20:37 +02:00
Luca	64181c6ab8	Update de-DE.yml ... adjusted grammar	2020-08-11 19:29:40 +02:00
JunTVDE	987d9a267c	added german translation for flag-descriptions to de-DE.yml	2020-08-09 13:05:40 +02:00
EinDev	b46a19f5ca	Keep player names, so they don't have to be looked up again. ... That way the lookup function MainUtil#getName won't get called which would throw an exception if called in the Bukkit Thread. As the player enters the Name, we don't have to look it up again. Fixes PS-96	2020-08-08 18:07:49 +02:00
dordsor21	7bad242944	Merge branch 'v6' into feature/v6/json. It builds! ... # Conflicts: # Bukkit/build.gradle # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java # Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java # Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java # Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.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/Clear.java # Core/src/main/java/com/plotsquared/core/command/Debug.java # Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java # Core/src/main/java/com/plotsquared/core/command/Relight.java # Core/src/main/java/com/plotsquared/core/command/Set.java # Core/src/main/java/com/plotsquared/core/command/Template.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/generator/ClassicPlotManager.java # Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java # Core/src/main/java/com/plotsquared/core/plot/Plot.java # Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java # Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java # Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java # Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java # Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java # Core/src/main/java/com/plotsquared/core/util/EntityUtil.java # Core/src/main/java/com/plotsquared/core/util/RegionManager.java # Core/src/main/java/com/plotsquared/core/util/WorldUtil.java # Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java # build.gradle	2020-08-08 13:20:30 +01:00
dordsor21	74a5c48214	Finish up core and bukkit json	2020-08-08 12:16:48 +01: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	6012705e95	Implement Permission#format to replace the CaptionUtility#format method	2020-08-07 12:12:16 +01:00
dordsor21	21a97863ac	Refactor Captions to Permission, reimplement message list in debug command	2020-08-07 11:53:32 +01:00
dordsor21	50cfecb3fd	Several minor progress. Couple of bigger (inboxes and help)	2020-08-07 11:08:03 +01:00
dordsor21	1461804039	Remove last reference to PlotMessage in Core	2020-08-07 10:20:11 +01:00
Timon	dc3f45acd4	Added UseFlag check at Roads	2020-08-07 09:57:02 +01:00
Hannes Greule	6970dfa5f8	More json progress	2020-08-07 02:53:05 +02:00
dordsor21	18f630ba15	Bit more json	2020-08-06 14:06:19 +01:00
dordsor21	f68eb9c778	update plot list	2020-08-06 13:36:15 +01:00
dordsor21	4a960d9f2c	update pagination to new json	2020-08-06 12:23:47 +01:00
Timon	c745b99922	Added UseFlag check at Roads	2020-08-06 12:01:43 +02:00
dordsor21	f1e3902fea	Several more progress	2020-08-05 11:48:10 +01:00
N0tMyFaultOG	41a623a643	More work towards json	2020-08-04 19:01:25 +02:00
dordsor21	d3fe1d3b2b	Fix plot info, sign usage in Plot.class	2020-08-04 15:07:07 +01:00
Hannes Greule	3fd3baaa47	Making progress on messages	2020-08-03 23:59:16 +02:00
N0tMyFaultOG	01d2b0024f	Add more information to the debugpaste	2020-07-31 20:33:17 +02:00
N0tMyFaultOG	01e66f8833	Readd skyblock template	2020-07-29 14:53:09 +02:00
N0tMyFaultOG	22a007b514	Revert "Update zh-CN.yml" ... This reverts commit 240362a16d.	2020-07-28 12:33:04 +02:00
dordsor21	38988b4819	A little spring cleaning ... - Add Javadoc comments for where QueueCoordinator can be given or nulled - Add some more Javadoc comments in general - Squash methods into one where QueueCoordinator can be given - Only use one queue in some places where it makes sense	2020-07-28 10:18:49 +01:00
dordsor21	704e92c3d0	Use placeholder	2020-07-28 09:38:27 +01:00
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
Alexander Söderberg	f2dcbce490	Fix problem where servers created in v5 (not converted from v4) would fail to start properly. ... This is a quite major issue and I hope this fix resolves it. Although, it should be tested with migration from v4 to v5 and then a fresh v5 server.	2020-07-25 03:16:36 +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	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
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
Alexander Söderberg	5d2d4ac12b	fix language issue	2020-07-14 20:47:15 +02:00
Alexander Söderberg	64f5580edd	Fix code styling issue	2020-07-14 20:46:52 +02:00
dordsor21	2e4c43c251	Add config option to disable placing top wall blocks	2020-07-14 19:10:53 +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	f9e5fd714d	Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform	2020-07-14 17:07:03 +02:00
Alexander Söderberg	55eefd09da	Merge branch 'v6' into feature/v6/json	2020-07-14 16:52:40 +02:00
Alexander Söderberg	0ce1f3e0f6	Send special message when caption cannot be found	2020-07-14 16:36:13 +02:00
Alexander Söderberg	99be181aea	Migrate some more captions	2020-07-14 16:31:58 +02:00
Alexander Söderberg	fbf6a3517d	Add back title method that somehow went missing and add a template utility class to make templates less annoying to work with	2020-07-14 15:04:31 +02:00
Alexander Söderberg	1dc4da8beb	Fix issues from previous merge	2020-07-14 13:21:59 +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	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
N0tMyFaultOG	f93714a44e	Properly add prefixes to messages	2020-07-13 13:01:13 +02:00
Hannes Greule	564efd77f7	Fix some messages	2020-07-12 22:11:23 +02:00
Hannes Greule	5442c7cc2e	Start moving commands to new message system	2020-07-12 22:06:07 +02:00
Alexander Söderberg	0fa5a16cd0	replace remaining debug calls	2020-07-12 21:49:05 +02:00
N0tMyFaultOG	1881cdc9ab	Revert "Add prefix" ... This reverts commit fb2aa44f78.	2020-07-12 21:28:38 +02:00
N0tMyFaultOG	fb2aa44f78	Add prefix	2020-07-12 21:25:22 +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
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
Alexander Söderberg	5a5c5721cc	fix compiler crashing	2020-07-12 07:38:57 +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
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
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	5341015cb1	Finalize immutable locations and add a platform world implementation	2020-07-10 12:21:29 +02:00
dordsor21	2fb76e6636	Split road and plot paste-on-top settings	2020-07-09 22:39:06 +01:00
dordsor21	55139eb134	Do not respect paste on top for road schematics.	2020-07-09 22:19:23 +01:00
Alexander Söderberg	cf1b027db9	Start making locations immutable	2020-07-09 22:28:46 +02:00
Traks	63c308971b	Update location block vector on add and subtract	2020-07-09 20:14:06 +02:00
Alexander Söderberg	89cb6450fb	Fix issue where PlotPlayer#getLocation returns a mutable location	2020-07-09 20:04:00 +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
Hannes Greule	d652225f36	Let players teleport to their merged plots	2020-07-08 19:33:58 +02:00
Alexander Söderberg	3fa532a3c0	Move message sending into PlotPlayer to make it platform independent	2020-07-08 15:35:58 +02:00
dordsor21	d267d1bb98	Start expiry tasks	2020-07-08 14:35:46 +01:00
Alexander Söderberg	9792d4cc4b	Remove style.yml	2020-07-08 15:23:33 +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	f2191cb731	Save style.yml again	2020-07-08 13:59:31 +02:00
Alexander Söderberg	265c10ec1c	Remove commands.yml	2020-07-08 13:59:31 +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
Hannes Greule	57127537f7	Add permission check for /plot home	2020-07-07 20:45:52 +02:00
Hannes Greule	3476522c00	Allow /p v <alias>	2020-07-07 20:45:52 +02:00
Hannes Greule	3d087b1bbe	Fix tab completion and usage	2020-07-07 20:45:52 +02:00
Hannes Greule	c058614fcc	Split visit command into home and visit	2020-07-07 20:45:52 +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	42d648e338	Use adventure for titles	2020-07-05 17:57:58 +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
Alexander Söderberg	d061f728bd	Merge remote-tracking branch 'origin/feature/v5/json' into feature/v5/json	2020-07-05 12:44:25 +02:00
Hannes Greule	6bf5bc60d1	Update messages_en.json with new placeholders	2020-07-04 18:57:56 +02:00
Alexander Söderberg	c784c69eb3	progress	2020-07-04 18:53:03 +02:00
Alexander Söderberg	e3759d059a	Fixing missing license headers.	2020-07-04 18:03:47 +02:00
Alexander Söderberg	429f5e55c3	Add option to disable background caching	2020-07-03 13:50:12 +02:00
dordsor21	ad1ec42b12	Add new clear pipeline to hpw and make some stuff read access as required.	2020-07-02 14:33:22 +01:00
dordsor21	b71de856a8	allow plugins extending and replacing RegionManager to be notified of, and "accept" plot clear "requests". ... . . . . . FAWE	2020-07-01 21:49:53 +01:00
Hannes Greule	35cff29917	Add license header	2020-07-01 17:24:47 +02:00
dordsor21	2910176b97	Add road flag container	2020-07-01 14:53:57 +01:00
dordsor21	82a887fd3b	Merge branch 'v5' into features/v5/road-respect-flags ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java	2020-07-01 14:12:16 +01:00
Hannes Greule	f80cadcd7f	Draft of Caption resolving	2020-06-29 21:33:57 +02:00
Hannes Greule	fa2ad8ab22	Improve plot alias command (tab complete, admin permission) fixes PS-63	2020-06-29 13:48:37 +02:00
N0tMyFaultOG	600f757046	Finish messages	2020-06-29 12:34:09 +02:00
N0tMyFaultOG	a2aaa3633a	More work	2020-06-28 16:56:42 +02:00
MeFisto94	bd9bdc9e03	Separate the Vault Permission Handling from the Economy Handling	2020-06-28 14:28:11 +02:00
N0tMyFaultOG	3b793929d8	Initialize messages_en.json	2020-06-28 13:51:57 +02:00
Hannes Greule	e139550949	Make cache expiration configurable	2020-06-27 23:07:20 +02:00
Carter	74876f9e64	Get biome data from correct schematic for intersections (Fixes PS-50)	2020-06-27 20:44:46 +01:00
dordsor21	02f3c3ef50	Fix my stupid mistake of using lamdas not creating nested classes when creating schematics. "this" doesn't work like that. Cheers Java.	2020-06-27 20:38:55 +01:00
MeFisto94	9c3d2cfb02	Move the caching and static accessors from EconHandler to PlotMain	2020-06-27 06:26:00 +02:00
Hannes Greule	38425a1eae	Update world border on Plot#claim (Fixes PS-13)	2020-06-26 13:49:17 +02:00
Alexander Söderberg	4b997d42df	Some slf4j progress	2020-06-26 11:03:42 +02:00
Alexander Söderberg	f64026af1a	Only initialise EconHandler when economy is enabled and stop accessing the static instance directly.	2020-06-24 15:26:06 +02:00
Alexander Söderberg	efab6e92f7	Lower tab completion cache time and fix "Invalid player" message for /plot kick	2020-06-24 13:44:06 +02:00
Alexander Söderberg	f6f26c6102	Fix issue where numbers were sometimes parsed as usernames when they shouldn't be. This commit also fixes an issue where "Not a valid plot ID" was sent twice.	2020-06-24 08:31:23 +02:00
Alexander Söderberg	55cf34508a	Fix issue where old player objects were not cleaned up properly. ... This is caused by an issue with the event order in Spigot (and Spigot derivatives), so the fix is rather hacky.	2020-06-23 18:36:53 +02:00
Alexander Söderberg	f4724a3c87	Fix expiration flag commands	2020-06-23 11:45:04 +02:00
Alexander Söderberg	2b4e2fc793	Add plot debugging and make tab completable aliases configurable	2020-06-23 11:39:45 +02:00
Alexander Söderberg	2d6e6ceaeb	Improve documentation of BukkitMain#wrapPlayer and improve generic types	2020-06-22 15:45:57 +02:00
Alexander Söderberg	1dcf8d3995	Progress on the debug logging API	2020-06-21 15:50:49 +02:00
Hannes Greule	d07d32e28b	Generate plot blocks on correct height when removing intersection ... Fixes PS-46	2020-06-20 00:14:04 +02:00
Hannes Greule	6259287dff	Add tab completion for /plot <deny|kick|remove>	2020-06-13 15:54:38 +02:00
Hannes Greule	a3586791b5	Remove unused code and use less aggressive colors	2020-06-11 01:01:00 +02:00
Hannes Greule	bb298ab660	Remove leftover TODO	2020-06-11 01:01:00 +02:00
Hannes Greule	8c0f581ff0	Add missing license headers to new files	2020-06-11 01:01:00 +02:00