Commit Graph

416 Commits

Author SHA1 Message Date
aed6807eb2 comment 2020-09-18 18:54:14 +01:00
cf750ba00c Correct tag name for writing and add compatibilty for created corrupt schematics 2020-09-18 18:31:42 +01:00
9c34702a47 Correct tag name for tile entities 2020-09-18 18:29:36 +01:00
fc91c3b56e Clone mutable regions given to clipboards
Fixes #630
2020-09-18 15:02:25 +01:00
07a5ef5ab4 Fix incorrect x/y/z stuff;
Fixes #616
Fixes #614
2020-09-14 20:17:55 +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
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
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
28767d6e0f Officially propagate GPL downwards to all files
(cherry picked from commit f2ce020da059718e34342c149172944dfd02b775)
2020-09-01 16:30:43 -04:00
a9d37fc6e5 Added BiomeMask.java and updated minor parts of miscellaneous files 2020-08-24 22:04:56 -04:00
02886b0387 Updated the WorldEdit license using find and replace 2020-08-24 21:31:47 -04:00
1e070b3a71 Merge pull request #518 from aurorasmiles/fixEntities
start reimplementing entities
2020-08-21 18:27:25 +02:00
79b5612311 Upstream merge of the region package and things that may have broken with it. 2020-08-18 15:48:31 -04:00
f24ad69f8f fix entity paste location offsets 2020-07-26 19:05:32 +02:00
b411ea9af4 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-26 19:03:46 +02:00
a38c82304a fix rotation of entities in clipboard 2020-07-26 18:26:21 +02:00
50971ee311 fix entity undo 2020-07-26 15:52:51 +02:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
94b1233d98 implement entities in paste -e 2020-07-03 19:52:55 +02:00
9fc2387f11 Revert "start reimplementing entities"
This reverts commit aac02ceea1.
2020-07-01 14:54:11 +02:00
b96d45e4e6 merge 1.16 2020-07-01 14:46:25 +02:00
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
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
aac02ceea1 start reimplementing entities 2020-06-25 22:13:34 +02:00
238c56a3c6 Revert "Revert matt's changes"
This reverts commit bfcc6184ad.
2020-06-13 14:41:36 -04:00
bfcc6184ad Revert matt's changes
Let's not break Fawe, thanks
2020-06-13 18:48:57 +02:00
1eacb91267 Make extent public (unsafe) 2020-06-12 21:45:49 -04:00
bdc14c10c7 Fix relight and removelight (#475)
* Start work on lighting engine (does not build)

* Implement getLighting

* Setting, flushing light etc works. Getting light should be working..?

* Better queue/chunk handling

* Use correct location for lighting update

* Correct set location, remove debug

* cleanup a little

* Fix fixlight

* Apply to all versions for the numpties

* Remove lighting extent if not using

* Actually bitmask blocks when setting in chunks

* Initialise Maps and Dequeues with inital size

* format

* Documentation maybe
2020-05-27 11:45:08 +01:00
5be11c541b Put the synchronisation higher up the food chain 2020-05-14 22:32:32 +01:00
2ccda85772 Fix #468
That's not how it works
2020-05-13 22:36:08 +01:00
32c30f45fe don't read __reserved__ 2020-05-12 11:00:54 +01:00
999b063762 Don't write reserved to schematics 2020-05-12 10:58:43 +01:00
3abf964620 Better logic for selecting schematic format.
- You had to specifically use //schem load <schematic>.schematic mcedit to load legacy schematics, now if you're loading .schematic it assumes you're wanting mcedit format
 - If you end up attempting to load an mcedit schematic with the sponge reader it now throws an exception.
2020-05-05 16:16:27 +01:00
aeb2820d89 Add debug message to addProcessor 2020-04-27 19:17:23 -04:00
396b03edf7 Add compatibility handlers for beds and banners for MCEdit Schematics (#561)
* Add compatibility handlers for beds and banners

* IntTag#getValue does not return null so do not check that

(cherry picked from commit 53ac21aa8723d71040d580902cfeae551a9cabf6)
2020-04-24 15:56:22 -04:00
735a37ffd0 Use custom radix sort for ordering blocks (#1277)
* Use custom radix sort for ordering blocks

* Licenses :P

* Fix ordering, add test for it

* Grant Gradle more memory (thx Fabric)

* Increase (?) / Specify memory for core tests

* Many attempts at fixing OOM

(cherry picked from commit bb013aa89b8457c4649e2546eef0aa94b9fc4020)
2020-04-10 13:42:27 -04:00
dded68e071 Add missing code to SpongeSchematicReader 2020-04-02 15:49:45 -04:00
755ea09797 Fix #390
Turns out the FilterBlock's getOrdinal value is from the "get", and does not share the same reference as setOrdinal, whose value is from the "set", would modify.

Because of this, even if #getOrdinal returns 0, we still must update the set with 0 by #setOrdinal.
2020-04-01 00:26:11 -04:00
56395534fa Remove useless messages 2020-03-31 19:28:21 -04:00
3cd30ebbff Fix DiskOptimisedClipboard not closing 2020-03-30 17:00:41 +01:00
76efbed4b2 Fix rotation breaking NBT data:
- Don't only copy NBT over if the original block had a Rot tag
2020-03-30 16:01:50 +01:00
45e0d37889 Clipboards paste biomes 2020-03-30 10:27:03 +01:00
8ffdd8a9e9 Better reading of schematic biomes.
Use biomes in the P2 schematic handler and save as a .schem not .schematic (when it's enabled again)
2020-03-28 10:44:51 +00:00
9c3fea6567 Remove poorly implemented biomes in MCEdit schematics 2020-03-27 19:09:01 -04:00
b2e3d40be2 Rename uploadAnonymous to upload 2020-03-23 20:48:58 -04:00
e7df3177cc Upstream merge 2020-03-23 20:47:30 -04:00
9f07894f28 Performance improvement based on case study by @me4502 2020-03-19 13:08:25 -04:00
2f8c2666df Removed LightingExtent and organized some classes. 2020-03-18 12:58:18 -04:00
1df5853f33 Remove unnecessary reflection 2020-03-17 22:27:41 -04:00