2234 Commits

Author	SHA1	Message	Date
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	54a8482a88	Minecraft does not always provide slf4j	2020-10-08 14:02:08 +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	85a23442cc	bump minimessage version to fix build	2020-09-18 12:22:01 +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	b12e9832c9	Update pom.xml	2020-09-02 17:20:54 +02:00
N0tMyFaultOG	0f9554c717	Merge branch 'v5' into v6	2020-09-02 17:19:12 +02:00
N0tMyFaultOG	7a529e156d	Add deb for onBlockIgnite event	2020-09-02 17:03:56 +02:00
N0tMyFaultOG	cba2474df7	Merge v5/v6	2020-09-02 16:44:18 +02:00
NotMyFault	03c889383b	Merge pull request #2908 from IntellectualSites/dependabot/gradle/v5/org.yaml-snakeyaml-1.26 ... Bump snakeyaml from 1.25 to 1.26	2020-09-02 16:15:26 +02:00
dependabot[bot]	7c53bfc870	Bump snakeyaml from 1.25 to 1.26 ... Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.25 to 1.26. - [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.26..snakeyaml-1.25) Signed-off-by: dependabot[bot] <support@github.com>	2020-09-02 14:10:44 +00:00
dependabot[bot]	32a8dcd411	Bump annotations from 20.0.0 to 20.1.0 ... Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0) Signed-off-by: dependabot[bot] <support@github.com>	2020-09-02 14:10:44 +00:00
N0tMyFaultOG	b3c77ef099	Merge branch 'dependabot/gradle/v5/org.jetbrains.kotlin-kotlin-stdlib-1.4.0' into v5	2020-09-02 12:57:05 +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
dependabot-preview[bot]	acb0bd95f2	Bump kotlin-stdlib from 1.3.72 to 1.4.0 ... Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.72 to 1.4.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.72...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-22 23:05:56 +00:00
NotMyFault	5d73b17415	Merge pull request #2899 from IntellectualSites/dependabot/gradle/v5/org.jetbrains-annotations-20.0.0 ... Bump annotations from 19.0.0 to 20.0.0	2020-08-23 01:04:40 +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
dependabot-preview[bot]	869a579655	Bump annotations from 19.0.0 to 20.0.0 ... Bumps [annotations](https://github.com/JetBrains/java-annotations) from 19.0.0 to 20.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/19.0.0...20.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-17 09:08:30 +00: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	ffe1e1e40d	Core is Core	2020-08-13 21:25:17 +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	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
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	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
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
Hannes Greule	033b87deb5	Resolve TODOs	2020-06-11 01:01:00 +02:00
Hannes Greule	e3fbb32399	Formatting and documentation	2020-06-11 01:01:00 +02:00
Hannes Greule	67b80bb8e8	Fix /plot setup back	2020-06-11 01:01:00 +02:00
Hannes Greule	ae1427b189	Remove usage of SetupObject	2020-06-11 01:01:00 +02:00
Hannes Greule	5165c439fc	Add tab completion and fix minor bugs	2020-06-11 01:01:00 +02:00
Hannes Greule	b15c48e074	Implement setup steps	2020-06-11 01:01:00 +02:00
Hannes Greule	c5bfde330f	First draft of redesigned setup processing	2020-06-11 01:01:00 +02:00
N0tMyFaultOG	f1b79a3b0d	Add more documentation to the settings.yml ... Apparently gradle wants to update the poms so here we go	2020-05-27 22:20:13 +02:00
Alexander Söderberg	6442922d86	Implement some more generic types to make the player objects easier to work with and also create wrapper objects for fake players (NPCs). Potentially fixes PS-27	2020-05-27 14:08:48 +02:00
Alexander Söderberg	b9b0d89b5f	Replace the R-tree library with PRTree. Fix SquirrelID shading issues. Bump the version to 5.12.0	2020-05-25 15:13:31 +02:00
Alexander Söderberg	52b90b6757	Merge pull request #2841 from IntellectualSites/features/v5/uuid	2020-05-25 01:40:35 +02:00
dordsor21	31b71ade69	* :D	2020-05-24 23:43:15 +01:00
dordsor21	0021b114de	Revert "Slow down queue a bit because 1.13+ performance is bad" ... This reverts commit bbde2f5e06.	2020-05-24 23:24:27 +01:00
Alexander Söderberg	28a7d027f6	Merge branch 'v5' into features/v5/uuid	2020-05-24 21:14:56 +02:00
Alexander Söderberg	e32a2e2723	Merge pull request #2847 from IntellectualSites/features/v5/single-area	2020-05-24 21:13:51 +02:00
Alexander Söderberg	46b68e489d	Tab complete /p list	2020-05-24 21:08:11 +02:00
Alexander Söderberg	2436a6a402	remove debug, whoops	2020-05-24 20:54:10 +02:00
Alexander Söderberg	862467c0fa	Tab complete /plot visit	2020-05-24 20:53:16 +02:00
Alexander Söderberg	69cfb431b1	Unstupidify Visit	2020-05-24 20:18:02 +02:00
Alexander Söderberg	172bd6f0f2	This should hopefully fix that broken merge. Maybe. Possibly. Idk.	2020-05-24 19:05:09 +02:00
Alexander Söderberg	a882555d1b	Merge branch 'v5' into features/v5/uuid ... # Conflicts: # Bukkit/build.gradle # Core/src/main/java/com/plotsquared/core/PlotSquared.java # Core/src/main/java/com/plotsquared/core/command/ListCmd.java # Core/src/main/java/com/plotsquared/core/command/Visit.java	2020-05-24 19:00:21 +02:00
NotMyFault	0b12c4e5b2	Update issue link	2020-05-24 18:48:15 +02:00
Alexander Söderberg	0ac6383c2c	Use PlotQuery in Visit	2020-05-24 18:35:32 +02:00
Alexander Söderberg	76913d4a78	immutable -> mutable	2020-05-24 18:35:32 +02:00
Alexander Söderberg	a0d1da3274	fix dum typo	2020-05-24 18:35:32 +02:00
Alexander Söderberg	1aa144e47d	Deprecate old PlotFilter class	2020-05-24 18:35:32 +02:00
Alexander Söderberg	6b31743fb3	add missing javadoc	2020-05-24 18:35:32 +02:00
Alexander Söderberg	508fdce704	Add missing methods to PlotQuery and use PlotQuery in ListCmd	2020-05-24 18:35:32 +02:00
Alexander Söderberg	e912909aad	Add plot query system	2020-05-24 18:35:32 +02:00
Alexander Söderberg	7b97130af7	Add option to disable legacy cache, also add an option to return "Unknown" when a request cannot be fulfilled (old behaviour) ... This should fix issues where lowercase offline mode UUIDs don't have access to their old cache.	2020-05-24 05:00:36 +02:00
Alexander Söderberg	6c6c2b57a1	Add options to disable tab completion and extend username completion, also limit the total number of username suggestions to 200 per request	2020-05-23 17:20:09 +02:00
Alexander Söderberg	113da81f29	Actually save the schematic	2020-05-23 16:15:48 +02:00
Alexander Söderberg	4dd2613f2f	Add missing caption	2020-05-23 15:02:53 +02:00
Alexander Söderberg	8c37cc5340	Fix minor issues	2020-05-23 15:02:31 +02:00
Alexander Söderberg	47c74cfa6d	Set correct region height	2020-05-23 14:39:28 +02:00
Alexander Söderberg	32a55127f1	Fix partial area regeneration when using PlotSquared generation. ... Also fix issues with region height and road width.	2020-05-23 14:32:02 +02:00
Alexander Söderberg	6d0458281b	Merge remote-tracking branch 'origin/v5' into features/v5/single-area	2020-05-23 02:30:45 +02:00
Alexander Söderberg	d2af342a5d	Shade r-tree into the bukkit module	2020-05-22 22:04:46 +02:00
Alexander Söderberg	93619b3988	Don't access tree until it has been created	2020-05-22 22:04:46 +02:00
Alexander Söderberg	dd4c5014fc	Get rid of unused field	2020-05-22 22:04:46 +02:00
Alexander Söderberg	1e3379b00a	Fix up the plot area nightmare	2020-05-22 22:04:46 +02:00
dordsor21	bbde2f5e06	Slow down queue a bit because 1.13+ performance is bad	2020-05-22 10:44:51 +01:00
Alexander Söderberg	b61dfd6f97	Single plot area progress	2020-05-22 03:20:11 +02:00
Alexander Söderberg	9752e5f62b	Start working on single plot areas	2020-05-22 02:48:32 +02:00
Alexander Söderberg	38a7c771be	Don't access tree until it has been created	2020-05-21 20:23:36 +02:00
Alexander Söderberg	1c6075df2b	Get rid of unused field	2020-05-21 20:06:37 +02:00
Alexander Söderberg	3ede0447b0	Fix up the plot area nightmare	2020-05-21 20:06:04 +02:00
Alexander Söderberg	f01b242e4a	For sign updating to be scheduled asynchronously. ... It then forces it back on the main thread, so it's fine, but this way we can safely wait for the UUID mapping to be fetched.	2020-05-20 15:26:20 +02:00
Alexander Söderberg	2417dace2d	Add UUID caching	2020-05-20 15:12:09 +02:00
Alexander Söderberg	f82a111518	Merge branch 'v5' into features/v5/uuid ... # Conflicts: # Bukkit/pom.xml # Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java	2020-05-20 11:27:11 +02:00
dordsor21	0160c2bb55	Add setCuboids method to RegionManager ... - Allow FAWE to take charge of big operations like /plot set all	2020-05-20 08:43:58 +01:00
Alexander Söderberg	ea41c842bc	Fix a bunch of minor issues	2020-05-20 00:31:59 +02:00
Alexander Söderberg	8efc78e1c9	IT COMPILES!	2020-05-19 23:05:36 +02:00
Alexander Söderberg	973c18623f	Port more commands and add more tab completion utilities	2020-05-19 19:34:33 +02:00
dordsor21	7aba70ea65	Make plot clears/sets less crashy. ... There's still the issue of Spigot's (or paper's) terrible GC that does nothing and stores everything in PS old gen memory so the server just numpties itself though.	2020-05-19 16:54:12 +01:00
Alexander Söderberg	123ca8efe9	Update more commands and add proper request timeouts	2020-05-19 17:33:59 +02:00
dordsor21	22c26fe962	Add PlotArea#getFlag	2020-05-19 13:07:50 +01:00
dordsor21	761803f777	Add option for roads to respect a plot area's flags and implement to PlayerEvents	2020-05-19 12:41:51 +01:00
dordsor21	d5d18a60fb	Fix #2836 ... getCompoundTag can also be in Core since we're using WorldEdit.	2020-05-19 11:53:18 +01:00
Alexander Söderberg	37b065a097	Progress.	2020-05-19 00:28:52 +02:00
Alexander Söderberg	31c84ab18f	Basic pipeline setup	2020-05-18 00:22:34 +02:00
Alexander Söderberg	12f2cb0d58	Add a cache uuid service	2020-05-17 23:57:40 +02:00
Alexander Söderberg	b5f92f5003	Add sync catcher to the blocking pipeline methods	2020-05-17 23:26:19 +02:00
Alexander Söderberg	58989c9311	Add some missing methods to the pipeline	2020-05-17 23:20:36 +02:00
Alexander Söderberg	736004d88b	Don't fill in stacktrace for ServiceError	2020-05-17 18:03:04 +02:00
Alexander Söderberg	49f51f24f7	Don't loop services when all mappings have been found	2020-05-17 18:02:26 +02:00
Alexander Söderberg	95df62e59b	Add missing consumer API methods	2020-05-17 17:48:42 +02:00
Alexander Söderberg	29f2863cf4	Progress	2020-05-17 17:26:48 +02:00
Alexander Söderberg	792fa1f11d	Improve design	2020-05-17 12:55:07 +02:00
Alexander Söderberg	7591c440c2	Begin working on the new UUID service API	2020-05-17 12:40:25 +02:00
Alexander Söderberg	29e0479081	Fix preset initialization	2020-05-16 21:37:14 +02:00
Alexander Söderberg	441a73839e	Add /plot components	2020-05-16 21:37:14 +02:00
Alexander Söderberg	31edffcb63	Begin working on a platform specific world management system ... This should make world management a fair bit cleaner	2020-05-16 21:37:14 +02:00
Alexander Söderberg	3d30885daf	No PlotSquared-Core-Core	2020-05-14 15:47:25 +02:00
Alexander Söderberg	6814b4bef2	Fix Core archive name	2020-05-14 15:24:43 +02:00
Alexander Söderberg	501fd9c8e6	Merge remote-tracking branch 'origin/v5' into v5	2020-05-14 14:16:17 +02:00
Alexander Söderberg	7ba7df5cb2	Make the upload task work	2020-05-14 14:16:10 +02:00
dordsor21	9dd9201b67	Allow plot auto from non-plot areas if the server has only one plot area	2020-05-14 13:10:53 +01:00
Alexander Söderberg	1fa41e6209	Merge branch 'v5' into tile-entity-cap	2020-05-14 13:17:41 +02:00
dordsor21	a2db2e8268	Add return	2020-05-14 11:27:35 +01:00
dordsor21	617abf89e6	Split ChunkManager to Chunk and Region Managers ... - Having not chunk-specific code in ChunkManager felt wrong. - Also allow FAWE to replace setbiome code - Also improve performance (proper usage of chunk loading) for setbiome	2020-05-14 11:27:35 +01:00
dordsor21	98b4ceab7d	Fix style.yml	2020-05-13 16:29:10 +01:00
Alexander Söderberg	86a996b2ff	Make the tile entity check true by default, as it only applies when the chunk processor is enabled (and it's disabled by default)	2020-05-13 15:09:00 +02:00
Alexander Söderberg	e6a9daf31a	Make the tile entity limit in ProcessedWEExtent apply per chunk rather than per edit	2020-05-13 14:54:54 +02:00
Alexander Söderberg	ec347f8738	Add missing blocks and block tile entities from /plot set if the chunk processor is enabled	2020-05-13 14:24:04 +02:00
Alexander Söderberg	19fe2efb6e	Fix the WE extent and add our own tile entity list	2020-05-13 14:11:17 +02:00
Alexander Söderberg	e6878d7804	clean up ProcessedWEExtent	2020-05-13 12:47:52 +02:00
Alexander Söderberg	3deff629b0	Add paper specific listener for limiting the amount of tile entities in a chunk during build, instead of just doing it during chunk unloading	2020-05-12 23:01:14 +02:00
Alexander Söderberg	d20fa39cf5	Add flag that prevents people from copying NBT data in the plot unless they're added as members	2020-05-12 19:25:06 +02:00
Aurélien	be6910d5d9	Reformated and update French translation ... Some of my translations used '' to represent ' but it's not needed. Also splited some long lines and translated new backup system and keep-inventory flag.	2020-05-12 17:29:32 +02:00
Alexander Söderberg	4ad90d423d	Fix timeout comment	2020-05-12 12:52:45 +02:00
Alexander Söderberg	d2dae45082	Add leaves to the blacklist	2020-05-12 12:49:39 +02:00
Alexander Söderberg	85c9bd7ceb	Add all sign type to blacklist	2020-05-12 12:24:36 +02:00
dordsor21	d0ee579069	Move backup config section to a more appropriate place	2020-05-12 10:44:34 +01:00
Alexander Söderberg	32c23e6ced	Merge branch 'v5' into backups	2020-05-11 22:27:16 +02:00
Alexander Söderberg	81aaba328a	ENGLISH > ROOT	2020-05-11 22:21:37 +02:00
Alexander Söderberg	3c5dd3d0d2	Merge remote-tracking branch 'origin/v5' into v5	2020-05-11 22:11:29 +02:00
Alexander Söderberg	2dc07d9321	Add a looooot of default disallowed blocks	2020-05-11 22:11:21 +02:00
N0tMyFaultOG	841dd5e189	Update wiki links	2020-05-11 20:27:06 +02:00
Alexander Söderberg	b2bc2887d2	Fix dumdum merge	2020-05-11 20:17:41 +02:00
Alexander Söderberg	e20319f4e1	Merge branch 'v5' into backups ... # Conflicts: # Core/src/main/java/com/plotsquared/core/configuration/Captions.java	2020-05-11 20:15:48 +02:00
Alexander Söderberg	d40160d205	Fix javadoc	2020-05-11 20:04:22 +02:00
Alexander Söderberg	f7167d5e83	Fix typo	2020-05-11 20:03:26 +02:00
Alexander Söderberg	282773a43f	Replace Guava methods with stdlib equivalents	2020-05-11 20:02:33 +02:00
Alexander Söderberg	8944be5319	(Complex) command suggestions for /plot set	2020-05-11 19:37:25 +02:00
Alexander Söderberg	df01f9bea7	Add a list of blocks that cannot be used in /plot set <component>	2020-05-11 18:35:06 +02:00
Alexander Söderberg	7a6909dab1	Merge branch 'v5' into backups	2020-05-11 11:19:59 +02:00
Alexander Söderberg	3064ae80d1	Add a keep-inventory flag	2020-05-11 11:19:36 +02:00
dordsor21	06bb6856a8	Fix bad getApplicablePlotArea(Location) code ... - Fixes #2815 alongside 667098268f	2020-05-11 09:48:18 +01:00
Alexander Söderberg	702caa6feb	Remove rogue line break	2020-05-10 22:09:56 +02:00
Alexander Söderberg	fc74c582bf	Add option to disable deletion of plot backups when the plot is unclaimed	2020-05-10 21:52:57 +02:00
Alexander Söderberg	658361f825	Destroy backups when the plot is uncalimed	2020-05-10 21:31:16 +02:00
Alexander Söderberg	e0c9a802d8	Add automatic backups and implement them /plot clear and /plot set <component>.	2020-05-10 20:31:07 +02:00
Alexander Söderberg	c4a70c0945	Fix tab completion for the backup command	2020-05-10 19:42:42 +02:00
Alexander Söderberg	f7d6ac00e4	Make the backup commands work	2020-05-10 19:20:11 +02:00
Alexander Söderberg	8ed5a21b36	Merge branch 'v5' into backups	2020-05-10 17:03:36 +02:00
Alexander Söderberg	6fb63c9609	Implement backup restoration command. This might work, idk, we'll see.	2020-05-10 16:53:19 +02:00
Alexander Söderberg	079289eb74	Use #getTranslated on GENERIC_UNOWNED	2020-05-10 16:40:12 +02:00
Alexander Söderberg	59f96d4455	Translate all backup failure reasons	2020-05-10 16:39:14 +02:00
Alexander Söderberg	cdab52fcbe	dumdum space go bye bye	2020-05-10 16:04:33 +02:00
Alexander Söderberg	63c9037b10	Fix typo	2020-05-10 16:00:20 +02:00
Alexander Söderberg	bbc86eba39	/plot debug progress	2020-05-10 15:51:27 +02:00
Alexander Söderberg	e0fb6f5440	/plot debug structure	2020-05-10 15:36:20 +02:00
Alexander Söderberg	2bd30af361	Cache both backup profiles and backup objects	2020-05-10 15:12:17 +02:00
NotMyFault	b136f44f12	Merge branch 'v5' into remove-eol-translation-strings	2020-05-10 15:05:58 +02:00
Alexander Söderberg	d0dbb495b0	Add BackupProfile#restoreBackup	2020-05-10 14:58:45 +02:00
Alexander Söderberg	8715a27a93	No backups for merged plots 🐮	2020-05-10 14:41:02 +02:00
Aurélien	503fc44208	Updated according to new translations and old removed	2020-05-10 14:12:56 +02:00
Aurélien	d3bfaeb5a4	Ready for merging ! ... Removed useless space at the end of the file + precision of the date (latest edition)	2020-05-10 14:12:56 +02:00
Aurélien	7adecd0808	Last fix (removed unused translation + added the missing)	2020-05-10 14:12:56 +02:00
Aurélien	c99e081ae0	Fiexed issues reported by CodeFactor	2020-05-10 14:12:56 +02:00
Aurélien	285b6bf62d	Updated and corrected French translation ... Old translation has been reviewed and new v5 flags' translations has been added. Some mistakes could now remain, I will fix them if needed ;) Enjoy !	2020-05-10 14:12:56 +02:00
Alexander Söderberg	723e29cdd0	Continue working on the backup system	2020-05-10 14:02:25 +02:00
dordsor21	e6408b35a2	fix merge auto	2020-05-10 10:44:14 +01:00
Alexander Söderberg	3eb0de68c4	Begin working on the structure for the backup system	2020-05-09 20:05:39 +02:00
N0tMyFaultOG	ae11f0610e	Add a few more translation strings for setup wizard	2020-05-09 16:45:32 +02:00
N0tMyFaultOG	198c7ca58d	Remove dead translations	2020-05-09 14:04:08 +02:00
Hannes Greule	5a2f70238a	Typo	2020-05-06 12:53:27 +01:00
Hannes Greule	8257b0b563	No lazy init when calling toString,equals or hashCode ... That prevents premature initialization as NullBlockCategory	2020-05-06 12:53:27 +01:00
Hannes Greule	9b997d2195	Make constructor private	2020-05-06 12:53:27 +01:00
Hannes Greule	a19fa1b92c	Send a debug message if category not found	2020-05-06 12:53:27 +01:00
Hannes Greule	2c060db9c0	Lazily initialize block tags	2020-05-06 12:53:27 +01:00
dordsor21	a8621a15ad	Override setblock setting Pattern in ChunkBlockQueue ... > Should stop NPE during plot analysis > Without overriding this method, DelegateLocalBlockQueue setblock Pattern is called > DelegateLocalBlockQueue's setblocks use parent.setBlock, but we set that to null in ChunkBlockQueue > ChunkBlockQueue is simply just to cache the values from generation to use in analysis > Therefore there is no need to setblocks in any other Queue implementation	2020-05-06 12:53:16 +01:00
dordsor21	179e9e1e74	Clean up plot grants and plot auto ... - Correct maths for calculating granted plots, etc etc - Don't check if the player has the correct number of plots AGAIN on AutoClaimFinishTask. That's dumb.	2020-05-06 11:39:34 +01:00
dordsor21	df5feff9ec	Display the correct number of grants used in auto	2020-05-05 13:50:29 +01:00
dordsor21	9226aaff1f	In the interest of debug should show everything, add debug when registering an unknown flag.	2020-05-05 12:57:14 +01:00
dordsor21	afe874a59b	try-catch for NPE in purge and fail gracefully if the world is null ... Plausible scenario since purge is often run to remove plots in the DB from removed worlds Shouls fix #2806	2020-05-05 11:12:39 +01:00
N0tMyFaultOG	4ad9f12d5d	Move plot version to debugpaste top	2020-05-04 23:58:01 +02:00
dordsor21	228c37815a	Fix merge all ... Fixes #2804	2020-05-04 17:15:53 +01:00
dordsor21	729469e030	Add config options for all paper events.	2020-05-02 11:58:32 +01:00
dordsor21	c6dc9ee189	Add some more listeners ... - Also use setShouldAbortSpawn so it doesn't just try forever - Add config to enable or disable all paper listeners	2020-05-02 11:58:32 +01:00
dordsor21	85a75ad868	Yeet that PaperSPiGoT out of here	2020-05-02 11:58:32 +01:00
dordsor21	8ec8b8d803	Add some paper-specific listeners	2020-05-02 11:58:32 +01:00
dordsor21	ed2e9a80ed	Fix rare bug where if the plot size was less than 15 and the chunk contained an entire plot, it would generate incorrectly	2020-05-01 20:30:59 +01:00
dordsor21	36948ed351	Move world settings dump to a better location (where all of the fields will actually have been set)	2020-05-01 20:29:35 +01:00
dordsor21	e06429f3b0	Correct world types given to player	2020-05-01 19:18:11 +01:00
MattBDev	fd4a9a16de	Execute commands when clicked for expire messages	2020-05-01 13:34:43 -04:00
dordsor21	d6d49e0912	Show suffix in versionString() too	2020-05-01 15:56:35 +01:00
dordsor21	b5de5f30ac	Allow suffixes to the version ... - Useful for "PlotSquared-5.10.4-SNAPSHOT" etc	2020-05-01 15:53:40 +01:00
Alexander Söderberg	135c6f2c15	Send a less obnoxious message if the flag name length exceeds the maximum allowed length	2020-04-30 13:36:03 +02:00
dordsor21	a263fe2f2d	Apparently we need to recover from bad flags	2020-04-30 12:15:42 +01:00
dordsor21	cbe46539ca	Pick up the rest of the reformating	2020-04-30 11:53:07 +01:00
dordsor21	5e842f1572	Force flag names to be 64 characters or less ... - A few people seem to be on interesting SQL installs. This should fix the issues they have with 767 bytes,	2020-04-30 11:52:39 +01:00
dordsor21	42106bb97a	I didn't get everything first time	2020-04-30 11:33:59 +01:00
dordsor21	e7216d4aef	Merge branch 'v5' into reformat	2020-04-30 11:33:31 +01:00
dordsor21	0751e9cea3	Make LiquidFlowFlag an enum	2020-04-30 11:18:28 +01:00
dordsor21	0091580ae0	Reformat it all.	2020-04-30 11:01:52 +01:00
N0tMyFaultOG	894d673c90	Fix tests	2020-04-30 11:32:50 +02:00
dordsor21	577fe3037f	Update checker improvements and 5.10.4 ... - Add config option to disable poll once it's found an update (true by default) - Better PlotVersion stuff can now detect if you're using a later version than the spigot API, and not tell you about it	2020-04-30 10:17:19 +01:00
dordsor21	8a21334e66	Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5	2020-04-28 11:21:51 +01:00
dordsor21	a130d801d5	schem.intellectualsites.com (just forwards to athion.net but cnamed)	2020-04-28 11:21:30 +01:00
N0tMyFaultOG	a829799b36	Update scripting message	2020-04-25 23:53:46 +02:00
Hannes Greule	5bd53436df	Prevent NPE for report comments	2020-04-23 13:44:34 +01:00
dordsor21	9081a5aff6	Fix incorrectly formatted biomes in worlds.yml automagically	2020-04-22 08:22:14 +01:00
N0tMyFaultOG	c8d8fb6aff	Reformat premium information	2020-04-21 23:38:56 +02:00
N0tMyFaultOG	6da4994955	Enhance premium verification	2020-04-21 23:06:11 +02:00
N0tMyFaultOG	4780fcd534	Fixes #2782 ... Thanks for the contribution :)	2020-04-21 15:53:38 +02:00
dordsor21	ffee7a518e	update default biome to match format WorldEdit accepts.	2020-04-21 09:16:02 +01:00
Cheezybo99	f1d10c96bc	Added PERMISSIONS_ADMIN_CHAT_BYPASS enum for the permission plots.admin.chat.bypass allowing users to bypass the plot chat security feature.	2020-04-20 18:55:28 +02:00
Alexander Söderberg	3c8b22688a	I'm dumb.	2020-04-19 21:24:45 +02:00
Alexander Söderberg	cdd1fad85c	Fix github link in debugpaste	2020-04-19 21:22:45 +02:00
Alexander Söderberg	bf5862942a	Disable prefixes for flag info headers and footers and suppress NPE in the update utility	2020-04-18 22:26:13 +02:00
Alexander Söderberg	cbea595fa0	Don't relocate json-simple.	2020-04-18 21:14:44 +02:00
dordsor21	952ea0b090	Fix setowner none (unclaim)	2020-04-18 17:59:45 +01:00
dordsor21	af951ac11c	Update upload to debug the content if incorrect properly.	2020-04-18 17:53:45 +01:00
dordsor21	165614efe9	make sure never to have unclaim be an alias of delete. Even if it doesn't work.	2020-04-18 17:44:01 +01:00
dordsor21	95335df84d	Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5	2020-04-18 17:22:58 +01:00
dordsor21	100861484a	Fix plot claim.	2020-04-18 17:22:51 +01:00
Alexander Söderberg	c206de263b	Merge remote-tracking branch 'origin/v5' into v5	2020-04-18 02:28:29 +02:00
Alexander Söderberg	0c12972c03	Register misc-flags.	2020-04-18 02:28:11 +02:00
N0tMyFaultOG	546c4defb7	Add SirYwell to authors list ... Thanks for all your hard work regarding v5 ❤️	2020-04-16 23:49:08 +02:00
N0tMyFaultOG	814fca3832	Update flag description	2020-04-16 19:15:40 +02:00
dordsor21	3ee29297e0	Add option to force plot chat in plot areas.	2020-04-16 16:55:14 +01:00
dordsor21	6d9d0fff10	Add description caption for chat flag	2020-04-16 12:49:00 +01:00
dordsor21	714b8dad87	Implement IntellectualSites/PlotSquaredSuggestions/96 ... Also make Plot Chat work properly. Not sure what was going on there before...	2020-04-16 11:54:32 +01:00
dordsor21	a44807d47b	Don't dump biome array on /ps reload. Gradle also seems to want to change the Core pom.	2020-04-16 11:43:13 +01:00
Alexander Söderberg	4aac3bf7e4	Merge pull request #2757 from IntellectualSites/api/v5/packages ... Package Restructure	2020-04-16 10:58:13 +02:00
Alexander Söderberg	ee2ed8222d	Merge config packages	2020-04-16 06:14:33 +02:00
Alexander Söderberg	edaf396894	Merge features/v5/internal-updates into api/v5/packages	2020-04-16 06:11:03 +02:00
Alexander Söderberg	6f052f0001	Remove extra line from HEADER	2020-04-16 05:05:58 +02:00
Alexander Söderberg	ba40a56c32	Add GPLv3 License headers to all source files.	2020-04-16 04:52:39 +02:00
MattBDev	780be3776a	Addressed some comments	2020-04-15 15:26:54 -04:00
dependabot-preview[bot]	f5a9abfc8d	Bump kotlin-stdlib from 1.3.61 to 1.3.72 ... Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.61 to 1.3.72. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-14 18:25:00 +00:00
dependabot-preview[bot]	c812bb1295	Bump annotations from 18.0.0 to 19.0.0 ... Bumps [annotations](https://github.com/JetBrains/java-annotations) from 18.0.0 to 19.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/18.0.0...19.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-14 17:50:27 +00:00
Alexander Söderberg	79bd69e599	Make the entity counting code use the new entity categories, remove usage of magic numbers and add /plot caps	2020-04-12 19:30:50 +02:00
Alexander Söderberg	658f2a3fc3	Finalize entity type categorisation	2020-04-12 01:23:13 +02:00
Hannes Greule	6e536f81ac	Add more entity categories	2020-04-12 00:57:50 +02:00
Alexander Söderberg	dd9450d36a	Add entity category loading code to WorldUtil (implemented in BukkitUtil)	2020-04-11 22:26:31 +02:00
Alexander Söderberg	e6c76ad3f3	Entity categories implementation	2020-04-11 21:49:08 +02:00
Hannes Greule	6f2b31f4a3	Add missing default flag values to GlobalFlagContainer (fixes #2748)	2020-04-11 18:49:04 +02:00
Alexander Söderberg	c5590440d6	Merge remote-tracking branch 'origin/features/v5/internal-updates' into features/v5/internal-updates	2020-04-11 17:58:27 +02:00
Alexander Söderberg	7931390ae4	Fix json relocation issue. Make plot areas dump their default flags and add progress output for flag conversion.	2020-04-11 17:58:08 +02:00
Alexander Söderberg	546b857b9d	Fail default flag parsing gracefully	2020-04-11 17:19:43 +02:00
Alexander Söderberg	ce10d54a9c	Don't use legacy IDs to get block types in the hybrid plot manager	2020-04-11 13:28:58 +02:00
Alexander Söderberg	965bbb9f3b	Extract block queues from AugmentedUtils	2020-04-11 13:23:57 +02:00
Alexander Söderberg	e88b331155	Clean up AugmentedUtils and make the code readable by humans	2020-04-11 12:08:46 +02:00
Alexander Söderberg	ce177c3c46	Clean up HybridGen and make the code readable by humans ... Previously it was only readable by androids, and Jesse.	2020-04-11 12:00:42 +02:00
Alexander Söderberg	5a6dbfda36	Fix javadoc generation issues	2020-04-11 03:23:48 +02:00
Alexander Söderberg	9c3c42c3e6	Rename published maven artifacts ... # Conflicts: # Bukkit/build.gradle # Core/build.gradle	2020-04-11 02:54:34 +02:00
Alexander Söderberg	5fc33dcc06	Rename published maven artifacts	2020-04-11 02:39:02 +02:00
Alexander Söderberg	c196ced0e2	Move org.json into core	2020-04-11 02:28:15 +02:00
MattBDev	dfa977a020	Moved more packaged based on feedback	2020-04-10 20:19:18 -04:00
MattBDev	5be2dfa747	Package Changes	2020-04-10 19:26:07 -04:00
Alexander Söderberg	f9ea99fa1d	Merge pull request #2754 from IntellectualSites/features/v5/owners ... Remove all direct access to Plot.owner	2020-04-10 19:52:41 +02:00
Alexander Söderberg	79583c011f	Replace getOwnerAbs() == null with !hasOwner()	2020-04-10 19:28:10 +02:00
Alexander Söderberg	172bcc7677	Revert "Replace getOwnerAbs() == null with hasOwner()" ... This reverts commit 79620042	2020-04-10 19:22:12 +02:00
Alexander Söderberg	c2060ea1a7	Remove deprecation of getOwner()	2020-04-10 19:11:53 +02:00
Alexander Söderberg	7962004215	Replace getOwnerAbs() == null with hasOwner()	2020-04-10 19:10:43 +02:00
Alexander Söderberg	45476f2867	I missed AbstractDB somehow...	2020-04-10 18:15:35 +02:00
Alexander Söderberg	280ced7904	Add GPLv3 License headers to all source files. ... Reason: " How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found."	2020-04-10 18:09:01 +02:00
Alexander Söderberg	474795367e	Reformat Plot after the owner changes. It was a bit too messy.	2020-04-10 14:07:52 +02:00
Alexander Söderberg	ce756411cf	Remove all direct access to Plot.owner ... New methods were added for access to the absolute owner of a plot, and the documentation of the owner getters to clarify the purpose of the methods.	2020-04-10 14:05:01 +02:00
Alexander Söderberg	dada7dbb86	Use relocated org.json instead of including the source files	2020-04-09 17:41:55 +02:00
Alexander Söderberg	cb05d34d20	Fixes #2751	2020-04-09 17:07:14 +02:00
Alexander Söderberg	86149224d1	Don't set walls, wall filling or outline in plots using full vanilla terrain generation	2020-04-09 13:06:45 +02:00
Alexander Söderberg	f717589074	Fix typo in MainUtil and switch out Consumer<Integer> to IntConsumer	2020-04-09 11:23:39 +02:00
Alexander Söderberg	271109a726	Fix dumdum async getLoadedChunks call, but only because Aikar broke everything.	2020-04-08 21:49:41 +02:00
Alexander Söderberg	865d11e844	Register vehicle-place and make it disabled by default	2020-04-08 17:28:16 +02:00
Alexander Söderberg	bc45b8b695	Merge branch 'features/v5/internal-updates' into features/v5/async-load	2020-04-08 17:17:17 +02:00
Alexander Söderberg	f6332d2cd9	Add tab completions to flyflag	2020-04-08 16:53:39 +02:00
Alexander Söderberg	4ca7a81e96	Fix untrusted-visit.	2020-04-08 16:52:10 +02:00
Alexander Söderberg	ae2867136a	Make the fly flag an enum flag instead. It now accepts: true, false and default, where default is the default value, and does not change the flight status at all.	2020-04-08 16:39:19 +02:00
Alexander Söderberg	ef04ed9151	Fix augmented generation	2020-04-08 04:10:22 +02:00
Alexander Söderberg	be6bcafccc	Make sure augmented generation doesn't crash the server	2020-04-08 01:23:22 +02:00
Alexander Söderberg	5d332e7d58	Fix plot clearing in normal plot worlds	2020-04-08 00:01:58 +02:00
Alexander Söderberg	283ff945f3	Fix /plot auto performance and remove sign-guessing	2020-04-07 23:39:56 +02:00
Alexander Söderberg	0d4af3023d	Extract TaskManager lambdas for better debugging	2020-04-07 23:18:36 +02:00
Alexander Söderberg	7fdb7961ce	Merge branch 'features/v5/internal-updates' into features/v5/async-load	2020-04-07 22:13:42 +02:00
Alexander Söderberg	e161209a46	Fix plot claiming	2020-04-07 22:12:52 +02:00
Alexander Söderberg	5547185b3f	Prevent synchronous chunk loading whenever possible	2020-04-07 20:19:39 +02:00
dordsor21	7841ee3dcc	Fix a few encapsulate merge issues	2020-04-02 13:40:11 +01:00
Hannes Greule	099a680c85	Encapsulation and Magic Values (#2711) ... * Encapsulate attributes of PlotArea using lombok Getters/Setters * Limit access to collections, don't expose implementation details * Better naming for some boolean attributes * Replace magic type value with PlotAreaType enum * Replace magic terrain value with PlotAreaTerrainType enum * Fix remaining rebase conflicts * Reduce code duplication Co-authored-by: Alexander Söderberg <Sauilitired@users.noreply.github.com>	2020-04-02 13:34:38 +01:00
dordsor21	9764d4d226	Actually add biomes to road schematics	2020-03-28 10:43:24 +00:00
NotMyFault	37336fffe2	Merge branch 'features/v5/internal-updates' of https://github.com/IntellectualSites/PlotSquared into features/v5/internal-updates	2020-03-28 02:26:25 +01:00
dordsor21	2994b2c158	Use try with resource to close ClipboardReader and stop adding "atic" to schematic files or not reason	2020-03-26 20:55:27 +00:00
NotMyFault	3a3a06631d	Add coral-dry flag	2020-03-25 21:14:58 +01:00
dordsor21	f9bf576d2e	Actually initialise the biome array in HybridPlotWorlds. ... Fixes generation using schematics (and allows generation using biomes in schematics for roads and plots....)	2020-03-25 17:46:08 +00:00
dordsor21	f2f7fbce09	Allow trusted users to use /plot set	2020-03-25 11:01:19 +00:00
dordsor21	412a3ee344	Support v2 schematics properly. No 3D biomes are supported by it as yet. (#2716)	2020-03-24 09:08:56 +01:00
dordsor21	2f4eea118a	add clear option to /ps purge (#2714)	2020-03-24 09:08:32 +01:00
dordsor21	7310506ed4	Add option to have road regeneration be persistent across restarts. (#2715) ... * Add option to have road regeneration be persistent across restarts. * Use int[] not Integer[]. There's the possibility of large arrays given the size of some worlds. * Correctly close Input/Output streams with try-with-resource. Also don't try to ObjectOutputStream if an existing file hasn't actually been deleted.	2020-03-22 19:23:35 +00:00
dordsor21	26b5ee7482	Merge branch 'features/v5/internal-updates' of https://github.com/IntellectualSites/PlotSquared into features/v5/internal-updates	2020-03-20 12:12:30 +00:00
dordsor21	58280a20a8	Log don't debug on regenallroad completion	2020-03-20 12:11:39 +00:00
dordsor21	3d47d7e73f	Use worldedit to regenerate chunks. (#2708) ... * Use worldedit to regeneration chunks. It's very slow, but it works. * Use the AutoClose-ness of EditSession	2020-03-20 13:05:13 +01:00
Alexander Söderberg	d9f9d7dc34	Features/v5/event results (#2706) ... * Begin events rewrite using Guava EventBus: - moved events to within core - removed BukkitEventUtil - EventUtil in core is now the implementation - Refactor any event calls TODO: - Test :) - Implement changes to PlotSquared's own listeners - Other * Correct code style for annotations and refactor EventUtil to EventDispatcher * Make getEventResultRaw default method and remove empty PlotEventListener file * not raw map * Remove PlotPlusListener * Add listener registration to PlotAPI. Add documentation and refactor Result enum * Add reason for the Event Result. Change how the claim event is called TODO: better auto event somehow. Possible re-write of auto required..? * Implement changes to events properly Add PlayerAutoPlotEvent Add PlotDoneEvent Add schematic variable to Claim event and allow it to be changed Add reason for plot unlink to unlink event Add pattern to component set event and allow it to be changed Allow component of component set event to be changed Add player to plot merge event * Fix compile * Correct formating * Various cleanup - Correct formatting in places - Add feedback to Desc command cancellation - Correct use of flag API - Add FlagRemove event to flagcommand where required * Replace reason with caption * Switch colours in Event Deny caption Co-authored-by: dordsor21 <dordsor21@gmail.com>	2020-03-15 12:22:49 +01:00
NotMyFault	4bcd926543	Update discord links	2020-03-09 23:50:22 +01:00
Alexander Söderberg	05626c2c8f	Features/v5/move swap fixes + some other important commits (comments, etc) (#2699) ... * Use generics instead of the raw class * Add Gradle wrapper verification * Fix biome setting in versions prior to 1.15 * Fixes #2654 * Document area getters in PlotAreaManager, and replace y-value with z in the area contains check. * Remove update notifications * Remove unused dependencies * Do not kick plot owners on "/p deny *" * Do not kick any added players on /p deny * * Allow redstone to be used in server plot with `redstone.disable-offline` enabled. Potentially fixes #2613 * Disallow swapping ,erged plots * Fix legacy converter. * Fix blockbucket pattern generation * Prevent pasting schematics onto merged plots. * Cancel claim event correctly * Revert "Cancel claim event correctly" This reverts commit 0f786155 Further investigation required * Fix plot swapping messing up owners. Fixes #2282 * Fix plot move * Prevent plot swapping form changing the database unless the swap was successful. * Update signs after swap. * Only send move success message if the move was successful. Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: Daniel <admin@hywse.eu> Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>	2020-02-28 22:15:04 +01:00
NotMyFault	30b83faab6	Fix plot downloading	2020-02-28 00:31:53 +01:00
Alexander Söderberg	9868648fcb	Pull/2693 (#2694) ... * Commit WIP flag work. * More ported flag types, and additions to the flag API. * Make PlotFlag more generic to allow generic flag creation * Pull Captions methods into a Caption interface. * Port MusicFlag * Port flight flag * Port UntrustedVisitFlag * Port DenyExitFlag * Remove paper suggestion * Make ListFlag lists immutable * Update Flag containers. Add javadocs. Add missing methods. * Port description flag * Port greeting and farewell flags * Port weather flag * Move getExample implementation to BooleanFlag * Port reserved flags * Port all boolean flags. * Remove unused flag types * Invert liquid-flow flag * Find the real (legacy) flag name * Change NOITFY -> NOTIFY in Captions * Make IntegerFlag extendable * Port integer flags * Update Flag command to current API state * Begin remaking flag command * Create DoubleFlag + extract common parsing stuff * Supply arguments in flag parse exceptions * Implement missing flag subcommands * Update Flag command to current API state * Implement PriceFlag * Port deny-teleport * Port gamemode flags * Port BreakFlag * Port PlaceFlag * Port UseFlag * Remove old unused flag constants * Port blocked-cmds flag * Fix entity util * Port TimeFlag * Use CaptionUtility for formatting * Port keep flag * Fix imports * Reformat code * Remove unused classes * Fix MainUtil.java * Remove FlagCmd * Add flag info header and footer * Comment out flag related stuff in SchematicHandler * Remove FlagManager * Finalize Plot.java * Finalize PlotArea.java * Finalize PlotListener * Fix API issues * Fix a bunch of compile errors * Fix `/plot flag remove` * Fix initialization of GlobalFlagContainer * Apply API changes to events * Update SQLManager to new API * Invert default value for DenyExitFlag * Replace flag.getValue().toString() with flag.toString() * Make FlagContainer instance in Plot final * Fix various command issues * Clean up PlotSettings * Don't show internal flags in flag list * Fix `/plot flag add` * Remove the info inventory as it's 100% broken * Add plot info entries and fix up the default format * Fix default flag state in Captions * 781c200 part 2 * Fix odd grammar in captions * Fix odd grammar in captions v2 * Add create table statements for plot_flags * Remove old flag references in SQLManager * Use the new plot_flags table * Add tab completion to `/plot flag` * Improve parse error handling * Make flag permission check recognize parse exceptions * Initial progress towards flag conversion * Fix minor issues * Don't validate flags during flag conversion * Allow unrecognized flags to be parsed * Filter out internal flags from command sugguestions * Use the wrong caption when there's no plot description set * Limit command suggestions for boolean flags * Make blocktypelistflags accept blockcategories * Require categories to be prefixed with '#' and fix some minor display issues * Fix plot database conversion * Update PlotFlagEvent.java Updated return description * Fix command annotation wrapping * Add FLAG_UPDATE event for FlagContainer listeners * Make getParentContainer nullable * Document castUnsafe in FlagContainer * Document FlagContainer constructors * Add missing documentation to FlagContainer * Document FlagParseException * Fix wording in FlagContainer javadoc * Document InternalFlag * Document PlotFlag * Minor changes * Remove revisit comments Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com> Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>	2020-02-24 18:42:02 +01:00
Alexander Söderberg	b99631f1bd	Fix regen. Fixes #2692	2020-02-24 14:00:45 +01:00
NotMyFault	f2aa9dccd1	Revert "Remove unused code" ... This reverts commit 6d779dad05.	2020-02-20 20:08:25 +01:00
Alexander Söderberg	464f5e09ae	Allow all messages to be formatted by external formatters and add PAPI support	2020-02-20 16:03:17 +01:00
NotMyFault	6d779dad05	Remove unused code ... Or at least I made it unused lul	2020-02-20 00:39:32 +01:00
Alexander Söderberg	38d0cc1b29	Fix isPremium method	2020-02-20 00:05:55 +01:00
NotMyFault	95394ec54f	Add Premium verification	2020-02-19 23:55:43 +01:00
NotMyFault	2632283431	Move recent changes into 1 branch	2020-02-16 15:17:06 +01:00
NotMyFault	8a014e3ad5	Remove wiki generator and unnencessary comments from the settings	2020-02-16 15:08:02 +01:00
NotMyFault	1b3427837e	Rename maven artifacts ... Renaming the Core module artifact matchin its module name on GitHub, like the bukkit or nukkit module does. Given that, it's more clear which maven artifact belongs to which module.	2020-02-16 14:42:27 +01:00
NotMyFault	b3c91d866b	Lazy cherry-pick 5db1e73eae4b0d4628df8bbbc172670c42d96435 without merge conflics	2020-02-16 14:41:51 +01:00
NotMyFault	6953187cac	Add current + new version to update notification ... And fix a little typo alongside bumping versioning to v5	2020-02-16 14:37:07 +01:00
NotMyFault	4ed108b5c0	Remove legacy auto updater (v3)	2020-02-16 01:36:24 +01:00
NotMyFault	24b6b23d25	Bind update notifications to spigot resource updates ... The notification permission could be moved back into the other class, but well	2020-02-16 01:33:43 +01:00
MattBDev	b16db904cc	Removed unused class which should be unbreaking.	2020-02-11 17:09:36 -05:00
MattBDev	4b306d454b	Fixed an error with the debug command and added @NotNull to generator methods	2020-02-11 17:06:58 -05:00
MattBDev	e53ea2377c	Fixed #2671 ... Sort of fixed. I added an if statement to log and return if a certain condition is met. It is unclear if there will be more generation issues as a result.	2020-02-11 16:52:16 -05:00
MattBDev	f79f2ac29e	Tweaks to the world generator	2020-02-11 16:16:56 -05:00
NotMyFault	54348d824c	Update authors	2020-02-10 17:36:54 +01:00
dependabot-preview[bot]	76e25953b1	Bump lombok from 1.18.10 to 1.18.12 ... Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.10 to 1.18.12. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.10...v1.18.12) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 08:03:18 +00:00
NotMyFault	2f0bf97162	Fix displaying 1 player remove as players	2020-02-09 01:12:32 +01:00
Hannes Greule	d0b6badf09	Fix DebugClaimTest (#2667) ... * Fix DebugClaimTest * Remove code causing 3 database updates per plot + errors when using MySQL	2020-01-31 17:12:06 +00:00