Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-14 16:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,385 Commits 1 Branch 0 Tags 50 MiB
ef6a5fd442
Commit Graph

1445 Commits

Author SHA1 Message Date
Jesse Boyd
eac1f8f73d
Remove debug (again) 2019-11-11 21:12:32 +00:00
Jesse Boyd
6cbbefc0de
Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline 2019-11-11 21:06:22 +00:00
Jesse Boyd
53ad3d3cd2
Fix schem save order 2019-11-11 21:06:10 +00:00
MattBDev
1ffe05464f Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline 2019-11-11 16:02:41 -05:00
MattBDev
a23a4e5496 misc changes. 2019-11-11 16:02:28 -05:00
Jesse Boyd
032942c0e8
Remove debug 2019-11-11 20:18:22 +00:00
Jesse Boyd
2e6f46e451
Fix QueueHandler uncache 2019-11-11 20:14:57 +00:00
Jesse Boyd
751e6a5dd4
Update SpongeSchematicReader.java 2019-11-11 19:56:55 +00:00
Jesse Boyd
19a7c54341
Fix schem save 2019-11-11 18:48:15 +00:00
Jesse Boyd
7aa0d9c122
Various minor 
Disable P2's we region restrictions (so that it uses FAWE's)
Fix extent binding
Fix filtering on null sections
 2019-11-11 16:49:13 +00:00
Jesse Boyd
9d6f2df908
Fix parsing for injected command types 2019-11-11 08:55:53 +00:00
Jesse Boyd
10a6619853
Update to latest P2 2019-11-10 22:20:46 +00:00
Jesse Boyd
59897dea11
Update MCAFile.java 2019-11-10 14:19:36 +00:00
Jesse Boyd
ac6455db5d
use FaweCache for MCAFile 2019-11-10 11:38:45 +00:00
wizjany
fc5c625f02 Add -n flag to //paste to select without pasting. 2019-11-09 20:58:47 -05:00
wizjany
2b1a7ed943 Make lrbuild tool use history. 2019-11-09 20:58:47 -05:00
wizjany
e5fe051340 Use persistent leaves for garden patch generator (/pumpkins) 2019-11-09 20:58:39 -05:00
wizjany
575463a8e9 Make a few more selection commands usable from console. 2019-11-09 11:31:51 -05:00
Jesse Boyd
d61dac5aa5
Fix CFI generation 2019-11-08 22:30:39 +00:00
Jesse Boyd
26f073faa2
idk what I was doing there 2019-11-08 09:42:07 +00:00
Jesse Boyd
faa63b0c35
CFI changeset 2019-11-08 05:27:04 +00:00
Kenzie Togami
1fbb7a70f9
Merge pull request #527 from EngineHub/feature/extended-expressions 
Expressions Part 1: ANTLR
 2019-11-07 16:23:43 -08:00
Jesse Boyd
82f5c4ebed
Fix compile 2019-11-07 10:28:17 +00:00
Jesse Boyd
5f4af7958f
MCAFile is chunk based extent 2019-11-06 10:38:36 +00:00
Jesse Boyd
54a9e03cd6
Update FaweLocalBlockQueue.java 2019-11-06 09:49:01 +00:00
Jesse Boyd
240b2de90c
Update to PlotSquared-we branch 2019-11-06 09:29:20 +00:00
Jesse Boyd
0bfb1dbdd1
Fix BlockArrayClipboard offset 2019-11-05 15:08:44 +00:00
Jesse Boyd
69b2b4eea8
Update CuboidRegion.java 2019-11-05 08:17:10 +00:00
Jesse Boyd
6142f30715
cache min/max for cuboid region 2019-11-04 20:04:41 +00:00
Jesse Boyd
b224457464
Update DiskOptimizedClipboard.java 2019-11-04 19:29:21 +00:00
Jesse Boyd
1e16095cba
Fix palette / region iteration 2019-11-04 07:47:31 +00:00
Jesse Boyd
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
MattBDev
3212f32b01 Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline 2019-11-02 15:59:57 -04:00
MattBDev
d8d7c8c53f Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline 
 Conflicts:
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java
	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java
	worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
	worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
 2019-11-02 15:58:46 -04:00
Jesse Boyd
e223d17522
Add missing properties 2019-11-02 20:58:12 +01:00
MattBDev
f262271519 Message updates 2019-11-02 15:53:25 -04:00
Jesse Boyd
e20e48f5fb
temporary disable plotsquared hook for schems 2019-11-02 20:44:49 +01:00
Jesse Boyd
32d837414b
static blocktype initialization 
instead of using hacky reflection
 2019-11-02 20:35:51 +01:00
