Commit Graph

5312 Commits

Author SHA1 Message Date
renovate[bot]
d69f3b0893
build: Update dependency com.intellectualsites.bom:bom-1.18.x to v1.5 (#3677)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-06-13 11:38:28 +02:00
Alexander Brandes
565838ad43
[ci skip] chore: Update renovate excludes (Closes #3678) 2022-06-13 11:36:46 +02:00
Alexander Brandes
8b52461271
build: Back to snapshot for development 2022-06-13 11:25:07 +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
1470b7117a
chore: Add tadpole buckets to the list of dispensable items (#3669)
chore: Add tadpole buckets to the list of disposables

Signed-off-by: Alexander Brandes <mc.cache@web.de>
2022-06-12 10:46:21 +02:00
Alexander Brandes
7cbc67f4fc
chore: Fix typo 2022-06-11 17:14:51 +02:00
Alexander Brandes
0a76bbb2b0
Update README.md 2022-06-11 17:14:05 +02:00
Alexander Brandes
09cc59a1c1
docs: Unify WE, P2 and Fawe abbreviations (#3672) 2022-06-11 16:16:06 +02:00
Alexander Brandes
60f7113105
build: Update bom 2022-06-11 14:53:39 +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
cc7e17960b
docs: Add 1.19 to issue template 2022-06-10 13:42:09 +02:00
Bernhard
3c75b170f0
fix: mob cap counting for each connected plot individually (#3643)
cap meta is now handled in the base plot
2022-06-10 01:27:39 +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
4bb480a238
chore: Update Code of conduct email (#3661) 2022-06-09 12:58:31 +02:00
Alexander Brandes
9ffa935c0c
build: Switch to bill of materials (#3653)
* build: Switch to managed dependencies

* build: Move bom to root build script

* build: Update bom

* Update build.gradle.kts

* fix: Use the correct bom version
2022-06-09 12:57:37 +02:00
dordsor21
3d87ee41b3
v7 is 7.0.0-SNAPSHOT 2022-06-08 14:42:14 +01:00
Bernhard
0a32268784
Prevent blocks moving/generating below and above build height (#3641)
* fix: cancel BlockFormEvent outside of build limit

* refactor: rename variables for easier readability

* fix: cancel liquid flow outside build limit

* refactor: implement to/from context
2022-06-05 20:51:07 +02:00
Alexander Brandes
ae3b8c06f6
chore: Address Paper javadoc warnings (#3648) 2022-06-05 20:50:49 +02:00
Alexander Brandes
713c4ad0d2
Remove aggregation of cross module javadocs (#3646)
chore: Don't aggregate javadocs anymore
2022-06-03 23:13:41 +02:00
NotMyFault
fd8832ac98
Merge branch 'v6' into v7 2022-06-01 20:13:07 +02:00
NotMyFault
48386c0828
build: Back to snapshot for development 2022-06-01 20:12:50 +02:00
NotMyFault
625b3921e1
build: Release 6.8.1 2022-06-01 20:09:36 +02:00
Alexander Brandes
48aa37d173
Update Readme SVG (#3642)
docs: Update Readme SVG
2022-05-30 13:47:25 +02:00
Alexander Brandes
228acc196c
Merge branch 'v7' of https://github.com/IntellectualSites/PlotSquared into v7 2022-05-29 22:05:37 +02: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
renovate[bot]
82cd9a092c
build: Update fawe to v2.2.0 (#3637)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-05-24 13:33:54 +02:00
Alexander Brandes
62754362c2
build: Don't expose jcip and findbugs annotations to the world on runtime (#3533)
* build: Don't expose jcip and findbugs

* build: Revert relocation change of unpublished, shaded deps

* chore: Exclude .DS_Store files
2022-05-21 10:01:06 +00:00
Alexander Brandes
daa9348993
chore: Change maven group and artifact ID (#3632)
chore: Change maven group and artifact ID
2022-05-21 11:58:30 +02:00
BlockyTheDev
2e9dfd6f6f
chore: Update PaperMC repository endpoint (#3633)
Migration - New PaperMC endpoints
2022-05-21 07:57:22 +02:00
Alexander Brandes
7e4499e092
Merge branch 'v7' of https://github.com/IntellectualSites/PlotSquared into v7 2022-05-18 22:14:35 +02:00
Alexander Brandes
396a1575d2
Merge branch 'v6' into v7 2022-05-18 22:13:29 +02:00
Alexander Brandes
fc9fe1462f
build: Back to snapshot for development 2022-05-18 22:07:22 +02:00
Alexander Brandes
41f546ca6b
build: Release 6.8.0 2022-05-18 22:05:31 +02:00
Alexander Brandes
d037da33cb
chore: Ignore .DS_Store files 2022-05-18 21:59:09 +02:00
renovate[bot]
dc2d08c67e
build: Update release-drafter/release-drafter action to v5.20.0 (#3624)
* build: Update release-drafter/release-drafter action to v5.20.0

* Update release-drafter.yml

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
2022-05-18 17:19:23 +02:00
Hannes Greule
953d57d1b5
Replace legacy color codes in flag examples (#3520) 2022-05-16 13:28:03 +01:00
Jordan
96dfc27411
Fix lag caused when generating augmented worlds with roads (#3614)
- Begin by implementing forceSync to the queue system as we know the chunk will be accessible to edits in some cases (i.e. population).
 - Also implement custom SideEffectSets to override any decided by the default chunk consumer, as we do NOT want to update neighbours in population (this caused infinite generation to be required causing the lag and server death). We also do not want to enqueue the QueueCoordinator in AugmentedUtils as this would write to the world and update neighbours before we might want to (plus it's just used to restrict and offset the blocks being set)
 - Then implement disabling any biomes from being saved/set to the queue to prevent augmented worlds having their biomes overridden in roads
 - Consequently fix ScopedQueueCoordinator, preventing the y value of blocks being set from needlessly being changed, fixing road heights in augmented worlds
 - Finally we do not need a method with chunkObject in the signature in AugmentedUtils as this is no longer used by the method
2022-05-16 13:27:41 +01:00
Jordan
171d2e5e99
Fix generation of augmented/partial worlds when single worlds are enabled (#3615) 2022-05-16 13:21:43 +01:00
Bernhard
4433892431
fix: Block Endermites from spawning if mob spawning is disabled (#3623) 2022-05-16 13:20:03 +01:00
Alexander Brandes
b53d2d03a4
Merge branch 'v6' into v7 2022-05-15 15:41:17 +02:00
Alexander Brandes
c1431c0971
build: Update to Paper 1.18.2 (#3622)
build: Align MM and Adventure version
2022-05-15 12:31:40 +02:00
Jordan
98a07dad1b
Fix plot analysis (#3618)
* Fix plot analysis
 - Stop using deprecated ChunkQueueCoordinator and create a new purpose-built coordinator
 - Generation is chunk-by-chunk thus the old blocks cache needs to be filled accordingly
 - Remove the **four** System#gc calls
 - Fixes #3464
 - Fix really weird dumb... maths? in ExpiryTask
 - Fixes #3600

* Add since annotation

* Address comments and maxY should be inclusive

* Annotate new queue as internal use only
2022-05-15 11:58:04 +02:00