Commit Graph

1008 Commits

Author SHA1 Message Date
MattBDev
a1c15e1c39 Many upstream changes. Should be non-breaking 2019-06-25 09:00:44 -04:00
MattBDev
c672bcfddd Add license notice back and remove left over git stuff. 2019-06-23 14:07:47 -04:00
MattBDev
57f992a524 Remove nullblock from EditSession 2019-06-23 14:05:14 -04:00
MattBDev
753b34ef99 Cleaned commands and extents a bit. 2019-06-23 14:00:22 -04:00
MattBDev
cd8bc6f733 Removed commented out classes 2019-06-23 13:35:16 -04:00
MattBDev
8c9090a21d I changed stuff. That's all I remember 2019-06-23 13:27:34 -04:00
MattBDev
1e02560039 Remove BukkitMask 2019-06-21 19:58:40 -04:00
MattBDev
eddb1ec677 Merge remote-tracking branch 'origin/breaking' into breaking 2019-06-20 20:06:08 -04:00
MattBDev
0313320816 As Jesse would say... * 2019-06-20 20:05:18 -04:00
NotMyFault
0cb068c4a6 Fixes #172
Purging the history data from disk can create an unnecessary amount of debug lines within a few seconds.
2019-06-19 18:09:02 +02:00
MattBDev
9d1117303c Removed a stupid worldname method. 2019-06-18 23:43:06 -04:00
NotMyFault
5f037df326 Adding missing permissions
Added some basic permissions to some basic and fawe specific commands.
Since they weren't around previously, they are true by default, however, you can now revoke/negate them.
2019-06-13 00:48:40 +02:00
MattBDev
1f14d4652e Upstream changes, prefix changes, formatting changes, variable name changes
I think that draining waterlogged items also works now?
2019-06-12 17:13:53 -04:00
MattBDev
e6a433ec93 Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking 2019-06-12 15:04:53 -04:00
NotMyFault
ec001b8d3b Revert "Upstream, generics, formatting"
This reverts commit cd88e513a8.
2019-06-12 15:45:41 +02:00
MattBDev
83197dba0c Removed unused classes 2019-06-11 20:42:26 -04:00
MattBDev
fb0bb62180 Removed installer
The code was mainly for forge and it was built using swing instead of javafx
2019-06-11 20:40:33 -04:00
MattBDev
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00
IronApollo
e2c2205dac Hollow fix 2019-06-08 14:48:30 -04:00
MattBDev
7f3c4c4828 A lot of removals, upstream merges, and maybe more. 2019-06-07 20:58:48 -04:00
MattBDev
3169592332 Merge remote-tracking branch 'origin/breaking' into breaking 2019-06-06 18:40:14 -04:00
MattBDev
229182aa63 Remove CUI and other cleaning 2019-06-06 18:39:51 -04:00
George Lin
c77ee07fcd
Fix incorrect casting of CharSequence to String 2019-06-06 15:34:45 +08:00
MattBDev
b42553116c Removal of many prefixes and deprecation of FaweLocation
- Removed some prefixes to help make upstream merging a bit easier.
- Replaced reflection code for titles with the regular bukkit api.
- Removed FAWELocation and FAWEPlayer where it wasn't needed.
- Deprecated FaweLocation since having it in the first place is very stupid.
- FAWEPlayer should also be deprecated soon because the majority of that code is redundant.
2019-06-05 21:28:02 -04:00
MattBDev
bf5d2c2788 Temporarily removed plotsquard replaceall.
Poorly written and there is code in there that I may break in a future commit.
2019-06-05 16:13:30 -04:00
MattBDev
6c94cca15e Selective upstream merge
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
MattBDev
c73fc28847 Minor upstream changes 2019-05-31 11:20:02 -04:00
MattBDev
3eb7200ea0 Fixed issues with //copy 2019-05-31 10:41:05 -04:00
MattBDev
aea5b68ced Upstream merges and a few code cleanups 2019-05-30 16:07:30 -04:00
MattBDev
a0eb7ce59e Typo Fixes and Added Annotations 2019-05-28 23:23:51 -04:00
Jesse Boyd
6bc5b4a823
. 2019-05-29 06:31:22 +10:00
MattBDev
6b0fcc8712 Removed some null checks and fixed some variable names 2019-05-22 14:40:56 -04:00
NotMyFault
e4c1ba3edf Revert "Fix //none removing arbitrary nbt"
This reverts dd0bec8913.
2019-05-19 20:55:45 +02:00
Jesse Boyd
e72a5cf12d
Merge branch 'master' into breaking 2019-05-13 00:41:28 +10:00
Jesse Boyd
118a51f477
Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking 2019-05-13 00:38:59 +10:00
Jesse Boyd
dd0bec8913
Fix //none removing arbitrary nbt 2019-05-13 00:37:18 +10:00
Jesse Boyd
da034f9ac4
Use mask for hollow
Closes #1298
2019-05-13 00:28:48 +10:00
Jesse Boyd
43a6541763
shift some code to EditSessionBuilder 2019-05-13 00:21:01 +10:00
Jesse Boyd
c797dcb194
WIP filter patterns 2019-05-12 23:32:04 +10:00
Kenzie Togami
8d68da09a3 Minor versioning changes 2019-05-09 15:02:11 +02:00
Jesse Boyd
113aeb1689
Use fuzzy blocks in default block parser 2019-05-07 16:40:37 +10:00
Jesse Boyd
55b02e1b1f
Implement FuzzyBlockState 2019-05-06 15:58:55 +10:00
Jesse Boyd
459629a2f2
scanchunk 2019-05-06 15:57:12 +10:00
NotMyFault
e2513e2c08 Fix paste service 2019-05-05 20:43:56 +02:00
Jesse Boyd
d603f45063
remove debug 2019-05-05 22:19:13 +10:00
Jesse Boyd
2be8d87d5a
Fix mask parsing not using factory 2019-05-05 03:59:25 +10:00
Jesse Boyd
7c174beaee
Region filter 2019-05-05 03:58:26 +10:00
Jesse Boyd
27ed596027
filter regions? 2019-05-04 02:33:45 +10:00
Jesse Boyd
4116adcfef
Some refactoring 2019-05-03 03:38:08 +10:00
Jesse Boyd
f5944fbcaf
filter set 2019-05-03 00:45:03 +10:00
Jesse Boyd
8dcc005ec1
tile/biome/entity set 2019-05-02 18:27:33 +10:00
NotMyFault
d9914d7f0a Re-add paste service
And move issue template
2019-05-01 21:42:18 +02:00
Jesse Boyd
68e7573c21
Merge branch 'breaking' 2019-05-02 05:25:52 +10:00
Jesse Boyd
adb2c37a02
set blocks 2019-05-02 04:19:15 +10:00
Jesse Boyd
f96760b36c
block set test 2019-05-02 02:01:41 +10:00
Jesse Boyd
eec08c81ad
async chunk loading 2019-05-02 01:45:18 +10:00
Jesse Boyd
33e119ccb6
implement block get 2019-05-01 02:19:10 +10:00
NotMyFault
ea07b540b1 Minor amendments 2019-04-29 18:13:58 +02:00
wizjany
3ffa54af84 Fix TrueZip region stores.
I think. Someone tell me if this breaks their setup with truezip, but
it works for me now and didn't before. I'm assuming people using .zip
just used the normal zip store anyway.