Jesse Boyd
70efdf8c54
Update PlatformCommandManager.java 2019-11-02 19:32:44 +01:00
Jesse Boyd
b97b40e413
various 
use vector.add for compatibility with vs-flattened
flush before remember
share meta objects across players
fix wg compatibility
 2019-11-02 19:31:32 +01:00
Jesse Boyd
b099f177b5
use editsession to regen 2019-11-02 13:51:22 +01:00
Jesse Boyd
2aa7fc543e
fix region processing 2019-11-02 13:12:21 +01:00
Jesse Boyd
6ed7923a1e
Add //cancel 2019-11-02 12:51:24 +01:00
Jesse Boyd
df9e9e510a
Limit processing 2019-11-02 12:13:42 +01:00
Jesse Boyd
0b2bd862a0
Update MCAFile.java 2019-11-02 08:40:11 +01:00
Jesse Boyd
ed7df341b4
Make mca file reusable 2019-11-02 08:07:40 +01:00
Jesse Boyd
2f3c6769c8
Legacy clipboards 2019-11-02 07:15:56 +01:00
Jesse Boyd
c2cb463dae
Fix schem load 2019-11-01 23:48:52 +01:00
Jesse Boyd
09bb9c18ca
Update SchematicCommands.java 2019-11-01 23:22:29 +01:00
Jesse Boyd
1a48546f0c
linear clipboard get block 2019-11-01 23:12:31 +01:00
Jesse Boyd
6de30f8ed4
fix chunk polling 2019-11-01 22:59:10 +01:00
Jesse Boyd
0c1fdcc498
remove broken debug 2019-11-01 22:56:07 +01:00
Jesse Boyd
822bc20c7c
Update ToolUtilCommands.java 2019-11-01 22:40:12 +01:00
Jesse Boyd
23e0b0ef02
Update SpongeSchematicReader.java 2019-11-01 22:26:39 +01:00
Jesse Boyd
88b6d60f8e
schem v2 biomes 2019-11-01 22:09:50 +01:00
Jesse Boyd
49c51e041c
delete writable mca chunk 2019-11-01 19:19:56 +01:00
Jesse Boyd
3e00ce36d2
Add barebones Anvil API 
not anvil commands, just the core of the api
could do with some optimization
 2019-11-01 19:11:05 +01:00
Jesse Boyd
1ad040f7d0
fix compile 2019-11-01 18:36:40 +01:00
Jesse Boyd
f0ab1d5f18
finish overhaul of NBT stream api 2019-11-01 18:29:13 +01:00
Jesse Boyd
9cf02fe654
WIP Anvil API 2019-10-31 21:04:02 +01:00
Jesse Boyd
b533408022
wip clipboard migration 2019-10-31 14:12:23 +01:00
Jesse Boyd
0296d566ed
wip remove faweclipboard 2019-10-31 04:04:15 +01:00
Jesse Boyd
e1b9b9e3e8
Revert "Like this @mattbdev ?" 
This reverts commit bddf92cd9b.
 2019-10-31 00:41:36 +01:00
Jesse Boyd
ef47ea74df
Revert "Or this?" 
This reverts commit 558144696a.
 2019-10-31 00:41:15 +01:00
Jesse Boyd
558144696a
Or this? 2019-10-30 20:03:38 +01:00
Jesse Boyd
bddf92cd9b
Like this @mattbdev ? 2019-10-30 20:01:18 +01:00
Jesse Boyd
50b7b4fb54
fix sp alias conflict 2019-10-30 18:52:55 +01:00
Jesse Boyd
0b39b4a381
wip schem vis 2019-10-30 13:14:15 +01:00
Jesse Boyd
c383fab2c2
cfi packet listener 2019-10-30 12:58:21 +01:00
Jesse Boyd
72951cdf23
Various 
fake chunk packet
aliases
cfi wip
 2019-10-30 12:26:52 +01:00
Pieter12345
bf3b91aaa7
Fix stack command diagonal shifting with -s flag 
Fix `//stack -s [num]` shifting the selection to unexpected places. This fix causes `//stack -s [num]` behavior in diagonal directions to be consistent with the behavior in non-diagonal directions, which means that the last stack will be selected.
 2019-10-28 15:02:24 +01:00
