Commit Graph

997 Commits

Author SHA1 Message Date
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
28f5a7072d Merge pull request #707 from IronApollo/biome-regen
Implement biome-specific regen
2020-10-22 10:57:49 +02:00
27f16d97b3 Optimize biome retrieval 2020-10-14 23:10:55 -04:00
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
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
67cc5fb984 Merge branch 'logging' into main 2020-10-09 10:03:13 +02: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
f5a42c63a7 Better logger support 2020-10-06 14:44:33 -04: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
9f232a9690 Enhance debugpaste information 2020-10-04 16:52:43 +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
987ab7d2b6 reduce the amount of synchronisation/locks being used unneecessarily and add nullcheck 2020-10-01 14:33:34 +01:00
13cfd638d6 Fix incorrtect field references 2020-09-29 10:11:29 +01:00
48cd763d3b fix performance issues in BukkitPlayer permission (#665)
* fix performance issues in BukkitPlayer permission stuff

* Put PermissionAttachmentManager in seperate file

Co-authored-by: @weaondara
2020-09-28 19:11:28 +02:00
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
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
218f570cb1 Fix LimitExtent and processing of Plot regions
Fixes #627
Fixes #609
2020-09-18 17:40:55 +01:00
8e8bd810b5 Relight after completing P2 operations
teporarily fix #629
2020-09-18 12:38:17 +01:00
c7369e2cc0 Update plugin.yml 2020-09-16 16:12:20 +02:00
371460a1ce Relocate metrics 2020-09-16 16:10:00 +02:00
241e85e491 Strip 1.14 2020-09-16 16:01:49 +02:00
a49ce02bd0 Delete DummyFawe on startup 2020-09-15 19:18:16 -04:00
cd5691b819 Fix styling 2020-09-15 19:07:52 -04:00
64a71600f9 Add DummyFawe detector 2020-09-14 22:10:37 -04:00
d741a8a905 Delete DummyFawe.src 2020-09-14 21:30:27 -04:00
4af36217b1 Merge branch '1.16' into vault-fix 2020-09-14 21:19:52 -04:00
9431f7c189 Fix Vault integration + remove DummyFAWE 2020-09-14 21:18:06 -04:00
3d2052b0c8 Better skylight handling and fix opacity on materials 2020-09-14 18:33:35 +01:00
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
d00899e177 More support for 3D biomes (#608)
* More support for 3D biomes

* Resolved merge conflicts
2020-09-12 15:31:42 +02:00
a8f53d6414 Use correct trustEdges value 2020-09-11 17:24:02 +01:00
7baaed946e 1.16.3 2020-09-11 01:11:56 +02:00
fec938dac2 just send PacketPlayOutChunkMap for chunk updates 2020-09-06 16:50:22 +02:00
ec141ecb46 Merge branch '1.16' into update-adapters 2020-09-02 17:41:08 +02:00
aa125b29d4 Update worldedit-adapters.jar 2020-09-02 17:31:27 +02:00
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
dd85fc254f actually do the file path stuff how it's supposed to work 2020-08-30 11:45:37 +02:00
aa93f192c6 Merge pull request #587 from aurorasmiles/fixnms
improve performance of chunk updates for 1.16.2
2020-08-26 21:05:38 +02:00
9515f3abfc fix for spigot boooooooooooooooooooooooooooooooooooooooooooo 2020-08-26 20:46:48 +02:00
b117c35580 improve performance of chunk updates for 1.16.2 2020-08-26 20:15:23 +02:00
32ee30d593 Merge pull request #585 from aurorasmiles/fixnms
Fixes NMS on 1.16.2
2020-08-26 16:24:37 +02:00
f969403b54 Fix NMS for Chunk Updates on 1.16.2 2020-08-26 16:05:22 +02:00
add1d96313 Update WorldEditPlugin.java 2020-08-25 21:36:19 +02:00
041029168f Fix NMS in 1.16.2. Still not working properly. 2020-08-25 20:43:07 +02:00
38007ed1d5 reimplement 1.16.1 support 2020-08-25 17:09:31 +02:00
e1f53934fa Fix nms 2020-08-25 15:19:33 +02:00
87fe1a2a21 Fix builds for paper 1.16.2 2020-08-26 00:23:01 +12:00