EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 06:36:44 +01:00
Code Issues Projects Releases Wiki Activity
5,359 Commits 232 Branches 71 Tags 87 MiB
0d2b36bac8
Commit Graph

2088 Commits

Author SHA1 Message Date
Alexander Brandes
a5c53a96d1
Record-inize methods (#3976) 2023-03-05 10:07:36 +01:00
Alexander Brandes
785362c576
Merge branch 'v6' into v7 2023-03-02 12:34:18 +01:00
Alexander Brandes
f5118e6802
Don't fire 'PlotUnlinkEvent' twice on plot clear (#3947) 2023-02-23 09:26:30 +01:00
Alexander Brandes
1e7ba7d173
Merge branch 'v6' into v7 2023-02-12 19:06:11 +01:00
Alexander Brandes
773fd6f59f
Release 6.11.0 2023-02-10 17:12:15 +01:00
Alexander Brandes
aa784e98f8
Merge branch 'v6' into v7 2023-02-10 16:44:57 +01:00
ByteExceptionM
5cce86d924
feat: Add event firing on remove road entity (#3955) 
* feat: Add event firing on remove road entity

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Add some more entity vars

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Rename method

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Code cleanup

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Code reformat

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Change iterator removal

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* Comply with checkstyle

---------

Signed-off-by: ByteExceptionM <git@byteexception.eu>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2023-02-09 20:51:59 +01:00
Alexander Brandes
586474c8e6
Merge branch 'v6' into v7 2023-01-23 13:40:52 +01:00
Alexander Brandes
70b6636f50
Revert "Cleanup deprecated methods" 
This reverts commit 26692d6633.
 2023-01-23 13:40:47 +01:00
Alexander Brandes
ab357deb48
Put more legacy web interface deprecations in place 2023-01-23 13:40:35 +01:00
Alexander Brandes
bd62d1a1c7
Merge branch 'v6' into v7 2023-01-23 13:28:12 +01:00
Alexander Brandes
6130c3dfa5
Clarify 2D biome deprecation 2023-01-23 13:28:05 +01:00
Alexander Brandes
26692d6633
Cleanup deprecated methods 2023-01-23 13:27:08 +01:00
Alexander Brandes
ee0f389c78
Merge branch 'v6' into v7 2023-01-23 13:01:48 +01:00
Alexander Brandes
be8903128d
Release 6.10.9 2023-01-23 12:28:33 +01:00
Alexander Brandes
08800ec16d
Cleanup deperecated WorldEdit met 
Co-authored-by: Matthew Kaulfers <42121989+mkaulfers@users.noreply.github.com>
 2023-01-22 11:26:07 +01:00
Alexander Brandes
83e274ff9f
Revert "PS-3908: Cleanup deprecated methods to improve code maturity. (#3944)" 
This reverts commit 0dd8b1053c.
 2023-01-22 11:21:01 +01:00
Matthew Kaulfers
0dd8b1053c
PS-3908: Cleanup deprecated methods to improve code maturity. (#3944) 
https://github.com/IntellectualSites/PlotSquared/issues/3908
 2023-01-22 00:02:15 +01:00
Alexander Brandes
0558fcf5d5
Provide full verbosity for invalid components 2023-01-21 22:27:20 +01:00
Jordan
5af8be4293
chore: Remove things marked as for removal (#3941) 
* chore: Remove things marked as for removal

* Address feedback

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2023-01-21 16:44:28 +01:00
Alexander Brandes
cbacdd67eb
Merge branch 'v6' into v7 2023-01-21 16:39:14 +01:00
Jordan
c45bbe3ec5
fix: ensure plots are fully unlinked before the clear itself is run (#3933) 
* fix: ensure plots are fully unlinked before the clear itself is run

* Update Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2023-01-19 09:01:06 +01:00
dordsor21
b79537ebbc
Clean up merge 2023-01-17 12:59:16 +00:00
dordsor21
6efd581500
Merge branch 'v6' into v7 
# Conflicts:
#	.github/workflows/codeql.yml
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Add.java
#	Core/src/main/java/com/plotsquared/core/command/Caps.java
#	Core/src/main/java/com/plotsquared/core/command/Cluster.java
#	Core/src/main/java/com/plotsquared/core/command/Continue.java
#	Core/src/main/java/com/plotsquared/core/command/Copy.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/command/Visit.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	build.gradle.kts
 2023-01-17 11:51:39 +00:00
Jordan
07e598e48f
fix: account for exclusivity of max build height where requires (#3935) 2023-01-16 21:15:35 +00:00
Alexander Brandes
abbac057ed
Default to unix line endings (#3932) 
* Default to unix line endings

* Respect preconfigured settings
 2023-01-15 17:54:52 +01:00
Jordan
39d2f1a72c
chore: remove uses of deprecated Permissions class and add javadoc notes (#3930) 
- Closes #3907
 2023-01-15 14:08:59 +01:00
Alexander Brandes
1448d8d4af
Fixes #3906 by fine-graining the help menu generation localization support 2023-01-14 00:42:46 +01:00
Hannes Greule
00722bc463
Reduce /plot home overhead (#3921) 
* Add JFR events

* Replace global connected plots cache with local cache

* Simplify isOwner check

* Avoid extensive hashing of plots

* Clear caches in more cases

* Revert "Add JFR events"

This reverts commit 78c107f1
 2023-01-14 00:27:09 +01:00
Alexander Brandes
0707aa47c9
Merge branch 'v6' into v7 2023-01-11 22:12:31 +01:00
Alexander Brandes
0f0030916f
Add source documentation to javadocs and add dependency tab (#3917) 
Get the most out of javadocs
 2023-01-11 18:25:51 +01:00
Alexander Brandes
a12490c3eb
Fixes #3919 2023-01-09 23:50:13 +01:00
Alexander Brandes
7135bdd6aa
Fix compile errors 2023-01-08 10:36:41 +01:00
Alexander Brandes
3198c3b081
Merge branch 'v6' into v7 2023-01-08 10:20:15 +01:00
Hannes Greule
339ca8e30f
Fix wrong plot id calculation for negative coordinates (#3898) 2023-01-04 12:35:12 +01:00
Jordan
f3bc504a6f
refactor: adjust specific Nullable annotations used (#3869) 2022-12-02 12:39:38 +00:00
Jordan
90ebd5d5ed
feat: add a permission to override-allow a merge if the other plot's owner is offline (#3844) 2022-11-25 10:48:33 +00:00
Alexander Brandes
c973ee8649
Revert "feat: check merge limits when completing auto-merge (#3868)" - Fixes a bug in 6.10.4 (#3876) 
Revert "feat: check merge limits when completing auto-merge (#3868)"

This reverts commit 25ce7a83f1.
 2022-11-20 10:58:04 +01:00
Jordan
c1543f034c
feat: improve handling of null issues in plot analysis (#3867) 2022-11-17 17:23:44 +00:00
Alexander Brandes
ee8902154a
Release 6.10.4 2022-11-16 11:26:03 +01:00
Jordan
b5bc1988e5
feature: implement road flags as widely as seems reasonable (#3870) 
* feature: implement road flags as widely as seems reasonable
 - Closes #3047
 - Any further road flag implementations would be very specific from what I can gather, and thus the gist of #3047 is now implemented

* Add javadoc since tag

Co-authored-by: Alexander Brandes <mc.cache@web.de>

* Create util class for method

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-11-15 19:07:38 +01:00
Jordan
25ce7a83f1
feat: check merge limits when completing auto-merge (#3868) 
- Closes #3748
 2022-11-13 11:57:41 +01:00
Jordan
db2d590e8e
fix: account for mismatched road-schematic heights (#3854) 2022-10-23 21:22:21 +02:00
Alexander Brandes
de4e91ff62
Release 6.10.2 2022-10-18 23:12:27 +02:00
Pierre Maurice Schwang
fe5e3d5f6d
Annotate ExpireManager with @Inject (#3852) 
fix: annotate ExpireManager with @Inject
 2022-10-18 10:17:34 +02:00
michizhou
b8b3098022
feat: Move ExpireManager to Guice by removing legacy IMP references (#3845) 
* feat: Move ExpireManager to Guice by removing legacy IMP references

* Mark ExpireManager IMP as deprecated and add comments

* Add import for PlotPlatform for function reference

* Add ExpireManager instance call and optimize performance
 2022-10-17 09:31:48 +02:00
BlockyTheDev
76c6be9ba7
Fix 'No resource for locale 'lang' found ' error (#3830) 
* Fix #3820

* Reword message and add link to completed translations

* Fix #3820

* Reword message and add link to completed translations

* Add line breaks for better code readability

* Add line breaks for better code readability

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-10-13 19:19:20 +02:00
Jordan
308a5aa781
Ensure all setBlock methods in BlockArrayCacheScopedQueueCoordinator apply the correct offset (#3843) 
- Fixes #3783
 2022-10-13 19:17:27 +02:00
Hannes Greule
e244527538
Make more complex patterns work correctly (#3847) 
allow more complex patterns to work correctly
 2022-10-13 19:16:19 +02:00
Jordan
11dd013333
fix: Adjust schematic height logic when pasting and actually set air as well (#3840) 2022-10-13 16:46:29 +01:00
Pierre Maurice Schwang
b740d5854c
Support MiniMessage in plot-title flag (#3835) 2022-10-10 17:41:35 +01:00
BlockyTheDev
d5445cfbef
Don't kill owned road entities (leashed / named) (#3829) 2022-10-10 17:41:25 +01:00
Hannes Greule
caef3a923b
Deprecate PlotId#copy (#3821) 2022-10-08 14:11:16 +01:00
BlockyTheDev
d4c3ceaf2b
Move license into jar during compile process (#3826) 2022-10-08 14:10:57 +01:00
StealWonders
e53d2ac449
Update the plot sign when a plot has been purchased (#3822) 2022-10-03 21:51:17 +02:00
Pierre Maurice Schwang
1b717c9b10
Only show visible players in /plot near (#3819) 
feat: check visibility of player in `/plot near`
 2022-10-03 21:50:41 +02:00
Hannes Greule
35abae99ca
Improve feedback for invalid patterns (#3818) 
improve feedback for invalid patterns
 2022-10-02 22:22:08 +02:00
Schuwi
d1a85982fb
Fix "set block timer" error after "/plot download" with legacy-webinterface setting (#3812) 
Add missing `Plot.removeRunning` call to Download
 2022-10-01 11:37:24 +02:00
resi23
3446b913cd
plots.auto.mega fix for #3815 (#3816) 
Co-authored-by: Resi <unconfigured@null.spigotmc.org>
 2022-09-28 10:53:44 +02:00
Alexander Brandes
60d266b2d7
Release 6.10.0 2022-09-21 16:28:17 +02:00
DerEingerostete
476f3d328d
feature: add flag for beacon effects of other plots (#3627) 
* feature: add flag for beacon effects of other plots

Took 7 minutes

* fix: don't add the beacon effect flag if the platform is not paper

Took 2 minutes

* fix: creating consistency in documentation

Took 7 minutes

* feature: add global paper setting for the beacon-effect

* fix: description of the plot flag and rewrite of the listener

* fix: renamed flag and added road support

* fix: renamed flag and changed flag functionality

* fix: added spigot fallback listener and fixed NPE

* refactor: Address checkstyle violations

* addition: remove beacon effects when player leaves a plot

* fix: updated javadoc and fixed usage of the PlotListener#addEffect method

* chore: Run license updater

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-09-05 20:06:37 +02:00
Hannes Greule
e0eff15694
fix: use correct uuid type in /grant (#3759) 
use correct type
 2022-08-07 21:19:01 +02:00
Hannes Greule
7669e79da1
refactor: simplify timeout logic in uuid pipeline (#3760) 
simplify timeout logic
 2022-08-06 16:32:11 +02:00
Alexander Brandes
4e5a2b9f96
fix: Add user friendly message for creationdate placeholder (#3745) 2022-07-29 23:00:37 +02:00
Alexander Brandes
dcf98c2298
build: Release 6.9.3 2022-07-25 21:10:39 +02:00
Hannes Greule
ae59c7442f
fix: improve handling of missing message files (#3718) 
* improve handling of missing message files

* fix javadoc

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-07-25 21:02:54 +02:00
Jordan
98708118d8
Deprecate the static Permissions "util" class that is almost entirely superseded by methods in PermissionHolder instances themselves (#3695) 
Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-07-24 15:55:43 +02:00
Bernhard
276d8f8e1e
change message of /p remove <player> if player does not need to be removed (#3734) 
refactor: change message of `/p remove <player>` if unnecessary
 2022-07-24 10:32:29 +02:00
Alexander Brandes
12e2705260
Revert #3681 (#3722) 
Revert "Adjust schematic height logic when pasting and actually set air as well (#3681)"

This reverts commit 08ce4c872c.
 2022-07-05 15:02:25 +02:00
dordsor21
91017acce4
Realistically only need the "highest" y level of adding overlay block errors 2022-06-27 17:41:47 +01:00
Alexander Brandes
263cb47a21
build: Release 6.9.1 2022-06-27 14:56:44 +02:00
Traks
005600c99e
Show old flag value in remove command (#3711) 2022-06-27 13:31:45 +02:00
NotMyFault
26bec7fe2f
style: Address javadoc violations 2022-06-26 11:18:33 +02:00
Jordan
f4b886d977
Minor cleanup of the plot analyze code (#3708) 
- No need to wrap the final analysis into another async method. It's already contained in an async task
 - Don't overstretch a chunk bounday when setting blocks to newBlocks array
 2022-06-23 19:18:29 +02:00
Jordan
75fd9b2631
Update to new Spigot generation API (#3659) 
* Address deprecations in queue/generation code

* Move to new generation API
 - Currently not working due to lack of biome-setting capability via BiomeProvider for flat worlds

* Any fixes to flat world biome setting will target 1.19

* Ensure compiled is actually set to true in BlockBucket

* Delegate to platformGenerator in deprecated generation method if applicable when using new generation methods (1.19)

* Re-add wrongly removed method

* Handle exceptions using logger

* We can simplify getting relative offset using floormod

* Replace many booleans with EnumSet

* Address comments, remove needless boolean return for populateChunk
 2022-06-22 14:57:39 +02:00
Jordan
f218902581
Implement build height limits into more events (#3691) 
* Implement build height limits into more events

* Implement util method to check if y is within world build limits

* Extract duplicate player-build-height-checking to plot area
 - Extract to core module to allow any possible future platforms to access the method, as they will always duplicate

* Add code tag to javadoc

Co-authored-by: Alexander Brandes <mc.cache@web.de>

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-06-21 19:09:29 +02:00
Alexander Brandes
f27009216c
chore: Replace AnnotationHelper class (#3706) 2022-06-21 19:09:17 +02:00
Alexander Brandes
6b680fb2c0
Merge v6/v7 2022-06-21 11:00:53 +02:00
Jordan
08ce4c872c
Adjust schematic height logic when pasting and actually set air as well (#3681) 2022-06-17 15:39:41 +01:00
Jordan
27ffe4fcdc
Address deprecations in queue/generation code (#3658) 2022-06-16 15:41:03 +01:00
dordsor21
8afcaccb8a
Merge branch 'v6' into v7 2022-06-16 15:26:03 +01:00
dordsor21
c83b13e374
Merge branch 'v6' into v7 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/command/Chat.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegExUtil.java
#	build.gradle.kts
#	gradle/libs.versions.toml
 2022-06-16 15:25:33 +01:00
Jordan
2b0c5b1e21
Reset wall filling on clear (#3680) 
- Implements #3591
 2022-06-16 16:22:27 +02:00
Alexander Brandes
3d5c694daa
chore: Comply with OSSRH licensing guidelines (#3684) 2022-06-15 20:17:17 +02:00
Jordan
23360057b9
Chore: General deprecations (#3660) 
Address deprecations for removal throughout the plugin
 2022-06-13 23:45:27 +02:00
Schuwi
d153232969
Fix maximum plot number check in /plot continue counting the current plot twice (#3674) 
Fix max plot restriction check in continue command

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-06-13 23:44:56 +02:00
Alexander Brandes
d08381dfed
build: Release 6.9.0 2022-06-13 11:23:48 +02:00
Jordan
b6c45f2df3
Add an on-complete task to PlotArea#mergePlots (#3671) 
* Add an on-complete task to PlotArea#mergePlots

* Fix typo
 2022-06-13 09:06:01 +02:00
Jordan
b9479405e1
Ensure forceSync is provided when constructing chunk coordinators (#3657) 
* Ensure forceSync is provided when constructing chunk coordinators

* Re-add old factory create method and deprecate for removal

* Remove old create method that Guice doesn't like
 2022-06-12 10:47:43 +02:00
Jordan
a238ff19bf
Implement tile entities to generation using Populators (#3665) 
* Implement tile entities to generation using Populators
 - Fixes #3051

* Javadocs

* Don't do the big error if heads don't work

* Address comments regarding javadocs/comments

* Ensure Location is still sealed, and add api description annotation to public methods in UncheckedWorldLocation

* Clean up HybridGen
 - There's no need for while loops acting as a modulo after we've already performed a modulo
 - Make the code-sections calculating if positions are in the wall/road more readable
 - Collaps duplicate if-elseif bodies

* Better exception handling when setting data to LimitedRegion during chunk population

* Address comments

Co-authored-by: Alexander Brandes <mc.cache@web.de>

* Better naming for "legacy" block state populator

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-06-12 10:47:25 +02:00
Alexander Brandes
c93b08d0c7
feat: Add 1.19 music disk to the /plot music GUI (#3668) 
feat: Add 1.19 music disk to the GUI
 2022-06-12 10:47:00 +02:00
Alexander Brandes
09cc59a1c1
docs: Unify WE, P2 and Fawe abbreviations (#3672) 2022-06-11 16:16:06 +02:00
Alexander Brandes
26c0c1b7cd
Merge branch 'v6' into v7 2022-06-11 14:11:25 +02:00
Jordan
bf646be482
Only load world cofigurations if WorldEdit has fully enabled (safe to do) (#3666) 
* Only load world cofigurations if WorldEdit has fully enabled (safe to do)
 - Fixes #3664

(cherry picked from commit f2e1e99be3b4f1fd5ce00e32ea7773dd4d1855aa)

* Fix imports

* QueryCapability is effectively a "dumb" method

* Update Core/src/main/java/com/plotsquared/core/PlotSquared.java

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-06-10 16:52:17 +02:00
Alexander Brandes
764c94c9cc
Merge branch 'v6' into v7 2022-06-10 01:14:09 +02:00
dordsor21
a79c474957
Deprecate methods for removal that will be removed/had their signatures changed in v7 2022-06-09 13:49:58 +01:00
Alexander Brandes
62197f3deb
Merge branch 'v6' into v7 2022-05-29 22:05:17 +02:00
Bernhard
2c2314e95c
refactor: return info.server for %plotsquared_currentplot_owner% if plot is a server plot (#3640) 2022-05-25 10:18:10 +02:00
Bernhard
5eb2fc3ad0
Kick players on merged plots appropriately (#3639) 
fix: kick denied player regardless on all connected plots
 2022-05-24 20:30:06 +02:00
Alexander Brandes
7e4499e092
Merge branch 'v7' of https://github.com/IntellectualSites/PlotSquared into v7 2022-05-18 22:14:35 +02:00