Kenzie Togami
777b132a04
Catch small edge-case in parser 2019-10-27 12:58:32 -07:00
Kenzie Togami
ae71c2a51b
Clean up formatting on ANTLR grammar 2019-10-26 16:51:13 -07:00
Kenzie Togami
fa42e40281
Limit expression thread count to processor count. 2019-10-26 16:44:23 -07:00
Kenzie Togami
b0528f157a
Improve timeout tracking for expressions 2019-10-26 16:18:59 -07:00
Jesse Boyd
8356004ec9
chunk sending / cfi 2019-10-26 14:21:49 +01:00
MattBDev
678a99667d Replaced an empty for loop with a while loop for better readability. 2019-10-25 13:40:56 -04:00
MattBDev
d20b8ddb2a Fixed/Removed some wrong JavaDocs 2019-10-25 13:40:13 -04:00
MattBDev
ca843f1b90 Minor changes for readability 2019-10-23 22:34:44 -04:00
MattBDev
1b28dcda40 Minor changes to match upstream more closely 2019-10-23 14:29:37 -04:00
MattBDev
c050132737 Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline 
 Conflicts:
	worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
 2019-10-23 13:40:45 -04:00
MattBDev
fd408c64ed Selective merge of commanding branch. 2019-10-23 12:58:36 -04:00
Jesse Boyd
938dde68b2
Don't force load 
didn't realize this loads the chunk, I just need to delay unloading until the operation is complete
 2019-10-23 16:44:36 +01:00
Jesse Boyd
a8df8a805f
Update CFICommands.java 2019-10-23 15:58:18 +01:00
Jesse Boyd
e32bc6db4a
Use enum type for scoll actions 2019-10-23 15:44:13 +01:00
Jesse Boyd
8768085479
schem list is still broken 
clickEvent and hoverEvent don't seem to work, I'm probably doing something wrong
 2019-10-23 15:35:04 +01:00
