Commit graph

1867 Commits

Autor SHA1 Nachricht Datum
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