Commit Graph

548 Commits

Author SHA1 Message Date
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 8aef06b29e *
haven't done one of these in a while
*continuing with merge in previous commit
2019-04-03 17:00:59 +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 3419bb6f30 Fixed stats issue. 2019-04-01 22:09:59 -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 f87e31683e don't use origin as the region bounds 2019-04-02 00:19:32 +11:00
Jesse Boyd c9f1fed282 Fixes #88 2019-04-02 00:08:56 +11: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 bf53194650 Again #47 2019-04-01 21:41:44 +11:00
Jesse Boyd ff67f6343f Binding improvements
WIP towards deprecating parsers and unifying the command bindings
Allow registering dynamic bindings
- Supports nesting bindings
2019-04-01 21:35:55 +11:00
Jesse Boyd 6e6a3f9035 Fix plotsquared schematic hook 2019-04-01 21:30:21 +11:00
Jesse Boyd 49e3102779 Fix lazy nbt reading for int/long arrays 2019-04-01 21:29:41 +11:00
Jesse Boyd 8afd96f03b Fixes #87 oops 2019-04-01 18:48:14 +11:00
Jesse Boyd 603df92f79 Merge pull request #34 from Cygaan/master
Fix copying entities
2019-04-01 13:42:59 +11:00
Jesse Boyd a44c38c170 Merge pull request #40 from Combustible/sponge_schematic_tweak
Fix sponge schematics not correctly setting dimensions if there are no entities
2019-04-01 13:42:47 +11:00
Jesse Boyd 49b2df1f2e remove redundant methods 2019-04-01 05:06:03 +11:00
Jesse Boyd 92a7bd5e44 minor tweak for mutable vectors 2019-04-01 03:09:20 +11:00
Jesse Boyd 7b5230ad08 Fawe shouldn't default to have any dissallowed blocks 2019-03-31 22:36:34 +11:00
wizjany a80420d14b Add biome storage to BlockArrayClipboard. 2019-03-30 00:42:28 -04: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
wizjany 42d0d6e79a Use getTag instead of requireTag in a few places. 2019-03-29 23:44:18 -04:00
matt 7ae8d567f3 Cleaned a class 2019-03-28 20:41:16 -04:00
matt 699783ba72 Another selective merge 2019-03-28 15:02:37 -04:00
wizjany d7d2d03ee8 Clipboard offset pattern is now #copy@[x,y,z].
Since the parsers were changed around, unescaped commas are parsed as
separate blocks now.
2019-03-27 23:36:59 -04:00
matt acc8eb0a99 Lambda's and References and Cleanups! Oh My! 2019-03-27 12:17:05 -04:00
matt 1424998327 Simplified switch statements and minor formatting 2019-03-27 11:36:26 -04:00
NotMyFault 67fd0668ee ocd 2019-03-27 15:40:53 +01:00
NotMyFault 8623dd0009 Fixes #80 2019-03-27 15:38:21 +01:00
matt 712479adbb Reverted incompatible EntityType upstream change 2019-03-27 00:16:54 -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 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
NotMyFault 464719c02a Revert upstream change 2019-03-26 21:00:28 +01:00
matt 3420b8329b Remove most of PseudoRandom, a few minor cleaning changes, and an upstream change 2019-03-26 13:41:09 -04:00
matt 0d88a6bce2 Merging upstream changes 2019-03-26 13:27:09 -04:00
wizjany 8eccdc7444 Add -f flag to //count to allow fuzzy inputs.
Also re-implement //distr -c. And remove outdated help text on //copy.
2019-03-25 22:38:51 -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
Josh Knight 4c3b09895d Merge pull request #76 from IntellectualSites/new-vector-system2
Revert "Make end tag singleton"
2019-03-25 06:09:13 -04:00
NotMyFault 68c8950cdc Add IncendoPaster
Co-Authored-By: Alexander Söderberg <citymonstret@hotmail.com>
2019-03-24 23:02:32 +01:00
NotMyFault a64ff8f299 Make master build (probably) 2019-03-24 20:58:05 +01:00
wizjany 692ba6fda3 Checkstyle. 2019-03-22 14:03:43 -04:00
matt 456f821ce0 Revert "Make end tag singleton"
This reverts commit 13d2ae20
Why was this changed. I doubt it did much in terms of performance. It's better to stay as close as we can to the worldedit repo.
2019-03-22 12:51:44 -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
wizjany 1934006d14 Better enforce the Request lifetime.
Previously, the current request would just get a new EditSession when
one was created. Now, a Request is reset before and after:
 - a command is used and
 - an interact is fired with the platform
This means each action taken will get a single, non-reusable Request.

Note that this only applies to actions taken through the platform.
API users will not be using requests anyway, since things like Masks,
etc. will be constructed directly instead of being passed through the
platform's parsers and so on. (e.g. if a plugin loads a schematic into
the world with a mask, they should create the EditSession and mask it
directly, and not use that Mask again for another EditSession in another
World).

Also, get rid of a bunch of (some now-)unnecessary EditSession creation
during command dispatching.

Note that this also fixed the dynamic selection mask, which apparently
has been broken for some unknown amount of time.
2019-03-20 19:13:54 -04:00