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
a1f262b5b2
Fix gradle setup and replace all debug calls
2020-07-13 22:51:57 +02:00
Alexander Söderberg
e84d82315c
Add log4j config (this might work :p)
2020-07-13 20:39:52 +02:00
Alexander Söderberg
c0f69f321d
Guice progress
2020-07-10 22:12:37 +02:00
Alexander Söderberg
4b997d42df
Some slf4j progress
2020-06-26 11:03:42 +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
1e3379b00a
Fix up the plot area nightmare
2020-05-22 22:04:46 +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
cbea595fa0
Don't relocate json-simple.
2020-04-18 21:14:44 +02: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
edaf396894
Merge features/v5/internal-updates into api/v5/packages
2020-04-16 06:11:03 +02: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
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
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
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
2020-02-24 18:42:02 +01:00
NotMyFault
2632283431
Move recent changes into 1 branch
2020-02-16 15:17:06 +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
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
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
dependabot-preview[bot]
7d8a5213dd
Bump okio from 2.2.2 to 2.4.1
...
Bumps [okio](https://github.com/square/okio ) from 2.2.2 to 2.4.1.
- [Release notes](https://github.com/square/okio/releases )
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 19:34:28 +01:00
dependabot-preview[bot]
eb09e0a633
Bump okhttp from 3.12.0 to 4.2.2
...
Bumps [okhttp](https://github.com/square/okhttp ) from 3.12.0 to 4.2.2.
- [Release notes](https://github.com/square/okhttp/releases )
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okhttp/compare/parent-3.12.0...parent-4.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:49:39 +01:00
dependabot-preview[bot]
4e2c90e399
Bump gson from 2.8.0 to 2.8.6
...
Bumps [gson](https://github.com/google/gson ) from 2.8.0 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases )
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:48:37 +01:00
dependabot-preview[bot]
e5423b5e08
Bump kotlin-stdlib from 1.3.50 to 1.3.61
...
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin ) from 1.3.50 to 1.3.61.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.61/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.50...v1.3.61 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:41:32 +01:00
dependabot-preview[bot]
c1a7844f4a
Bump lombok from 1.18.8 to 1.18.10
...
Bumps [lombok](https://github.com/rzwitserloot/lombok ) from 1.18.8 to 1.18.10.
- [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.8...v1.18.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:36:45 +01:00
NotMyFault
72c6f1165a
Fix okio
2019-11-07 17:02:08 +01:00
MattBDev
17e784c283
Revert dependency upgrades
2019-11-01 21:45:06 -04:00
Matt
8b30d6a7ff
Merge pull request #2537 from IntellectualSites/dependabot/gradle/com.google.code.gson-gson-2.8.6
...
Bump gson from 2.8.0 to 2.8.6
2019-10-19 17:45:28 -04:00
dependabot-preview[bot]
d7d9b1793f
Bump okhttp from 3.14.0 to 4.2.2
...
Bumps [okhttp](https://github.com/square/okhttp ) from 3.14.0 to 4.2.2.
- [Release notes](https://github.com/square/okhttp/releases )
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.0...parent-4.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-19 21:40:45 +00:00
dependabot-preview[bot]
427cf081e3
Bump okio from 2.2.2 to 2.4.1
...
Bumps [okio](https://github.com/square/okio ) from 2.2.2 to 2.4.1.
- [Release notes](https://github.com/square/okio/releases )
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-19 21:37:55 +00:00
Matt
c103504fc8
Merge pull request #2529 from IntellectualSites/dependabot/gradle/org.jetbrains.kotlin-kotlin-stdlib-1.3.50
...
Bump kotlin-stdlib from 1.3.30 to 1.3.50
2019-10-19 17:36:40 -04:00
dependabot-preview[bot]
53e94cc001
Bump gson from 2.8.0 to 2.8.6
...
Bumps [gson](https://github.com/google/gson ) from 2.8.0 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases )
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-14 15:17:37 +00:00
Matt
e445f96e0c
Merge pull request #2528 from IntellectualSites/dependabot/gradle/org.yaml-snakeyaml-1.25
...
Bump snakeyaml from 1.23 to 1.25
2019-10-07 13:49:52 -04:00
dependabot-preview[bot]
ec6c9dac49
Bump lombok from 1.18.8 to 1.18.10
...
Bumps [lombok](https://github.com/rzwitserloot/lombok ) from 1.18.8 to 1.18.10.
- [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.8...v1.18.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 15:16:57 +00:00
dependabot-preview[bot]
8068671200
Bump kotlin-stdlib from 1.3.30 to 1.3.50
...
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin ) from 1.3.30 to 1.3.50.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.50/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.30...v1.3.50 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 15:16:54 +00:00
dependabot-preview[bot]
8927f50cc6
Bump snakeyaml from 1.23 to 1.25
...
Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml ) from 1.23 to 1.25.
- [Commits](https://bitbucket.org/asomov/snakeyaml/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 15:16:31 +00:00
NotMyFault
20b0fa31d0
Update gradle and deprecated methods
2019-09-07 22:46:13 +02:00
NotMyFault
4d0bd8a3a3
Upgrade build files
2019-09-04 03:04:51 +02:00
MattBDev
5ddbf3def4
Update gradle
2019-08-07 19:16:44 -04:00
MattBDev
5b8f6e466a
Minor gradle edit
2019-08-06 15:05:04 -04:00
MattBDev
fe471c3571
new library in gradle and another change I can't remember.
2019-05-21 18:32:26 -04:00
MattBDev
237b10a2a2
Tidying up the code
2019-04-29 10:49:58 -04:00
dordsor21
d352804b5d
Update gradle lombok version for core
2019-04-23 23:47:00 +01:00
dordsor21
c7ba94f959
Fix legacy material loading error and Jenkins4J dependencies
2019-04-23 23:03:52 +01:00
dordsor21
5ac00c4920
downgrade Jenkins4J
2019-04-23 22:41:06 +01:00