(cherry picked from commit dcfb769d96)
2019-04-28 17:28:15 -04:00
NotMyFault
bf684d478e
Remove hashtag preventing wrong issue references 2019-04-28 20:11:05 +02:00
Jesse Boyd
6692a2eb92
document some methods 2019-04-29 03:36:23 +10:00
Jesse Boyd
57b5be84f4
more structure 2019-04-29 01:44:59 +10:00
NotMyFault
c64b59da2f Fix build number in version 2019-04-28 11:34:07 +02:00
NotMyFault
686c71d965 Move around some debugs 2019-04-27 20:34:56 +02:00
Jesse Boyd
6adf0e6435
some structure 2019-04-27 11:15:08 +10:00
Jesse Boyd
35fd159e79
WIP rewrite of NMS pipeline 2019-04-25 20:32:27 +10:00
Jesse Boyd
cc80bc61cf
Compiles in 1.14 (yay) 2019-04-25 00:10:52 +10:00
Jesse Boyd
c6ce0c773f
Fixes #30 2019-04-23 23:49:45 +10:00
Jesse Boyd
aaa39d1d32
Fixes #126 2019-04-23 23:41:12 +10:00
Jesse Boyd
c45d4b58cc
Fixes #117 2019-04-23 22:56:01 +10:00
Jesse Boyd
d97836762d
Fixes #103 2019-04-23 22:48:41 +10:00
Jesse Boyd
208929c378
Fix ItemType.getBlockType 2019-04-23 16:16:26 +10:00
Jesse Boyd
290f047f6a
Fix tab complete error for single property states 2019-04-23 15:08:05 +10:00
NotMyFault
43fec813b8 Moving some commands 2019-04-21 19:01:49 +02:00
NotMyFault
640fac6374 Add flags 2019-04-21 10:28:50 +02:00
Jesse Boyd
c56ba112d1
Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking 2019-04-20 00:47:32 +10:00
NotMyFault
a22ba45b1c Minors 2019-04-18 20:47:25 +02:00
Matt
72c766a87b
Add DataFixerUpper 2019-04-17 20:22:54 -04:00
NotMyFault
7b8bf18309 Fixes #124
This fixes the output of /fawe version and gives the versioning a fresh overhaul as well
2019-04-17 00:35:39 +02:00
NotMyFault
988c4b042d Minors 2019-04-16 17:14:53 +02:00
Jesse Boyd
274c52163b
Fix setting the same block multiple times sequencially 2019-04-17 01:12:09 +10:00
Jesse Boyd
629be505e2
Fix ghost blocks 2019-04-16 13:29:59 +10:00
Jesse Boyd
8c30c72b73
Fix repl 2019-04-16 13:08:57 +10:00
Jesse Boyd
9207263426
Remove chunk notify task 2019-04-16 01:16:00 +10:00
Jesse Boyd
a4de4e1a65
Use format extension here 2019-04-15 21:22:58 +10:00
Jesse Boyd
f849caf655
Fix clipboard upload/download 2019-04-15 21:05:26 +10:00
Jesse Boyd
69e2ce6165
Avoid block vector creation for combine stages = false 2019-04-15 19:56:38 +10:00
NotMyFault
86727c5fb8 Minors
- Update links
- Remove update part from settings
2019-04-14 19:10:40 +02:00
Jesse Boyd
a8b0fd21bb
Minor tweaks to work with build.js 2019-04-14 22:46:01 +10:00
Jesse Boyd
fab197034e
fix NMS queue palette size 2019-04-14 21:43:06 +10:00
Jesse Boyd
b3e1076868
Fix combine-stages=false for FAVS 2019-04-14 14:31:27 +10:00
Jesse Boyd
a4f63ec6f0
Check type, not state 2019-04-14 12:16:15 +10:00
Jesse Boyd
eadf5ad246
Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking 2019-04-14 12:13:58 +10:00
Jesse Boyd
ce0dda5931
Fix ProtocolSupport compatibility 2019-04-14 12:13:41 +10:00
NotMyFault
20cb114357 Reorder commands 2019-04-13 20:45:04 +02:00
NotMyFault
d26e7e142f Fixes #15 2019-04-13 16:13:19 +02:00
Jesse Boyd
edde2ebe51
remove debug 2019-04-14 00:07:17 +10:00
Jesse Boyd
110f782a5c
Optimize entity get (lazy nbt) 2019-04-14 00:00:38 +10:00
NotMyFault
0781c762e6 Merge branch 'remove-auto_updater' into breaking 2019-04-13 12:30:54 +02:00
NotMyFault
c4dc39edbf Remove report system 2019-04-13 12:18:03 +02:00
Jesse Boyd
f9f6aead0f
Some optimizations for 1.13 2019-04-13 16:44:23 +10:00
Jesse Boyd
99c4c2f35d
Add option to disable commands 2019-04-12 10:51:18 +10:00
NotMyFault
fda8f56c5b *
Giving credit to translators 😉

