Commit Graph

247 Commits

Author SHA1 Message Date
b411ea9af4 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-26 19:03:46 +02:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
11373c865a Fix BlockCategoryMasks not working 2020-07-03 21:57:30 +02:00
bc45a112ee Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-03 19:54:08 +02:00
ea7897934f Implement ability to use -w flag on //drain
fixes #464
2020-07-03 13:49:17 +01:00
f1d4104480 Bunch of changes to help masks 2020-07-02 22:09:12 +01:00
34298f7dee Add back the getEntity Stuff since it seems to work fine 2020-07-01 19:28:38 +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
0bb6bc3563 Start reimplementation of simplex pattern (#520)
* Start reimplementation of simplex pattern

* Fix suggestions

* Allow nested weighted patterns

* Add documentation and improve error handling

* Remove unnecessary code and obsolete TODOs
2020-07-01 13:01:39 +01:00
aac02ceea1 start reimplementing entities 2020-06-25 22:13:34 +02:00
ffa25b1d9a Fixes #452
- ChunkSections containing only air are technically null according to NMS Chunks
- Therefore if we're replacing air, we should ignore the result of get.hasSection(layer) by using "full = true" as it returns false if the chunksection is only air
- We also then need to ensure that the masks correctly identify that the block is "air"
2020-05-09 13:39:41 +01:00
a2b0a5e622 Fix offset mask (< and >) 2020-05-07 19:38:42 +01:00
8b1a0bbc34 Fix #417
This commit aims to fix existing issues regarding the "0/-1 blocks affected" bug. Introducing the new LinkedFilter class allows us to use multiple filters for single-filter operations, e.g. applying a pattern to blocks while also counting the amount of blocks applied to. SetFilter.java was also removed due to not being used.
2020-05-07 12:29:18 -04:00
0c539b4e84 Fix replace patterns
Fixes #445 #440 #372
2020-05-06 15:50:57 +01:00
69bd0274dd Fix undo for stack, move
- Most/anything using ForwardCopyExtent basically
2020-04-23 17:07:34 +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
e648b35b95 Small code quality changes 2020-03-24 12:32:36 -04:00
2e1c0c83f5 Minor adjustments to masks 2020-03-18 13:33:09 -04:00
2f8c2666df Removed LightingExtent and organized some classes. 2020-03-18 12:58:18 -04:00
ecedc1ff12 New masks 2020-03-17 22:23:03 -04:00
614f5e1c16 Minor changes 2020-02-06 16:33:31 -05:00
3452fd5a63 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-02-04 17:59:08 -05:00
8f82a763bf Remove debug line 2020-02-02 16:12:18 -05:00
cb1fd7400e Remove debug line 2020-02-01 23:16:30 -05:00
38d5506e18 Generify BlockMap
(cherry picked from commit 7384b6973498084f4082d7e1a805b84b13a3ba44)
2020-01-31 14:42:38 -05:00
cb6359f010 Removed 1.13.2 support. 2020-01-27 18:54:31 -05:00
88359f0215 More Kotlin 2020-01-21 14:30:13 -05:00
b8e3941bb4 Revert "Add some debug messages to aid in future coding decisions."
This reverts commit c4f376a2
2020-01-13 17:44:51 -05:00
c4f376a2e5 Add some debug messages to aid in future coding decisions. 2020-01-13 16:54:29 -05:00
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
195c4a7647 wip history changes 2020-01-06 08:36:16 +00:00
c05cdd8faa Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-01-04 10:12:33 +00:00
88a95221a8 Make masks more stateless 2020-01-04 10:11:13 +00:00
f3e0109be2 A lot of small changes 2020-01-03 15:38:30 -05:00
0d1e32efcb Upstream and debugging changes. 2020-01-02 16:30:44 -05:00
f37bc9417c Merge branch 'merge' into 1.15 2019-12-19 19:05:27 +01:00
ea5f7a77be Merge branch 'merge' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into merge 2019-12-16 09:08:28 +00:00
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
9bef8d5664 Minor changes 2019-12-11 17:46:47 -05:00
80d7b0582f i18n upstream merge 2019-12-09 20:07:57 +01:00
0c85db920c save strings.json 2019-11-21 20:37:56 +00:00
1341e38a90 fix compile 2019-11-21 19:56:10 +00:00
66744bfaa4 Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge 2019-11-21 13:50:05 +00:00
60759934a3 Fix some merge issues 2019-11-20 00:11:54 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
4ba54c4337 Further translations 2019-11-16 22:45:36 +10:00
0e6037584f Remove support for pluralisation to match Minecraft and alleviate issues with over-complexity 2019-11-16 22:43:23 +10:00
455a40b3fc Add a few more strings 2019-11-16 22:43:22 +10:00