MattBDev
79b5612311
Upstream merge of the region package and things that may have broken with it.
2020-08-18 15:48:31 -04: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
50971ee311
fix entity undo
2020-07-26 15:52:51 +02:00
MattBDev
3bc692ff11
Part 1 of upstream merge and format
2020-07-13 22:50:59 -04:00
Aurora
94b1233d98
implement entities in paste -e
2020-07-03 19:52:55 +02: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
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
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
Aurora
aac02ceea1
start reimplementing entities
2020-06-25 22:13:34 +02:00
IronApollo
238c56a3c6
Revert "Revert matt's changes"
...
This reverts commit bfcc6184ad
.
2020-06-13 14:41:36 -04:00
N0tMyFaultOG
bfcc6184ad
Revert matt's changes
...
Let's not break Fawe, thanks
2020-06-13 18:48:57 +02:00
MattBDev
1eacb91267
Make extent public (unsafe)
2020-06-12 21:45:49 -04:00
dordsor21
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
dordsor21
5be11c541b
Put the synchronisation higher up the food chain
2020-05-14 22:32:32 +01:00
dordsor21
2ccda85772
Fix #468
...
That's not how it works
2020-05-13 22:36:08 +01:00
dordsor21
32c30f45fe
don't read __reserved__
2020-05-12 11:00:54 +01:00
dordsor21
999b063762
Don't write reserved to schematics
2020-05-12 10:58:43 +01:00
dordsor21
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
MattBDev
aeb2820d89
Add debug message to addProcessor
2020-04-27 19:17:23 -04:00
chickeneer
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
Octavia Togami
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
MattBDev
dded68e071
Add missing code to SpongeSchematicReader
2020-04-02 15:49:45 -04:00
IronApollo
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
MattBDev
56395534fa
Remove useless messages
2020-03-31 19:28:21 -04:00
dordsor21
3cd30ebbff
Fix DiskOptimisedClipboard not closing
2020-03-30 17:00:41 +01:00
dordsor21
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
dordsor21
45e0d37889
Clipboards paste biomes
2020-03-30 10:27:03 +01:00
dordsor21
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
MattBDev
9c3fea6567
Remove poorly implemented biomes in MCEdit schematics
2020-03-27 19:09:01 -04:00
MattBDev
b2e3d40be2
Rename uploadAnonymous to upload
2020-03-23 20:48:58 -04:00
MattBDev
e7df3177cc
Upstream merge
2020-03-23 20:47:30 -04:00
MattBDev
9f07894f28
Performance improvement based on case study by @me4502
2020-03-19 13:08:25 -04:00
MattBDev
2f8c2666df
Removed LightingExtent and organized some classes.
2020-03-18 12:58:18 -04:00
MattBDev
1df5853f33
Remove unnecessary reflection
2020-03-17 22:27:41 -04:00
MattBDev
b7b11cc478
Gradle Upgrades and Clipboard Refactoring
2020-03-02 17:43:27 -05:00
Matthew Miller
c566bb8333
Replaced the "please report this" message in the legacy schematic loader
...
(cherry picked from commit be30a94be5aedc9e365491372fb80d2ea98ff368)
2020-02-27 21:44:37 -05:00
MattBDev
0bf0848758
Started refactoring Clipboards
2020-02-27 21:35:59 -05:00
MattBDev
798e04a644
Remove DelegateClipboard
2020-02-19 13:44:39 -05:00
MattBDev
1ed4118319
More upstream changes to clipboard
2020-02-19 13:37:19 -05:00
MattBDev
8e97b3b4b1
Revert "Lighting and Database changes"
...
This reverts commit 39dfc244
2020-02-18 18:06:19 -05:00
MattBDev
39dfc2444b
Lighting and Database changes
2020-02-18 17:21:09 -05:00
MattBDev
d243d02fb6
Add a debugging message
2020-02-18 14:32:44 -05:00
MattBDev
048974dca5
Introduce Resettable interface
2020-02-16 15:14:34 -05:00
MattBDev
6dd85e48ba
Various changes
...
the most notable change is that PlotSquared is being moved to the Bukkit module again to allow for future compatibility with version 5 of the plugin.
2020-02-12 16:18:36 -05:00
Octavia Togami
38d5506e18
Generify BlockMap
...
(cherry picked from commit 7384b6973498084f4082d7e1a805b84b13a3ba44)
2020-01-31 14:42:38 -05:00
MattBDev
020c674c01
Revert migration of FaweCache to Kotlin
2020-01-29 15:01:38 -05:00
MattBDev
8078cf077a
consistency changes
2020-01-26 13:01:16 -05:00
MattBDev
e0f6869573
Revert "More code quality fixes"
...
This reverts commit 2d6957ce
2020-01-23 14:41:57 -05:00
MattBDev
2d6957ce1c
More code quality fixes
2020-01-22 21:15:52 -05:00
MattBDev
88359f0215
More Kotlin
2020-01-21 14:30:13 -05:00
MattBDev
2d5a8ce573
Cleaned up a lot of code and introduced Kotlin to the project
2020-01-14 19:44:09 -05:00
Jesse Boyd
a84eb29d86
Merge commit 'e69ea37'
2020-01-07 00:14:25 +00:00
Jesse Boyd
e69ea37665
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15
2020-01-07 00:09:49 +00:00
Jesse Boyd
195c4a7647
wip history changes
2020-01-06 08:36:16 +00:00
Jesse Boyd
dce9e545ec
Fix schem load byte/varint
2020-01-05 18:41:58 +11:00
Jesse Boyd
c05cdd8faa
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15
2020-01-04 10:12:33 +00:00
Jesse Boyd
88a95221a8
Make masks more stateless
2020-01-04 10:11:13 +00:00
MattBDev
f3e0109be2
A lot of small changes
2020-01-03 15:38:30 -05:00
NotMyFault
f37bc9417c
Merge branch 'merge' into 1.15
2019-12-19 19:05:27 +01:00
Jesse Boyd
6a49b71cf2
Fix compile
2019-12-19 16:19:46 +00:00
Jesse Boyd
6ddeb2ebf5
Various minor
...
refactor some region dependencies
swithc masking extent to a filter (so it can be parallelized)
Some unfinished refactoring of the filters
remove piston messages from strings.json
2019-12-16 09:07:51 +00:00
Jesse Boyd
aac30742de
Remove TranslatableComponent override
...
use Caption class
2019-12-16 09:01:41 +00:00
Jesse Boyd
0c85db920c
save strings.json
2019-11-21 20:37:56 +00:00
Jesse Boyd
1341e38a90
fix compile
2019-11-21 19:56:10 +00:00
Jesse Boyd
66744bfaa4
Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge
2019-11-21 13:50:05 +00:00
Jesse Boyd
60759934a3
Fix some merge issues
2019-11-20 00:11:54 +00:00
Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge
2019-11-19 21:23:47 +00:00
Kenzie Togami
d9b0aeca7f
7e3fc6c8e7
2019-11-19 04:49:08 +00:00
Kenzie Togami
122f3b2562
8af68fc884
2019-11-19 04:43:30 +00:00
Jesse Boyd
1b07846746
some adapter refactoring
2019-11-19 04:40:40 +00:00
Jesse Boyd
0087a0d6ab
Various minor
...
fix undo null sections
fix cancel for certain parallel jobs
optimize schem paste
2019-11-17 22:47:56 +00:00
Matthew Miller
96e56bdd0c
Rebase translation work for easier rebasing
2019-11-16 22:42:14 +10:00
Jesse Boyd
3dde61cee6
Legacy schem reader offset
2019-11-14 19:23:41 +00:00
Jesse Boyd
ac6f4ae358
Use BlockArrayClipboard for schem load
2019-11-12 12:41:39 +00:00
Brokkonaut
89bc664f69
Fix flipping of chests and stairs ( #526 )
...
* Fix flipping of chests and stairs
* Check if the new property value is valid before updating
* Only for horizontal flips double chests/stairs should be modified
2019-11-12 21:09:28 +10:00
Jesse Boyd
cfa147cf76
WIP clipboard offsets
...
TODO schem load -> BlockArrayClipboard
2019-11-11 22:34:33 +00:00
Jesse Boyd
eac1f8f73d
Remove debug (again)
2019-11-11 21:12:32 +00:00
Jesse Boyd
6cbbefc0de
Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline
2019-11-11 21:06:22 +00:00
Jesse Boyd
53ad3d3cd2
Fix schem save order
2019-11-11 21:06:10 +00:00
MattBDev
1ffe05464f
Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline
2019-11-11 16:02:41 -05:00
MattBDev
a23a4e5496
misc changes.
2019-11-11 16:02:28 -05:00
Jesse Boyd
032942c0e8
Remove debug
2019-11-11 20:18:22 +00:00
Jesse Boyd
751e6a5dd4
Update SpongeSchematicReader.java
2019-11-11 19:56:55 +00:00
Jesse Boyd
19a7c54341
Fix schem save
2019-11-11 18:48:15 +00:00
Jesse Boyd
7aa0d9c122
Various minor
...
Disable P2's we region restrictions (so that it uses FAWE's)
Fix extent binding
Fix filtering on null sections
2019-11-11 16:49:13 +00:00
Jesse Boyd
240b2de90c
Update to PlotSquared-we branch
2019-11-06 09:29:20 +00:00
Jesse Boyd
0bfb1dbdd1
Fix BlockArrayClipboard offset
2019-11-05 15:08:44 +00:00
Jesse Boyd
32d837414b
static blocktype initialization
...
instead of using hacky reflection
2019-11-02 20:35:51 +01:00
Jesse Boyd
df9e9e510a
Limit processing
2019-11-02 12:13:42 +01:00
Jesse Boyd
ed7df341b4
Make mca file reusable
2019-11-02 08:07:40 +01:00
Jesse Boyd
2f3c6769c8
Legacy clipboards
2019-11-02 07:15:56 +01:00
Jesse Boyd
c2cb463dae
Fix schem load
2019-11-01 23:48:52 +01:00
Jesse Boyd
0c1fdcc498
remove broken debug
2019-11-01 22:56:07 +01:00
Jesse Boyd
23e0b0ef02
Update SpongeSchematicReader.java
2019-11-01 22:26:39 +01:00
Jesse Boyd
88b6d60f8e
schem v2 biomes
2019-11-01 22:09:50 +01:00
Jesse Boyd
1ad040f7d0
fix compile
2019-11-01 18:36:40 +01:00
Jesse Boyd
f0ab1d5f18
finish overhaul of NBT stream api
2019-11-01 18:29:13 +01:00