Commit Graph

68 Commits

Author SHA1 Message Date
92a7bd5e44 minor tweak for mutable vectors 2019-04-01 03:09:20 +11:00
699783ba72 Another selective merge 2019-03-28 15:02:37 -04:00
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
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
44bfc2f753 Fixes #17, and an annoying typo in SnipeData :) 2019-03-21 07:20:47 +01:00
0fa9d7a4a7 Changes to EditSession to improve upstream compatibility 2019-02-27 09:01:07 -05:00
3ffb5ff00d Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing 2019-02-27 08:09:04 -05:00
511c279153 Fixed issues regarding block transformations and using the BaseBlock to apply a function. 2019-02-07 09:04:14 -05:00
0e5847e1ce Various fixes 2019-02-03 09:22:10 -05:00
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -05:00
d5e4c76bfe Allow a pattern for the leave-id of //move 2019-02-03 02:47:32 -05:00
d80ac24c63 Pass the exception converter through more. 2019-02-02 11:36:55 -05:00
e88b8c961d Added "fast mode corrections" 2019-02-02 09:21:16 -05:00
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
f74381b93f Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system 2019-01-13 02:00:14 -05:00
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
4d6045813c Move vectors to static creators, for caching 2019-01-10 07:17:04 -05:00
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
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
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
7cf7c0712f fix fixwater/lava + tile paste 2018-10-13 19:50:13 +11:00
1a12c065a1 Various minor fixes
Fix drain
Fix some messages lacking prefix
Fix non persistent brushes
2018-10-13 15:15:38 +11:00
cfbf7dbec0 Update from sk89q/master 2018-09-25 15:35:21 +10:00
8ed67f66ad Merge boy0001/FastAsyncWorldEdit 2018-09-14 02:42:55 +10:00
82ede1d42b freebuild region restrictions 2018-09-05 05:10:15 +10:00
b24d322d29 Update from sk89q/master 2018-09-03 00:10:38 +10:00
8bfbc55c71 Enable experimental //walls for non-cuboid regions. 2018-08-30 16:42:50 +10:00
c55353e5b1 Various command (use es6 if java9 + nashorn) 2018-08-22 03:22:37 +10:00
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
43d5459595 Fix __reserved__ being solid 2018-08-17 19:21:45 +10:00
177bfaa930 Rename setCopyEntities to setCopyingEntities 2018-08-17 18:33:37 +10:00
36ede1b27d Fixes boy0001/FastAsyncWorldedit#1078 2018-08-17 18:27:48 +10:00
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
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
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
131fd39f63 Various minor
Add entity registry
Re-add AbstractLoggingExtent
Fill in missing nbt on entity load
2018-08-14 19:24:10 +10:00
e7c27b08bf Remove stub injector methods 2018-08-13 02:36:39 +10:00
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
f96487a2d1 Use BlockStateHolder for setBlocks 2018-08-10 20:36:00 +10:00
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
5f4cc3e694 Cleanup a little bit more code. 2018-08-06 19:08:15 +10:00
2f3bc59e1b Fixed //move 2018-08-04 11:43:42 +10:00
1480606b52 Fixed a few more issues found looking over the changeset. 2018-08-04 11:43:42 +10:00
db21f51a18 Fixed up data cycler command, and the fixwater & fixlava commands. 2018-08-04 11:43:41 +10:00
a48c319e7e package move 2018-08-04 11:43:40 +10:00
efa09001c2 Remove the 'natural only' smooth brush feature due to inaccuracies. 2018-08-04 11:43:40 +10:00
57c13ef8f4 Continue moving out of legacy BlockType 2018-08-04 11:43:40 +10:00
11f5d05e7b Update BlockState to remove legacy ID usage. 2018-08-04 11:43:40 +10:00
93b225ca3c Expose a way of switching between ItemType and BlockType for ItemBlocks. 2018-08-04 11:43:39 +10:00