Commit Graph

38 Commits

Author SHA1 Message Date
4cd8d08134 merge with upstream (broken) 2019-04-03 16:53:58 +11:00
f361619037 Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
c820406e8c Fix binding order 2019-04-01 23:55:15 +11:00
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
92a7bd5e44 minor tweak for mutable vectors 2019-04-01 03:09:20 +11: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
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
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
6046fa1cec Only copy entities from within the region 2019-01-28 17:36:39 +01:00
d48ea909b5 Actually filter out players, not everything else 2019-01-28 17:31:29 +01: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
a9919d130c Current progress #4 2019-01-09 03:32:38 -05: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
cf96c478be change entity list to ignore player when pasting 2018-12-22 00:46:05 +01: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
2c8b2fe089 Move vectors to static creators, for caching 2018-11-03 23:00:24 -07:00
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
ff391ca0b3 Update licenses 2018-10-10 11:38:23 -07:00
e059490cd1 Rework block-batching, create draft of chunk batching 2018-10-10 11:38:23 -07:00
177bfaa930 Rename setCopyEntities to setCopyingEntities 2018-08-17 18:33:37 +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
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
1480606b52 Fixed a few more issues found looking over the changeset. 2018-08-04 11:43:42 +10:00
521238b4eb Fixed a few clipboard related issues. 2018-08-04 11:43:41 +10:00
663dd1f4d8 Added an entity, weathertype, and gamemode registry. 2018-08-04 11:43:41 +10:00
a48c319e7e package move 2018-08-04 11:43:40 +10:00
484687a49d Further work on BlockState transition 2018-08-04 11:43:39 +10:00
aaaf2d5678 More deprecation removal 2018-08-04 11:43:38 +10:00
6a8ff1f4fe Fix entities double transformation
tested with commands stack,copy,rotate,paste
1. //stack 3 up (checked field "repetitions")
2. //copy -e //rotate 45 //rotate 45 //paste (checked transformation)
2018-05-19 20:07:32 +03:00
50f60da69f Prevent players and complex parts being pasted in schematics. 2018-01-02 20:49:36 +10:00
41de204186 Allow copyEntities to be used in ForwardExtentCopy again.
The -e flag should now work for //copy and //cut as it used to.

Fixes WORLDEDIT-3557.
2017-03-19 11:56:04 -04:00
fdfc3cdb33 Reorganize and further unify the new commands. 2015-10-29 13:05:04 -07:00
7192780251 Switch to Gradle. Use git log --follow for history.
This converts the project into a multi-module Gradle build.

By default, Git does not show history past a rename, so use git log
--follow to see further history.
2014-11-14 11:27:39 -08:00