Co-Authored-By: douwe265 <douwe265@gmail.com>
Co-Authored-By: NShoot <nshoot@users.noreply.github.com>
2019-04-11 22:13:39 +02:00
NotMyFault
bb20dd1e00 Update translations adapting latest translation changes
There are still some translations open, if anyone wants to update them as well. Unfortunately I'm not that good with them so I'll leave them up 😅
2019-04-11 21:58:22 +02:00
NotMyFault
dcfa436c64 Minors
- Make disallowed-blocks translatable
- Add more trnslatable messages
- Update WorldEdit messages missing a prefix
2019-04-11 19:49:09 +02:00
Jesse Boyd
7a88039711
Fixes #105 2019-04-12 01:04:54 +10:00
Jesse Boyd
524b24eeae
Fixes #114 (untested) 2019-04-12 01:00:03 +10:00
Jesse Boyd
c05cdb35d8
Don't use CommandContext here 2019-04-12 00:56:59 +10:00
Jesse Boyd
a831ae17b7
Merge pull request #110 from Mgazul/breaking
Fix fixLiquid
2019-04-12 00:55:59 +10:00
NotMyFault
d49be8047c Fix missing prefixes 2019-04-11 15:13:15 +02:00
Jesse Boyd
6996a97027
various minor
CFI works without PlotSquared
tab completion
biome tweaks
WIP on anvil
document disallowed-blocks in legacy config
2019-04-11 21:32:32 +10:00
Jesse Boyd
24590199c8
Fix disallowedBlocks 2019-04-11 14:05:29 +10:00
Jesse Boyd
f726c9afc4
fix //none for tools 2019-04-11 11:28:06 +10:00
Jesse Boyd
a7c5580db3
comment out forced key 2019-04-11 11:19:51 +10:00
Jesse Boyd
d61e5f33f1
some minor fixes
/br sspl - says to click same spot again to apply, clicked same spot and nothing happens
/br layer - gives an error message "there was an error handling a FAWE command: [See console]
/br clipboard - doesn't let me execute because of max radius of 5, however am unable to set a lower radius as there is no option for it
/br butcher - tried to kill some mobs, but didn't work (nothing happened)
/br splatter - tried to execute the command, nothing happened
2019-04-11 05:14:58 +10:00
Jesse Boyd
21be61f03a
fix block mask inverse 2019-04-11 03:25:19 +10:00
Jesse Boyd
2e1b7676eb
Just use instanceof 2019-04-11 02:17:45 +10:00
Jesse Boyd
f0d646a9a1
remove getSimpleName from FawePlayer 2019-04-11 02:11:14 +10:00
Jesse Boyd
c519c5ec38
some anvil fixes 2019-04-11 02:07:57 +10:00
Jesse Boyd
0ef97ccf28
fix cfi issues 2019-04-11 00:49:16 +10:00
Jesse Boyd
e03a43a1ab
finish MCAWriter 2019-04-10 22:04:22 +10:00
Jesse Boyd
808d32bc85
make bit mask protected
TODO same for BIT_OFFSET
2019-04-10 22:03:51 +10:00
Jesse Boyd
b24ebaf6f2
Delay command setup 2019-04-10 22:03:10 +10:00
Jesse Boyd
31797d4231
WIP on 1.13 CFI 2019-04-10 18:32:21 +10:00
Jesse Boyd
d7380781f4
Fix BlockTransformExtent 2019-04-10 02:31:05 +10:00
Mgazul
652f27c853 Fix fixLiquid 2019-04-09 11:29:43 +08:00
Jesse Boyd
093542c337
fix compile + use mutable vector for affine transform + fix bstats package 2019-04-07 20:43:59 +10:00
Jesse Boyd
1529c187d2
Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking 2019-04-07 17:41:51 +10:00
Jesse Boyd
31ac2b69d1
Fix block rotation 2019-04-07 17:41:26 +10:00
Jesse Boyd
c8529b0609
. 2019-04-07 10:52:30 +10:00
NotMyFault
ed9ae5a6ab
Update BBC.java 2019-04-07 01:26:34 +02:00
NotMyFault
ab3394c35e Add prefixes and make FAWE more translatable 2019-04-07 01:13:23 +02:00
Jesse Boyd
6558e549fd
Fix smooth brush 2019-04-06 06:52:12 +11:00
Jesse Boyd
39830046bc
Fix //none 2019-04-06 06:47:51 +11:00
Jesse Boyd
ee797219b4
Fix findFreePos 2019-04-06 06:13:15 +11:00
Jesse Boyd
501992dd20
Fix setPosition 2019-04-06 05:51:18 +11:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType 2019-04-06 03:34:11 +11:00
Jesse Boyd
d49c5ebe74
translate a few utility commands 2019-04-06 03:04:27 +11:00
Jesse Boyd
386c8836cd
Fix registry 2019-04-06 02:52:27 +11:00
Jesse Boyd
144215c813
Don't construct new BaseBlock 2019-04-06 01:12:57 +11:00
Jesse Boyd
99db2d557a
optimize repeating extent pattern 2019-04-06 01:05:48 +11:00
Jesse Boyd
9e2832c273
Use BlockVectorSet 2019-04-06 01:01:05 +11:00
Jesse Boyd
f7cdae5e56
Disable undo if fastmode 2019-04-06 00:53:00 +11:00
Jesse Boyd
fd735a6f60
Fix property pattern 2019-04-05 19:22:50 +11:00
Jesse Boyd
ed83ef1aa7
disable transform test for now 2019-04-05 18:20:27 +11:00
Jesse Boyd
2143b9b5b7
finish block registry 2019-04-05 17:51:42 +11:00
Jesse Boyd
be5541b61b
revert some changes 2019-04-05 15:48:41 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking 2019-04-05 15:47:04 +11:00
Jesse Boyd
140809c903
Working now 2019-04-05 15:15:10 +11:00
Jesse Boyd
33f5322fda
WIP merge (i'll finish this later) 2019-04-05 01:24:47 +11:00
Jesse Boyd
1beea3cd22
Some more upstream merge 2019-04-04 21:28:41 +11:00
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
Jesse Boyd
9fbcbc7cea
<pattern> not <block>
As there are actual commands that will only accept blocks
2019-04-03 15:40:31 +11:00
matt
2407f9246f How did it compile locally? 2019-04-03 00:21:42 -04:00
matt
122236f6c7 Too lazy to write a commit message 2019-04-02 23:36:32 -04:00
matt
29692f3fbe Migrate to SLF4J 2019-04-02 18:21:02 -04:00
matt
47e66913e3 Selective upstream merge 2019-04-02 16:26:51 -04:00
matt
4af43eb84c WeatherTypes now matches upstream 2019-04-02 15:43:40 -04:00
matt
6ccd0eb58e Fixed deleted code due to IDE glitch 2019-04-02 15:22:54 -04:00
matt
1a19bc457f Added Nullable to BlockTypes 2019-04-02 15:03:59 -04: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
NotMyFault
cb482ccbd5 Remove auto updater and minors
- Remove Changelog command
- Remove Auto updater
2019-03-28 21:31:28 +01: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
wizjany
25631af31c Add RequestExtent to be used when a delayed EditSession is needed.
For example, if you set a mask that takes an extent (many of them),
and then move to another world, the mask will test blocks in the old
world and return bad results.
2019-03-20 19:13:54 -04:00
Josh Knight
83bdb3c8e8
Merge pull request #11 from IntellectualSites/incendo-paste
Make debugpaste use Incendo Paste Viewer, rather than Hastebin.
2019-03-19 10:36:21 -04:00
Matthew Miller
d186cce393 Merge remote-tracking branch 'origin/feature/slf4j-logging' 2019-03-19 20:32:21 +10:00
wizjany
9d2d43f0db Add -f to //schem save to confirm overwriting.
Overwriting existing schematics now checks delete perm.
Also allow delete to be run from console.

Fixes WORLDEDIT-3868.
2019-03-15 17:08:11 -04:00
wizjany
18414fe3b5 Fix symlink detection. 2019-03-15 09:10:51 -04:00
Kenzie Togami
d6804737cf
Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
wizjany
1c5d3368a0 Defer permissions check when making LocalSession.
Also use Java7 Paths to get rid of some funky logic.
2019-03-11 21:31:43 -04:00
Matthew Miller
a5cec7728d
Merge pull request #452 from EngineHub/forge-1.13
Added support for Forge 1.13
2019-03-11 22:52:30 +10:00
wizjany
a59d994d84 Hook up the biome registry. 2019-03-11 00:15:21 -04:00
wizjany
a22b5535fe Shh checkstyle, I'm a C# dev now. 2019-03-08 16:14:16 -05:00
wizjany
7c89ece96e Few tweaks to schematic loading and error fixes.
* Not all EntityTypes in Bukkit have the correct enum name.
* Don't read entire schematic files to list. Go off file extension only.
   (Reading in files is more accurate, but slow.)
* Enforce extensions. (Due to the above, while you can technically make a
   schematic called 'test.txt', it's better that we save it as
   'test.txt.schem'.)
* Fix a few minor warnings.
2019-03-08 16:00:49 -05:00
wizjany
de08c8b8c7
Add better control over expression timeouts. (#451)
Add better control over expression timeouts.
* //timeout command can be used to change player's current timeout.
* Config now also has a max timeout, can be bypassed with permission
* Timeout of < 0 will let expressions run indefinitely.
* Said expressions won't run on a separate thread, slightly reducing the
  overhead from context switching. For large //gen commands, for example,
  this can actually increase speed.
2019-03-06 19:58:32 -05:00
NotMyFault
8a528b26b6 Update P2 repo and minors 2019-03-06 17:35:42 +01:00
IronApollo
c98a311146 Update to working PlotSquared repo; Update to PlotSquared C>Captions class rename; Cleaning and minor modifications to SpongeSchematicReader 2019-03-06 03:06:47 -05:00
Kenzie Togami
4878f38250
Fix platform registration, config setup 2019-03-04 19:36:06 -08:00
wizjany
f84f3c6f85 Fix error when parsing hand/offhand/pos1 as blocks. 2019-03-03 19:51:49 -05:00
wizjany
aafb854e4f More useful names for block ItemTypes. 2019-03-02 12:26:26 -05:00
wizjany
c3ee926a2e Correctness improvement for legacy data in expression generation. 2019-03-02 11:55:03 -05:00
wizjany
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
wizjany
f46c70093c Fix the long-range build tool's ability to build mid-air. 2019-03-01 20:10:46 -05:00
wizjany
0656ef1920 Fix LayerVisitor stopping early instead of skipping covered columns. 2019-03-01 19:25:10 -05:00
wizjany
4bd6d73085 Fix some bad copy-pasta in expression environment queries. 2019-02-28 01:03:02 -05:00
IronApollo
0fa9d7a4a7 Changes to EditSession to improve upstream compatibility 2019-02-27 09:01:07 -05:00
IronApollo
3ffb5ff00d Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing 2019-02-27 08:09:04 -05:00
wizjany
243d6476ac Re-add smooth filtering via a mask.
Instead of trying to maintain a list of "natural terrain blocks", just
let the user specify a mask of blocks to use for the height map filter.

https://gfycat.com/severaljauntycondor
2019-02-26 23:54:53 -05:00
wizjany
9eeb0acffe Add radius checks to a few more utility commands. 2019-02-25 18:41:20 -05:00
wizjany
2f734d4570 Check radius instead of diameter for clipboard brush.
This brings it more in line with other brushes in terms of allowable size.
2019-02-25 18:41:19 -05:00
Matthew Miller
5de8e0852c Treat categories as empty when missing 2019-02-18 21:17:36 +10:00
IronApollo
24fbc86cdd INDEV -- Pushed for in-house testing and development 2019-02-17 03:47:32 -05:00
Matthew Miller
50a286b070 Update the block/item category registries - this won't build until a Spigot PR is merged though. 2019-02-17 13:30:40 +10:00
Matthew Miller
3683a0438a Use nonNull rather than !isNull 2019-02-16 19:58:06 +10:00
Matthew Miller
db1315e043 Refactor registries to entirely use the platform 2019-02-16 19:35:13 +10:00
Matthew Miller
1b101740fe Use a proper registry for biomes 2019-02-16 17:27:00 +10:00
Matthew Miller
d6bc85ccbe Speed up the BlockState hashCode method by caching (As it's Immutable). Allows some better optimisations in the future by using them as map keys 2019-02-16 12:46:10 +10:00
wizjany
de9d202681
Clear shaped brush material on command.
The initial material is held in the factory, but if a brush was previously bound, that pattern is used.
Now, using `//br set` will clear the previous material, allowing the OperationFactory's material to work.
This can be changed later with `/mat`, which will once again set the fill on the tool, overriding the factory's context.
2019-02-15 14:51:26 -05:00
wizjany
313cd20b14 Make legacy compat layer return straight stairs. 2019-02-14 17:53:30 -05:00
wizjany
88014b18a3 Added a few new things using block states.
* `//set ##*tag` sets all states in the tag (not just default state per type)
* `//set ^type` is a pattern changing block type but copying all valid existing states
* `//set ^[prop=val,...]` sets the property `prop` to `val` wherever the existing block has that property
* `//set ^type[prop=val,...]` does both of the above
Those work anywhere a pattern is taken, of course.

* The mask syntax `^[prop=val]` matches blocks with the property `prop` set to `val`, or blocks that don't have the property at all.
* The mask syntax `^=[prop=val]` only matches blocks that have the property.
Those work anywhere a mask is taken, of course. (`//mask`, `//gmask`, `//replace`, etc)

The `//drain` command now takes `-w` flag that removes the waterlogged state from blocks (in addition to removing water, as before).
2019-02-14 17:21:01 -05:00
wizjany
287be0209c Slight readability and usability improvements.
Also no longer allows trailing strings (e.g. //set #clipboardasdf).
2019-02-12 17:11:57 -05:00
wizjany
19796aa3be Added offset to ClipboardPattern.
Takes input like '//set #clipboard@-1,0,1' which shifts the pattern over.
It also now extends RepeatingExtentPattern, which was previously unused.
2019-02-12 17:11:57 -05:00
Wizjany
76400e533d
Add missing flags to clipboard brush usage. 2019-02-11 12:50:51 -05:00
Matthew Miller
3e988e7ffe Fixed parsing fuzzy blocks failing. 2019-02-11 20:30:42 +10:00
wizjany
6708e8292f Restore generation of hollow shapes.
Unfortunately this is a bit slower than before since we can't cache block
id & data values. However, applying patterns generally isn't too expensive,
and hollow regions were entirely broken before.
2019-02-09 20:30:57 -05:00
IronApollo
0763e4c05c Pull changes from upstream to match cdd7117 2019-02-07 09:11:51 -05:00
IronApollo
511c279153 Fixed issues regarding block transformations and using the BaseBlock to apply a function. 2019-02-07 09:04:14 -05:00
Byron Marohn
f6788f16e4 Fix sponge schematics not correctly setting dimensions if there are no entities
Signed-off-by: Byron Marohn <combustible@live.com>
2019-02-06 20:48:30 -08:00
wizjany
cdd71178f5 Ensure BlockCategories are initialized.
We should probably have a way to initialize all these catalog classes ahead of time.
2019-02-04 22:34:25 -05:00
wizjany
dddf2b963a Fix long-range build tool.
Blocks were always placed around 0,0,0 since the trace direction was being used as a position.
Also the message was backwards.
2019-02-03 19:27:30 -05:00
IronApollo
0e5847e1ce Various fixes 2019-02-03 09:22:10 -05:00
IronApollo
2d586ff53e Registry changes & additions 2019-02-03 08:53:04 -05:00
Matthew Miller
4a8931a55a Added a ##tag parser Pattern. gives a random combination using the blocks from the tag with an equal distribution. 2019-02-03 07:59:06 -05:00
Brokkonaut
2bae161e5c Make biome changes undoable 2019-02-03 07:38:11 -05:00
Matthew Miller
b27913324b Tweak the last access extent cache to provide better caching 2019-02-03 07:35:38 -05:00
Kenzie Togami
8f11d0469b Clarify state when asking for caps with no platforms (+ fuzzy system changes) 2019-02-03 07:30:18 -05:00
Matthew Miller
7d7da78dbc Fuzzier fuzzies 2019-02-03 07:13:21 -05:00
Kenzie Togami
4b5b7b8003 Clean up other compiler warnings 2019-02-03 06:06:07 -05:00
Kenzie Togami
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -05:00
Matthew Miller
1d87642b52 Minor improvements to the server side CUI 2019-02-03 03:54:04 -05:00
gamerforEA
ea0ca470f1 Fix Metrics injection 2019-02-03 03:51:15 -05:00
Matthew Miller
26d4ea101e Fixed the bundle being directly used outside of the registry system. 2019-02-03 03:44:10 -05:00
Matthew Miller
53308416ff Start work on modularising masks and patterns 2019-02-03 03:33:52 -05:00
Matthew Miller
d5e4c76bfe Allow a pattern for the leave-id of //move 2019-02-03 02:47:32 -05:00
Matthew Miller
d80ac24c63 Pass the exception converter through more. 2019-02-02 11:36:55 -05:00
Matthew Miller
9c3964d330 Added a way to get the spawn position of a world 2019-02-02 11:29:51 -05:00
Matthew Miller
c935e381b7 Added a method to teleport entities across worlds. 2019-02-02 11:23:02 -05:00
Matthew Miller
7a9bd226ce Update draw.js and roof.js 2019-02-02 11:21:43 -05:00
Matthew Miller
45f1de6009 Move the pasting system over to WorldEdit, and add a /we report command. Currently only reports system status and the config. Need to add a platform reporter system. 2019-02-02 11:20:36 -05:00
Matthew Miller
54142c8669 Added a display name to Actors 2019-02-02 09:37:14 -05:00
Matthew Miller
bc3562eb57 Few fixes for FastModeExtent. 2019-02-02 09:26:18 -05:00
Matthew Miller
e88b8c961d Added "fast mode corrections" 2019-02-02 09:21:16 -05:00
Matthew Miller
346eee8953 Added the multi-staging from the multipass2 branch 2019-02-02 09:12:30 -05:00
JOO200
63bf01fdaf Check by setting blocks with BlockBagExtend for changed materials. 2019-02-02 09:05:59 -05:00
Matthew Miller
b276907dcd Filter out commands that the player doesn't have permissions for. Workaround for a Spigot issue. 2019-02-02 08:54:36 -05:00
Matthew Miller
f3c633582e Finish removal of PlayerDirection, and partially added diagonal support back to commands. (Other minor changes to WorldEdit-Sponge and FAVS) 2019-02-02 08:43:57 -05:00
Matthew Miller
13bf8429ce Fixed serialisation of vectors. 2019-02-02 08:30:02 -05:00
Gerrygames
e724b1f1cd fix NPE when reading sponge schematics with tile entities or entities 2019-02-01 13:40:22 +01:00
IronApollo
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
Matthew Miller
f3ec5bbdde Added a ##tag parser Pattern. gives a random combination using the blocks from the tag with an equal distribution. 2019-01-31 22:28:04 +10:00
Cygaan
6046fa1cec Only copy entities from within the region 2019-01-28 17:36:39 +01:00
Cygaan
d48ea909b5 Actually filter out players, not everything else 2019-01-28 17:31:29 +01:00
Matthew Miller
2f9c7f19f5 Added support for 'rotation' BlockState values. 2019-01-22 21:59:20 +10:00
Matthew Miller
2e0fa300b7 Actually support disabling chunk loading extent 2019-01-22 21:34:37 +10:00
Brokkonaut
432a201266 Make biome changes undoable 2019-01-21 19:07:29 +01:00
IronApollo
271b45f3ba Final changes for the Vector update (probable fix for the "copying player entity" bug) 2019-01-17 05:23:47 -05:00
IronApollo
62e6e9de96 Some general changes to the handling of blocks 2019-01-14 05:49:05 -05:00
IronApollo
f74381b93f Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system 2019-01-13 02:00:14 -05:00
IronApollo
90b3439dc2 Even more changes made towards a proper Vector update, as well as minor FAVS changes to accomodate for recent vector changes. 2019-01-13 01:38:08 -05:00
Matthew Miller
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
NotMyFault
c0c0db0d6e
Adding discord to debugpaste 2019-01-10 14:57:32 +01:00
NotMyFault
b200744d57
Cya hastebin 2019-01-10 14:46:10 +01:00
Kenzie Togami
4d6045813c Move vectors to static creators, for caching 2019-01-10 07:17:04 -05:00
Byron Marohn
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
Sauilitired
33ad31454e
Make debugpaste use Incendo Paste Viewer, rather than Hastebin. 2019-01-10 04:04:52 +01:00
IronApollo
a9919d130c Current progress #4 2019-01-09 03:32:38 -05:00
IronApollo
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
Matthew Miller
871541d8c0 Tweak the last access extent cache to provide better caching 2018-12-29 19:21:45 +10:00
SirYwell
193361ac32 fix //removenear exception for size < 1 2018-12-29 08:47:57 +01:00
Kenzie Togami
2f8bdccf65
Clarify state when asking for caps with no platforms 2018-12-28 22:20:12 -08:00
Matthew Miller
862b63d43a Can't query the row directly 2018-12-28 18:06:41 +10:00
Matthew Miller
54b6e57186 Few minor improvements to the fuzzy system. 2018-12-28 15:05:05 +10:00
Matthew Miller
b544782f3b Make the base fuzzy cached per block type 2018-12-27 15:33:19 +10:00
Matthew Miller
8da984d9f9 Fuzzier fuzzies 2018-12-27 15:19:58 +10:00
Kenzie Togami
386668d221
Clean up other compiler warnings 2018-12-26 16:50:24 -08:00
Kenzie Togami
3fefcbf971
Remove all raw usages of BSH, improve API generics 2018-12-26 16:39:10 -08:00
Matthew Miller
a88f6b8430 Minor improvements to the server side CUI 2018-12-26 18:15:17 +10:00
Byron Marohn
2259f7d025 Merge upstream changes through 88f22f2e
This was not a straightforward merge. A new method was added upstream to:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

This file has been substantially changed vs upstream worldedit. I merged
things as best I could - added the new method to this interface, and
then implemented it in:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

Unfortunately there's no easy way to test that it works - so I left a note...

Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-23 19:58:49 -08:00
IronApollo
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
Matthew Miller
b75d5149eb Fixed the bundle being directly used outside of the registry system. 2018-12-23 21:43:20 +10:00
Matthew Miller
1d5e9b7d04 Few fixes 2018-12-23 21:24:58 +10:00
Matthew Miller
645fd682b6 Finish porting all the old masks across 2018-12-23 19:10:05 +10:00
Matthew Miller
6312bcecf6 Fixed the item parser not using the ItemRegistry 2018-12-23 19:02:58 +10:00
Matthew Miller
c5d9aadab8 Start work on modularising masks and patterns 2018-12-23 18:56:26 +10:00
Matthew Miller
d6977aeae4 Allow a pattern for the leave-id of //move 2018-12-22 17:26:02 +10:00
SirYwell
cf96c478be change entity list to ignore player when pasting 2018-12-22 00:46:05 +01:00
Byron Marohn
801793cc12 Merge upstream changes through 7961fa58
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 12:13:43 -08:00
Byron Marohn
dab9e9a799 Fix imports - build working again
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:09:58 -08:00
Matthew Miller
8d07877463 Pass the exception converter through more. 2018-12-21 17:31:27 +10:00
Matthew Miller
ea30578781 Added a way to get the spawn position of a world 2018-12-21 17:05:30 +10:00
Matthew Miller
c949b07df1 Added a method to teleport entities across worlds. 2018-12-21 16:56:10 +10:00
Byron Marohn
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
Matthew Miller
b300c21185 Update draw.js and roof.js 2018-12-20 13:43:01 +10:00
NotMyFault
5520813ae6 Switching from IRC to Discord
To offer us a better possibility to help you regarding issues or bugs, join us on discord https://discord.gg/ngZCzbU
2018-12-18 21:54:17 +01:00
Matthew Miller
5eb9b779d7 Move the pasting system over to WorldEdit, and add a /we report command. Currently only reports system status and the config. Need to add a platform reporter system. 2018-12-18 19:28:55 +10:00
Matthew Miller
8f236afae9 Added a display name to Actors 2018-12-18 17:36:53 +10:00
dordsor21
07c86f32ae Definitely fix build 2018-12-17 13:47:29 +00:00
Matthew Miller
700e41b706 Remove the final stage committer from the MultiStageReorder extent, as it caused issues and no longer appears to be entirely necessary. 2018-12-13 20:30:54 +10:00
NotMyFault
7a1b75f110
Significantly improved the quality of Simplified Chinese translation 2018-12-10 16:58:27 +01:00
Matthew Miller
926f6a6ab8 Flush undo/redo 2018-12-09 16:28:01 +10:00
Matthew Miller
6f3016c7f0 Fixed up the commitRequired checks. 2018-12-09 16:28:01 +10:00
Matthew Miller
5f2c77b719 Further work on this. Currently fast mode breaks doors, gotta work out why applying physics to doors breaks them. 2018-12-09 16:28:01 +10:00
Matthew Miller
618cbd2250 Few small fixes 2018-12-09 16:28:01 +10:00
Matthew Miller
59f9864ba3 Set fast to the default 2018-12-09 16:28:01 +10:00
Matthew Miller
7f11b2800d Added an option to switch reorder modes 2018-12-09 16:28:01 +10:00
Matthew Miller
b3f5bc030e Few fixes for FastModeExtent. 2018-12-09 16:28:01 +10:00
Matthew Miller
7d468357e3 Added "fast mode corrections" 2018-12-09 16:27:02 +10:00
Matthew Miller
4e5e9f609e Added the multi-staging from the multipass2 branch 2018-12-09 16:27:02 +10:00
JOO200
a73faf0c8b Check by setting blocks with BlockBagExtend for changed materials. 2018-12-05 17:09:06 +01:00
Matthew Miller
be0d21e2a9 Filter out commands that the player doesn't have permissions for. Workaround for a Spigot issue. 2018-12-05 16:32:20 +10:00
Matthew Miller
8e18ecb645
Merge pull request #330 from Europia79/vpcmdfix
Fixes issue 3315 with VirtualPlayers
2018-11-24 13:16:56 +10:00
NotMyFault
99fb2b546c Fixing Italian translation 2018-11-21 14:37:44 +01:00
Matthew Miller
2dc9321da6 Added support for axis rotations. 2018-11-17 12:00:19 +10:00