Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge
2019-11-19 21:23:47 +00:00
Jesse Boyd
dd38cbe750
.
2019-07-18 04:30:02 +10:00
MattBDev
8108d0a936
Major command changes that don't work yet.
2019-07-16 23:44:34 -04:00
Jesse Boyd
f99d6e7478
wip on 1.14
2019-07-09 17:18:51 +10:00
MattBDev
d0a31691e1
Small changes
2019-06-26 20:14:00 -04:00
MattBDev
a69b239848
Upstream
2019-06-25 13:07:47 -04:00
Jesse Boyd
6bc5b4a823
.
2019-05-29 06:31:22 +10:00
Matthew Miller
8ee484fca8
Removed unused classes
2019-05-19 13:34:43 +10:00
Kenzie Togami
13a8c480e3
Insert Locale.ROOT into all case change methods
2019-05-01 15:24:32 -07:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +11:00
Jesse Boyd
f361619037
Merge remote-tracking branch 'upstream/master' into breaking
2019-04-03 16:53:34 +11:00
matt
47e66913e3
Selective upstream merge
2019-04-02 16:26:51 -04:00
wizjany
74bff83e38
Don't let items types be null.
...
Better fail-fast if registry doesn't load? or why-ever else this happens
2019-03-26 22:30:46 -04: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
Kenzie Togami
590b7e23a9
Remove all raw usages of BSH, improve API generics
2019-02-03 05:01:39 -05:00
Matthew Miller
346eee8953
Added the multi-staging from the multipass2 branch
2019-02-02 09:12:30 -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
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
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
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
4e5e9f609e
Added the multi-staging from the multipass2 branch
2018-12-09 16:27:02 +10:00
Jesse Boyd
b24d322d29
Update from sk89q/master
2018-09-03 00:10:38 +10:00
Jesse Boyd
abd886acd7
some hasty refactoring
2018-08-28 02:56:28 +10:00
Matthew Miller
c931095736
Little bit of formatting
2018-08-27 17:24:18 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn)
2018-08-22 03:22:37 +10:00
Jesse Boyd
36ede1b27d
Fixes boy0001/FastAsyncWorldedit#1078
2018-08-17 18:27:48 +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
Jesse Boyd
a67441bbff
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
2018-08-15 14:02:51 +10:00
Matthew Miller
e0e7778536
Fixed some bugs and cleanup some code.
2018-08-13 22:18:12 +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
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
a75d9e896b
Start work on the Sponge schematic format. This should work but it may not, it's untested.
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
965e977411
Fixed a few more errors, and added legacy support to the item parser.
2018-08-04 11:43:41 +10:00
Matthew Miller
9f9fda72b7
Re-add legacy support to block parser, and fix query tool.
2018-08-04 11:43:41 +10:00
Matthew Miller
572bf04482
Cleanup the bukkit implementation, and update to the 1.13 release items/blocks.
2018-08-04 11:43:41 +10:00
kashike
ee6af8ee76
state stuff
2018-08-04 11:43:40 +10:00
kashike
40a665a509
package move
2018-08-04 11:43:40 +10:00
kashike
70208c38fd
category changes
2018-08-04 11:43:40 +10:00
Matthew Miller
e1c2ea3a3b
Update configs, and remove unused BlockData methods.
2018-08-04 11:43:40 +10:00
kashike
a48c319e7e
package move
2018-08-04 11:43:40 +10:00
Matthew Miller
7db443a69a
Migrate the logic for which pass a block goes into. Also updated it and made it use tags where possible.
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
e291cccb94
Move simulateBlockMine up to the platforms.
2018-08-04 11:43:40 +10:00