3d5c694daa
chore: Comply with OSSRH licensing guidelines ( #3684 )
2022-06-15 20:17:17 +02:00
09cc59a1c1
docs: Unify WE, P2 and Fawe abbreviations ( #3672 )
2022-06-11 16:16:06 +02:00
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
13d7357c85
Niceties
...
- Better ordering of augmented information printed to consol on startup
- Override
2022-05-10 01:43:01 +01:00
9f632af0ae
Implement extended world heights from Y-64 to Y319 #3473 ( #3473 )
...
* Begin to implement extended world heights:
- Implemented in Bukkit module (and where required in Core module)
* Implement extended world heights into core module
* Add min gen height to setup,
* Default gen/build heights based on minecraft version
* Few fixes
* Fix up queues
* Address comments
* Make road schematic stuff slightly more efficient by sharing queues
* Minor fixes, don't overlay error many times for the same y
* Fix incorrect schematic paste height, undo changes to HybridUtils
* Overhall regenallroads method to make it work, make sure BukkitChunkCoordinator can/will finish
* Process chunks in order when regenerating all roads
* Address comments
* Address comments
* Ground level//bedrock is at min gen height
- Add comment on == rather than <= being used
- It's because it's only checking for the bedrock layer being broken if that's disabled
* Fix offset for min build height in SchematicHandler
* Better javadoc
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
* Address inclusivity issues for max world height
* Javadocs/comments/deprecation
* Use world min/max heights if present in QueueCoordinator
* Address some deprecations for regions and biome setting
* Add a count for chunks we're currently trying to load to not skip chunks at the end of a queue's edit
* Use minGenHeight + 1 rather than build height in AugmentedUtils
* Create utility method for layer index in GenChunk
* Correct height in HybridUtils, also use minGenHeight + 1
* Don't magically split to 128 height in regeneration
* Add utility methods for world height in QueueCoordinator
* Clean up ClassicPlotManager road creation/removal
* Start generation at min gen height if bedrock is disabled
* min gen height is set in PlotArea
* Add note on schem y normalisation
* Improve plot getVolume method readability
* Don't overly extend height when regenerating road region
* y index utility method in ChunknQueueCoordinator
* Layer index utility method in LocalChunk
* Use version min/max heights if world not present in QueueCoordinator
* Fix min -> max
* Don't allow players to modify outside build height when using plot set / schematics.
- Also fixes schematic height issues
* Remove debug
* Address comments
* Switch loadingChunks to AtomicInteger to be safe (in case of multi-threaded)
* Fix "security" issue that was already present
* Ensure sign isn't physicsed
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
2022-03-05 19:03:39 +01:00
a0594c19ee
docs: Address dangling `@see` tags ( #3469 )
2022-01-24 21:43:35 +01:00
da41c136fe
docs: Unify true/false style in `@return` ( #3470 )
2022-01-24 21:41:54 +01:00
42bf413528
chore: Address more violations
2022-01-20 21:01:38 +01:00
25095f4546
chore: Welcome 2022
2022-01-02 22:22:19 +01:00
b9a130ab00
feat: Add -`Post` events firing after operational plot events ( #3334 )
...
* Create Post* events
* Address license violations
* address review
* standardize post event calls in EventDispatcher
* Add package-info.java
* Add @since-tag to Post* events
* fix licenser issue
Co-authored-by: Alex <mc.cache@web.de>
2021-12-06 19:50:04 +01:00
b97e843849
perf: Get rid of Guice overhead when accessing the plot area manager ( #3315 )
...
Fixes #3311
Co-authored-by: Jordan <dordsor21@gmail.com>
2021-11-02 13:38:48 +00:00
40e651188e
Improve javadoc linking
2021-08-24 15:34:21 +02:00
2988ad6b11
Address style violations
2021-08-18 11:58:18 +02:00
a797d748ea
Handle `/p f add` message properly
...
- Leave a note if the database connection has been established properly
2021-07-12 22:55:28 +02:00
56920fe833
Load configs before accessing them ( fixes #3099 )
2021-06-21 16:38:40 +02:00
2ac5fe45e3
Make CaptionLoader namespace-aware
2021-06-08 15:36:03 +02:00
f4552e358d
Fixes #3027
...
- Ditch slf4j in favor of log4j. slf4j is (unfortunately) very much unmaintained at this time and future versions of MC (1.17+) will use log4j version 2.14.1 onwards over some ancient sfl4j version.
- Using log4j reduces our jar size as well, because we don't need to bridge it as the game provides it natively.
2021-06-03 12:40:27 +02:00
7775cd0073
Do not rely on a static file path
...
Doing so will cause issues with the `--plugins` flag.
E.g. `java -jar server.jar --plugins /path/to/plugins/`
2021-05-21 00:35:19 +02:00
3748d8e246
Minor cleanup in favor of Java 16
...
- Addressing a few command deprecations during the major release superseded by toggles
- Don't swallow SQL warnings in loggers behind debug, as it's often set to false
- Deleted JavaVersionCheck, it's part of ServerLib.
2021-05-15 20:39:16 +02:00
10e2d65221
Remove scripting-related stuff ( #2947 )
...
* Remove scripting-related stuff
* Cleanup
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-02-24 09:53:55 +01:00
8292ed9e31
More annotation work
2021-01-10 00:01:48 +01:00
57fc51d013
Initial annotation usage cleanup + EditorConfig
2021-01-09 22:28:41 +01:00
7ac3f7ca03
Fix sync tasks not being sync
2021-01-09 20:39:25 +01:00
0c76833997
Implement CaptionLoader API to be used by third party plugins/addons
...
This allows to load resources from other classloaders than the P2 one. Therefore, we can use this in addons too to manage messages the same way.
2021-01-03 23:42:32 +01:00
e8642df674
Update licenses to 2021
...
Happy new year 🎆
2021-01-01 00:19:45 +01:00
c8ad936d26
Clean up PlotPlatform a bit and make the placeholder registry injectible
2020-12-05 18:41:41 +01:00
f14121e99c
Initiate placeholder registry
2020-12-05 15:08:27 +01:00
0d89125a8e
Replace sys out with logger factory
2020-10-08 20:52:02 +02:00
c3069a425d
Format licence headers
2020-10-08 14:02:08 +02:00
ec23fcdd75
Rewrite build scripts
...
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
2020-10-08 14:02:08 +02:00
352136f0c6
Cleanup logging system
2020-08-18 15:50:28 +02:00
665a72a08f
Fill out a lot more JavaDoc.
...
I've left DB stuff alone
2020-08-16 13:22:49 +01:00
a4c9ed90b7
Fix startup issues and make messages send properly
2020-08-16 13:49:16 +02:00
4a220f9bfb
Update license header
2020-08-15 14:59:29 +02:00
c9fae6a070
Remove old translation setup and move commands to templates
2020-08-13 21:11:07 +02:00
2b17f730d4
Merge v5 into v6
2020-08-12 18:20:37 +02:00
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
f1e3902fea
Several more progress
2020-08-05 11:48:10 +01:00
41a623a643
More work towards json
2020-08-04 19:01:25 +02:00
01e66f8833
Readd skyblock template
2020-07-29 14:53:09 +02:00
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
115ca903b2
Remove unused stuff
2020-07-24 17:36:48 +02:00
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
af44fe74ff
Add namespaces for translations
2020-07-24 17:19:25 +02:00
97a2ccbfe0
make sure the PlayerMetaDataKeys keys are loaded
2020-07-24 13:32:46 +02:00
c5e1b87c61
Fix small issues
2020-07-22 21:06:23 +02:00
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
193054f1fc
Move shit out of MainUtil into more appropriate classes
2020-07-19 14:23:55 +02:00
e80ade65c7
Clean up PlotId
2020-07-18 11:05:16 +02:00
22bd2eb238
Super minor issues from previous merges
2020-07-17 18:06:38 +02:00
Alexander Brandes
Jordan
Pierre Maurice Schwang
Hannes Greule
SirYwell
Alexander Söderberg
Alexander Söderberg
Mariell Hoversholm