MattBDev
46f5b12b36
Convert tabs to whitespace.
2019-07-22 16:42:40 -04:00
Jesse Boyd
4d8cf04be1
fix some more compilation issues
2019-07-22 19:05:14 +10:00
Jesse Boyd
e86e4c9c53
wip on FaweQueue
2019-07-19 06:49:29 +10:00
Jesse Boyd
0a924915c8
shift extent queue methods
2019-07-19 02:07:31 +10:00
Jesse Boyd
6e13b44f84
resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b
2019-07-18 20:12:23 +10:00
Jesse Boyd
be8213d8ee
resolve conflicts
2019-07-18 16:56:57 +10:00
Jesse Boyd
dd38cbe750
.
2019-07-18 04:30:02 +10:00
Jesse Boyd
ff94a1e5ed
8108d0a9
2019-07-18 04:24:21 +10:00
MattBDev
8108d0a936
Major command changes that don't work yet.
2019-07-16 23:44:34 -04:00
Jesse Boyd
cfbde956f4
some refactoring to pipeline classes (WIP)
2019-07-17 05:10:39 +10:00
Jesse Boyd
14d5275e05
wip chunk based bitset
2019-07-12 02:10:32 +10:00
Jesse Boyd
cf09ca7f37
delete FaweQueue
2019-07-12 01:32:14 +10:00
Jesse Boyd
b44dcc91b8
update vs
2019-07-11 20:27:29 +10:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114
2019-07-11 08:08:55 +10:00
MattBDev
4a40c7d99c
Renaming and cleanup and a new method.
2019-07-09 15:50:13 -04:00
Jesse Boyd
f99d6e7478
wip on 1.14
2019-07-09 17:18:51 +10:00
MattBDev
ffc2092d93
toggles and timeouts
2019-06-30 14:56:32 -04:00
wizjany
9136139cfd
Fix pasting leashed entities. ( #494 )
2019-06-28 17:09:42 -04:00
Brokkonaut
096a9e4f9f
Paintings are very special ( #492 )
...
Fixes WORLDEDIT-3429
2019-06-28 16:11:24 -04:00
Jesse Boyd
3850944a81
Optimize waterlog remover
2019-06-29 04:49:48 +10:00
Jesse Boyd
f1e98da01f
d0a31691e1
2019-06-29 03:29:53 +10:00
Jesse Boyd
a2efdbc488
a1c15e1c39
2019-06-29 03:10:47 +10:00
Jesse Boyd
8c44c532c4
753b34ef99
2019-06-29 02:35:41 +10:00
Jesse Boyd
5a67363a78
0313320816
2019-06-29 02:24:57 +10:00
Jesse Boyd
846a1b0769
6c94cca15e
2019-06-29 00:01:51 +10:00
MattBDev
d0a31691e1
Small changes
2019-06-26 20:14:00 -04:00
Jesse Boyd
de4dcc0dd5
idk, messing around with region filtering
2019-06-26 20:22:21 +10:00
MattBDev
a69b239848
Upstream
2019-06-25 13:07:47 -04:00
MattBDev
a1c15e1c39
Many upstream changes. Should be non-breaking
2019-06-25 09:00:44 -04:00
MattBDev
c672bcfddd
Add license notice back and remove left over git stuff.
2019-06-23 14:07:47 -04:00
MattBDev
8c9090a21d
I changed stuff. That's all I remember
2019-06-23 13:27:34 -04:00
MattBDev
0313320816
As Jesse would say... *
2019-06-20 20:05:18 -04:00
wizjany
213cadf093
Import cleanup, ensure gradle uses https for deps, bump deps.
2019-06-13 09:17:00 -04:00
NotMyFault
ec001b8d3b
Revert "Upstream, generics, formatting"
...
This reverts commit cd88e513a8
.
2019-06-12 15:45:41 +02:00
MattBDev
cd88e513a8
Upstream, generics, formatting
2019-06-11 20:31:56 -04:00
Wyatt Childers
026bfeed08
Improved usage of the naturalize command over large areas
...
This change fixes the block count report, and also makes
naturalize act more like a "//replace dirt grass" where
we only attempt block changes if the block is not already
what we're looking for.
2019-06-11 18:01:45 -04:00
wizjany
f2f9c26602
Expanded the scope of item brushes (/br apply item, /br paint item).
...
They now additionally take a direction in which the simulated item usage
should be facing.
Also allow the item parser to parse "hand" and "offhand" as items, to
allow platforms with NBT item support return items with NBT (since
parsing is a slightly more complex task).
2019-06-09 20:44:30 -04:00
MattBDev
6c94cca15e
Selective upstream merge
...
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
MattBDev
aea5b68ced
Upstream merges and a few code cleanups
2019-05-30 16:07:30 -04:00
Jesse Boyd
6bc5b4a823
.
2019-05-29 06:31:22 +10:00
Matthew Miller
a3ffb91917
Added suggestions to a lot of factory-related commands
2019-05-24 21:31:29 +10:00
Jesse Boyd
c797dcb194
WIP filter patterns
2019-05-12 23:32:04 +10:00
Jesse Boyd
459629a2f2
scanchunk
2019-05-06 15:57:12 +10:00
wizjany
ceff17c4f7
Misc fixes.
...
Closes a few old youtrack issues which I don't remember because I had
like 30 tabs open, and a few other issues which I found while testing
some of those.
2019-05-05 15:15:03 -04:00
Kenzie Togami
23279c007e
Fix intialization, rework registration
2019-04-26 01:38:06 -07:00
Kenzie Togami
7ff537138a
Merge master again
2019-04-26 01:25:42 -07:00
Kenzie Togami
b8c120e0c4
Finish porting commands
2019-04-26 01:18:02 -07:00
wizjany
648ecf2153
Add entity, biome, and mask flags to clipboard brush.
2019-04-26 16:41:39 +10:00
wizjany
f0587354be
Cleanup, make copy/paste flags consistent, add status messages.
2019-04-26 16:41:39 +10:00
wizjany
af1af43ac1
Allow copy/pasting biomes.
...
Copy takes a -b flag to copy biomes.
Paste takes a -b flag to paste biomes (if available).
This allows flexibility to create/load schematics with/without biomes
(when schematic biome support is added).
Also added a -m mask flag to paste to set a source mask, and a -e flag
to skip pasting entities if they are loaded.
2019-04-26 16:41:39 +10:00
wizjany
526b3366b5
Add more schematic compat, cleanup.
2019-04-26 16:41:39 +10:00
Kenzie Togami
56ef786415
Don't touch the Direction tag, as possibly only Facing changed.
2019-04-26 16:41:39 +10:00
Brokkonaut
6415d0d964
Fix typo
2019-04-23 18:24:32 -07:00
Jesse Boyd
a4f63ec6f0
Check type, not state
2019-04-14 12:16:15 +10:00
Jesse Boyd
110f782a5c
Optimize entity get (lazy nbt)
2019-04-14 00:00:38 +10:00
Jesse Boyd
6996a97027
various minor
...
CFI works without PlotSquared
tab completion
biome tweaks
WIP on anvil
document disallowed-blocks in legacy config
2019-04-11 21:32:32 +10:00
Jesse Boyd
21be61f03a
fix block mask inverse
2019-04-11 03:25:19 +10:00
Jesse Boyd
31ac2b69d1
Fix block rotation
2019-04-07 17:41:26 +10:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType
2019-04-06 03:34:11 +11:00
Jesse Boyd
99db2d557a
optimize repeating extent pattern
2019-04-06 01:05:48 +11:00
Jesse Boyd
be5541b61b
revert some changes
2019-04-05 15:48:41 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +11:00
Jesse Boyd
33f5322fda
WIP merge (i'll finish this later)
2019-04-05 01:24:47 +11:00
Jesse Boyd
4de5487c51
Change Vector hash codes ( #456 )
...
And add additional unit vectors where needed.
2019-04-04 08:36:19 -04:00
Jesse Boyd
8897109dc4
wip upstream merge
2019-04-04 00:25:16 +11:00
Jesse Boyd
7086eb8b3e
continue with merge
2019-04-03 22:28:57 +11:00
Jesse Boyd
4cd8d08134
merge with upstream (broken)
2019-04-03 16:53:58 +11:00
Jesse Boyd
f361619037
Merge remote-tracking branch 'upstream/master' into breaking
2019-04-03 16:53:34 +11:00
matt
122236f6c7
Too lazy to write a commit message
2019-04-02 23:36:32 -04:00
Jesse Boyd
c820406e8c
Fix binding order
2019-04-01 23:55:15 +11:00
Jesse Boyd
64a134a9ee
Merge remote-tracking branch 'refs/remotes/origin/master' into new-vector-system
...
# Conflicts:
# build.gradle
# worldedit-core/build.gradle
# worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
2019-04-01 23:50:16 +11:00
Jesse Boyd
92a7bd5e44
minor tweak for mutable vectors
2019-04-01 03:09:20 +11:00
wizjany
4e66b9a336
Revert 6b3426e1
.
...
Empty base blocks are always immutable. Fuzzy states don't have NBT.
2019-03-30 00:41:47 -04:00
matt
699783ba72
Another selective merge
2019-03-28 15:02:37 -04:00
matt
acc8eb0a99
Lambda's and References and Cleanups! Oh My!
2019-03-27 12:17:05 -04:00
wizjany
6b3426e1de
BaseBlock is technically mutable so that technically shouldn't use it.
2019-03-26 18:14:35 -04:00
wizjany
2a194b0434
Add pattern that randomly chooses states.
...
Also works with fuzzy states.
Syntax is `*type`, e.g. `//set *stone_slab` or with states,
`//set *oak_fence[waterlogged=false]`
2019-03-26 18:11:32 -04:00
matt
9fcf805148
Pattern doesn't need to be deprecated
2019-03-26 16:35:22 -04:00
matt
85bfd16d7c
Code cleaning
...
Most notable change: Remove redundant type parameters and replaced with <>. This is a small step to bring us closer to upstream parity.
2019-03-25 19:55:32 -04:00
IronApollo
3236bdd78e
Changes to NBT-handling in operations and extents, changes to match the widely supported setBlock functionality, minor code cleanup
2019-03-25 13:42:11 -04:00
wizjany
9b473cecbd
Fixes and changes to forest/forestgen.
...
* Sync up implementations of the two commands.
* Fix generating trees in spots with replaceable blocks.
* Make message when you mistype tree-type arg more correct.
Fixes WORLDEDIT-3869.
2019-03-20 21:05:11 -04:00
wizjany
de08c8b8c7
Add better control over expression timeouts. ( #451 )
...
Add better control over expression timeouts.
* //timeout command can be used to change player's current timeout.
* Config now also has a max timeout, can be bypassed with permission
* Timeout of < 0 will let expressions run indefinitely.
* Said expressions won't run on a separate thread, slightly reducing the
overhead from context switching. For large //gen commands, for example,
this can actually increase speed.
2019-03-06 19:58:32 -05:00
wizjany
e53962dadd
Apply source function after source mask in ForwardExtentCopy.
...
The source function should only get applied to actually copied blocks.
2019-03-01 21:15:21 -05:00
wizjany
0656ef1920
Fix LayerVisitor stopping early instead of skipping covered columns.
2019-03-01 19:25:10 -05:00
Matthew Miller
1b101740fe
Use a proper registry for biomes
2019-02-16 17:27:00 +10:00
wizjany
88014b18a3
Added a few new things using block states.
...
* `//set ##*tag` sets all states in the tag (not just default state per type)
* `//set ^type` is a pattern changing block type but copying all valid existing states
* `//set ^[prop=val,...]` sets the property `prop` to `val` wherever the existing block has that property
* `//set ^type[prop=val,...]` does both of the above
Those work anywhere a pattern is taken, of course.
* The mask syntax `^[prop=val]` matches blocks with the property `prop` set to `val`, or blocks that don't have the property at all.
* The mask syntax `^=[prop=val]` only matches blocks that have the property.
Those work anywhere a mask is taken, of course. (`//mask`, `//gmask`, `//replace`, etc)
The `//drain` command now takes `-w` flag that removes the waterlogged state from blocks (in addition to removing water, as before).
2019-02-14 17:21:01 -05:00
wizjany
19796aa3be
Added offset to ClipboardPattern.
...
Takes input like '//set #clipboard@-1,0,1' which shifts the pattern over.
It also now extends RepeatingExtentPattern, which was previously unused.
2019-02-12 17:11:57 -05:00
IronApollo
511c279153
Fixed issues regarding block transformations and using the BaseBlock to apply a function.
2019-02-07 09:04:14 -05:00
Kenzie Togami
590b7e23a9
Remove all raw usages of BSH, improve API generics
2019-02-03 05:01:39 -05:00
IronApollo
e53535319d
Plenty of changes to core block behavior to become more compatible with upstream WorldEdit (still more to be done!)
2019-01-31 10:08:58 -05:00
Cygaan
6046fa1cec
Only copy entities from within the region
2019-01-28 17:36:39 +01:00
Cygaan
d48ea909b5
Actually filter out players, not everything else
2019-01-28 17:31:29 +01:00
IronApollo
271b45f3ba
Final changes for the Vector update (probable fix for the "copying player entity" bug)
2019-01-17 05:23:47 -05:00
IronApollo
f74381b93f
Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system
2019-01-13 02:00:14 -05:00
Matthew Miller
628c9cc0b7
Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
2019-01-10 09:54:21 -05:00
Kenzie Togami
4d6045813c
Move vectors to static creators, for caching
2019-01-10 07:17:04 -05:00
Byron Marohn
ab6aed703d
Merge current FAWE master ( 227d6d91
) into new-vector-system
...
Signed-off-by: Byron Marohn <combustible@live.com>
2019-01-09 22:35:26 -08:00
IronApollo
a9919d130c
Current progress #4
2019-01-09 03:32:38 -05:00
IronApollo
842b1307c7
Current Progress #3
2019-01-09 02:13:44 -05:00
Kenzie Togami
3fefcbf971
Remove all raw usages of BSH, improve API generics
2018-12-26 16:39:10 -08:00