Commit graph

2501 Commits

Autor SHA1 Nachricht Datum
Aurélien
abaa347ad4
Fix major security bugs (3 brushes + superpickaxe)! (#1213)
* Fix major security bugs (3 brushes + superpickaxe)!
- Due to some recent changes, FAWE could edit everything in the world, no matter other plugin protections such as PS or WG.
- Fix superpickaxe allow to bypass protections => Fix SurvivalModeExtent not taking into account protections plugins due to breaking blocks naturally to get drops.

* Adress requests
- Revert some unsuitabe changes
- Add FAWE diff comments

* Clean imports

* Adress requests

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-08-07 11:09:33 +02:00
NotMyFault
14fc2dbf9b
Fix fawe-deprecation javadoc linking 2021-08-05 18:33:19 +02:00
NotMyFault
3ccb5e0aed
Use translation message for brush assignment 2021-08-04 22:44:24 +02:00
NotMyFault
2bcf3eedf1
Add //br snow
Apparently an upstream addition we forgot to pull.
2021-08-04 22:29:43 +02:00
NotMyFault
45a8030aeb
Update Upstream
b9f0416 Use a Guava Cache instead of a ThreadLocal (1862)
2021-08-02 22:10:21 +02:00
NotMyFault
a5e84dcfea
Switch to version catalogs
- Closes #1204
- Switch to security advisory
- Move fawe-tests to fawe packages
2021-08-01 19:28:51 +02:00
NotMyFault
9f3a451ef6
Fixes #756 2021-07-31 14:18:04 +02:00
dordsor21
d62a1b5ad3
Always trim chunk GET in ChunkHolder
- Possibly something to do with #1169
2021-07-29 20:37:10 +01:00
NotMyFault
84b9dce6be
Move debug notes to logger factory 2021-07-29 21:11:23 +02:00
NotMyFault
69067fe8c8
Leave a note about (temporary) not undoable tree tools 2021-07-27 19:45:31 +02:00
NotMyFault
b4f9ade5bd
Fixes #1071 2021-07-26 17:05:54 +02:00
NotMyFault
92b4524dd6
Update Upstream
f414af5 Fix the offset mask forcing negation of itself (1656)
2021-07-26 00:48:38 +02:00
NotMyFault
f479e32b5f
Update contributing url 2021-07-24 19:28:28 +02:00
dordsor21
8c0195970b
Add and apply .editorconfig from P2 (#1195)
* Consistenty use javax annotations.
 - Unfortunately jetbrains annotations seem to be exposed transitively via core somewhere, but with the correct IDE settings, annotations can be defaulted to javax
 - Cleaning up of import order in #1195
 - Must be merged before #1195

* Add and apply .editorconfig from P2
 - Does not rearrange entries

* Address some comments

* add back some javadoc comments

* Address final comments

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-07-24 16:34:05 +01:00
dordsor21
3b4beba7d6
Improve performance of various commands/actions
- Add chunk preloading to RegionVisitor if supplied with a suitable Extent
 - Where extents are used in masks, set EditSession as the extent as they are otherwise initialised with WorldWrapper that is very slow
 - Fixes #1073
2021-07-24 15:47:22 +01:00
dordsor21
f2ee2248e0
Consistenty use javax annotations. (#1197)
- Unfortunately jetbrains annotations seem to be exposed transitively via core somewhere, but with the correct IDE settings, annotations can be defaulted to javax
 - Cleaning up of import order in #1195
 - Must be merged before #1195

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-07-24 15:52:08 +02:00
dordsor21
41f4aadf40
Update to 1.17.1 texture jar 2021-07-24 12:19:44 +01:00
dordsor21
d46af0136b
Fix nullable world in regions 2021-07-24 10:04:04 +01:00
dordsor21
0be8746c11
Add more directionals
- Fixes #1122
 - Levers and buttons can be flipped/rotated vertically
2021-07-23 20:15:22 +01:00
renovate[bot]
0d26dad397
Update dependency com.github.luben:zstd-jni to v1.5.0-4 (#1189)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-07-23 20:17:43 +02:00
NotMyFault
50ab8ad5c7
Feature/propagate diff and object cleanup (#1190)
* Feature/main/propagate diff annotations (#1187)

* 25% done

* More work

* More work

* 50%

* More work

* 75%

* 100% & cleanup

* Update adapters

* Squish squash, applesauce

commit 275ba9bd84
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Jul 17 01:10:20 2021 +0200

    Update dependency com.comphenix.protocol:ProtocolLib to v4.7.0 (#1173)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>

commit 9fd8984804
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Jul 17 01:09:29 2021 +0200

    Update dependency org.checkerframework:checker-qual to v3.16.0 (#1184)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>

commit 861fb45e5c
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 19:07:02 2021 +0100

    Fix #1075

commit 420c45a29a
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 18:48:21 2021 +0100

    Entity removal should be on the main thread as we're just passing through rather than doing chunk operations
     - Fixes #1164
     - Not working: butcher/remove history

commit 4d4db7dcd0
Author: SirYwell <hannesgreule@outlook.de>
Date:   Fri Jul 16 17:52:44 2021 +0200

    Make sure leaves category is loaded for heightmaps (fixes #1176)

commit c98f6e4f37
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 10:44:52 2021 +0100

    Do not allow generation commands to generate outside selection

commit 2485f5eccc
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 10:43:15 2021 +0100

    EditSession needs to override some Extent methods to ensure block changes are correctly set through the various extents
    Fixes #1152

commit d9418ec8ae
Author: dordsor21 <dordsor21@gmail.com>
Date:   Fri Jul 16 09:52:44 2021 +0100

    Undo part of 41073bb1a0
    Fixes #1178

* Update Upstream

fb1fb84 Fixed typo and grammar

* We don't support custom heights yet

* Casing inconsistency

* Address a few comments

* Address comments

* Don't refactor to AP classpath

* Document annotation style

* Refactoring & shade cleanup

* Address a few comments

* More work

* Resolve comments not being resolved yet

* Feature/main/propagate diff annotations (#1187) (#1194)

* Remove beta package, fix history packages, move classes out of object package

* Resolve comments not being resolved yet

* Remove beta package, fix history packages, move classes out of object package

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

* brushes should be under brush

* More refactoring
 - Filters/processors should be in the same place and are related to extents
 - Transforms are in `extent.transform` in upstream

* Move history classes under history

* Update adapters

Co-authored-by: dordsor21 <dordsor21@gmail.com>
2021-07-23 17:48:51 +02:00
dordsor21
ad102ab7a9
clipboard brush is supposed to be -o not -p 2021-07-23 11:27:14 +01:00
dordsor21
8e16acde1d
Fix error in clipboard brush switches 2021-07-23 09:54:30 +01:00
dordsor21
1e49f59001
Much better hinge handling 2021-07-21 20:00:39 +01:00
dordsor21
1ec927f30c
Add check when obtaining BlockState from id to prevent edits losing large amounts of data 2021-07-20 20:49:47 +01:00
dordsor21
5f8addbb5b
Fix #1185
TODO: fix door hinge placement on rotate/flip sometimes
2021-07-20 20:49:13 +01:00
dordsor21
ca1744aa97
Likely fix for rotation issue
fixes #996
2021-07-19 20:33:50 +01:00
dordsor21
6ab927fa4d
Fix #1167 2021-07-19 20:28:36 +01:00
dordsor21
861fb45e5c
Fix #1075 2021-07-16 19:07:02 +01:00
dordsor21
420c45a29a
Entity removal should be on the main thread as we're just passing through rather than doing chunk operations
- Fixes #1164
 - Not working: butcher/remove history
2021-07-16 18:48:21 +01:00
SirYwell
4d4db7dcd0 Make sure leaves category is loaded for heightmaps (fixes #1176) 2021-07-16 17:54:18 +02:00
dordsor21
c98f6e4f37
Do not allow generation commands to generate outside selection 2021-07-16 10:44:52 +01:00
dordsor21
2485f5eccc
EditSession needs to override some Extent methods to ensure block changes are correctly set through the various extents
Fixes #1152
2021-07-16 10:43:15 +01:00
dordsor21
d9418ec8ae
Undo part of 41073bb1a0
Fixes #1178
2021-07-16 09:52:44 +01:00
NotMyFault
bcceadee6b
Propagate FAWE diff annotations down the bukkit module
- Minor upstream merge
2021-07-14 14:40:20 +02:00
NotMyFault
d7763c8542
Fixes #1181 2021-07-13 17:20:37 +02:00
NotMyFault
3cf283a65b
Update Upstream
954210d Fix //outline for non-cuboid regions (1827)
2021-07-13 10:59:04 +02:00
dordsor21
41073bb1a0
More exact testing for scaling/flipping in AffineTransform and only combine transforms when not equal in ForwardExtentCopy
- Fixes #1162
 - Also fixes rotation in x/z axes
2021-07-10 19:47:39 +01:00
dordsor21
338be0ff31
Undo/redo should not be allowed outside allowed regions by default.
Fixes #949
2021-07-10 14:14:34 +01:00
NotMyFault
0434b86d8e
Feature/1.17.1 (#1172)
* Update adapters for 1.17.1

* Fixes #1074

* fd10efa56b51d915302d616302145c74c3f079ee

* Fix `//chunkinfo` message

* 9fc85704e9570304f1b336612039afc85bb17064

* 03b4437023

* JitPack decided to work again
2021-07-09 16:07:48 +02:00
NotMyFault
a183425642
Update Upstream
40ded93 Fix loading legacy invalid blocks
2021-07-06 13:13:54 +02:00
NotMyFault
22f11abce8
Remove unneeded maven repos 2021-07-05 22:26:14 +02:00
NotMyFault
35b1202951
Mitigate logger spam introduced in 256d7c4e5d
Touches #1122, #1166
2021-07-04 00:43:57 +02:00
renovate[bot]
af1a3c3ddb
Update dependency net.kyori:adventure-nbt to v4.8.1 (#1161)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-07-01 22:57:52 +02:00
NotMyFault
876d84aec0
Fix typo 2021-07-01 22:49:10 +02:00
dordsor21
aa3ae63682
Feature/1.17 (#1120)
* start v6

* Update classes to v6 method signatures

* change rootVersion to signify p2v6 compat

* Use 16 as toolchain version but target 11 for build output

* add minimessage as api

* Require v6 and don't attempt to "setup" hook from FAWE

* Address comments

* *address /all/ comments

* FAWE classes should only act as a delegate

* Uppercase logger

* Settings for v6-hook have moved to P2-v6, remove unneeded if statements

* Rename classes to Delegate

* add whenDone task to setCuboids

* Remove bad spaces

* Fix plot swap

* Initial work on 1.17 support

* Remove data versions from the Bukkit adapters (#1507)

* Remove data versions from the Bukkit adapters

* Don't allow saving schematics without an adapter in place on Bukkit.

* Removed confusing line

(cherry picked from commit 2056218b4a8644836b1d127105dfa289e9cdbc1c)

* More progress

* Fix chunk sending

* Repackage from com.boydti to com.fastasyncworldedit.<module> (#1119)

* Preliminary work on repackaging

* Rename build artifacts matching our pattern

* Finish up repackaging

* Fix a few field accesses and old imports

* Dirty fix for chunks container ChunkSections outside of 0-15

* Correctly read from NibbleArrays for lighting

* Fix getSections and BlockMaterial for 1.17

* Fix writing blocks to the world.
 - The issue isn't the presence of a "-1" chunk, it's the constructor for ChunkSection requiring the layer (0 to 15) rather than the y chord

* Fix more field accesses

* More work towards 1.17

* Update Upstream

a57f66f Fix watchdog, add negative y support. (1782)

* Add azalea tree to `/tool tree`

* Don't define toolchain twice

* Repackage GriefDefender

* Relocate under new namespace

* Bye bye ecma left overs

* Add 1.17 to issue templates and instructions

* Move to adventure-nbt (#918)

* Initial work for adventure-nbt

* Some more FAWE specific stuff

* Fix erroneous deprecation check

* Workflow change

* Continued merging all adventure NBT related changes

* Continued merging all adventure NBT related changes

* Made a constructor public again

This needs to be public for BlockTransformExtent.java

* Finished converting all NBT data to adventure.

* Make this compile

* Fix conflicts

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>

* Update adapters to 1.17

* Change build prefix to 1.17

* Move more nms classes to adapters

* Move left over nms classes

* Move Spigot 1.17 class

* Remove unneeded adapter loader code
The loader will find the appropriate class now itself

* Update adapters

* Update adapters

* Lazy fix tests

* Update adapters

* Update Upstream

43da91a Remove method reflection for getMinHeight in BukkitWorld. (1796)

* Relocate adventure-nbt under proper namespace

* Add LazyCompoundTag as a non-version-specific class to be used by adapters

* Better integration between old NBT and Adventure NBT - begin fixing the issues seen recently

* Correctly NBT conversion method

* LazyCompoundTags should actually be overriding and correctly returning a CompoundBinaryTag.

* Update worldedit-adapters
Fixes #1141

* Remove unnecessary massive lag machine

* Refactor apply to applyBlock in subclasses

* applyBlock should be overriden by all subclasses.
Default apply to applyBlock

* Closes #1130 Closes #1132

* Squashed commit of the following:

commit a9bfa1a07c77083c844a0c3ba62f4bd94bed107c
Author: NotMyFault <mc.cache@web.de>
Date:   Sun Jun 27 21:53:21 2021 +0200

    [ci skip] Update gradle wrapper validation

commit aa7471f95317d28a16f62e4b200de8d0fea2fa95
Author: Matthew Miller <mnmiller1@me.com>
Date:   Sat Oct 10 15:49:13 2020 +1000

    Add ^x,y,z relative offset support to the offset parser (#1545)

    * Add ^x,y,z relative offset support to the offset parser

    * Wrap in a try-catch

    (cherry picked from commit 28bdf7ff9254bbc85bb4f5f792b303943a3930a8)

* Add `fawe.error.schematic.not.found` translation key

* Update Upstream

728a152 Skip notify if chunk section doesn't exist (1794)

* Fixed #1157

* Add a null check to prevent NPE in nbt code

* Update adapters

* Update Upstream

fbb047a Optimize legacy schematic loading (1808)

* Hurr durr I don't want to update Java

* Update Upstream

0790e6e Fix CLI Mess (1811)

* Fixes #1160

* Expose minimessage transitively thru PlotSquared

Touches #32

* [ci skip] Remove unneeded maven repository

* Steal tab completion from PlotSquared for P2 related commands

* Don't error on startup when building locally

Co-Authored-By: goldfishapp <8278196+goldfishapp@users.noreply.github.com>

* [ci skip] Update gh actions to Java 16

* Update textures to grab 1.17 jar

Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: SirYwell <hannesgreule@outlook.de>
Co-authored-by: Matthew Miller <mnmiller1@me.com>
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
Co-authored-by: goldfishapp <8278196+goldfishapp@users.noreply.github.com>
2021-07-01 22:16:25 +02:00
NotMyFault
78acb857da
Closes #1129 Closes #1128 2021-06-19 10:17:43 +02:00
dordsor21
a0e84d7a44
Fix superpickaxe item dropping
Fixes #1079
2021-06-18 23:48:23 +01:00
NotMyFault
7af06a533b
Split up worldedit.anyblock and worldedit.anyblock.nbt for specific nbt operations 2021-06-18 20:58:10 +02:00
dordsor21
391869cf3a
Fix up LimitExtent
- Correctly handle block state limit checks.
- Don't quash exceptions thrown in a region operation by having a "max-fails" check that can only be hit once....
Fixes #1127
2021-06-18 18:00:42 +01:00
dordsor21
256d7c4e5d
Temporary fix for #1122 2021-06-14 06:34:05 +01:00
dordsor21
b796106dd7
Add directionals for chests and slabs "type" block state
Fixes #987
2021-06-11 15:25:52 +01:00
dordsor21
da264b52e1
Fix #1116 2021-06-11 15:05:52 +01:00
dordsor21
f6c87b6726
Add null check to creating default NBT data 2021-06-10 19:59:17 +01:00
dordsor21
717a1b5db4
Replace ImmutableBaseBlock with BlanketBaseBlock
- ImmutableBaseBlock is no longer needed as NBT was made immutable previously
 - BlanketBaseBlock represents to masks that the block has NBT, but does not need to match a specific state
 - Allow FuzzyBlockState to create BaseBlocks without NBT data (fixed tab completion issues)
2021-06-10 19:47:34 +01:00
renovate[bot]
e11a2d7f6d
Update dependency com.github.luben:zstd-jni to v1.5.0-2 (#1113)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-10 17:37:15 +02:00
dordsor21
1fa5f4d725
Begin fixing layer brush
- Required new argument parser, which should ultimately be made into a singe blockstate parser for best results, and proper tab-completion
 - The layer brush itself is broken because of the changes to internal block retrieval from legacy
2021-06-10 16:19:23 +01:00
dordsor21
7ef8b2f95e
Create default TileEntity data where required.
Fixes #1093
Fixes #1042
2021-06-10 13:39:36 +01:00
dordsor21
71130025e8
Allow ^ mask to be used between blocks that may have different properties, only keeping the shared properties
Fixes #1092
2021-06-10 12:46:19 +01:00
renovate[bot]
75935f91e9
Update dependency com.github.luben:zstd-jni to v1.5.0-1 (#1106)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-08 23:46:46 +02:00
dordsor21
f6af9925e8
Char block null check (#1030)
**Add a null-check to CharBlocks FULL section layer-retrieval.**
 - It is possible to trim CharBlocks whilst it is attempting to read data due to the batching of chunks to help reduce memory
 - This is done when the number of chunks sitting loaded in memory with having been "submitted" to the queue for writing to disk becomes high
 - Seconday operations such as heightmap processing and lighting will quickly load chunks, meaning many chunks are submitted early
 - This leads to much higher chances of the chunk being submitted and subsequently trimmed given heightmap and light processing is done layer-by-layer over many chunks, rather than chunk-by-chunk - thus leading to NPEs.
 - By adding synchronisation to and around only the specific sections when loading/updating, and not blocking the whole chunk, many access can still be thread-safe without causing deadlocks
 - This allows removal of lots of the needless and very-slowing synchronisation on get**Block** methods

**Remove much of the synchronisation from ChunkHolder**
 - We shouldn't be synchronising with call() and safety should be added elsewhere. (plus it's making edits very very slow when queue target size is hit)
 - Also remove much of synchronisation because we've added the null-check and section-specific synchronisation to CharBlocks
 
**Some QOL/thread-safe data access changes**
- Replaces the Array#clone seen in the get blocks classes with System#arraycopy as deep cloning is not required, and is also slower than arraycopy
- Add System#arraycopy when accessing chunk section data via history to ensure it is not altered whilst being written
- Renaming EMPTY to empty means it is not implied to be a static variable

Fixes https://github.com/IntellectualSites/FastAsyncWorldEdit/issues/1028
Fixes https://github.com/IntellectualSites/FastAsyncWorldEdit/issues/1025
Fixes https://github.com/IntellectualSites/FastAsyncWorldEdit/issues/1089
Fixes https://github.com/IntellectualSites/FastAsyncWorldEdit/issues/1091
Fixes https://github.com/IntellectualSites/FastAsyncWorldEdit/issues/1097
2021-06-08 14:28:16 +00:00
dordsor21
1cd2d8d121
Send before history is acttually safer at the moment
- avoids deadlocks
2021-06-08 14:15:43 +01:00
NotMyFault
ef5211d5b5
Update Wiki link 2021-06-06 21:17:24 +02:00
NotMyFault
75fbe654ee
Update Upstream
0036e06 Alter the CUI lifecycle to be more consistent and reliable (1633)
2021-06-05 11:27:27 +02:00
NotMyFault
d1af6c38e7
Update Upstream
9516002 Register platforms and commands in a more proper way (1766)
2021-06-05 10:27:38 +02:00
MattBDev
6bfc3ceb95 Removed cast to ResettableExtent in for loop.
I have no idea why we were casting it when all objects in the loop were ResettableExtents in the first place.
2021-06-03 17:59:51 -04:00
MattBDev
7f51d8374b Merge remote-tracking branch 'origin/main' 2021-06-02 17:27:46 -04:00
MattBDev
930b9b07d5 Fixed raw class usage in DistrFilter 2021-06-02 17:27:37 -04:00
NotMyFault
46ed9a2d67
Include classloader in extend debug message 2021-06-02 17:27:18 +02:00
NotMyFault
b599769f8c
Fixes #1098 2021-05-30 23:49:46 +02:00
Hannes Greule
53681ccc59
Feature/unsafe over reflections (#1082)
* Use Unsafe to replace Lock

* Start cleaning up everything that has to do with CleanableThreadLocal

* Make cancellation work

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-05-28 18:47:46 -04:00
NotMyFault
cbe5cd4eb3
Move Fawe commands to Captions 2021-05-24 11:36:37 +02:00
NotMyFault
d2dee87ab9
Update Upstream
5a7cbfd Fix selecting at 0,0,0 or radius 0 cyl/ellipse (1734)
2021-05-24 10:52:58 +02:00
NotMyFault
b7f595cc50
Remove redundant tab from translation file 2021-05-23 23:39:00 +02:00
NotMyFault
8d35963171
Address dead Component imports 2021-05-23 23:35:08 +02:00
NotMyFault
106f9aed79
Address requested changes
- 4534154894 (r50694638)
- 4c1d0bc9a6 (r50694886)
2021-05-23 23:24:18 +02:00
NotMyFault
d48808f111
Fixes #1072 2021-05-22 17:33:42 +02:00
NotMyFault
a7cbf1dd0a
Elaborate where config changes can be applied to 2021-05-19 23:51:42 +02:00
SirYwell
71f7103edd Always use Unsafe to clean ByteBuffer 2021-05-15 15:27:28 +02:00
Matt
aa0ad16a1b
Update to Gradle 7 (#1078) 2021-05-14 23:42:37 +02:00
NotMyFault
9aa25ce109
Update Upstream
876108f Prepare for Gradle 7, but due to FG only get to 6.9
Touches #1020
2021-05-14 10:31:32 +02:00
NotMyFault
44fe51826f
Remove nashorn scripting engine (#1068)
- Remove the ScriptTranspiler as es6 is no longer supported
2021-05-13 20:19:55 +02:00
Hannes Greule
ff728478c6
Relight using starlight engine on Tuinity & perform heightmap updates (#1023)
* Relight using starlight engine on Tuinity

* Make use of invokeExact

* Cache MethodHandle

* Address some requested changes

* Remove random *

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

* Simplify and clean up sendChunk
Hopefully, that doesn't cause any issues

* Add naive HeightmapProcessor

* Make HeightmapProcessor more efficient

* Remove heightmap code from NMSRelighter

* Recognize fluid for waterlogged blocks

* Remove config option for heightmaps as they should always be updated

* Batch relighting for Starlight

* Dirty workaround for CharBlocks blocks NPE

* Revert "Dirty workaround for CharBlocks blocks NPE"

This reverts commit 737606a7
It only caused the heightmap to be wrong again and didn't help much with the original issue

* Adapt better chunk sending on older versions

* Adapt requested changes for HeightMapType

* Relight all changed chunks, batched
Also, address some requested changes

* Avoid deadlocks

* Clean up tuinity relighter and add some comments

* Minor changes to HeightmapProcessor

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
2021-05-13 11:29:11 -04:00
NotMyFault
9ff47d3404
Relocate zstd 2021-05-12 18:04:21 +02:00
MattBDev
46fae22de4 Fixed annoying capitalization issue. 2021-05-11 20:24:52 -04:00
MattBDev
6f2e4c0cf3 Simplify logic 2021-05-11 20:16:53 -04:00
MattBDev
4534154894 Throw error instead of returning null on a boolean return 2021-05-11 20:16:32 -04:00
MattBDev
bdd3bc26af Replaced hardcoded values of Pi with Math.PI 2021-05-11 20:15:24 -04:00
MattBDev
4c1d0bc9a6 Removed redundant null checks and fixed a potential file separator issue 2021-05-11 20:01:11 -04:00
NotMyFault
2b0ab1a084
Fixes #1046
Also remove option to shorten urls for schematic upload. This option does not work with self hosted interfaces, nor is it really safe to use, as per-design.
2021-05-11 20:16:54 +02:00
NotMyFault
00d689a238
Clarify why mcedit is discontinued 2021-05-08 14:55:25 +02:00
PureGero
1c9015531f
Keep order of block properties (#1053) 2021-05-07 13:12:58 +02:00
NotMyFault
22be7410fc
Add Pattern#applyBlock in favor of Pattern#apply
As Fawe extends into its own Filter class, this will need a Fawe-suitable solution at some point when removing the deprecated method.
This is a compatibility-layer workaround for plugins calling the WorldEdit method `Pattern#applyBlock`.
2021-05-06 11:54:22 +02:00
NotMyFault
5dafa5f62b
Update Wiki link 2021-04-28 14:04:02 +02:00
NotMyFault
207d029def
Anvil commands are currently not implemented 2021-04-22 20:36:36 +02:00
Hannes Greule
57773765d7 Prevent exceptions from being thrown endlessly 2021-04-16 20:32:23 +02:00
Aurélien
e4331844ac
Fix performance issues getting next file ids (#1027)
* Greetly optimize disk history

* Greetly optimize disk cfi changeset

* Remove wildcard import.

* Improve performance fix

* Improved performance fix
2021-04-13 16:55:12 +02:00
NotMyFault
ae647dadfb
Fix /fawe threads output 2021-04-12 19:32:17 +02:00
NotMyFault
88764d8d46
Update Upstream
98adde2 Allow toggleplace to work on any Actor + Locatable
2021-04-10 11:15:41 +02:00
Hannes Greule
19592df1f6 Don't cache location for circle brush, fix #970
Also, allow filled circles (very cool feature)
2021-04-10 01:07:51 +02:00
Hannes Greule
911d3a00eb Don't paste biomes out of bounds, fix #1009
Also some preparations for variable world heights
2021-04-09 22:59:31 +02:00
Hannes Greule
4b371e2c3f Fix latest.log not contained in debugpaste, fix #1017 2021-04-09 22:14:27 +02:00
NotMyFault
4d77771ea1
Increase cui limit based on game limits 2021-04-07 19:54:44 +02:00
NotMyFault
6e8cc06637
Address a few deprecations 2021-04-06 18:30:29 +02:00
NotMyFault
01dff32597
Fine tuning captions
Fix listchunks throwing component error
2021-04-06 14:01:04 +02:00
NotMyFault
dc51379e8f
Update upstream
acf9c3b Change oak stair shape to straight in legacy.json.
c7da4c0 Swap out logback for log4j2
2021-04-05 23:14:20 +02:00
NotMyFault
5e534ff9e2
Finalize Captions
Follow up to a9d1202ce1
2021-04-05 19:54:49 +02:00
NotMyFault
a9d1202ce1 Finish up transition to captions 2021-04-05 19:52:13 +02:00
renovate[bot]
7b9e8a0d79
Update dependency com.plotsquared:PlotSquared-Core to v5.13.11 (#1010)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-04-04 13:31:14 +02:00
Aurélien
e40d3e3c19
Fixes LongRangeBuildTool tool (#1005) 2021-04-02 23:03:59 +02:00
NotMyFault
b96cea75b8
Update Upstream
609c7b8 Scrapped Logging Framework 4 Java

Closes #997
Closes #998
Closes #999
Closes #1000
Closes #1001
Closes #1002
2021-03-29 15:29:16 +02:00
NotMyFault
2dc89f735d
Add missing translation key 2021-03-27 14:22:04 +01:00
NotMyFault
c689b4e5d2
Update Upstream
acd63daddf7b45ce2b7699bc85ae88e0aa4433e9: Slightly improve usability of LocalSession#getSelection.
Co-Authored-By: wizjany <568161+wizjany@users.noreply.github.com>
2021-03-26 10:11:26 +01:00
NotMyFault
4af7316118
Remove freebuild regions (#991)
* Remove freebuild regions

* Remove configuration option of freebuild

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
2021-03-25 08:40:09 +01:00
NotMyFault
51487135bb
Adding a try-catch for some edge scenario Fawe failing to grab Mojang assets 2021-03-22 18:17:46 +01:00
dordsor21
d224d6ea32
Add synchronization to CharBlocks (#963)
similar to ChunkHolder, it represents an internal chunk for which operations should not be accepted by multiple threads at once.

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-03-15 18:33:21 +00:00
Hannes Greule
20424b081c Allow none as image in height brush, fixes #969 2021-03-14 22:00:05 +01:00
Hannes Greule
d974164204
Switch from PropertyKey enum to class (#971)
* Switch from PropertyKey enum to class

* Fix generic toArray
2021-03-14 19:38:11 +00:00
NotMyFault
bc64eaff1c
Merge upstream 2021-03-13 10:59:17 +01:00
NotMyFault
6476345e44
Implement missing methods 2021-03-12 12:23:44 +01:00
NotMyFault
5acd1d7b95
Improve note about loading invalid schematics via FSR and SSR 2021-03-08 16:34:16 +01:00
NotMyFault
99ea64fa4e
Add a couple of permissions 2021-03-06 20:22:39 +01:00
dordsor21
7a0dc39eb7
Apply a lot of synchronization to ChunkHolder (#941)
This is basically the main "chunk" class for internal FAWE. Chunk operations should (and are) almost always single-threaded operations, however, under certain circumstances it is possible for the chunk to be "called" (flushed: written to the world and sent to the player) from a separate thread. This would specifically occur from SingleThreadQueueExtent when there are a lot of chunks being loaded in memory by FAWE (where the chunk would then be submitted to a multi-threaded queue). It would therefore be possible for a thread accessing the chunk to attempt to access it in the middle of the call, which can lead to a number of issues, and it is my opinion that the most frequent of these is the NPE seen during lighting operations, where new chunks can be accessed/loaded very quickly, increasing the likelihood for the aforementioned synchronisation issue to occur.

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
2021-03-03 15:26:00 +01:00
NotMyFault
6bd866bdf7
Making renovate happy
Closes #940
Closes #933
Closes #931
2021-02-27 15:52:50 +01:00
NotMyFault
0b65533294
Show a message with install instructions when running the jar file
Co-Authored-By: Matthew Miller <mnmiller1@me.com>
2021-02-25 22:58:17 +01:00
NotMyFault
4af3cc6e4c
Closes #929 2021-02-22 11:13:08 +01:00
NotMyFault
4a6af7182a
Improve per-player schematic declaration 2021-02-22 10:47:34 +01:00
Aurora
e550189cb8
Add more debug output to find a error (#924) 2021-02-19 20:19:19 +01:00
NotMyFault
80b6a100e8
Switch to vanity url 2021-02-16 23:49:04 +01:00
NotMyFault
0a721b18ce
Implement methods 2021-02-14 19:56:05 +01:00
MattBDev
20304bf7ad Cherry-pick build-script changes from upstream 2021-02-11 12:00:28 -05:00
MattBDev
8981a5c484 Merge remote-tracking branch 'origin/main' 2021-02-11 11:45:11 -05:00
NotMyFault
eead11f32a
Fixes #265 2021-02-08 13:20:56 +01:00
dordsor21
5f83643d88
Couple of command fixes
fixes #899
2021-02-05 23:20:15 +00:00
NotMyFault
3df080abe4
Add note if clipboard >= Integer.MAX_VALUE 2021-02-05 13:21:15 +01:00
Octavia Togami
8b1f043dc5 Update so many dependencies, merge Forge/Fabric for final jar (#1651)
* Update so many dependencies, merge Forge/Fabric for final

* Clean up contrib docs for Gradle change

* Fix setting compat flags while using toolchain

* Fix deprecation in doc printer

* Restore proper forge JAR name

* Add dist classifier for mod jar

* Properly relocate new bStats

* Fix jar used from fabric

* Fix fabric bom

* Dup the shaded classes for consistency

* Sync Forge/Fabric log4j versions, de-dup

* Downgrade both log4j. This will work

* Update some plugins as well

* Drop the fabric force stuff

* Use duplicate strategy to directly merge jar
2021-02-04 17:45:49 -05:00
MattBDev
f3d4621589 Minor build script changes 2021-02-04 17:06:49 -05:00
NotMyFault
ac16c9a2ba Minor upstream merge 2021-02-03 23:08:39 +01:00
NotMyFault
3e37a66a12
Leave a better note about EOL versions 2021-02-01 22:40:27 +01:00
NotMyFault
818a75b809
Update dependency com.github.luben:zstd-jni to v1.4.8-2 2021-01-28 15:48:01 +01:00
dordsor21
287aa9dd8b
Remove bad default copy method in AbstractMask 2021-01-28 14:23:00 +00:00
dordsor21
485781f711
Merge branch 'main' of github.com:IntellectualSites/FastAsyncWorldEdit 2021-01-28 13:13:10 +00:00
dordsor21
781f39f71a
Properly define /ore arguments
Fix #885
2021-01-28 12:54:55 +00:00
N0tMyFaultOG
9cfcaa7605
Improve texture util if version is missing
This could defo be done cleaner, but it works for now.
2021-01-21 20:20:09 +01:00
N0tMyFaultOG
487d817542
Merge branch 'main' into renovate/com.google.code.gson-gson-2.x 2021-01-21 16:59:18 +01:00
Renovate Bot
e9da3daf9e
Update dependency it.unimi.dsi:fastutil to v8.4.4 2021-01-21 12:53:43 +00:00
Renovate Bot
692a844759
Update dependency com.google.code.gson:gson to v2.8.6 2021-01-21 12:53:35 +00:00
N0tMyFaultOG
c35ebd7b53
Only scan used repositories 2021-01-21 13:07:17 +01:00
N0tMyFaultOG
1c4339ce1c
Replace dead links 2021-01-20 13:56:19 +01:00
MattBDev
06dc92b7ce Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit
 Conflicts:
	worldedit-bukkit/build.gradle.kts
2021-01-18 15:59:51 -05:00
MattBDev
2ce493ae68 Miscellaneous improvements to build scripts. 2021-01-18 15:58:50 -05:00
dordsor21
c218743fa8
Fix some coordinate errors
- Fixes WorldGuard weirdness
 - Fixes #860
2021-01-18 15:37:14 +00:00
dordsor21
798b4cdd4e
Fix #806 2021-01-15 20:16:46 +00:00
dordsor21
b450a0af80
Fix confirm for some commands that give AutoValue_CommandParametersImpl from the getgo 2021-01-14 20:08:43 +00:00
dordsor21
b18c646bce
AbstractExtentMasks should have the correct extent.
- Fixes #843
2021-01-14 16:54:38 +00:00
dordsor21
fa69c79160
lock when editing the chunks cache in SingletThreadQueueExtent
- Long2ObjectLinkedOpenHashMap is not thread-safe and should not be used from multiple threads at once
 - Fixes #851
2021-01-14 15:42:38 +00:00
dordsor21
3034419918
Send before history is safe 2021-01-14 14:48:13 +00:00
dordsor21
3136fb460b
Revert "actually delegate in AbstractDelegateExtent"
This reverts commit 761d05ac19.
2021-01-14 14:39:50 +00:00
dordsor21
761d05ac19
actually delegate in AbstractDelegateExtent
fixes #843
2021-01-14 14:38:37 +00:00
dordsor21
af34bd4e57
the material seems to hold state data for some reason.
- This requires a more complicated fix. Reverting this change for now
2021-01-14 13:42:37 +00:00
dordsor21
5e1289494e
Delegate to blocktype for obtaining a BlockState's material 2021-01-14 12:45:11 +00:00
dordsor21
ac73478827
Fix bad/needless code
- Fixes #852
2021-01-14 12:39:57 +00:00
dordsor21
fd1ed63703
Don't confirm twice every time
- I channelled my inner Jesse on this one.
2021-01-13 23:50:29 +00:00
dordsor21
05d7558873
Don't print stack trace of FaweExceptions from submitted chunks
Addresses #353
2021-01-13 20:30:22 +00:00
dordsor21
be9866ddb3
Fix a lot of FAWE-freezing properly
- Add a "loadPrivately" method to be used when GetChunks are called to avoid synchronocity issues with super classes being used on different threads
 - Synchronise the call method so we're not attempting to call whilst also loading/updating
2021-01-13 19:02:51 +00:00
dordsor21
e94e3b7b05
Only forcefully submit a chunk if we hold the monitor.
- Properly ensures we don't try to submit chunks that already have a monitor (prevent the FAWE-freezing)
 - We can't detect if "no" threads hold the chunk's monitor, but equally that would also be kinda very bad practice.
2021-01-13 18:18:25 +00:00
dordsor21
eaa9872294
Revert this for now as it had unintended consquences 2021-01-13 17:36:50 +00:00
dordsor21
97209d5680
better locking of lighting and use correct method for relight without removing first
Fixes #847
2021-01-13 17:24:14 +00:00
dordsor21
b066ca8349
only relight blocks that have light 2021-01-13 17:10:08 +00:00
dordsor21
b1e8c6c3ba
Synchronizing on accessing a lock is pointless. 2021-01-13 17:09:44 +00:00
dordsor21
b4d7562b87
Looks like automagical relighting (#838)
Fixes #686
2021-01-11 19:29:16 +00:00
dordsor21
74a2f02003
put MCEdit before sponge and query by file extension.
Massively reduces loading time a few addon plugins that are literally only trying to get the format of a schematic
2021-01-11 16:02:50 +00:00
dordsor21
ddb41a9669
With "queueing" enabled, FAWE may start attempting to place chunks before the operation is finished.
This is unnacceptable for recursive operations, thus the queue should be disable in these cases
Fixes #842
2021-01-11 15:06:55 +00:00
dordsor21
fa8660c7a9
More verbosely check for "scaled" in AffineTransform and override all required methods in BlockTransformExtent
- fixes #462
2021-01-11 14:21:56 +00:00
dordsor21
5903178c53
Fix rotate/flip applying in the wrong order
- pretty cheat fix, but it reverts to legacy FAWE behaviour
2021-01-11 13:18:24 +00:00
dordsor21
ae6a1f1be4
Correct rounding bevhaviour for Vector3 -> BlockVector3
- fixes #512
2021-01-10 20:49:38 +00:00
dordsor21
0b727d9760
Fix for OPs when "not in a region" 2021-01-10 18:51:07 +00:00
dordsor21
831c6f6854
fix NPE with null sourcemask on move 2021-01-10 17:36:41 +00:00
dordsor21
846443291f
allowed regions can be null 2021-01-10 17:14:40 +00:00
dordsor21
278e9d5991
Set source masks that include the editsession's allowed regions to ForwardExtentCopies
Fixes #710
2021-01-10 14:59:21 +00:00
dordsor21
edc7e9028b
disableQueue stops buffering, switch to enableQueue to buffer when "//move"ing
fixes #738
2021-01-10 13:22:47 +00:00
dordsor21
aab9958932
Fixes #221
If WE wants to add it as well, it's up to them. I asked but wiz was hostile about it.
2021-01-09 21:52:50 +00:00
dordsor21
6bc3dd2293
Fix wna when used internally 2021-01-09 21:27:55 +00:00
dordsor21
6f0180447f
Don't ParallelQueueExtent if the editsession is created on the main thread. 2021-01-09 17:48:57 +00:00
dordsor21
31542ed4fa
Add 3D biomes to clipboards properly
- Also fix disk clipboard's size check, allowing for larger clipboards but with disabled biomes
2021-01-09 16:40:41 +00:00
dordsor21
3accbb84dd
Don't talk about CP 2021-01-08 14:38:41 +00:00
dordsor21
febcf5f76f
display potentially unsafe extent message in console if no Actor 2021-01-08 14:28:09 +00:00
dordsor21
6b3fe20c61
revert to upstream slf4j so it's present in IDE 2021-01-08 14:24:58 +00:00
dordsor21
9d2c631035
**BaseBlocks are immutable 2021-01-06 21:13:32 +00:00
dordsor21
8f74186e14
*BaseBlocks are immutable 2021-01-06 18:15:59 +00:00
dordsor21
7afddcc411
Fix more NBT mutability issues 2021-01-06 18:00:40 +00:00
Aurora
1b870c5d78
Upstream/add missing y variable to generate biome (#824)
* Add the missing y variable to generate biome

* Remove unused imports

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-01-06 16:57:59 +00:00
dordsor21
e40e86df5f
Add some more __internal__ <-> air logi
Fixes #831
2021-01-06 16:40:28 +00:00
dordsor21
336b90be15
Also fix CPUOptimizedClipboard 2021-01-06 13:39:25 +00:00
dordsor21
280ade9994
fix NBT in memory optimized clipboard 2021-01-06 13:29:52 +00:00
dordsor21
91de441403
No need to check WorldEdit schematics for bad entities 2021-01-05 17:21:35 +00:00
dordsor21
6db588a19f
Don't allow FAWE to "deadlock" itself when post-processing history by switching to the primary ForkJoinPool
- With enough chunks waiting to write to history, it's possible to fill the secondary fork pool up with locked threads, and thus prevent any threads from actually writing their history.
2021-01-05 16:42:53 +00:00
dordsor21
89cc2f9d9f
Large memory use reduction when PostProcessing history 2021-01-05 15:03:47 +00:00
dordsor21
7c174ee6b3
Return to static "sections" in CharBlocks.
- Synchronise (lock) outside the static object
 - Reduces object creation
2021-01-05 13:51:26 +00:00
Hannes Greule
aece0229c4
Properly repeat extents for negative coordinates (#825)
An extent's content was returned flipped when applied for negative positions, as e.g. `Math.abs(-2) % 3` returns 2 instead of 1 (as 1 + -1 * 3 = -2)

(cherry picked from commit b0cf5dd2bf1b9bcbf1c7efff0fe25de7ee9a2090)
2021-01-05 14:01:11 +01:00
dordsor21
bfd04e4155
Revert "~1/3 faster history writing with small caching"
This reverts commit 836b7a9750.
2021-01-05 00:50:26 +00:00
dordsor21
836b7a9750
~1/3 faster history writing with small caching 2021-01-04 21:25:29 +00:00
dordsor21
916c080310
5000th commit: Fix //download 2021-01-04 19:10:10 +00:00
Alexander Söderberg
3f0b9a2a92
Reorder BuildInClipboardFormat and document changed JNBT classes (#807)
* Get rid of FastSchematicReader/Writer and document changed JNBT classes

This commit includes changes from upstream to the schematic classes
(`com.sk89q.worldedit.extent.clipboard.io`). It also documents the JNBT
classes, specifying what has been changed in FAWE. This was done in preparation
for the upcoming move to adventure-nbt.

The PlotSquared schematic handler classes will now use SpongeSchematicReader/Writer rather than FastSchematicReader/Writer.

This is yet untested and the entire branch is a W.I.P.

* Fix JNBT mutability misuse in FAWE

FAWE previously had mutable compound and list tags. The previous commit changed that, and this commit will fix misuse of the tag API.

I've tried to identify the places where mutability was assumed, but I might have missed something. This needs quite extensive testing.

This is yet another change which increases upstream compatibility in FAWE.

* Fix FAWE_Spigot_<..>#getEntity

* Fix JNBT usage in the AsyncBlockState code

* Readd FastSchematicReader/Writer and add a new schematic format (`FAST`)

* Update dead repository

* Implement missing AsyncChunk#getTileEntities

* handle entities properly and add "brokenentity" format

* Fix fast schematic reader
lazily reading means it's read in order of appearance in the inputstream so we need to read schematic version first (skip past everything) and then reset the stream

* Fix p2 FAWE

* Go back to fast schematics in P2/CompressedSchematicTag (#819)

* Fix compile

Co-authored-by: N0tMyFaultOG <mc.cache@web.de>
Co-authored-by: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
Co-authored-by: Aurora <aurora@relanet.eu>
2021-01-04 19:18:23 +01:00
dordsor21
39b0da2b99
we do want to synchronise across the chunk when loading sections 2021-01-01 17:19:14 +00:00
dordsor21
42346b429b
Don't synchronise across the entire edit for a single ChunkSection load (speed boost) 2021-01-01 16:48:17 +00:00
dordsor21
fbfe3221d7
Fix fast schematic reader/writer
- Have both sponge and fast r/w available but default to "fast"
 - Correctly "offset" entities in the schematic, and add a legacy mode for loading old FAWE schematics with entities required.
 - Lazily reading means it's read in order of appearance in the inputstream so we need to read schematic version first (skip past everything) and then reset the stream. Fixes #740
 - Add an FAWEVersion to the metadata
 - Correctly actually return a BlockArrayClipboard when required. Fixes #454
2021-01-01 15:01:35 +00:00
dordsor21
82f640d132
fix loading Fawe.properties 2020-12-31 17:45:07 +00:00
dordsor21
df48b7e81d
stop bottling clipboard sizes for no reason 2020-12-31 15:01:54 +00:00
dordsor21
b60d9ef6d5
Fix #787 2020-12-23 17:26:26 +00:00
N0tMyFaultOG
7236f1d6fa
Update zStandard jni 2020-12-22 11:57:12 +01:00
Renovate Bot
bbc0ea0f35
Update dependency com.github.luben:zstd-jni to v1.4.8-1 2020-12-21 20:06:43 +00:00
N0tMyFaultOG
44f15da5a3
Update Paster 2020-12-21 15:57:57 +01:00
renovate[bot]
be05ae9230
Update dependency net.java.truevfs:truevfs-profile-default_2.13 to v0.12.2 (#796)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 11:40:00 +01:00
renovate[bot]
7928479046
Update dependency de.schlichtherle:truezip to v6.8.4 (#793)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:55:46 +01:00
renovate[bot]
2f23643635
Update dependency org.slf4j:slf4j-api to v1.7.30 (#803)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:47:07 +01:00
renovate[bot]
f6cbde6386
Update dependency org.yaml:snakeyaml to v1.27 (#804)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:44:31 +01:00
renovate[bot]
2eb4f14724
Update dependency com.plotsquared:PlotSquared-Core to v5.13.3 (#791)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-20 23:35:57 +01:00
dordsor21
7444c643a1
Switch to IncendoPaster "library" 2020-12-19 16:18:57 +00:00
dordsor21
e8f0c0e6ea
allow count to access "full" chunks if counting air 2020-12-17 22:05:32 +00:00
dordsor21
d379b0af9b
fix //image ane image brush
fixes #208 and fixes #698
2020-12-17 20:19:54 +00:00
dordsor21
94a14b03b6
fix brush size 0/1 2020-12-17 15:26:17 +00:00
dordsor21
236e3c3f6f
correctly set changes to editsession for line/spline
fixes #696
2020-12-17 15:02:49 +00:00
dordsor21
b57c472b86
Save the get blocks to the set chunk after history is written when post-processing 2020-12-17 14:09:54 +00:00
dordsor21
f347e0f5f5
update some utility commands
fixes #557
2020-12-16 19:23:41 +00:00
dordsor21
d5005a04e3
Return air if attempt to retrieve block from outside range
Fixes #682
2020-12-16 19:08:00 +00:00
dordsor21
aeccce24a9
fix #550 2020-12-16 17:38:15 +00:00
dordsor21
3a3bf7382d
Update block NBT to include the coordinates when saving to history
fixes #708 and fixes #655
2020-12-16 16:59:16 +00:00
dordsor21
e4709eb6dc
idk why I did &3
half fixes #769
2020-12-16 12:34:54 +00:00
dordsor21
6676d77aaa
Stop writing corrupt tile entities to schematics
also make some stuff definitely immutable.
2020-12-13 21:06:36 +00:00
Ivan Volkov
04ba545aa2
NullPointer fix for /schematic list (#781)
* fixed null pointer

* fixed rest of similarly caused null pointers

* checkstyle
2020-12-13 15:20:10 +01:00
Ivan Volkov
bfc657d3f6
Schem file limits (#773)
* added filesize/file count checks for /schematic save

* fixed /schematic save, added filesize component to /schematic list

* improved /schematics list total filesize output
need to add automatic conversion into Mb in the future

* temporary fix for page wrap from MessageBox

* reverted changed to MessageBox

* applied FAWE's checkstyle where applicable

* crude fix for worldedit MessageBox line wrapping happening sometimes

* small visual adjustments

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

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

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

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

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

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

* fixed settings variable names

* Improved `/schematic save` success/error notifications
fixed local variable names

* removed unneeded comment

* fixed typo

* made schematics in subdirectories count towards file limit

Co-authored-by: NotMyFault <mc.cache@web.de>
2020-12-12 23:38:44 +01:00
dordsor21
26e3e56988
Don't allow blocks as brushes
fixes #748
2020-12-11 17:02:54 +00:00
dordsor21
ae39f7bba3
use full chunks for distr and account for __RESERVED__ blocks
fixes #759
2020-12-11 16:13:09 +00:00
dordsor21
3717351d61
//setbiome should be 3D as well 2020-12-11 12:55:49 +00:00
dordsor21
ff7c972ea6
Don't try to be clever with bitwise
Fixes #769
2020-12-11 12:55:38 +00:00
dordsor21
be44e1449c
remove mutability in clipboards (particularly clipboard pattern)
fixes #776
2020-12-11 11:34:56 +00:00
Aurora
11f50f8b53
Add 1.16 tree types (#757) 2020-11-23 18:04:34 +00:00
libraryaddict
2ccc234608
Correct typo from max world height of 265 to 256 2020-11-17 21:06:03 +13:00
NotMyFault
2a5b385578
Fix missing stacker tool message 2020-11-16 13:31:49 +01:00
N0tMyFaultOG
60f3224318 Deprecate the non-Pattern methods in EditSession and fix a recursion loop
eca310cf8f16240fabc0259f4f615cfa2d37909a

Co-Authored-By: Matthew Miller <mnmiller1@me.com>
2020-11-13 22:42:03 +01:00
N0tMyFaultOG
5d283e1a17 Fix variable argument functions in expressions
204ef7a708466d8739e5dcbfbc4794b57cabab0f

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
2020-11-13 22:35:53 +01:00
N0tMyFaultOG
a32b4a1345 Fixed undo/redo not working from console/commandblock
65fbe09c35e9affa71d0ce7c20fa5ebd0f1c8365

Co-Authored-By: Matthew Miller <mnmiller1@me.com>
2020-11-13 22:25:47 +01:00
N0tMyFaultOG
cb088ff3e5 Remove Y limits if a region has no world
0cb1eea55b311473c9468f608a0090b93cf5de91

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
2020-11-13 22:10:43 +01:00
N0tMyFaultOG
197389bd32 Improve requireTag exception messages
e15d7993ada7b26784471bdb0e9550228724d900

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
2020-11-13 22:09:36 +01:00
N0tMyFaultOG
d44cceb1e9 Fix //chunk text and clarify the y-index in the help text.
e0b8b4856d22bc3edc7879e291a5502b79664fc3

Co-Authored-By: wizjany <568161+wizjany@users.noreply.github.com>
2020-11-13 22:01:12 +01:00
N0tMyFaultOG
560ab289a7 Move connections to neighbors update
e575ffef2c790ec2eb6f3fe121d44ddca850914c

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
2020-11-13 22:00:01 +01:00
N0tMyFaultOG
d2fbd40021 Lower-case registry arguments in converter
8377a6bdacb4d5e0b0af2d97e097e3d946cf1a0d

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
2020-11-13 21:56:27 +01:00
N0tMyFaultOG
0d2c4c0825 Make block positions copy on click for //size
6925d3715a6c6992d01ab1d4b5564bb9535b6711

Co-Authored-By: Lewis B <17665267+lewisjb@users.noreply.github.com>
2020-11-13 21:54:46 +01:00
N0tMyFaultOG
679b9d203d Add -w flag to butcher for water mobs
beb784e0ffe1d8a8cf678912dbd6207e96afcfc8

Co-Authored-By: Lewis B <17665267+lewisjb@users.noreply.github.com>
2020-11-13 21:46:11 +01:00
N0tMyFaultOG
9cd05bc5a1 Use /tool in /toggleeditwand description
e320833961734c68a9d783bc9e3e77458e4c54d3

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
2020-11-13 21:37:36 +01:00
Octavia Togami
9fbbcdb3f7 Make /toggleeditwand translatable
56182ad0793b79fe53927c1363be92a42e3af14d

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
2020-11-13 21:36:38 +01:00
N0tMyFaultOG
0ee1321546 Add missing permissions 2020-11-13 21:08:57 +01:00
Hannes Greule
6ae2275990 Register GenerationCommands 2020-11-09 11:51:36 +01:00
Hannes Greule
428f8e201d
Upstream changes (#717)
* Perform part of the move of //fast to //perf (#1377)

This re-adds a deprecated `//fast` and moves the current logic to
`//perf`. Later `//perf` will have its syntax reworked, when Piston
finally supports sub-commands properly!

* Names via Translation (#1268)

* Deprecate BiomeRegistry, etc.

* Update some libraries, e.g. text

* Move to new translation renderer

* Revert "Deprecate BiomeRegistry, etc."

This reverts commit 59a5d6c92aec52739a8dc68ac3d23898af7593dd.

This was not a good idea for potential mod shenanigans.

* Move BiomeData#getName to BiomeRegistry, use i18n

* Use getRichName instead of getName

* Implement getRichName for NullBiomeRegistry

* Add getRichName for blocks

* Relocate net.kyori.minecraft

* Update adapters for getRichBlockName

* Add getRichName for items

* Update adapters for getRichItemName

* Update adapters JAR for merge

(cherry picked from commit cfd26253b6fb59ff6c65a0157a6780be7db4ea5a)

* Follow-up fixes for 92f8776796

* Don't send deprecation warning and improve info message

* Fix click command for perf box

(cherry picked from commit 7ee60060c31df2f8b41212b430a0875312189339)

* update R3 adapter§

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: Aurora <aurora@relanet.eu>
2020-11-09 10:38:10 +01:00
N0tMyFaultOG
b728989355 Refactor Jars to ThirdPartyManager 2020-11-01 20:56:45 +01:00
Matt
781c1e943b
Fixed dumb typo 2020-10-31 22:09:13 -04:00
Matt
9fd872a49e
Fixed dumb typo 2020-10-31 22:08:45 -04:00
Matt
985fd90ef7
Update Jars.java (#730) 2020-10-31 22:05:31 -04:00
Matt
65c0b8905f
Update SilentPlayerWrapper.java (#729) 2020-10-31 22:00:14 -04:00
Matt
0746c1185f
Update FaweVersion.java (#728) 2020-10-31 21:56:21 -04:00
NotMyFault
478ab167fa
Shift region logger to debug 2020-10-24 09:55:49 +02:00
dordsor21
c6ef1bc1de
Full support for 3D biomes (#714)
* Full support for 3D biomes
Since we're only supporting 1.15+ there's no need to try anything other than compatibility

* this is not part of the PR

* Clipboards should still always be y 0 for biomes
(this "bug" has existed for ages)
2020-10-22 22:18:16 +01:00
NotMyFault
28f5a7072d
Merge pull request #707 from IronApollo/biome-regen
Implement biome-specific regen
2020-10-22 10:57:49 +02:00
Hannes Greule
30863c36e7
Fix confirm deadlock and confirm permissions/limits (#718) 2020-10-22 01:28:07 -04:00
Hannes Greule
097f3ec473
Reimplement #offset mask (#712) 2020-10-20 13:37:21 +01:00
N0tMyFaultOG
d3600e4225 Remove dead config entries 2020-10-15 18:23:10 +02:00
IronApollo
e6b083554b Implement biome-specific regen
- initial biome-specific regen implementation
- RegenOptions modified to include biomeType option (null if not specified)
- Matched upstream's regen command
2020-10-13 22:43:11 -04:00
NotMyFault
b86e452b80
Add jvm flags to debugpaste 2020-10-13 15:14:55 +02:00
NotMyFault
f95cf0a9ca
Add missing translation strings 2020-10-13 15:00:46 +02:00
Aurora
4127e83749 Don't paste ComplexEntityParts 2020-10-12 14:05:46 +02:00
wea_ondara
b5f41501e4 fix tabcomplete for brushes and possible many other commands 2020-10-12 12:26:26 +02:00
wea_ondara
6d45169d9d fix tabcomplete for biomes and tree types, fixes #457 2020-10-12 12:26:26 +02:00
Aurora
3c6280b11e
Re-Implement //regen (#598)
* start reimplementing regen command

* start reimplementing regen command

* Formatting and logic tweaks.

Regen will now throw exceptions but they are not caught yet.
ConversionSessions will now be closed when no longer being used instead of left open.

* fix //regen crashing server

* added //regen support for 1.16.1 and 1.15.2

* cleanup

* Update the issue template

* improve performance of regen by a factor of 40, approx 1.2 millon blocks/second

* Update the issue template

* Update the issue template & add a config (#640)

* Update the issue template

* Add a config.yml to the issue template

* improve performance of regen by a factor of 40, approx 1.2 millon blocks/second

* Fix entity rotation (#642)

* fix entity rotation
fixes #577 
Co-authored-by: wea_ondara <wea_ondara@alpenblock.net>

* Fix toggle permission (#644)

* Fixes #529
* fix superperms perm toggling

Co-authored-by: @weaondara <wea_ondara@alpenblock.net>

* Fix #647

* Squash errors and debug to aid fixing #652 properly

* cleanup imports

* cleanup imports 2

* cleanup imports 3

* cleanup imports 4

* add patch by @SirYwell

* aysnc world gen with features and stuff and some minor issues

* optimizations, full chunkstatus, block populators

* optimizations, cleanup

* optimizations

* fix feature regeneration, fix temp folder deletion

* cleanup

* make chunk gen multithreaded

* fix precomputation of chunk lists for RegionLimitedWorldAccess again

* added regenerator abstraction, fix aioobe while running through chunk stati

* remove override for getChunkAt in freshnmsworld

* don't use concurrent chunk gen if custom chunk generators do not support it

* distinct between generator types

* improve regen speed for overworlds

* mix

* Add message that regen might take a while

* use a shared map for FastAreaLazy, cleanup imports

* use custom concurrency levels for chunk stati and process accordingly

* implement new regen in 1.15.2 and 1.16.1 as well

Conflicts:
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java

* woops

* further abstraction, finalized regen impl

* Formatting

* Fix some typos, remove debug

* replace wildcard imports

* cleanup debug

* braces

* serr -> logger

* move regen impls to seperate classes

* fix world init for 1.16.1

* fix world init for 1.15.2

* fix world init for 1.15.2 #2

* use original world name for regeneration

* Update Regen_v1_15_R2.java

* Update worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>

* Update worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>

* Update worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>

* improve documentation, use parallel task count for fawe settings

* fix compile

Co-authored-by: wea_ondara <wea_ondara@alpenblock.net>
Co-authored-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
2020-10-10 11:57:12 +02:00
NotMyFault
3c40c53f66
Add missing aliases 2020-10-09 10:13:13 +02:00
N0tMyFaultOG
67cc5fb984 Merge branch 'logging' into main 2020-10-09 10:03:13 +02:00
MattBDev
c4c50da4f9 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-10-08 21:47:41 -04:00
MattBDev
af3c723e0d Rename FAWE Threads to be more identifiable. 2020-10-08 21:47:34 -04:00
dordsor21
0c9f00b6ba
Update worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java
Co-authored-by: NotMyFault <mc.cache@web.de>
2020-10-08 21:15:48 +01:00
dordsor21
5b97c0abcd
Several fixes to actual, probable and possible synchronocity issues (#691)
* Several fixes to actual, probable and possible synchronocity issues
 - Ensure that all edits are queued onto the same AsyncNotifyQueue by actually delegating to the parent player in PlayerProxy
 - Ensure that the order editsessions are being remembered on the LocalSession is being respected by using a fair ReentrentLock
 - Ensure a chunk cannot be called when an update is being called

* Don't add locks to GetBlocks
2020-10-08 21:15:05 +01:00
Hannes Greule
4407749219
Reimplement l2d, l3d, existing and buffer pattern (#684)
* Reimplement l2d, l3d, existing and buffer pattern
Also smaller translation improvements and cleanup

* Allow aliases in RichParser
2020-10-08 16:39:15 +01:00
weaondara
116c5d17c5
Fix //jumpto (#689)
* fix jumpto command

* imports

* Formatting

Co-authored-by: Aurora <aurora@relanet.eu>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
2020-10-08 16:38:31 +01:00
dordsor21
2c27b9c02a
Correctly queue edits
Synchronising on the LocalSession ends up being dangerous as it's a craftbukkit thread, leading to blocking issues if something goes wrong in an edit, made worse by the fact craftbukkit threads like to interfere with each other sometimes, and also cause OOMs and hanging when there are too many of them.
2020-10-08 10:53:57 +01:00
weaondara
a64a1ab09e
Fix schem loading of sponge schems with dataversion == 1 (#690)
* fix sponge schem loading with schem version 1
2020-10-07 21:11:57 +02:00
dordsor21
70c40ae077
Merge branch 'main' of github.com:IntellectualSites/FastAsyncWorldEdit into main 2020-10-07 15:53:09 +01:00
dordsor21
def986710f
Remove deep synchronisation that is a very plausible cause of circular locking.
This may be a fix for #685
2020-10-07 15:52:48 +01:00
Hannes Greule
5800c0bc96
Fix copypaste brush (#688) 2020-10-07 15:32:05 +02:00
MattBDev
728ced8c06 Merge branch 'main' into logging 2020-10-06 14:47:28 -04:00
MattBDev
f5a42c63a7 Better logger support 2020-10-06 14:44:33 -04:00
Hannes Greule
f71ca32140
Reimplement biome pattern (#681)
* Reimplement biome pattern

* Improve suggestions and messages
2020-10-05 20:00:35 +01:00
Matt
96dcb95b7c
Javadoc and Formatting fixes. (#619)
Javadoc and Formatting fixes.

Also, extremely minor code changes which have been tested.
This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. 

* Updated PlotSquared URL
* Removed plugin acronyms
* Fixed a typo
* Fixed grammar
* Use modern block id's
* Update YouTube video URL
2020-10-05 13:41:41 -04:00
dordsor21
b06d943f7c
There's no need to duplicate everything when copying the intersection masks, as the Set and array should be the same. (#680)
* There's no need to duplicate everything when copying the intersection masks, as the Set and array should be the same.

* do the same for Union mask
2020-10-04 19:49:45 +02:00
dordsor21
fc606ff5ff
use concurrent hashmap for thread processor cache 2020-10-04 18:34:15 +01:00
N0tMyFaultOG
9f232a9690 Enhance debugpaste information 2020-10-04 16:52:43 +02:00
dordsor21
1f02287caa
trim get where chunk SET is remembered from a previous session 2020-10-03 15:53:49 +01:00
NotMyFault
346762d93b
Add heightmapinterface alias 2020-10-02 17:28:49 +02:00
dordsor21
40717c23c4
If extent is world when pasting clipboard, cretae editsession
fixes #583
2020-10-01 15:02:34 +01:00
dordsor21
318eca364d
We ought to always clear (close) the clipboard on logout
Fixes #672
2020-09-30 10:56:07 +01:00
dordsor21
6332b8c965
This ought to be false by default for now 2020-09-28 11:18:16 +01:00
dordsor21
82bcc0e9a5
Allow "post processing" of chunks (#658)
* begin allowing "post processing" of chunks
 - restores legacy capability to continue saving edits in the background after sending the chunks
 - speeds up the edit clientside
 - nail in the coffin of the terrible and staticly coded coreedit
 - We should totally make IronGolem work so Core* is no longer used by anyone

* begin allowing background history saving

* Handle post processors in queues properly

* Use futures for postprocessing so we're not waiting for them needlessly

* better use of closed boolean

* Reword
2020-09-28 11:13:02 +01:00
dordsor21
bd4a3a3efd
Fix inconsistency with legacy regarding loading schematics from URL 2020-09-26 22:20:47 +01:00
dordsor21
68deed1469
schematics are just fun 2020-09-26 21:56:38 +01:00
dordsor21
1766c62278
Attempt to recover from incorrectly-extensioned schematic reads (#660)
* Attempt to recover from incorrectly-extensioned schematic reads
 - Should help avoid #605 (I'm assuming this is the issue)
 - Possible issues with the InputStream being closed/pre-read or so? Thoughts:?

* more verbose checking in the first place
2020-09-25 15:15:00 +01:00
dordsor21
65747bf8f8
accessing clipboards should not be synchronized to LocalSession (#653)
* accessing clipboards should not be synchronized to LocalSession
I believe this may be the issue causing thread locks when wrapping new players. If we're attempting to run a synchronised method within the LocalSesison when initialising it, it may go wrong..?

* nullcheck within synchronisation
2020-09-25 15:02:09 +01:00
dordsor21
855389c785
Allow parallelisation of masks (#636)
* Allow parallelisation of masks
Increasing performance improvement with increased masking complexity and edit size.

* Address comments
 - Rename Mask#clone to Mask#copy
 - Rename Mask2D#copy to Mask2D#copy2D
 - Correct formatting

* cx -> centerX

* Make various operations relying on a single SingleThreadQueueExtent instance (mainly brushes) thread safe
2020-09-25 15:00:42 +01:00
Aurora
3f1e8fa4d4
Fixes unsafe memory access using cross server clipboards (#651)
Co-authored-by: wea_ondara <wea_ondara@alpenblock.net>
2020-09-24 18:10:43 +01:00
dordsor21
5e67c1b658
Squash errors and debug to aid fixing #652 properly 2020-09-22 11:34:45 +01:00
dordsor21
3b660756f6
Fix #647 2020-09-21 17:10:33 +01:00
Aurora
3b2fe2ffde
Fix toggle permission (#644)
* Fixes #529
* fix superperms perm toggling

Co-authored-by: @weaondara <wea_ondara@alpenblock.net>
2020-09-21 17:07:35 +02:00
Aurora
806916d6e8
Fix entity rotation (#642)
* fix entity rotation
fixes #577 
Co-authored-by: wea_ondara <wea_ondara@alpenblock.net>
2020-09-20 16:33:07 +02:00
dordsor21
845c32bd18
Fix #639
looks like we too speedy
2020-09-19 20:46:46 +01:00
dordsor21
be0e33746c
Ensure the block actually can be waterlogged when checking for waterlogged status.
Fixes #632
Fixed #633
2020-09-19 16:54:42 +01:00
dordsor21
aed6807eb2
comment 2020-09-18 18:54:14 +01:00
dordsor21
cf750ba00c
Correct tag name for writing and add compatibilty for created corrupt schematics 2020-09-18 18:31:42 +01:00
dordsor21
9c34702a47
Correct tag name for tile entities 2020-09-18 18:29:36 +01:00
dordsor21
218f570cb1
Fix LimitExtent and processing of Plot regions
Fixes #627
Fixes #609
2020-09-18 17:40:55 +01:00
dordsor21
fc91c3b56e
Clone mutable regions given to clipboards
Fixes #630
2020-09-18 15:02:25 +01:00
dordsor21
8e8bd810b5
Relight after completing P2 operations
teporarily fix #629
2020-09-18 12:38:17 +01:00
dordsor21
7375827844
implement getBiome(BlockVector3)
fixes #622
2020-09-18 11:52:49 +01:00
Matt
2e73746abe
Remove Kotlin (#625)
Shrinks the jar size since we no longer must bundle the Kotlin library. The downside is that some classes grew in size compared to their Kotlin versions.
Many contributors didn't care for Kotlin either.
2020-09-17 16:31:55 -04:00
NotMyFault
4f6c904615
Merge pull request #617 from IronApollo/vault-fix
Fix vault, remove 1.14 and DummyFawe
2020-09-16 18:06:57 +02:00
N0tMyFaultOG
241e85e491 Strip 1.14 2020-09-16 16:01:49 +02:00
IronApollo
f5f5a55b4c Fix limits 2020-09-16 14:11:26 +01:00
dordsor21
07a5ef5ab4
Fix incorrect x/y/z stuff;
Fixes #616
Fixes #614
2020-09-14 20:17:55 +01:00
dordsor21
3d2052b0c8
Better skylight handling and fix opacity on materials 2020-09-14 18:33:35 +01:00
dordsor21
d6c9a887ac
Fixlighting now also calculates heightmaps
Fixes #386 and #438 seems fixed, but that might be something else that fixed?
2020-09-14 14:19:23 +01:00
Hannes Greule
0685881f64
Implement SupplyingExtent (#613) 2020-09-14 11:20:26 +01:00
dordsor21
4243e8e86b
Begin working on improved lighting to better match 1.14's "new" light… (#611)
* Begin working on improved lighting to better match 1.14's "new" lighting engine
I guess the "new" lighting engine is somewhat old now lol
Also implement the remove first stuff to fixlight

* And then make it work
2020-09-13 15:36:36 +01:00
Matt
d00899e177
More support for 3D biomes (#608)
* More support for 3D biomes

* Resolved merge conflicts
2020-09-12 15:31:42 +02:00
Matt
de199a0e59
More work on masks (#607)
* Add a #air mask, the opposite of #existing (#1511)

(cherry picked from commit 84fa2bbbc63de7bece01f41c0d5cb7d85cf129e6)

* Remove unused methods in Mask.java

* Remove `test(Extent, BlockVector3)` from Masks.

This was a poorly planned idea. This should save some memory too.

Authored-by: Matthew Miller <mnmiller1@me.com>
2020-09-11 21:13:31 +02:00
IronApollo
1fa0777d3b Fix erosion and pull brushes
Fixes #559
2020-09-11 20:58:27 +02:00
Josh Knight
4a18147125
Merge pull request #600 from IronApollo/mask-work
Reimplement Masks + Fixes
2020-09-08 16:21:20 -04:00
MattBDev
2fcf4bdf7e Updated Gradle 2020-09-08 15:34:53 -04:00
IronApollo
dc465f7d3c Reformat, fix RichParser suggestions 2020-09-07 21:46:54 -04:00
IronApollo
7929320611 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into mask-work 2020-09-07 21:45:05 -04:00
Aurora
ddff407f18 Fix convert function in AbstractDirectionConverter 2020-09-07 20:18:31 +02:00
IronApollo
6807ccd960 Reimplement Masks + Fixes
Masks Reimplemented:
    - Adjacent (~): Adjacent to a specific number of other blocks.
        - Example: ~[oak_log][1][4]
    - Extrema (#extrema): Restrict to near specific terrain extrema. The "-o" flag will only overlay existing terrain.
        - Example: #extrema[0d][45d][-o]
    - ROC Angle (#roc): Restrict to near specific terrain slope rate of change. The "-o" flag will only overlay existing terrain.
        - Example: #roc[0d][45d][-o]
    - Surface (#surface): Restrict to surfaces (any solid block touching air).
        - Example: #surface
    - Wall (#wall): Restrict to walls (any block n,e,s,w of air).
        - Example: #wall

Other Changes:
    - Minor logic change to angle mask's overlay.
    - Fixed negating air mask.
    - Added overlay flag to angle (/) mask.
2020-09-06 18:42:43 -04:00
Octavia Togami
1d05da75d8 Regenerate list classes from MCUtils
(cherry picked from commit da4d70fab5c5e5efe242260b5d09ca273f944c55)
2020-09-03 12:46:17 +01:00
Octavia Togami
f7e1f70e19 Replace BlockStates reading with new 1.16 logic (#1413)
* Replace BlockStates reading with new 1.16 logic

* Account for running on older platforms

Splits out the new reading to AnvilChunk16, uses data version to detect
the appropriate version.

* Move data versions to Constants

Also fixes some logic hiccups that become obvious with the new names.

* Fix LegacyMapper DFU handling

* Fix factor indexing

(cherry picked from commit 8c171f0929e8530aab1731d122649adc58c5161f)
2020-09-02 11:25:50 -04:00
Octavia Togami
28767d6e0f Officially propagate GPL downwards to all files
(cherry picked from commit f2ce020da059718e34342c149172944dfd02b775)
2020-09-01 16:30:43 -04:00
MattBDev
eeb02d3937 Update gradle and kotlin 2020-08-24 22:53:29 -04:00
MattBDev
8a6db57433 Removed useless functionality 2020-08-24 22:19:07 -04:00
MattBDev
a9d37fc6e5 Added BiomeMask.java and updated minor parts of miscellaneous files 2020-08-24 22:04:56 -04:00
MattBDev
02886b0387 Updated the WorldEdit license using find and replace 2020-08-24 21:31:47 -04:00
MattBDev
ce078aad70 Updated many exception classes 2020-08-24 21:29:34 -04:00
MattBDev
75a18b9d5b Update BukkitImplLoader 2020-08-24 21:20:18 -04:00
MattBDev
fd8cf1ebba Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16 2020-08-24 21:17:53 -04:00
N0tMyFaultOG
c0dee5caee Fixes #579 2020-08-24 21:39:41 +02:00
MattBDev
fd336feb46 Upstream merge of TranslationManager and ResourceLoader 2020-08-24 12:38:30 -04:00
N0tMyFaultOG
6cb8352686 1.16.2
- My IJ is broke but this should work. Dunno if I got all nms changes, but we will see.
2020-08-23 17:18:29 +02:00
NotMyFault
1e070b3a71
Merge pull request #518 from aurorasmiles/fixEntities
start reimplementing entities
2020-08-21 18:27:25 +02:00
NotMyFault
75cbae8261
Merge pull request #568 from HazelTheWitch/fix-spline-sweep
Fixed NullPointerException in Spline and Sweep brush
2020-08-21 18:25:09 +02:00
NotMyFault
c8a9919c63
Merge pull request #569 from IntellectualSites/feature/better-noise
Feature/better noise
2020-08-21 18:20:30 +02:00
Hazel Trinity
c725dd0b18 Uses setDirection
SweepBrush.java should be correct
2020-08-19 10:13:41 -07:00
aurorasmiles
947871281f
Fix styling issues 2020-08-19 11:08:59 +02:00
MattBDev
49f1658f0b Merge remote-tracking branch 'origin/1.16' into 1.16 2020-08-18 15:50:00 -04:00
MattBDev
79b5612311 Upstream merge of the region package and things that may have broken with it. 2020-08-18 15:48:31 -04:00
MattBDev
de34047365 Upstream merge of the registry package 2020-08-18 13:46:14 -04:00
MattBDev
72a4bb3552 Upstream merge of the scripting package 2020-08-18 13:43:18 -04:00
Hazel Trinity
73d70527f3 Signed angles 2020-08-16 16:05:09 -07:00
Hazel Trinity
5a482f4d38 Fixed argument exception
If someone knows better please tell
2020-08-16 15:40:53 -07:00
Aurora
e74cb33847
comment biome change output back in 2020-08-16 17:05:09 +02:00
Aurora
3aa041aa7e Merge remote-tracking branch 'upstream/1.16' into fixEntities 2020-08-16 17:01:45 +02:00
Hazel Trinity
054e60729b Slightly better angle calculation 2020-08-16 02:15:05 -07:00
Hazel Trinity
5c32cc17a2 Used Reparameterized Interpolation 2020-08-16 01:11:12 -07:00
Hazel Trinity
e5f092c3ef Updated ClipboardSpline paste 2020-08-16 01:10:51 -07:00
Hazel Trinity
cd0dac813c Incorrectly rounding results. 2020-08-15 23:39:30 -07:00
Hazel Trinity
e51f6e562d Sweep brush semi-fix 2020-08-15 14:20:47 -07:00
N0tMyFaultOG
5f2d60deb3 Remove dead translations, Crowdin ftw 2020-08-15 19:51:15 +02:00
Hazel Trinity
da9c4ad543 Handle null case in equality checking BlockVector3+DFSNode 2020-08-15 09:28:39 -07:00
Hannes Greule
da9d85e427 Point out API usage of RandomCollection 2020-08-15 18:05:26 +02:00
Hannes Greule
6fb202443b Clean up RandomCollection architecture 2020-08-15 13:18:14 +02:00
Hannes Greule
bb05bd24d9 Implement more noise patterns 2020-08-15 13:17:44 +02:00
Hazel Trinity
b7e9547cd5 Fixed NullPointerException in Spline and Sweep brush 2020-08-14 19:04:11 -07:00
MattBDev
4041b2aa1d Updated Math package with upstream and formatted code 2020-08-14 20:49:59 -04:00
MattBDev
69e547688b Updated WNA package with upstream 2020-08-14 20:25:21 -04:00
MattBDev
0a07599abf Update build files and NOTICE.txt 2020-08-14 15:29:15 -04:00
N0tMyFaultOG
bbff5c60b2 Fix metrics 2020-08-14 15:04:06 -04:00
Hannes Greule
dcdb42eadb Fix NPE on AbstractRegion#equals 2020-08-06 23:53:24 +02:00
wea_ondara
b582d3f70d fix compile error 2020-08-03 17:43:36 +02:00
wea_ondara
1097ac7889 remove entity properly 2020-08-03 17:35:53 +02:00
wea_ondara
9b95343601 keep original constructor to not break plugin that use the api 2020-08-03 17:34:06 +02:00
wea_ondara
629a237fb5 set forge uuid values 2020-08-03 17:27:08 +02:00
NotMyFault
3b7f7237b8
Improve debugpaste declaration 2020-08-01 23:30:48 +02:00
N0tMyFaultOG
7704ec5cd4 Fix paste service interacting with EH's paste service
We need to differ here between our own and EH or we break pastes from WorldGuard or any other EH software.
2020-08-01 13:52:54 +02:00
N0tMyFaultOG
b01e1be21b Add more information to the debugpaste 2020-07-31 20:16:01 +02:00
wea_ondara
bf09d6922c fix //move -e 2020-07-30 14:19:04 +02:00
wea_ondara
3c70cdc9fd more cleanup 2020-07-29 22:47:47 +02:00
wea_ondara
ae95ad8fe7 cleanup 2020-07-29 22:45:55 +02:00
wea_ondara
ae23794b43 fix //cut -e 2020-07-29 22:43:52 +02:00
wea_ondara
26110d336b cleanup 2020-07-27 23:54:41 +02:00
wea_ondara
24fbd21ff1 added missing entity functions; all or nothing; and nothing did not work 2020-07-27 23:51:26 +02:00
wea_ondara
84d2c8f2ce fix redo exception; fix positioning of entities in redo 2020-07-26 19:52:03 +02:00
wea_ondara
51cdd66c62 fix imports 2020-07-26 19:08:35 +02:00
wea_ondara
f24ad69f8f fix entity paste location offsets 2020-07-26 19:05:32 +02:00
Aurora
b411ea9af4 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-26 19:03:46 +02:00
wea_ondara
a38c82304a fix rotation of entities in clipboard 2020-07-26 18:26:21 +02:00
wea_ondara
950f343339 fix entity undo; amend constants 2020-07-26 15:54:02 +02:00
wea_ondara
50971ee311 fix entity undo 2020-07-26 15:52:51 +02:00
MattBDev
99745b8e59 Fix piston breaking 2020-07-15 13:05:55 -04:00
MattBDev
db3718e092 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-14 19:18:06 -04:00
Hannes Greule
eb74c7307c Fix blob brush doing weird things due to mutable vectors 2020-07-14 21:32:16 +02:00
MattBDev
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
MattBDev
204de7eab5 Add new annotations from upstream 2020-07-13 15:02:35 -04:00
MattBDev
1e80c0429a Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-13 13:09:55 -04:00
N0tMyFaultOG
da96365504 Updating a few links 2020-07-13 13:13:43 +02:00
Hannes Greule
11e762f07a Add basic angle mask suggestions
Mask suggestions are a bit broken in general so this doesn't change much
2020-07-13 11:15:01 +02:00
Hannes Greule
7198c03cd3 Reimplement angle mask parsing 2020-07-13 02:25:30 +02:00
Hannes Greule
8e33ff9549 Make mask parsing actually working 2020-07-13 02:18:05 +02:00
Octavia Togami
4c299bc0b8 Replace setPosition with trySetPosition (#1403)
Allows cancellation information to be fed back into the ascend/descend
algorithms.

(cherry picked from commit 71e104bcb187a5313e88dda5df79059c8ffbc1fe)
2020-07-10 13:22:48 -04:00
NotMyFault
c82fec931a
Update discord link at debugpaste 2020-07-09 23:43:48 +02:00
dordsor21
33b2b634ac
Allow specific P2 queue hooks to be disabled 2020-07-09 22:14:24 +01:00
MattBDev
6d6de61560 Updated missing biomes, entities, and categories. 2020-07-06 23:54:55 -04:00
Matthew Miller
39439fb405 fix: require extent for mask parsing (#1373)
(cherry picked from commit 1ced57c301bc1c98667a260fd8b6aa128675f0d2)
2020-07-06 23:47:33 -04:00
Octavia Togami
c0bfe06e4b Set ES6 compat flag for Rhino
(cherry picked from commit 849a515d4a5c02c083e5ab343db40d7eb05b2f51)
2020-07-06 23:45:28 -04:00
Hannes Greule
6fb10c3879 Make surface brush not replacing the whole world 2020-07-06 02:30:08 +02:00
Hannes Greule
ed6f3e7b4a Implement simplex mask (fixes #437) 2020-07-05 11:19:48 +02:00
dordsor21
704e76eb6d
Fixes #519
Use regex for finding colour codes
Merge styles rather than replacing and undoing our work sometimes.
2020-07-04 14:15:49 +01:00
Hannes Greule
11373c865a Fix BlockCategoryMasks not working 2020-07-03 21:57:30 +02:00
Hannes Greule
9da4bbef5f Fix scatter/splatter brush 2020-07-03 20:43:34 +02:00
aurorasmiles
05ef46994e
Update IChunkExtent.java
fix Indentation
2020-07-03 20:03:34 +02:00
Aurora
bc45a112ee Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-03 19:54:08 +02:00
Aurora
94b1233d98
implement entities in paste -e 2020-07-03 19:52:55 +02:00
dordsor21
77204df3f0
prevent players being teleported down a single block after some edits 2020-07-03 16:56:20 +01:00
dordsor21
e2ab87cc07
lazy //deform AIOOB fix.
Fixes #495
2020-07-03 16:45:28 +01:00
dordsor21
f7d375c76c
Lazy heightmap range fix 2020-07-03 16:29:27 +01:00
dordsor21
9e25c736a0
Add new blocks to BlockTypes 2020-07-03 14:12:43 +01:00
dordsor21
2812841481
Add -p flag to //drain to allow kelp and watergrass to be removed.
properly fixed #464
2020-07-03 14:01:16 +01:00
dordsor21
ea7897934f
Implement ability to use -w flag on //drain
fixes #464
2020-07-03 13:49:17 +01:00
dordsor21
fae528ab64
add a couple more changes++
Fixes #508
2020-07-03 13:18:09 +01:00
dordsor21
f1d4104480
Bunch of changes to help masks 2020-07-02 22:09:12 +01:00
dordsor21
18c9da372c
GetBlocks should default to air not reserved 2020-07-02 18:16:15 +01:00
dordsor21
d3afc9c65d
Update to p2 5.12.2 and implement clear pipeline 2020-07-02 14:34:05 +01:00
MattBDev
ac314fcedb Gradle update 2020-07-01 20:06:59 -04:00
Aurora
34298f7dee
Add back the getEntity Stuff since it seems to work fine 2020-07-01 19:28:38 +02:00
MattBDev
0fb564be0c Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16
 Conflicts:
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
2020-07-01 12:48:12 -04:00
Aurora
9fc2387f11
Revert "start reimplementing entities"
This reverts commit aac02ceea1.
2020-07-01 14:54:11 +02:00
Aurora
b96d45e4e6
merge 1.16 2020-07-01 14:46:25 +02:00
dordsor21
efc1a888d8
update links, versions, etc 2020-07-01 13:17:19 +01:00
Hannes Greule
0bb6bc3563
Start reimplementation of simplex pattern (#520)
* Start reimplementation of simplex pattern

* Fix suggestions

* Allow nested weighted patterns

* Add documentation and improve error handling

* Remove unnecessary code and obsolete TODOs
2020-07-01 13:01:39 +01:00
dordsor21
3b19738ea0
Merge branch '1.15' into 1.16
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
2020-07-01 12:47:04 +01:00
dordsor21
3f3c49c0a8
Looks like working block setting and removal 2020-07-01 12:41:20 +01:00
dordsor21
f84958957c
Fix various lighting issues
fixes #496
possibly fixes #497
2020-06-30 13:44:26 +01:00
Octavia Togami
d232dc28e3 Cherry-pick WNA, minor changes. 1.16 VERY WIP
First noticed incident of operations ruining ChunkSections. Do not build and use this unless you're testing.

Rushed some of the changes, gotta sleep. Would be nice to get a review of this one from @mattbdev and @dordsor21
2020-06-29 22:08:16 -04:00
Matthew Miller
4604aa5920 Additional work towards 1.16 compatibility
- Very basic implementation of the SideEffects system. Will definitely need fine tuning for it to be functional, but is not considered a priority in my opinion.
- Minor changes to the World interface and World implementations related to the SideEffects system. Shouldn't be the cause of any new bugs but be on the lookout.
- Included debug in BukkitImplLoader.java to assist contributors in understanding what needs to be implemented for the adapter to load properly.

Still very WIP but we're a few steps closer. So far, this is coming along better than I anticipated. Hopefully we can keep the momentum.
2020-06-29 22:08:16 -04:00
Octavia Togami
b59b95c282 Cherry-pick WNA, minor changes. 1.16 VERY WIP
First noticed incident of operations ruining ChunkSections. Do not build and use this unless you're testing.

Rushed some of the changes, gotta sleep. Would be nice to get a review of this one from @mattbdev and @dordsor21
2020-06-29 22:05:41 -04:00
MattBDev
2517aca66f Removed some unnecessary code. 2020-06-28 17:31:13 -04:00
Matthew Miller
82adab77b4 Additional work towards 1.16 compatibility
- Very basic implementation of the SideEffects system. Will definitely need fine tuning for it to be functional, but is not considered a priority in my opinion.
- Minor changes to the World interface and World implementations related to the SideEffects system. Shouldn't be the cause of any new bugs but be on the lookout.
- Included debug in BukkitImplLoader.java to assist contributors in understanding what needs to be implemented for the adapter to load properly.

Still very WIP but we're a few steps closer. So far, this is coming along better than I anticipated. Hopefully we can keep the momentum.
2020-06-26 22:14:19 -04:00
MattBDev
b7debce4d4 1.16.1 Prep work 2020-06-25 20:29:09 -04:00
Aurora
aac02ceea1
start reimplementing entities 2020-06-25 22:13:34 +02:00