MattBDev
14ed3f1d9c
Remove FawePlayer and API modifications
2019-09-13 23:05:16 -04:00
MattBDev
c20f4c6b7f
Fixed a null pointer. Merged in a bunch of CLI stuff.
2019-09-02 15:22:43 -04:00
Jesse Boyd
d434dfcfdd
some minor refactoring
2019-08-18 02:09:09 +01:00
Kenzie Togami
33633acbe7
Add validator extent to every entry point, fix extent ordering
2019-08-12 10:04:29 -07:00
Jesse Boyd
3c626ef25a
Differentiate passthrough / abstract delegate
...
AbstractDelegateExtent allows overriding just the basic set/get to change behavior - at performance cost
Passthrough passes all operation, so each must be individually overrided.
2019-08-07 06:38:25 +10:00
Jesse Boyd
92fb90de09
Fix some arguments
2019-08-07 06:18:44 +10:00
Jesse Boyd
4c2b753687
merge
2019-08-07 01:32:05 +10:00
Jesse Boyd
a3c58a187e
merge
2019-08-07 01:29:09 +10:00
wizjany
e25a6d21cd
Add -e/-b/-m flags to //stack and //move, to match copy and paste.
...
Fixes WORLDEDIT-3935.
2019-08-05 22:47:57 -04:00
wizjany
a1465c02ed
Make EditSession#center (//center) set even y blocks.
...
At some point this was fixed for x and z but never for y...
2019-08-05 22:44:51 -04:00
MattBDev
198427dc3d
fix more compile errors
2019-07-29 21:05:31 -04:00
MattBDev
12114ec987
Minor changes
2019-07-29 11:19:38 -04:00
wizjany
6631b6bdf0
Make BlockStateHolder extend Pattern.
...
Removes the need for wrapping them in BlockPattern.
2019-07-28 18:20:00 -04:00
MattBDev
46f5b12b36
Convert tabs to whitespace.
2019-07-22 16:42:40 -04:00
Jesse Boyd
0a924915c8
shift extent queue methods
2019-07-19 02:07:31 +10:00
Jesse Boyd
22a7ad7503
optimized biome streaming to schematics
2019-07-18 22:36:50 +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
905fbf5a0b
8108d0a9
2019-07-18 02:31:13 +10:00
Jesse Boyd
68ea3d6e99
revert some changes
2019-07-17 20:50:54 +10:00
MattBDev
8108d0a936
Major command changes that don't work yet.
2019-07-16 23:44:34 -04:00
MattBDev
ffc2092d93
toggles and timeouts
2019-06-30 14:56:32 -04:00
wizjany
625cbe5e3d
Make //count take a mask. Also doc updates, perm fixes.
2019-06-30 00:38:17 -04:00
MattBDev
51b1b4262d
Revert removal of world field.
...
This is needed. It shouldn't have been removed because it's nothing new.
2019-06-28 18:03:01 -04:00
Jesse Boyd
c5b90ba954
use cached maxY
2019-06-29 04:53:44 +10:00
Jesse Boyd
a2efdbc488
a1c15e1c39
2019-06-29 03:10:47 +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
a1c15e1c39
Many upstream changes. Should be non-breaking
2019-06-25 09:00:44 -04:00
MattBDev
57f992a524
Remove nullblock from EditSession
2019-06-23 14:05:14 -04:00
MattBDev
9d1117303c
Removed a stupid worldname method.
2019-06-18 23:43:06 -04:00
wizjany
6f7927bc5a
Skip poi folders for snapshot restores.
...
New to 1.14, Mojang stores .mca files which don't contain chunks in the
poi folder.
Note: we explicitly filter *out* the poi folder, instead of filtering
*to* the regions folder, since old versions of minecraft had regions
directly in the world folder (instead of a regions subfolder).
2019-06-12 21:51:22 -04:00
MattBDev
1f14d4652e
Upstream changes, prefix changes, formatting changes, variable name changes
...
I think that draining waterlogged items also works now?
2019-06-12 17:13:53 -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
IronApollo
e2c2205dac
Hollow fix
2019-06-08 14:48:30 -04:00
MattBDev
7f3c4c4828
A lot of removals, upstream merges, and maybe more.
2019-06-07 20:58:48 -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
NotMyFault
686c71d965
Move around some debugs
2019-04-27 20:34:56 +02:00
Kenzie Togami
9b0fda9f83
Port utility commands
2019-04-25 19:36:22 -07:00
Kenzie Togami
8c2b725f42
Port toll / tool util commands, add more enums
2019-04-25 12:49:03 -07:00
Jesse Boyd
c6ce0c773f
Fixes #30
2019-04-23 23:49:45 +10:00
Jesse Boyd
274c52163b
Fix setting the same block multiple times sequencially
2019-04-17 01:12:09 +10:00
Jesse Boyd
a831ae17b7
Merge pull request #110 from Mgazul/breaking
...
Fix fixLiquid
2019-04-12 00:55:59 +10:00
Jesse Boyd
31797d4231
WIP on 1.13 CFI
2019-04-10 18:32:21 +10:00
Mgazul
652f27c853
Fix fixLiquid
2019-04-09 11:29:43 +08:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType
2019-04-06 03:34:11 +11:00
Jesse Boyd
9e2832c273
Use BlockVectorSet
2019-04-06 01:01:05 +11:00
Jesse Boyd
2143b9b5b7
finish block registry
2019-04-05 17:51:42 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +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
7086eb8b3e
continue with merge
2019-04-03 22:28:57 +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
matt
29692f3fbe
Migrate to SLF4J
2019-04-02 18:21:02 -04:00
matt
86ce762982
Minor performance tweaks and cleaning of metrics
...
Why were metrics so messed up in the first place?
2019-04-01 20:42:10 -04:00
Jesse Boyd
92a7bd5e44
minor tweak for mutable vectors
2019-04-01 03:09:20 +11:00
matt
699783ba72
Another selective merge
2019-03-28 15:02:37 -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
Sauilitired
44bfc2f753
Fixes #17 , and an annoying typo in SnipeData :)
2019-03-21 07:20:47 +01: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
Kenzie Togami
d6804737cf
Switch to SLF4J logging.
2019-03-13 19:51:48 -07: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
c3ee926a2e
Correctness improvement for legacy data in expression generation.
2019-03-02 11:55:03 -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
IronApollo
0fa9d7a4a7
Changes to EditSession to improve upstream compatibility
2019-02-27 09:01:07 -05:00
IronApollo
3ffb5ff00d
Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing
2019-02-27 08:09:04 -05:00
wizjany
243d6476ac
Re-add smooth filtering via a mask.
...
Instead of trying to maintain a list of "natural terrain blocks", just
let the user specify a mask of blocks to use for the height map filter.
https://gfycat.com/severaljauntycondor
2019-02-26 23:54:53 -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
IronApollo
511c279153
Fixed issues regarding block transformations and using the BaseBlock to apply a function.
2019-02-07 09:04:14 -05:00
IronApollo
0e5847e1ce
Various fixes
2019-02-03 09:22:10 -05:00
Kenzie Togami
590b7e23a9
Remove all raw usages of BSH, improve API generics
2019-02-03 05:01:39 -05:00
Matthew Miller
d5e4c76bfe
Allow a pattern for the leave-id of //move
2019-02-03 02:47:32 -05:00
Matthew Miller
d80ac24c63
Pass the exception converter through more.
2019-02-02 11:36:55 -05:00
Matthew Miller
e88b8c961d
Added "fast mode corrections"
2019-02-02 09:21:16 -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
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
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
IronApollo
d4157b7e0e
Current progress with update
2018-12-23 11:19:33 -05:00
Matthew Miller
d6977aeae4
Allow a pattern for the leave-id of //move
2018-12-22 17:26:02 +10:00
Byron Marohn
c0fa1602ad
Restore the formatting of many things to upstream WorldEdit - no code changes
...
This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.
This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b
) into this codebase.
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-20 11:33:56 -08:00
Matthew Miller
6f3016c7f0
Fixed up the commitRequired checks.
2018-12-09 16:28:01 +10:00
Matthew Miller
5f2c77b719
Further work on this. Currently fast mode breaks doors, gotta work out why applying physics to doors breaks them.
2018-12-09 16:28:01 +10:00
Matthew Miller
618cbd2250
Few small fixes
2018-12-09 16:28:01 +10:00
Matthew Miller
59f9864ba3
Set fast to the default
2018-12-09 16:28:01 +10:00
Matthew Miller
7f11b2800d
Added an option to switch reorder modes
2018-12-09 16:28:01 +10:00
Matthew Miller
b3f5bc030e
Few fixes for FastModeExtent.
2018-12-09 16:28:01 +10:00
Matthew Miller
7d468357e3
Added "fast mode corrections"
2018-12-09 16:27:02 +10:00
Matthew Miller
4e4ed6c893
Fixed missing BaseBlock import
2018-11-04 17:27:36 +10:00
Matthew Miller
53bc730909
Merge pull request #435 from sk89q/feature/trace-unflushed-sessions
...
Add tracing for unflushed EditSessions
2018-11-04 17:21:25 +10:00
Kenzie Togami
2c8b2fe089
Move vectors to static creators, for caching
2018-11-03 23:00:24 -07:00
Kenzie Togami
399e0ad5fa
Refactor vector system to be cleaner
...
- Move Vector, etc. into `.math` package
- Drop many methods that will be auto-promoted anyways, eg. with
`divide(int)` and `divide(double)` the first is now gone.
- Take Block vectors into their own class hierarchy
- Make it clear throughout the API what takes blockvectors
- many more improvements
2018-11-03 23:00:23 -07:00
Kenzie Togami
e202348dac
Simplify commit-required detection
2018-11-03 22:22:43 -07:00
Kenzie Togami
e1fbaaff59
Add tracing for unflushed EditSessions
2018-10-30 18:39:51 -07:00
Kenzie Togami
d1312c66e1
Ensure we flush iff it is needed
2018-10-20 19:54:13 -07:00
Kenzie Togami
a3f1c71d97
Make EditSession closeable for easy flushing
2018-10-20 19:50:35 -07:00
Kenzie Togami
1fa1ff895b
Flush or disable buffers in tools
2018-10-20 19:47:17 -07:00
Matthew Miller
dd2fcbac23
Merge pull request #430 from sk89q/feature/chunk-batching-mode
...
Chunk Batching
2018-10-15 13:50:10 +10:00
Jesse Boyd
7cf7c0712f
fix fixwater/lava + tile paste
2018-10-13 19:50:13 +11:00
Jesse Boyd
1a12c065a1
Various minor fixes
...
Fix drain
Fix some messages lacking prefix
Fix non persistent brushes
2018-10-13 15:15:38 +11:00
Matthew Miller
0a149a796f
Make distr operation based
2018-10-12 15:28:40 +10:00
Kenzie Togami
2824a92c19
Fix some minor ordering bugs
2018-10-10 12:23:00 -07:00
Kenzie Togami
7d4906cfe9
Add chunk batching flag, enable by default
2018-10-10 11:38:23 -07:00
Jesse Boyd
cfbf7dbec0
Update from sk89q/master
2018-09-25 15:35:21 +10:00
Jesse Boyd
8ed67f66ad
Merge boy0001/FastAsyncWorldEdit
2018-09-14 02:42:55 +10:00
Jesse Boyd
82ede1d42b
freebuild region restrictions
2018-09-05 05:10:15 +10:00
Jesse Boyd
b24d322d29
Update from sk89q/master
2018-09-03 00:10:38 +10:00
Matthew Miller
8bfbc55c71
Enable experimental //walls for non-cuboid regions.
2018-08-30 16:42:50 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn)
2018-08-22 03:22:37 +10:00
Matthew Miller
69ab1781c6
Replace FuzzyBlockMask with BlockMask, and added BlockTypeMask as a more performant mask for just block types.
2018-08-20 15:57:42 +10:00
Jesse Boyd
43d5459595
Fix __reserved__ being solid
2018-08-17 19:21:45 +10:00
Jesse Boyd
177bfaa930
Rename setCopyEntities to setCopyingEntities
2018-08-17 18:33:37 +10:00
Jesse Boyd
36ede1b27d
Fixes boy0001/FastAsyncWorldedit#1078
2018-08-17 18:27:48 +10:00
Jesse Boyd
4ffb9bce6c
Various minor
...
Fix image brush
Fix some java 9 issues
Fix metrics being disabled
Fix compile: duplicate method in SimpleBlockMaterial
Load as both FastAsyncWorldEdit and WorldEdit
2018-08-16 23:21:39 +10:00
Jesse Boyd
6ebdc00fba
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
# worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java
# worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughBlockMaterial.java
2018-08-16 20:06:27 +10:00
Matthew Miller
bc5609114b
Add a material to check if air is air, because there are now 3 types of air.
2018-08-16 15:42:11 +10:00
Jesse Boyd
131fd39f63
Various minor
...
Add entity registry
Re-add AbstractLoggingExtent
Fill in missing nbt on entity load
2018-08-14 19:24:10 +10:00
Jesse Boyd
e7c27b08bf
Remove stub injector methods
2018-08-13 02:36:39 +10:00
Jesse Boyd
a629d15c74
Copy paste/merge FAWE classes to this WorldEdit fork
...
- so certain people can look at the diff and complain about my sloppy code :(
Signed-off-by: Jesse Boyd <jessepaleg@gmail.com>
2018-08-13 00:03:07 +10:00
Matthew Miller
f96487a2d1
Use BlockStateHolder for setBlocks
2018-08-10 20:36:00 +10:00
Matthew Miller
f54d6afb65
Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
2018-08-10 20:29:06 +10:00
Matthew Miller
5f4cc3e694
Cleanup a little bit more code.
2018-08-06 19:08:15 +10:00
Matthew Miller
2f3bc59e1b
Fixed //move
2018-08-04 11:43:42 +10:00
Matthew Miller
1480606b52
Fixed a few more issues found looking over the changeset.
2018-08-04 11:43:42 +10:00
Matthew Miller
db21f51a18
Fixed up data cycler command, and the fixwater & fixlava commands.
2018-08-04 11:43:41 +10:00
kashike
a48c319e7e
package move
2018-08-04 11:43:40 +10:00
Matthew Miller
efa09001c2
Remove the 'natural only' smooth brush feature due to inaccuracies.
2018-08-04 11:43:40 +10:00
Matthew Miller
57c13ef8f4
Continue moving out of legacy BlockType
2018-08-04 11:43:40 +10:00
Matthew Miller
11f5d05e7b
Update BlockState to remove legacy ID usage.
2018-08-04 11:43:40 +10:00
Matthew Miller
93b225ca3c
Expose a way of switching between ItemType and BlockType for ItemBlocks.
2018-08-04 11:43:39 +10:00
Matthew Miller
b06937d1c8
Setup a legacy mapper system. The file does not exist yet.
2018-08-04 11:43:39 +10:00
Matthew Miller
66d70f00e7
Removed more deprecated code
2018-08-04 11:43:39 +10:00
Matthew Miller
416480c16d
Separated out fluids and blocks - they're different now
2018-08-04 11:43:39 +10:00
Matthew Miller
70aceb3837
Use default state a bit more.
2018-08-04 11:43:39 +10:00
Matthew Miller
282eca7663
Added a category system and refactored registries
2018-08-04 11:43:39 +10:00
Matthew Miller
484687a49d
Further work on BlockState transition
2018-08-04 11:43:39 +10:00
Matthew Miller
e99190225e
Further BaseBlock modernisation
2018-08-04 11:43:39 +10:00
Matthew Miller
c43109bde5
Start work on the new BaseBlock/BlockState split
2018-08-04 11:43:39 +10:00
Matthew Miller
aaaf2d5678
More deprecation removal
2018-08-04 11:43:38 +10:00
Matthew Miller
20bf6e079b
Continue the great purge
2018-08-04 11:43:38 +10:00
Matthew Miller
c537a2e948
Remove a tonne of code from WorldEdit. This breaks backwards compatibility. More will be removed. Sorry :)
2018-08-04 11:43:38 +10:00
Matthew Miller
41a80064f5
I guarantee this is broken. Start some form of string ID for blocks
2018-08-04 11:43:14 +10:00
Brokkonaut
701d80c757
LEAVES2 should have snow on it too
2018-03-25 08:38:47 +02:00
SlimSoftware
099987d439
Fix //snow didn't put snow on all types of leaves
...
For example, //snow didn't work on Oak leaves while it did work as you would expect on Dark Oak leaves. Fixed by adding leaves2 to translucent block list and checking if the block to put snow on is a leaf block when executing //snow.
2017-12-14 21:00:38 +01:00