Commit Graph

288 Commits

Author SHA1 Message Date
053b1a20d6 More 1.15 wip 2019-12-11 14:45:27 +01:00
39b60aa742 Fix legacy id conversion 2019-12-09 22:36:52 +01:00
b0208e06cd More updates 2019-12-09 21:59:51 +01:00
1f19b92b0b 1.13? 2019-11-24 00:57:29 +00:00
37b6c406ac reduce diff 2019-11-21 07:57:32 +00:00
144ea2ef34 Lazy tags + get / set tiles
Lazy tags means tiles/ents are not translated into the nms NBTBase until it is needed. Should be faster in cases where getFullBlock is called, but nbt is not always needed.
Commands like Copy and Paste, where the input/output are both nms worlds, can entirely bypass WorldEdit translating to and from the WorldEdit JNBT classes.
2019-11-20 03:40:52 +00:00
60759934a3 Fix some merge issues 2019-11-20 00:11:54 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
1b07846746 some adapter refactoring 2019-11-19 04:40:40 +00:00
601890fe64 Fix biome sending 2019-11-14 19:21:28 +00:00
630245bb9f Attempt to fix compile and other small changes 2019-11-11 16:22:03 -05:00
a23a4e5496 misc changes. 2019-11-11 16:02:28 -05:00
240b2de90c Update to PlotSquared-we branch 2019-11-06 09:29:20 +00:00
930dfb7f7c Various minor
thread local cleans on close
remove unnecessary loop on set
remove unnecessary get on set
clean CFI cache on generate
2019-11-03 16:59:11 +00:00
32d837414b static blocktype initialization
instead of using hacky reflection
2019-11-02 20:35:51 +01:00
df9e9e510a Limit processing 2019-11-02 12:13:42 +01:00
2f3c6769c8 Legacy clipboards 2019-11-02 07:15:56 +01:00
e1b9b9e3e8 Revert "Like this @mattbdev ?"
This reverts commit bddf92cd9b.
2019-10-31 00:41:36 +01:00
ef47ea74df Revert "Or this?"
This reverts commit 558144696a.
2019-10-31 00:41:15 +01:00
558144696a Or this? 2019-10-30 20:03:38 +01:00
bddf92cd9b Like this @mattbdev ? 2019-10-30 20:01:18 +01:00
72951cdf23 Various
fake chunk packet
aliases
cfi wip
2019-10-30 12:26:52 +01:00
8356004ec9 chunk sending / cfi 2019-10-26 14:21:49 +01:00
2080e9786b commanding-pipeline diff 2019-10-23 05:23:52 +01:00
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
51a5c22677 I hope these are the last few errors 2019-10-03 20:37:19 -04:00
8b96cdc9a5 *
A tribute to Jesse
2019-09-20 21:52:35 -04:00
c926cddbd6 Item Registry Test is now functional 2019-09-19 14:56:03 -04:00
16e24a2400 Created an Item Registry Test (non-functional) 2019-09-19 11:30:22 -04:00
3bcfcd3008 Fixed bug with wands and updated tests 2019-09-18 15:09:04 -04:00
cafb4120ef More upstream compatibility fixes 2019-09-03 15:21:53 -04:00
06a92d29b1 Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding
# Conflicts:
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
#	worldedit-libs/core/build.gradle.kts
2019-09-02 15:24:53 -04:00
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
68eea925e1 update adapter and platform manager 2019-08-29 13:57:03 +01:00
edb626a961 merge 2019-08-26 05:49:00 +01:00
4e49d16505 fix dependencies 2019-08-26 05:45:03 +01:00
0620478763 feature(cli): Added a CLI version of WorldEdit, and allowed most commands to be run from console (#508)
* Re-do commits to avoid awful rebase

* You can load and save a schematic file now. Still gotta setup ability to use commands as a console actor.

* Add a world override concept to LocalSession, and allow a lot more commands to be performed by actors.

* Fixed commands, and set the loaded schematic as the world override in CLI

* Properly load tags

* Added 1.14.4 data values

* Allow a majority of commands to be performed by the console.

* Fixed a lot of PR requested changes

* Added a Locatable interface and use that for getting the location of the player in commands.

* Added script support. Currently requires a newline at the end of the script.

* Shade everything to allow this to run locally - should probably minimize this to an extent later.

* Actually hook up the version

* Added a //world command to set the override

* Fixed a missed checkstyle issue

* Added CommandBlock support to Bukkit

* Make command block support configurable

* Minor cleanup and implementing a few of the final functions

* Fixed most issues from PR

* Improve UX, saving is now automatic and unknown command messages show

* Better save docs and support any clipboard format

* Include the entire formats list

* Arrays.copyOf

* Clear the world override if the selector is called on another world.

* Update logging extent to allow basic logging with non-player actors
2019-08-25 19:58:28 +10:00
ae89c16390 merge 2019-08-23 08:36:33 +01:00
135c12b650 More compile fixes 2019-08-22 13:14:27 -04:00
1eec4884c8 Attempt at fixing NamespacedRegistry 2019-08-19 14:12:28 -04:00
d434dfcfdd some minor refactoring 2019-08-18 02:09:09 +01:00
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
f472c20bfb Memory optimizations (#505)
* Remove LocatedBlock overhead in LBL map

* Add new space-efficient block map, with thourough testing

* Drop ordering property, add full insertion test

* Add licenses

* Fix mocked platform conflicts

* Disable full block map testing for faster builds

* Re-implement BlockMap with fastutil maps

* Re-write chunk batching to be memory efficient

* Make MultiStageReorder use BlockMap

* Increase LBL load factor, fix long-pack limit detection

* Fix infinite loop in chunk batching

* Save memory in history by cleaning up MSR

* Re-implement LocatedBlockList in BlockMap

* Fix data race with BlockType lazy fields

* Make IDs ALWAYS present, only runtime-consistent. Use for memory efficiency in BlockMap

* Remap inner structure of BlockMap for smaller maps

* Remove containedBlocks fields, not very efficient

* Fix minor de-optimizing bug in stage reorder

* Make long packed y signed

* Add extended Y limit configuration option

* Add licenses

* Store 3 ints for unoptimized BV list

* Add final to BitMath

* Correct int-cast for long-packing
2019-08-12 22:06:40 +10:00
7a57a5dd8c minor
idk it compiles now
2019-08-10 16:01:42 +10:00
a476ab1ea0 merge 2019-08-07 01:29:49 +10:00
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
df9d766eb3 Merge pull request #513 from EngineHub/bugfix/reloadable-internal-state-ids
Re-load internal state IDs when WORLD_EDITING cap is re-loaded
2019-08-03 09:59:10 -04:00
f848d3114f Re-load internal state IDs when WORLD_EDITING cap is re-loaded 2019-08-02 15:47:29 -07:00
9d9e3ea065 Remove overrides. 2019-07-28 22:50:42 -04:00
6631b6bdf0 Make BlockStateHolder extend Pattern.
Removes the need for wrapping them in BlockPattern.
2019-07-28 18:20:00 -04:00