Jesse Boyd
d904270a3d
Update CommandUtil.java 2019-10-23 05:31:26 +01:00
Jesse Boyd
2080e9786b
commanding-pipeline diff 2019-10-23 05:23:52 +01:00
Kenzie Togami
1ba02c54b7
Completely rewrite the expression parser in ANTLR. 2019-10-18 22:27:31 -07:00
Kenzie Togami
9f1e7cdaaf
Small modifications for better visitors 2019-10-13 02:20:10 -07:00
Kenzie Togami
7d52374fc0
Add initial ANTLR setup + lex/parser 2019-10-13 02:02:47 -07:00
Matt
ffbb25f1ea
Fixed snapshot typo 2019-10-11 13:42:07 -04:00
MattBDev
fb91456bdd Some changes to make the diff between 1.14-snapshot and commanding branch smaller. 2019-10-11 10:34:56 -04:00
MattBDev
0d794c1004 Minor annotation change. 2019-10-10 20:30:51 -04:00
MattBDev
c9aa6816df Limit shouldn't ever be null. 2019-10-09 23:01:51 -04:00
MattBDev
7d60053aaf Fixed the mixup of backslash and forward slash 2019-10-09 21:51:37 -04:00
MattBDev
f5ded1e50b New command fix attempt 2019-10-09 21:43:14 -04:00
MattBDev
e0895ef042 New command fix attempt 2019-10-09 21:05:47 -04:00
MattBDev
ccd8f2c2a9 Attempt to fix command execution. 2019-10-09 20:43:28 -04:00
MattBDev
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
MattBDev
67b3fa054a Allow Actors to use generation commands 2019-10-07 15:23:40 -04:00
MattBDev
11d30d2f94 Disabled FAWE commands until the plugin can actually set a block again 2019-10-07 15:09:52 -04:00
Kenzie Togami
0767f56711 Update to Piston 0.5.2 + Doctools/Deprecation improvements (#523) 
* Update to Piston 0.5.2

* [Doctools] Fix output, be verbose about deprecations

* Improve deprecation system, doctools output

(cherry picked from commit 03c0cce53e)
 2019-10-07 12:57:47 -04:00
Kenzie Togami
03c0cce53e Update to Piston 0.5.2 + Doctools/Deprecation improvements (#523) 
* Update to Piston 0.5.2

* [Doctools] Fix output, be verbose about deprecations

* Improve deprecation system, doctools output
 2019-10-05 19:06:18 +10:00
MattBDev
51a5c22677 I hope these are the last few errors 2019-10-03 20:37:19 -04:00
MattBDev
f963e63f58 Attempt to fix compiling 2019-10-03 19:35:55 -04:00
wizjany
91f92a46fe Apply watchdog mode to undo/redo. Abstract EditSession creation logic. 2019-09-30 18:28:13 -04:00
Kenzie Togami
7e3fc6c8e7
Disable watchdog ticking by default, //watchdog to turn on 2019-09-29 22:10:04 -07:00
Kenzie Togami
8af68fc884
Initial watchdog setup. Bukkit needs adapters, everything needs testing. 2019-09-29 22:09:55 -07:00
Kenzie Togami
fa25ad22cd
Harden JsonFileSessionStore against nulls/Gson oddities 2019-09-23 11:46:24 -07:00
Kenzie Togami
1832d08d92
Merge pull request #520 from EngineHub/feature/tool-command 
Add /tool back, deprecate global tool commands
 2019-09-22 13:27:43 -07:00
Kenzie Togami
6162a47002
Force non-Locatable actors to use placeAtPos1 2019-09-21 18:21:22 -07:00
MattBDev
24a147465d Fixed a bunch of extends and removed slottableblockbag 2019-09-21 21:00:45 -04:00
MattBDev
8b96cdc9a5 * 
A tribute to Jesse
 2019-09-20 21:52:35 -04:00
wizjany
44dc926c49 Fix console command usage. 2019-09-19 20:53:47 -04:00
MattBDev
68c8fca672 Fixed PlotSquared compiling issues 2019-09-19 16:43:21 -04:00
MattBDev
c926cddbd6 Item Registry Test is now functional 2019-09-19 14:56:03 -04:00
MattBDev
16e24a2400 Created an Item Registry Test (non-functional) 2019-09-19 11:30:22 -04:00
MattBDev
3bcfcd3008 Fixed bug with wands and updated tests 2019-09-18 15:09:04 -04:00
MattBDev
4357c4b049 Fixed not being able to login. 2019-09-15 12:50:37 -04:00
MattBDev
0bddb565ab Fixed compile issue 2019-09-13 23:19:28 -04:00
MattBDev
14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
Kenzie Togami
ba26d788af
Add /brush none and unbind aliases 2019-09-09 18:13:57 -07:00
Kenzie Togami
0e9fee3b60
Add /tool back, deprecate global tool commands 2019-09-08 17:46:29 -07:00
MattBDev
c65e06cb1b Removed tool command 2019-09-03 15:40:59 -04:00
MattBDev
2548b955ac Remove immutable list from brushes to prevent possible startup issue. 2019-09-03 15:33:07 -04:00
MattBDev
cafb4120ef More upstream compatibility fixes 2019-09-03 15:21:53 -04:00
MattBDev
e88adea066 Added WorldConverter.java 2019-09-03 12:35:22 -04:00
MattBDev
c03015adc8 Temporarily removed the world command 
Issues need to be worked out and investigated.
 2019-09-02 15:41:43 -04:00
MattBDev
46550a076f Possible compile fix 2019-09-02 15:37:01 -04:00
MattBDev
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
MattBDev
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
Matthew Miller
a73a45ce43
Create parser context data for factory converter in non-user-mode 2019-08-31 16:30:51 +10:00
NotMyFault
e8a768f7c8 Fix issue on startup and update outdated links 2019-08-29 15:52:08 +02:00
Jesse Boyd
68eea925e1
update adapter and platform manager 2019-08-29 13:57:03 +01:00
Matthew Miller
44bffc5a86 Use https for the pastebin service 2019-08-27 21:54:53 +10:00
Jesse Boyd
aa4c443358
Revert "Revert 'revert ivy change'" 2019-08-26 06:03:58 +01:00
Jesse Boyd
edb626a961
merge 2019-08-26 05:49:00 +01:00
Jesse Boyd
4e49d16505
fix dependencies 2019-08-26 05:45:03 +01:00
Matthew Miller
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
NotMyFault
c5d3c4dca7 Build "Fawe" and credit Matt ❤️ 
Also update PlotSquared stuff
 2019-08-23 15:48:51 +02:00
Jesse Boyd
ae89c16390
merge 2019-08-23 08:36:33 +01:00
MattBDev
20fff1c668 Commands can't have overlapping aliases 2019-08-22 21:40:22 -04:00
MattBDev
135c12b650 More compile fixes 2019-08-22 13:14:27 -04:00
MattBDev
6998c2d230 fix compile 2019-08-20 16:03:50 -04:00
MattBDev
64a1bfc9b3 migrate to gradle to kotlin 2019-08-20 14:52:24 -04:00
MattBDev
1eec4884c8 Attempt at fixing NamespacedRegistry 2019-08-19 14:12:28 -04:00
MattBDev
f04cae1686 Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 2019-08-18 10:42:37 -04:00
Jesse Boyd
d434dfcfdd
some minor refactoring 2019-08-18 02:09:09 +01:00
Jesse Boyd
21caf0cf94
delete some classes 2019-08-18 01:59:07 +01:00
MattBDev
4db192c9b8 fixes and brush command tweaks 2019-08-17 18:50:06 -04:00
MattBDev
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
Kenzie Togami
33633acbe7
Add validator extent to every entry point, fix extent ordering 2019-08-12 10:04:29 -07:00
Kenzie Togami
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
wizjany
61bc012f6f
Fix source masks using EditSession instead of clipboard. (#515) 2019-08-10 11:54:22 -04:00
Jesse Boyd
7a57a5dd8c
minor 
idk it compiles now
 2019-08-10 16:01:42 +10:00
Kenzie Togami
f83de2a703
Fix bug with spaces at end of suggestions. 2019-08-08 16:28:00 -07:00
wizjany
0e25839490
Fix schematic list box loading schems with spaces in path. 2019-08-08 10:14:16 -04:00
wizjany
95d5adb30c Update docs links to point to enginehub. 2019-08-06 21:49:43 -04:00
Jesse Boyd
3b879477b6
more compiling 2019-08-07 10:25:57 +10:00
Jesse Boyd
ee59dec3d8
comments / minor compiling 2019-08-07 10:13:07 +10:00
Jesse Boyd
3c626ef25a
Differentiate passthrough / abstract delegate 
AbstractDelegateExtent allows overriding just the basic set/get to change behavior - at performance cost

Passthrough passes all operation, so each must be individually overrided.
 2019-08-07 06:38:25 +10:00
Jesse Boyd
322a3e66be
piston doesn't like conditions 2019-08-07 06:24:05 +10:00
Jesse Boyd
92fb90de09
Fix some arguments 2019-08-07 06:18:44 +10:00
Jesse Boyd
4c2b753687
merge 2019-08-07 01:32:05 +10:00
Jesse Boyd
a476ab1ea0
merge 2019-08-07 01:29:49 +10:00
Jesse Boyd
a3c58a187e
merge 2019-08-07 01:29:09 +10:00
Jesse Boyd
74fe88ae01
merge 2019-08-07 01:28:12 +10:00
Jesse Boyd
b6bc09226c
conflicts 2019-08-07 01:25:53 +10:00
wizjany
d822ccc9e5 This is how Mojang checks if trees can grow. 
Subject to changes.
 2019-08-05 23:16:42 -04:00
wizjany
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
wizjany
a1465c02ed Make EditSession#center (//center) set even y blocks. 
At some point this was fixed for x and z but never for y...
 2019-08-05 22:44:51 -04:00
wizjany
6ab74dc7e5 Add missing radius checks. 
Courtesy @mathiascode.
 2019-08-05 17:39:00 -04:00
wizjany
4b54c32f3a Skip invalid blocks in schematics. 2019-08-04 15:56:16 -04:00
MattBDev
5c6c41a95a Docs, command, and formatting changes. 2019-08-03 22:43:29 -04:00
wizjany
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
Kenzie Togami
f848d3114f
Re-load internal state IDs when WORLD_EDITING cap is re-loaded 2019-08-02 15:47:29 -07:00
wizjany
9a133c05d1
Merge pull request #510 from EngineHub/feature/blocks-are-patterns 
Make BlockStateHolder extend Pattern.
 2019-08-02 17:42:14 -04:00
wizjany
afae2b0784 Make TE tag optional for MCEdit schems too. 
And name our threads here too.
 2019-08-01 20:15:34 -04:00
MattBDev
cb03ed2fe8 remove Fast2DIterator 2019-07-30 15:27:59 -04:00
MattBDev
0d2b0025ce Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 
# Conflicts:
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/MaskCommands.java
 2019-07-29 21:06:11 -04:00
MattBDev
198427dc3d fix more compile errors 2019-07-29 21:05:31 -04:00
Jesse Boyd
accc62c10b
7963b2c9 2019-07-30 07:48:19 +10:00
Jesse Boyd
cdb9abc117
9a4473b73f 2019-07-30 07:44:19 +10:00
Jesse Boyd
7967ef4db4
ff586011 2019-07-30 07:39:18 +10:00
MattBDev
12114ec987 Minor changes 2019-07-29 11:19:38 -04:00
MattBDev
7f51791d6c Merge remote-tracking branch 'remotes/origin/commanding' into commanding 
# Conflicts:
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
 2019-07-29 10:58:41 -04:00
MattBDev
ca54f8c371 Work on CLI and I forget what else 2019-07-29 10:57:28 -04:00
wizjany
9d9e3ea065 Remove overrides. 2019-07-28 22:50:42 -04:00
wizjany
6631b6bdf0 Make BlockStateHolder extend Pattern. 
Removes the need for wrapping them in BlockPattern.
 2019-07-28 18:20:00 -04:00
Jesse Boyd
02d5f3e8d5
Update PlatformManager.java 2019-07-29 05:27:50 +10:00
Jesse Boyd
1c256c1f5a
add Range annotation 2019-07-29 05:26:44 +10:00
Jesse Boyd
3303434d52
listchunks doesn't need to be a list 
Nor does it need to be a string. As long as we can iterate, it should be fine.

This somewhat mitigates OOM from listchunks.
 2019-07-29 05:03:17 +10:00
wizjany
f4c238c3da Load chunks when setting biomes too. 2019-07-28 10:21:29 -04:00
wizjany
c93e5ccfdf Don't suggest ##* for masks. 2019-07-28 10:02:47 -04:00
Kenzie Togami
50cea37439
Fix other minor suggestion bugs 2019-07-27 23:49:11 -07:00
Kenzie Togami
76b608f90b
Fix suggestions on Bukkit for good 2019-07-27 23:31:38 -07:00
Kenzie Togami
3a5170a0e8
Potenially fix quoted string completion 2019-07-27 18:12:18 -07:00
Kenzie Togami
d134820bcb
Merge branch 'master' into fix/quoted 2019-07-27 17:41:44 -07:00
wizjany
8f33e0d550 Make a bunch of paginations internal, generify command boxes. (#509) 2019-07-27 14:35:38 +10:00
NotMyFault
8aaed49fa6 Strip color codes from translations 2019-07-26 20:51:38 -04:00
MattBDev
7963b2c92f Removed commands.yml 
I also did a few renames as well as a command registration fix.
 2019-07-26 19:23:24 -04:00
MattBDev
9a4473b73f Formatting 2019-07-25 15:09:12 -04:00
MattBDev
3a3efb8117 Updated a class, minor command tweaks, and formatting 2019-07-25 14:58:59 -04:00
MattBDev
ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
wizjany
415cdc0ab2 Output to debug only if we have a valid DFU for schematics. 
Warn for backwards (since we can't DFU) and info for missing DFU
(since it might still be compatible).
Under normal circumstances, a DFU should be available so we'll only
log to debug (which is generally off).
 2019-07-24 19:05:39 -04:00
wizjany
78488d9b76
Merge pull request #495 from EngineHub/hotfix/nav 
Pass through wall improvements
 2019-07-23 22:17:15 -04:00
wizjany
4ee2d3b47c Move isAllowedToFly and setFlying to AbstractPlayer, protect them. 2019-07-23 22:16:26 -04:00
wizjany
2cc6a367c6 Move floatAt logic to AbstractPlayer, add isAllowedToFly and setFlying. 2019-07-23 22:16:26 -04:00
wizjany
8545417b3a Fix error in /up when used out of bounds. 
Also reduce calls to Entity#getLocation() all over since it's
more expensive than it needs to be (adapts world/vector every time).
 2019-07-23 22:16:26 -04:00
MattBDev
01c371df9c Minor upstream changes and obviously more command work 2019-07-23 19:17:38 -04:00
MattBDev
9816eb3102 More work on commands 2019-07-23 16:26:18 -04:00
Wyatt Childers
917f8a1842 Pass through wall improvements 
This change simplifies the algorithm greatly.

Additionally, this fixes a bug where if standing in a non-solid block
i.e. a glass pane, //thru, and the nav wand would not work.
 2019-07-23 12:53:10 -04:00
MattBDev
478c330c1e Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 
# Conflicts:
#	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
#	worldedit-core/src/main/java/com/boydti/fawe/object/extent/NullExtent.java
 2019-07-22 22:26:00 -04:00
MattBDev
b230999ca0 Mainly formatting and some work on schematic commands 2019-07-22 22:22:32 -04:00
Jesse Boyd
c05d425f64
couple more compilation issues 2019-07-23 06:58:18 +10:00
MattBDev
46f5b12b36 Convert tabs to whitespace. 2019-07-22 16:42:40 -04:00
Jesse Boyd
4d8cf04be1
fix some more compilation issues 2019-07-22 19:05:14 +10:00
Jesse Boyd
55196cec6d
Update GenerationCommands.java 2019-07-22 16:57:12 +10:00
Jesse Boyd
53eba86cdc
Delete SelectionCommand.java 2019-07-22 16:57:06 +10:00
Jesse Boyd
c8650f11f9
Update ImmutableVirtualWorld.java 2019-07-22 16:57:02 +10:00
Jesse Boyd
90044382d4
typo 2019-07-22 16:47:12 +10:00
Jesse Boyd
42a65ac924
@Range 2019-07-22 16:44:03 +10:00
Jesse Boyd
283351fea5
fix conflicts 2019-07-22 16:39:43 +10:00
Jesse Boyd
07283af614
some bindings 2019-07-22 16:02:51 +10:00
MattBDev
9c3122a227 More work on getting commands to compile 2019-07-21 22:49:08 -04:00
Jesse Boyd
f5c202af6d
BrushCommands 2019-07-21 21:39:36 +10:00
Jesse Boyd
ee5e15eda3
visual chunk 2019-07-20 15:32:15 +10:00
wizjany
edb2e919e7 Add more id conversions. 
Bukkit apparently lower cases these for us, but not Forge.
(And invalid block entities are fine - invalid keys are not).
 2019-07-19 21:45:25 -04:00
Jesse Boyd
85ebee7da7
brush settings 2019-07-20 01:29:49 +10:00
Jesse Boyd
5242efb4cf
remove mapped fawe queue 2019-07-19 06:52:01 +10:00
Jesse Boyd
e86e4c9c53
wip on FaweQueue 2019-07-19 06:49:29 +10:00
Jesse Boyd
1dcb18ae20
FaweAPI 2019-07-19 06:23:00 +10:00
Jesse Boyd
f500b5e056
CommandContext + Confirmation 
Use InjectedValueAccess instead
Fix command confirmation
 2019-07-19 06:03:27 +10:00
Jesse Boyd
81298bf555
add command queuing 2019-07-19 03:10:04 +10:00
Jesse Boyd
b696f9fc79
Delete SetQueue.java 2019-07-19 03:09:01 +10:00
Jesse Boyd
0a924915c8
shift extent queue methods 2019-07-19 02:07:31 +10:00
Jesse Boyd
2c22f02c20
begin centralizing world height constants 2019-07-18 22:42:04 +10:00
Jesse Boyd
22a7ad7503
optimized biome streaming to schematics 2019-07-18 22:36:50 +10:00
Jesse Boyd
be9430a92f
don't register biomes here 2019-07-18 20:22:59 +10:00
Jesse Boyd
4ed3fe724e
Merge branch 'breaking-114' into commanding 2019-07-18 20:22:44 +10:00
Jesse Boyd
6e13b44f84
resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b 2019-07-18 20:12:23 +10:00
Jesse Boyd
1bc35eb59a
add missing method to baseblock 2019-07-18 17:00:33 +10:00
Jesse Boyd
be8213d8ee
resolve conflicts 2019-07-18 16:56:57 +10:00
Jesse Boyd
dd38cbe750
. 2019-07-18 04:30:02 +10:00
Jesse Boyd
ff94a1e5ed
8108d0a9 2019-07-18 04:24:21 +10:00
Jesse Boyd
905fbf5a0b
8108d0a9 2019-07-18 02:31:13 +10:00
Jesse Boyd
1d413cde76 BrushTool typo 2019-07-17 10:56:28 -04:00
Jesse Boyd
eff203c3b8
Merge branch 'breaking' into breaking-114 2019-07-17 21:31:06 +10:00
Jesse Boyd
68ea3d6e99
revert some changes 2019-07-17 20:50:54 +10:00
Jesse Boyd
08dead5a86
cleanup build script 2019-07-17 19:43:14 +10:00
Jesse Boyd
2da3367f3d
Switch 2019-07-17 16:21:30 +10:00
Jesse Boyd
3113d8dd69
Optional 2019-07-17 16:11:55 +10:00
Jesse Boyd
cedb261313
fix some Command annotations 2019-07-17 15:43:18 +10:00
Jesse Boyd
ae9efc3df1
Merge branch 'breaking-114' into filter-pipeline 2019-07-17 14:55:04 +10:00
MattBDev
0e54f196fc Deleted a class and work on generation commands 2019-07-16 23:57:35 -04:00
MattBDev
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
wizjany
05cee0a30b Don't overwrite history during changes. 
Fixes issues with some changes not being undone.

I mean, the sphere algorithm needs to not set blocks 20 times,
but other things can trigger this too.

Also allow radius 0 sphere via //sphere (because /br sphere allows it).
 2019-07-16 21:43:14 -04:00
wizjany
f75104f2ac Actually use fixed IDs in MCEdit reader. 
Fixes WORLDEDIT-3947.
 2019-07-16 19:45:27 -04:00
Jesse Boyd
48356275af
fix loading legacy biomes 2019-07-17 06:36:48 +10:00
Jesse Boyd
71a9256617
Merge branch 'breaking' into breaking-114 2019-07-17 06:08:18 +10:00
Jesse Boyd
75f059fdc5
check length, not null 2019-07-17 05:28:55 +10:00
Jesse Boyd
b3e11d2094
patch for missing tile position data 2019-07-17 05:16:08 +10:00
Jesse Boyd
cfbde956f4
some refactoring to pipeline classes (WIP) 2019-07-17 05:10:39 +10:00
Kenzie Togami
e98b99edcd
Properly acquire JUnit 4, drop json-simple 2019-07-15 16:38:33 -07:00
Kenzie Togami
5277f99bf2
Minor fixes for craftscripts in Forge 2019-07-12 13:49:45 -07:00
Jesse Boyd
14d5275e05
wip chunk based bitset 2019-07-12 02:10:32 +10:00
Jesse Boyd
d6a8e9738a
delete SetQueue 2019-07-12 01:41:54 +10:00
Jesse Boyd
cf09ca7f37
delete FaweQueue 2019-07-12 01:32:14 +10:00
NotMyFault
f0cabb7d11 Build 1.14 artifacts 2019-07-11 13:13:43 +02:00
Jesse Boyd
b44dcc91b8
update vs 2019-07-11 20:27:29 +10:00
Jesse Boyd
f4947885b2
fix import 2019-07-11 08:46:02 +10:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114 2019-07-11 08:08:55 +10:00
Kenzie Togami
9e7d46662c
Merge pull request #498 from EngineHub/feature/improved-chunk-batching 
Buffered extent improvements
 2019-07-10 14:25:22 -07:00
Kenzie Togami
e87a5559d6
Ensure blocks are not moved below world boundary 2019-07-10 14:10:22 -07:00
Jesse Boyd
cafd4bfece
use Locale.ROOT for uppercase as well 2019-07-10 22:26:31 +10:00
Jesse Boyd
a98a91e066
Use Locale.ROOT 2019-07-10 21:03:00 +10:00
Jesse Boyd
b32d46b08a
Use Locale.ROOT 2019-07-10 21:01:56 +10:00
Jesse Boyd
50e649acb8
update items 2019-07-10 20:58:27 +10:00
Jesse Boyd
2e9c5e6804
update legacy.json 2019-07-10 06:52:15 +10:00
Jesse Boyd
20b7b121b1
1.14 blocks 2019-07-10 06:49:51 +10:00
MattBDev
4a40c7d99c Renaming and cleanup and a new method. 2019-07-09 15:50:13 -04:00
Jesse Boyd
6a87d2107d
fix compile 2019-07-10 04:58:53 +10:00
Jesse Boyd
19468b64d4
Use bstats for metrics 
The metrics config option will be removed in the future
 - The current value will be copied over when generating bstats config
 2019-07-09 17:46:27 +10:00
Jesse Boyd
f99d6e7478
wip on 1.14 2019-07-09 17:18:51 +10:00
Kenzie Togami
2ee71cc72f
Grav brush: move to bottom, not down one 2019-07-06 15:41:11 -07:00
Kenzie Togami
3ad80665d8
Fix gravity brush itself, not EditSession 2019-07-06 00:12:17 -07:00
wizjany
96e2b6c5af First attempt at fixing quoted string oddities. 2019-07-04 22:01:55 -04:00
wizjany
508ece9e0f
Use pagination for //distr and store results. (#496) 2019-07-04 19:33:37 -04:00
wizjany
a2b3aabbbf Typo fixes and command clarifications/cleanup. 
Also re-disable the gradle daemon. It doesn't always play nice with
ForgeGradle and hogs ram.
 2019-07-04 19:28:42 -04:00
Kenzie Togami
f2c47f3759
License for new class 2019-07-04 11:55:27 -07:00
Kenzie Togami
99ee32fe8e
Many fixes for buffered extents 2019-07-04 11:43:36 -07:00
Kenzie Togami
d27daefd3e
Implement getBlock for chunk batching extent 
Also improve speed of comparators, by using ::comparingX and bitwise
ops.
 2019-07-03 21:11:36 -07:00
MattBDev
ffc2092d93 toggles and timeouts 2019-06-30 14:56:32 -04:00
wizjany
625cbe5e3d Make //count take a mask. Also doc updates, perm fixes. 2019-06-30 00:38:17 -04:00
wizjany
1d1c38887f Added worldedit.setwand permission required to change wand/navwand. 
Players without this perm will be stuck with the configuration-defined
default wand/navwand items.
 2019-06-29 14:15:58 -04:00
wizjany
6be77451b6 Correct perms for nav wand binding. 2019-06-29 13:55:58 -04:00
wizjany
9cbf8178ea Fix setting player heads with owner name. 2019-06-29 11:11:22 -04:00
wizjany
fae44ffaf2 Re-send type id for cuboid CUI. 
Works like poly CUI now.

CUI in general needs to cleanup :\
 2019-06-29 07:49:09 -04:00
Jesse Boyd
6a7935829b
Merge from upstream 2019-06-29 16:01:32 +10:00