Commit Graph

6599 Commits

Author SHA1 Message Date
5508b415c9 Allow nullable BukkitPlayers for whatever reason WorldGuard needs them for I guess? (#706) 2020-10-14 19:56:16 +01:00
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
b86e452b80 Add jvm flags to debugpaste 2020-10-13 15:14:55 +02:00
f95cf0a9ca Add missing translation strings 2020-10-13 15:00:46 +02:00
3ab0d05c1d Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main
 Conflicts:
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/blocks/CharBlocks.java
2020-10-12 18:26:00 -04:00
4127e83749 Don't paste ComplexEntityParts 2020-10-12 14:05:46 +02:00
b5f41501e4 fix tabcomplete for brushes and possible many other commands 2020-10-12 12:26:26 +02:00
6d45169d9d fix tabcomplete for biomes and tree types, fixes #457 2020-10-12 12:26:26 +02:00
8c26c55501 Fix scaling 2020-10-11 13:39:59 +02:00
4cea303eb7 Update logo 2020-10-11 13:37:11 +02:00
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
d42e152348 Update adapters 2020-10-09 22:39:36 +02:00
3c40c53f66 Add missing aliases 2020-10-09 10:13:13 +02:00
67cc5fb984 Merge branch 'logging' into main 2020-10-09 10:03:13 +02:00
3fab209bdb Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-10-08 22:53:19 -04:00
0021aeb40a 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:50:42 -04:00
e19c537f62 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 21:50:42 -04:00
62fa6d255c 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 21:50:41 -04:00
cf0ff72524 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 21:50:41 -04:00
d10a5cc5fa Fix schem loading of sponge schems with dataversion == 1 (#690)
* fix sponge schem loading with schem version 1
2020-10-08 21:50:41 -04:00
950b1599ec Fix copypaste brush (#688) 2020-10-08 21:50:41 -04:00
d5d09ba586 Remove deep synchronisation that is a very plausible cause of circular locking.
This may be a fix for #685
2020-10-08 21:50:32 -04:00
ae38880e1b Rename FAWE Threads to be more identifiable. 2020-10-08 21:50:05 -04:00
c4c50da4f9 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-10-08 21:47:41 -04:00
af3c723e0d Rename FAWE Threads to be more identifiable. 2020-10-08 21:47:34 -04:00
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
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
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
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
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
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
70c40ae077 Merge branch 'main' of github.com:IntellectualSites/FastAsyncWorldEdit into main 2020-10-07 15:53:09 +01:00
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
5800c0bc96 Fix copypaste brush (#688) 2020-10-07 15:32:05 +02:00
728ced8c06 Merge branch 'main' into logging 2020-10-06 14:47:28 -04:00
f5a42c63a7 Better logger support 2020-10-06 14:44:33 -04:00
f71ca32140 Reimplement biome pattern (#681)
* Reimplement biome pattern

* Improve suggestions and messages
2020-10-05 20:00:35 +01:00
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
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
fc606ff5ff use concurrent hashmap for thread processor cache 2020-10-04 18:34:15 +01:00
9f232a9690 Enhance debugpaste information 2020-10-04 16:52:43 +02:00
3a5cfdc357 Build on Java 1.8 and 1.11 2020-10-04 09:26:18 +02:00
1f02287caa trim get where chunk SET is remembered from a previous session 2020-10-03 15:53:49 +01:00
346762d93b Add heightmapinterface alias 2020-10-02 17:28:49 +02:00
88e64a0632 Simplify further as using ConcurrentHashMap 2020-10-01 17:08:29 +01:00
197e08a937 use ConcurrentHashMap 2020-10-01 16:48:02 +01:00
40717c23c4 If extent is world when pasting clipboard, cretae editsession
fixes #583
2020-10-01 15:02:34 +01:00
987ab7d2b6 reduce the amount of synchronisation/locks being used unneecessarily and add nullcheck 2020-10-01 14:33:34 +01:00
318eca364d We ought to always clear (close) the clipboard on logout
Fixes #672
2020-09-30 10:56:07 +01:00
13cfd638d6 Fix incorrtect field references 2020-09-29 10:11:29 +01:00