Commit Graph

264 Commits

Author SHA1 Message Date
543284e016 fix: NPE on unavailable music discs on lower versions (#3475)
* fix: NPE on unavailable music discs

* chore: documentation for InventoryUtil changes

* fix: no need for additional decrement

* chore: address requested changes

* fix: prevent binary mismatch

Co-authored-by: Alex <mc.cache@web.de>
2022-02-04 18:21:43 +01:00
827f46566c draft: Address false positives in code style issues (#3461)
* chore: Address false positive code style issues

* chore: More work

* More work
2022-01-20 12:39:40 +01:00
25095f4546 chore: Welcome 2022 2022-01-02 22:22:19 +01:00
47ae79e123 Revert "refactor: Address MiniMessage deprecations (#3354)" (#3371)
This reverts commit f086826942.
2021-12-14 23:04:36 +01:00
f086826942 refactor: Address MiniMessage deprecations (#3354)
* refactor: Address MiniMessage deprecations

* refactor: More MiniMessage deprecations

* Move away from our `Templates#of`

* Address comments

* style: Address migration style issues

* docs: Add javadoc link for MiniMessage
2021-12-13 09:48:34 +01:00
48c7a3e94e refactor: Use player friendly done message on restricted building (#3309) 2021-11-02 13:32:04 +00:00
b2b8598b5b Fix #3246 2021-09-15 13:19:25 +01:00
732f79bbfc Fix #3231 2021-09-07 14:47:37 +01:00
2988ad6b11 Address style violations 2021-08-18 11:58:18 +02:00
67bbd64fa1 Update to FAWE 1.17 2021-06-26 16:19:07 +01:00
f0cbc4f23e Add whenDone task to setCuboids and ensure whenDone tasks are added to the queue before FAWE might do something 2021-06-09 13:09:50 +01:00
4ba1217b84 Fix licences 2021-06-09 13:09:50 +01:00
50d4353045 begin integration with fawe 2021-06-09 13:09:50 +01: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
8a244d12fc Fix if-condition limited to roads for animal attack cancelling on plots (#3079)
* Negate mob-place flag debug message

* fixed a little typo :)

* Added check for dragon egg teleportation event
https://github.com/IntellectualSites/PlotSquared/issues/3074

* Basic dragon egg interact bugfix (Left-click interaction)

* Lifted admin if-condition out of roads (out-of-plot) only block (for animals)

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-06-02 19:55:35 +02:00
87706d471b Add option for legacy sign material
Follow up to cde27899dd
2021-05-22 12:34:04 +02:00
a17085bb18 Remove dead imports 2021-05-21 20:56:44 +02:00
cde27899dd Fixes #3064 2021-05-21 19:14:13 +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
0106a4222d Address a few deprecations 2021-05-01 18:33:02 +02:00
5780ad370a Strip Java 15 note 2021-03-01 10:58:27 +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
ad99ca1723 Use WE Expressions instead of js evaluation (#2941)
* Implement thread-safe expression evaluation

* Update `{args}` to `plot` automatically

* Stringify more money/balance/price occurrences with EconHandler#format
2021-01-02 16:32:07 +00:00
e8642df674 Update licenses to 2021
Happy new year 🎆
2021-01-01 00:19:45 +01:00
3ca8a94419 Update java 8 notice 2020-12-08 00:18:40 +01:00
c8ad936d26 Clean up PlotPlatform a bit and make the placeholder registry injectible 2020-12-05 18:41:41 +01:00
60b5f5fe48 Add note about Nashorn 2020-12-05 18:38:10 +01:00
34e02e9f3a Make JavaVersionCheck private 2020-12-04 16:00:18 +01:00
5d30e0854f Add java version checker 2020-12-04 12:15:56 +01:00
81c72ee5d9 Finish up permissions 2020-11-02 21:03:46 +01:00
fed7f89f96 Fix compiling 2020-11-02 11:58:07 +01:00
aefa629509 Generify permissions thru Permission class
- Fixed a few improper permissions
- Fixed a couple of typos
2020-11-02 00:55:58 +01:00
a451d2d6f2 Fix the injection 2020-10-09 16:34:59 +01:00
f0e9a8c5fe Implement progress subscribers 2020-09-11 12:59:40 +01:00
551d1d9f1a Add NullEconHandler to avoid verbose null checks 2020-08-25 12:41:03 +02:00
352136f0c6 Cleanup logging system 2020-08-18 15:50:28 +02:00
3c8d7a808b Prefix changes and others 2020-08-17 23:21:18 +02:00
47d9895077 Fix ms to ticks conversion on Paper 2020-08-17 16:37:27 +02:00
aacf15757f Use less confusing variable name 2020-08-17 15:32:17 +02:00
914b44069b Convert item display name 2020-08-17 15:22:41 +02:00
4789327378 Encapsulate fields 2020-08-17 15:17:40 +02:00
c55f2945ac Fix sign text 2020-08-17 15:08:21 +02:00
f636db49f7 Remove SetupObject 2020-08-17 01:10:46 +02:00
4a220f9bfb Update license header 2020-08-15 14:59:29 +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
7f29b5d1e8 ComponentPreset inventory to json 2020-08-07 13:22:10 +01:00
d3fe1d3b2b Fix plot info, sign usage in Plot.class 2020-08-04 15:07:07 +01:00
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