Commit Graph

2300 Commits

Author SHA1 Message Date
dordsor21
c28a5ee66e
Merge branch 'main' into major/2.0.0/1.18 2021-12-29 00:19:25 +00:00
dordsor21
3ec1912046
Fix tests 2021-12-28 23:22:59 +00:00
dordsor21
36857a5064
Fix #1490 2021-12-28 23:02:48 +00:00
dordsor21
f236934a39
Add get default version min/max world height to platform
- Fixes #1500
2021-12-28 22:46:19 +00:00
dordsor21
46fdceaea6
add missing annotation to Region 2021-12-28 22:05:40 +00:00
NotMyFault
596356a936
refactor: Shift FileAlreadyExistsException catch to a higher level 2021-12-27 00:00:49 +01:00
NotMyFault
0c8db1e1fe
feat: Add a bunch of new types to the flora generator 2021-12-25 19:03:30 +01:00
NotMyFault
42035bdb87
chore: Lazily prepare update checker for future job
Future versions of Fawe use a version agnostic job. This commit will remain unmerged to any other branch but warrant a working update checker.
2021-12-25 17:24:26 +01:00
NotMyFault
3b24a8ae8a
Merge branch 'main' into major/2.0.0/1.18 2021-12-25 17:20:52 +01:00
Hannes Greule
96ca83704a
fix: Backport fixing delay closing of clipboards on quit (#1493) 2021-12-25 17:18:39 +01:00
NotMyFault
28079e8129
refactor: Also deprecated IMP for DBHandler 2021-12-23 15:59:05 +01:00
Aurélien
ca5ad58f01
Fix WEManager (#1487)
* Fix WeManager?

* Fix WeManager?

* Also register WEManager if not available, like TaskManager.
2021-12-23 12:39:11 +01:00
NotMyFault
7da921e075
refactor: Deprecate IMP initializors in favor of builders 2021-12-22 20:58:23 +01:00
NotMyFault
1715f35341
refactor: Do prepared statements properly
- Update TextureUtil client jar to 1.18.1
- Limit the update checker to our domain
2021-12-22 13:10:04 +01:00
dordsor21
77802758a9
Fix parsing of build in FaweVersion 2021-12-22 11:44:37 +00:00
Jordan
6b6c94556a
refactor! Remove deprecations marked for removal that are not present in upstream (#1483) 2021-12-22 01:53:45 +01:00
NotMyFault
94b392dd39
refactor: Address a few TODO 1.18's
(cherry picked from commit 0b77932b6e46c825d78b8c7ccae2a68ad890564e)
2021-12-21 18:02:20 +00:00
NotMyFault
7453f12e66
chore: Lazily change build delimiter 2021-12-21 16:27:46 +01:00
dordsor21
e9d97fc7b1
Update version (checking) for semver 2021-12-20 21:18:26 +00:00
Jordan
d6e3c331d4
Make 1.18 to be effectively in a usable state (#1452)
* Update swathes of easy-to-update-sort-of-code.
 - Untested
 - Should compile but NMF broken something
 - Several todos:
  - biome history//better support (move to biome sections in core)
  - regen (haha lol no thanks, someone else can do that)
  - probably actually do the palette stuff that probably won't work in PaperweightPlatformAdapter

* ci: Provide basic Jenkinsfile for ghprb pipeline

* build: Update paperweight

* upstream: Update Upstream

de6fa17 Add getBrush helper for use with instanceof pattern matching (1926)

* FAWE will now load on startup

* it....works?

* Begin to allow biome edits (and fix biomes reverting to plains upon editing blocks)

* Add new blocks/block properties

* Only create biome palette if supplies is null

* Fix biome operations

* Finally get removing BlockID done (major version change allows it)

* refactor!: Drop PlotSquared v4

Fawe 2.0.0 and newer requires Java 17, PlotSquared v4 supports 1.13 and 1.14, Fawe wont work on these versions nevertheless and refuses to load due Java version incompatiblities with older versions. Newer versions can use PlotSquared v6.

* docs: Update readme

* Added and removed some comments

* Added and removed some comments

* refactor: Rename worldedit configuration

* build: Re-add 1.17 module

This the a very nasty commit

* chore: Implement missing methods

* build: Update paperweight

* upstream: Update upstream

6df194e Remove finalize, use a Cleaner instead (1943)
9843a4f Fix snapshots in 1.18 (1959)

* ci: Escape workflows

* build: Update paperweight to 1.18.1

* build: Update Paster

* Fix compilation

* Bump to 1.18.1

* Do both 1.18 and 1.18.1

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

* Fix single-block lookups

* Reserve ordinals 0 through 3 for air/"reserved"

* Create block palette data with values

* Fix classpath for testing for starlight

* Correctly use block rather than sky light layer [not used in paper]

Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
2021-12-20 21:12:04 +00:00
dordsor21
c697eb8d41
Merge branch 'main' into major/2.0.0/1.18 2021-12-20 20:28:15 +00:00
Owen1212055
781bfc542f
fix: Properly delete ChangeSets on history clear (#1413)
Fixes #1347

Co-authored-by: Jordan <dordsor21@gmail.com>
Co-authored-by: Alex <mc.cache@web.de>
2021-12-06 14:31:46 +01:00
NotMyFault
1f975ac044
Update templates, address JEP deprecations and place a few TODOs 2021-11-30 21:30:46 +01:00
NotMyFault
0b45248b8c
style: Use minimized version output 2021-11-29 22:15:41 +01:00
Alex
11e25911d5
upstream: Update upstream (#1430)
* upstream: Update upstream

c407471 Re-add class shutter with tweaks. (1947)

* upstream: Update Upstream

29f1c66 If a trace hits the world limit, cancel it (1942)

* upstream: Update upstream

511daa5 Update paperweight dev bundle
2021-11-26 23:31:27 +01:00
Alex
4c6e707fcf
fix: Error when setting PS v4's config option (#1427)
Fixes https://github.com/IntellectualSites/FastAsyncWorldEdit/issues/1372
2021-11-19 09:42:33 +00:00
dordsor21
ef61ecccaa
Fix tab completion when *not* using %.
- Also allow tab-completion of % pattern when it's the first/only pattern being used
 - Also don't error when attempting to tab complete an invalid percent value
2021-11-18 18:42:19 +00:00
dordsor21
9bf9885ffb
Fix tab completion of % (random) pattern removing the % part of the input 2021-11-16 14:54:43 +00:00
dordsor21
5692ec54dd
Parse with square brackets after a % modifier
- Fixes #1409
2021-11-16 14:32:25 +00:00
dordsor21
66357b8adb
Fix RichParser assuming it should be used if its prefix is short than, and contained by, the input 2021-11-16 12:49:54 +00:00
dordsor21
575b0035df
Should be equals in checking if valid prefix when not shorter and with no arguments 2021-11-16 12:48:09 +00:00
dordsor21
cf6f54bd28
Fix RichParser suggestion sometimes giving a different pattern/mask when specifying arguments 2021-11-16 12:19:08 +00:00
dordsor21
527b7141a3
RandomPatternParser is an upstream class 2021-11-15 18:02:43 +00:00
Desjardins Jérôme
a2df590fae
feat: Add worldedit.schematic.save.global permission (#1406) 2021-11-12 14:21:06 +00:00
Jordan
6df16cfe96
refactor: Alter handling of errors in bindings (#1395)
* Alter handling of errors in bindings
 - Fixes #1384

* Arbitrarily use TextComponent#of for InputParseException
2021-11-11 17:37:25 +00:00
dordsor21
806ea14ad2
Unfix #826 in favour of allowing toggling the wand
- #826 is a pretty niche requirement, usually permissions do not change without a world change, relog, etc. very frequently
 - Allowing //toggleeditwand and /tool none on the wand feels more important
2021-11-10 22:13:44 +00:00
dordsor21
f04e891e0c
Allow schematics with empty, but present, biome data 2021-11-10 19:45:49 +00:00
dordsor21
7a9549b75a
Unmerge wall/"besides / |" masks 2021-11-08 15:49:43 +00:00
Lilly Tempest
971ae04020
Fix incompatibility between WorldEdit and FAWE for LocalSession#getTool (#1399) 2021-11-04 20:29:40 +00:00
dordsor21
21b6f582e1
Switch some Caption#of to TextComponent#of 2021-11-03 18:33:19 +00:00
dordsor21
d91a971e85
Allow extent to be used down the pipeline in BlockReplace
- It's quite likely for this to be required given BlockReplace use in replacenear
 - Fixes #1390
2021-11-02 20:53:14 +00:00
JayemCeekay
2c56e480c3
Expand certain FAWE limits to use Long instead of Integer. (#1382) 2021-11-02 16:38:39 +00:00
dordsor21
0674f39600
Synchronise chunk filtering 2021-11-02 13:34:37 +00:00
Arcaniax
ee0d1b5a5b
fix: Add missing Gray Candle types (#1383)
* Added Gray Candle types

Added GRAY_CANDLE & GRAY_CANDLE_CAKE

* Added Gray Candle to the ItemTypes
2021-10-29 14:57:58 +00:00
dordsor21
1b1f3bbcbe
Fix #1375 2021-10-25 15:04:59 +01:00
dordsor21
47f25c4f31
Slight cleanup of region parsing in EditSessionBuilder 2021-10-25 14:13:26 +01:00
dordsor21
f7e94fd450
Only add backupregions if whitelisting 2021-10-25 14:12:36 +01:00
NotMyFault
ad640532dc
Update Upstream
d48530c Don't allow editing without a Bukkit Impl Adapter. (1920)
2021-10-24 12:21:23 +02:00
NotMyFault
c55bc8c05f
refactor: Move update checker to core
feat: Add permission for tracing
2021-10-23 19:36:59 +02:00
dordsor21
3d70d9e496
RegionIntersection requires List constructor 2021-10-23 14:09:01 +01:00
dordsor21
ae949d607b
Move paperweight to BinaryTag
- Upstream put paperweight into master branch, which doesn't have BinaryTags
 - Fixes #1374
2021-10-22 16:00:51 +01:00
dordsor21
857090bdde
Add meaningful default methods to getMask for region protection 2021-10-21 18:25:36 +01:00
NotMyFault
d4eda78818
refactor: Remove redundant loggers 2021-10-21 17:26:16 +02:00
NotMyFault
c07ba4e88e
Merge branch 'feature/region-blacklist' 2021-10-21 17:13:13 +02:00
NotMyFault
e7a6c3e58c
Merge branch 'chore/main/deprecate-unsafe-utils' 2021-10-19 22:09:01 +02:00
dordsor21
37eb4a1008
Regress to upstream for (Binary)Tags in data fixers 2021-10-19 14:12:02 +01:00
NotMyFault
bd9476a175
refactor: Address .editorconfig violations 2021-10-18 23:09:21 +02:00
NotMyFault
f1e8a1a29a
refactor: Move Unsafe to reflection class 2021-10-18 22:01:54 +02:00
Pierre Maurice Schwang
c7a490fa03
Fix paperweight changes (#1364) 2021-10-18 20:38:43 +01:00
dordsor21
8fe610311d
Comments 2021-10-17 15:53:19 +01:00
dordsor21
7d894228d0
Implement region blacklisting 2021-10-17 15:53:04 +01:00
NotMyFault
f0880a27a0
feat: Paperweight support (#1362)
* Initial work towards paperweight

* feat: Port Fawe classes to paperweight

- Hide UnsafeUtilities in javadocs
- Fix typo in Regenerator
- Create fawe tmp directory for fawe regen

* Update adapters

* chore: Update MiniMessage

* Address todos

* Fix leftover Tuinity loggers
2021-10-17 16:32:36 +02:00
Jordan
9c1c8bfdf2
Implement restoring biomes, entities, and extended world heights (#1316) 2021-10-17 13:40:55 +00:00
NotMyFault
27865dc785
chore: Exchange debug log levels & component-ify a few messages (#1342) 2021-10-17 14:50:42 +02:00
NotMyFault
5db9a601b1
feat: (Re-) Add update notifications (#1361)
* feat: (Re-) Add update notifications

Fixes #1348

* Move update notification to seperate class

- Add a couple of linebreaks to the chat messages
2021-10-17 09:55:25 +02:00
NotMyFault
99b45c13fb
fix: Invalid yaml syntax of new config values
Follow up from 6839fa5567
2021-10-09 17:22:16 +02:00
dordsor21
6839fa5567
Add configurable disallowed states for limits, global disallowed blocks (#1312) 2021-10-09 11:02:26 +00:00
Pierre Maurice Schwang
2eb6451810
fix: Add dummy constructor for CraftBook5 support (Fixes #1334) (#1344)
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-10-07 17:18:10 +00:00
NotMyFault
e2924f4cba
feat: Improve wording of allowed-plugins message (#1341)
Fixes #1319
2021-10-07 17:12:17 +00:00
dordsor21
6895234815
Don't allow edits on plots when owner is offline and player is only added (#1313) 2021-10-04 12:34:40 +00:00
dordsor21
d44f297068
Fully fix #1331 2021-10-01 13:27:05 +01:00
dordsor21
3a45a31e65
Better error message for LocalBlockVectorSet 2021-09-30 13:17:28 +01:00
dordsor21
f886320c44
SurfaceMask should be copied properly.
#1331
2021-09-30 13:17:15 +01:00
dordsor21
7a6a0f68fe
Don't allow area pickaxe outside max y
#1331
2021-09-30 13:16:15 +01:00
dordsor21
0ed98729f8
Allow console to execute commands now that editsessions etc. accept actors
- Fixes #724
 - Fixes #1044
2021-09-28 15:59:52 +01:00
dordsor21
fa2f50dea8
Sometimes an overlay position may not be able to be found. Attempt to resolve or fail nicely. 2021-09-28 14:39:14 +01:00
dordsor21
a3365a12bc
Fix #1327 2021-09-28 14:27:36 +01:00
dordsor21
848eac8623
Fix schematic offset when loaded to clipboard 2021-09-28 13:16:26 +01:00
dordsor21
56999fd1e0
Drain bubble columns as well
Fixes #1326
2021-09-27 14:42:43 +01:00
dordsor21
1cf5899586
Allow deletion of DOC
Fixes #1325
2021-09-27 14:39:21 +01:00
dordsor21
b73db47e01
Add switch to schem loadall to replace existing clipboard(s) 2021-09-27 14:15:26 +01:00
dordsor21
58f231ad12
Slightly improve add clipboard hover message for schematic list 2021-09-27 14:14:24 +01:00
dordsor21
5155055446
Add deprecation message to fawe EditSessionBuilder 2021-09-26 22:10:59 +01:00
dordsor21
e6675f1656
Default per player schematics to false 2021-09-26 22:07:25 +01:00
NotMyFault
ca15e93102
refactor: Remove lz4-stream
LZ4-Java contains a modern version & delegate for lz4-java-stream.
2021-09-26 00:48:50 +02:00
dordsor21
6b5f21d67b
Support old, corrupt, schematics 2021-09-24 16:41:09 +01:00
dordsor21
e97c945b2f
Big fix to clipboards when relogging/restarting server etc.
- Refactor the way FAWE clipboards work slightly with regards to offsets (FAWE-added) and origin (upstream-present)
 - Better error messages when exceptions are thrown attempting to load DOC
 - No longer attempt to resolve old clipboard versions. Attempt to give informative error instead
 - Don't always delete clipboards held in memory on player logout unless configured to do so
 - Go back to fully closing the DOC on logout. We now attempt to lock the file which will hopefully help with debugging shared clipboard folders
2021-09-24 12:22:01 +01:00
dordsor21
bfd9e5b347
Don't stop edits for old clipboards, attempt to load them anyway (for now) 2021-09-24 09:32:49 +01:00
dordsor21
8593c2df9f
Rearrange DOC methods 2021-09-23 12:42:51 +01:00
dordsor21
07c02b5825
Remove import static org.apache.logging.log4j.LogManager.getLogger 2021-09-23 12:34:22 +01:00
dordsor21
6c56fa29aa
Fix #1317 2021-09-22 22:22:39 +01:00
NotMyFault
a5795461f2
Improve a few dependency scopes 2021-09-22 23:00:12 +02:00
dordsor21
663d0139b7
default to a meaningful preload chunk count 2021-09-22 15:58:20 +01:00
dordsor21
3376baa3c5
Remove needless EditSession#getWorld for setting blocks/biomes in a couple of cases
#32 IntellectualSites/FastAsyncWorldEdit-Adapters#7
2021-09-22 15:04:12 +01:00
dordsor21
d25a85e0d4
Fix expression evaluation method used for generatebiome
#32
2021-09-22 15:03:03 +01:00
dordsor21
4400b0f83e
Fix #1114
- Ensure short is correctly cast to int, as we're using it as if it were unsigned
2021-09-22 14:32:49 +01:00
dordsor21
a241e594c1
Slight adjustment to DOC 2021-09-22 13:14:10 +01:00
dordsor21
268d8cff49
Apply list of properties everywhere 2021-09-21 18:53:37 +01:00
dordsor21
b8ec4be95c
Revert "Slightly preferable messages on UsageException thrown by piston"
This reverts commit e9adf0f30d.
2021-09-21 17:30:32 +01:00
dordsor21
c805102819
Fix #1143 2021-09-21 17:18:49 +01:00