Commit Graph

675 Commits

Author SHA1 Message Date
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
e86e4c9c53
wip on FaweQueue 2019-07-19 06:49:29 +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
be8213d8ee
resolve conflicts 2019-07-18 16:56:57 +10:00
Jesse Boyd
dd38cbe750
. 2019-07-18 04:30:02 +10:00
Jesse Boyd
8d60c0197b
Update AsyncChunk.java 2019-07-17 22:09:48 +10:00
Jesse Boyd
7a42bd208f
Update AsyncWorld.java 2019-07-17 22:04:05 +10:00
Jesse Boyd
505af853bd
setLocation should be synchronized 2019-07-17 22:00:00 +10:00
Jesse Boyd
eff203c3b8
Merge branch 'breaking' into breaking-114 2019-07-17 21:31:06 +10:00
Jesse Boyd
8f902c797d
Don't print within high stack depth conditions
FAWE is trying to detect prevent a stackoverflow from block/item lag. Calling print adds to the stack depth.
2019-07-17 21:28:46 +10:00
Jesse Boyd
68ea3d6e99
revert some changes 2019-07-17 20:50:54 +10:00
Jesse Boyd
ae9efc3df1
Merge branch 'breaking-114' into filter-pipeline 2019-07-17 14:55:04 +10:00
MattBDev
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
Jesse Boyd
5d41bdb7c7
merge from breaking 2019-07-17 06:10:18 +10:00
Jesse Boyd
71a9256617
Merge branch 'breaking' into breaking-114 2019-07-17 06:08:18 +10:00
Jesse Boyd
cfbde956f4
some refactoring to pipeline classes (WIP) 2019-07-17 05:10:39 +10:00
NotMyFault
fee57017cd Bump dummy version to 1.14 2019-07-11 22:50:28 +02:00
Jesse Boyd
cf09ca7f37
delete FaweQueue 2019-07-12 01:32:14 +10:00
Jesse Boyd
4dea4f4c45
method changed 2019-07-11 20:12:18 +10:00
Jesse Boyd
3e8fd842d8
use ivy repo 2019-07-11 08:42:44 +10:00
Jesse Boyd
2c76c23bf2
don't use nms world.n 2019-07-11 08:11:37 +10:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114 2019-07-11 08:08:55 +10:00
Jesse Boyd
280147491d
protochunk 2019-07-11 07:52:55 +10: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
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
wizjany
a18f26f8af Play nicer with naughty plugins. 2019-07-06 09:44:53 -04: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
Jesse Boyd
de52b65738
Add paper methods to AsyncWorld 2019-06-29 16:04:37 +10:00
Jesse Boyd
6a7935829b
Merge from upstream 2019-06-29 16:01:32 +10:00
Jesse Boyd
a4344fb2df
add 1.14 depend (non functional) 2019-06-29 14:06:19 +10:00
MattBDev
8dd5f0c298 Fix a compile error 2019-06-28 18:24:56 -04:00
Jesse Boyd
664a7017b6
Add NotNull annotation to adapter 2019-06-29 06:28:14 +10:00
Jesse Boyd
8b9a2ff18c
get tool from player 2019-06-29 04:27:46 +10:00
Jesse Boyd
d6280ec945
Avoid redundant check for performance critical code 2019-06-29 04:23:51 +10:00
Jesse Boyd
a2efdbc488
a1c15e1c39 2019-06-29 03:10:47 +10:00
Jesse Boyd
5a67363a78
0313320816 2019-06-29 02:24:57 +10:00
Jesse Boyd
c773a1e278
Remove FaweLocation
it was a leftover from when WE didn't have Location
2019-06-29 00:13:30 +10:00
Jesse Boyd
846a1b0769
6c94cca15e 2019-06-29 00:01:51 +10:00
Jesse Boyd
fecb380d44
aea5b68ced 2019-06-28 22:43:32 +10:00
MattBDev
d0a31691e1 Small changes 2019-06-26 20:14:00 -04:00
MattBDev
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
MattBDev
a1c15e1c39 Many upstream changes. Should be non-breaking 2019-06-25 09:00:44 -04:00
MattBDev
57f992a524 Remove nullblock from EditSession 2019-06-23 14:05:14 -04:00
MattBDev
8c9090a21d I changed stuff. That's all I remember 2019-06-23 13:27:34 -04:00
wizjany
d763ab374c
Re-add delchunks command (#481)
The new command now writes a json file to WorldEdit's working directory with instructions on which chunks to delete, which is read by the plugin/mod at startup and calls the ChunkDeleter.
The chunk deleter parses the json and iterates the instructions, backing up .mca files as it goes and overwriting the offset headers with 0 wherever a chunk needs to be deleted.
This allows Minecraft to reclaim the space used for that chunk, as well as forcing it to be generated from scratch next time the area is loaded.
2019-06-22 14:20:14 -04:00
MattBDev
1e02560039 Remove BukkitMask 2019-06-21 19:58:40 -04:00
MattBDev
0313320816 As Jesse would say... * 2019-06-20 20:05:18 -04:00
wizjany
0088fe79b3 Cleanup Bukkit internal id usage. 2019-06-15 17:33:17 +10:00
Kenzie Togami
27c7d488a2 Add perf. improvments for Forge 2019-06-15 17:33:17 +10:00
Kenzie Togami
8c17aab9c5 Clean-up some misc. parts of the code 2019-06-15 17:33:17 +10:00
wizjany
dc21b4df58 This does something idk. 2019-06-15 17:33:17 +10:00
Kenzie Togami
a3a175ab8c Initial attempt at binding state IDs 2019-06-15 17:33:17 +10:00
wizjany
e1c191599c Implement item brushes and item NBT for bukkit.
This allows usage of `/br <apply|paint> <shape> item` and the `offhand`
syntax for item parser to use NBT.
2019-06-14 16:37:23 -04:00
wizjany
213cadf093 Import cleanup, ensure gradle uses https for deps, bump deps. 2019-06-13 09:17:00 -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
NotMyFault
ec001b8d3b Revert "Upstream, generics, formatting"
This reverts commit cd88e513a8.
2019-06-12 15:45:41 +02:00
MattBDev
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00
wizjany
efb7650d6f Fix some reload issues.
And some unload issues.
2019-06-11 18:02:24 -04:00
wizjany
3fd661c513 Don't attempt to check unloaded world refs. 2019-06-08 11:25:36 -04:00
MattBDev
7f3c4c4828 A lot of removals, upstream merges, and maybe more. 2019-06-07 20:58:48 -04:00
MattBDev
229182aa63 Remove CUI and other cleaning 2019-06-06 18:39:51 -04: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
6c94cca15e Selective upstream merge
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
wizjany
3df2410254 Change chunk loading method.
Behavior of loadChunk changed a lot for the worse in CB 1.14.
2019-06-02 21:56:29 -04:00
wizjany
1e7c074217 Few misc command fixes. 2019-06-01 09:35:27 -04:00
wizjany
44ee1546b7
Apparently CB uses this. 2019-05-31 11:48:08 -04:00
MattBDev
aea5b68ced Upstream merges and a few code cleanups 2019-05-30 16:07:30 -04:00
wizjany
6ad274677f Don't require command for CUI init. 2019-05-29 23:15:06 -04:00
wizjany
ec3648e521 Wrap and unwrap.
Exceptions are fun.
2019-05-29 23:15:05 -04:00
MattBDev
a0eb7ce59e Typo Fixes and Added Annotations 2019-05-28 23:23:51 -04:00
wizjany
6962b2e7b6 Add comprehensive suggestions to many commands.
All patterns now have suggestions, including recursive patterns.
Suggestions will suggest blocks and block states.
All masks now have suggestions, though mask intersections are not
yet supported due to issues with quotes strings.
EntityRemover and ItemFactory now also have completions, as well
as all RegistryConverters (though I am unsure how many are actually
used).

Also use paper's AsyncTabComplete event, if available.
2019-05-28 22:55:20 -04:00
Jesse Boyd
6bc5b4a823
. 2019-05-29 06:31:22 +10:00
wizjany
48fb669119 Guard against reloads breaking too much. 2019-05-25 18:11:23 -04:00
wizjany
7b47d9a945
Add /tracemask. (#474)
Allows setting a mask used for block traces. This allows brush tools to
pass through various materials, such as water (e.g. `/tracemask #solid`
or `/tracemask !air,water`) before starting to build.
By default, a null mask is equivalent to #existing (original behavior).

https://gfycat.com/ImmaculateFrayedCockatiel
2019-05-23 21:12:31 -04:00
MattBDev
6b0fcc8712 Removed some null checks and fixed some variable names 2019-05-22 14:40:56 -04:00
wizjany
b0777f6b06 Use DFUs for some additional data fixing.
Legacy mapper now uses the data fixers to upgrade blocks and item types
(e.g. signs, dyes that changed names in 1.14).
The sponge schematic reader can now attempt to use the data fixers to
upgrade blocks, block entities, biomes and entities. This has been
tested with the 1.13 -> 1.14 changes. It is yet to be seen if it will
continue to work because...
The mc edit schematic reader has code for using data fixers, but it is
currently disabled as there seem to be some issues with fixing up older
block entities.
2019-05-20 16:39:58 -04:00
wizjany
334d5cfaab The "spawner|mobType" syntax once again makes functional mob spawners.
Also fix block parser context not being restricted.
2019-05-18 10:16:08 -04:00
wizjany
f9d0d340e7 Add DFUs. Currently used by //restore. 2019-05-13 23:07:53 -04:00
Jesse Boyd
c797dcb194
WIP filter patterns 2019-05-12 23:32:04 +10:00
Kenzie Togami
8a3e6a12b9 Implement suggestions for Bukkit + Sponge 2019-05-05 23:06:20 -07:00
wizjany
ceff17c4f7 Misc fixes.
Closes a few old youtrack issues which I don't remember because I had
like 30 tabs open, and a few other issues which I found while testing
some of those.
2019-05-05 15:15:03 -04:00
Jesse Boyd
d603f45063
remove debug 2019-05-05 22:19:13 +10:00
Jesse Boyd
7c174beaee
Region filter 2019-05-05 03:58:26 +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
wizjany
57c161a602 Actually initialize GameModes and WeatherTypes. 2019-05-02 00:08:19 -04:00
Kenzie Togami
13a8c480e3 Insert Locale.ROOT into all case change methods 2019-05-01 15:24:32 -07:00
Jesse Boyd
ad52e01e9f
update players 2019-05-02 05:19:25 +10:00
Jesse Boyd
4619fd2b49
Reuse get array after apply 2019-05-02 05:02:11 +10:00
Jesse Boyd
18e6c09fdd
use paper writeLock 2019-05-02 04:30:32 +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
Kenzie Togami
7c1764548d
Deprecate old system, still in use by WG/CB 2019-04-30 13:53:14 -07:00
Jesse Boyd
33e119ccb6
implement block get 2019-05-01 02:19:10 +10:00
dordsor21
e2c9454399
Don't print stack trace, print another few lines of debug for using paper
Closes #133 bye bye
2019-04-30 11:56:30 +01:00
wizjany
3c04a83852 Add nicer error when using player commands as console.
Also fix slash counts for Bukkit.
2019-04-29 17:39:30 -04: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
wizjany
b3053f19ce Pagination changes and cleanup.
Refactored PaginationBox to be abstract. Implementations can generate individual components as needed now.
Add lots of Component usage to schematic list, help listings, etc.
Fix a few schematic and file resolution issues.
2019-04-28 01:12:05 -04:00
NotMyFault
686c71d965 Move around some debugs 2019-04-27 20:34:56 +02:00
Matthew Miller
62353a46db Added a pagination box and use it in Biome List and Chunk List 2019-04-27 21:57:45 +10:00
Jesse Boyd
6adf0e6435
some structure 2019-04-27 11:15:08 +10:00
Kenzie Togami
7ff537138a
Merge master again 2019-04-26 01:25:42 -07:00
Kenzie Togami
b8c120e0c4
Finish porting commands 2019-04-26 01:18:02 -07:00
wizjany
31a8328fb5 Add data version to BukkitImplAdapter.
Also throttle unknown-block warning when loading MCEdit schematics.
2019-04-26 16:41:39 +10:00
wizjany
17fba54305 Update SpongeSchematic format to version 2.
Allows saving and loading entities and biomes.
2019-04-26 16:41:39 +10:00
Kenzie Togami
853bfab022
Merge master, update to texts 2019-04-25 22:11:46 -07:00
Matthew Miller
f70557e3da Provide a warning when an invalid property is entered rather than failing. Fixes WorldEdit entirely failing on new MC versions. 2019-04-25 22:48:15 +10:00
Jesse Boyd
35fd159e79
WIP rewrite of NMS pipeline 2019-04-25 20:32:27 +10:00
Jesse Boyd
8808ec89a0
Revert "wip 1.14"
This reverts commit 3bf2ccdebc.
2019-04-25 01:32:27 +10:00
Jesse Boyd
cc80bc61cf
Compiles in 1.14 (yay) 2019-04-25 00:10:52 +10:00
Jesse Boyd
3bf2ccdebc
wip 1.14 2019-04-24 02:48:42 +10:00
Jesse Boyd
219321b777
Check before copy 2019-04-24 02:29:25 +10:00
Jesse Boyd
1503ba94a4
Forgot FAWE was already added to lookup names 2019-04-23 23:44:47 +10:00
Jesse Boyd
a523ef8176
Use update folder 2019-04-23 23:31:54 +10:00
Jesse Boyd
02a6caa3ab
Don't load dummy twice 2019-04-23 23:30:43 +10:00
Jesse Boyd
aa1fec2dad
Remove check 2019-04-23 00:17:54 +10:00
Kenzie Togami
1e7b4fc835
Move shaded libraries to their own artifacts 2019-04-20 23:11:39 -07: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
Matthew Miller
55348346e9 Shade in Kashike's lib 2019-04-19 14:49:29 +10:00
Kenzie Togami
ac03de89cc
Work on adding converters for some arguments 2019-04-18 19:11:57 -07:00
Kenzie Togami
37c993be16
Port ClipboardCommands, update to new Key 2019-04-18 12:34:57 -07:00
NotMyFault
a22ba45b1c Minors 2019-04-18 20:47:25 +02:00
Jesse Boyd
274c52163b
Fix setting the same block multiple times sequencially 2019-04-17 01:12:09 +10:00
Jesse Boyd
2a373b1390
Remove PS check here 2019-04-16 13:53:21 +10:00
Jesse Boyd
e7869643d9
Fix ghost blocks !protocolsupport 2019-04-16 13:47:05 +10:00
Jesse Boyd
629be505e2
Fix ghost blocks 2019-04-16 13:29:59 +10:00
Jesse Boyd
cd4d0f7725
Remove air check 2019-04-16 11:30:46 +10:00
Jesse Boyd
9207263426
Remove chunk notify task 2019-04-16 01:16:00 +10:00
Jesse Boyd
7c54f16d43
Fix chunk section Y 2019-04-15 20:26:41 +10:00
Jesse Boyd
f6014089cc
Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking 2019-04-15 19:36:55 +10:00
Jesse Boyd
d80f25c4c0
minor cleanup 2019-04-15 19:36:42 +10:00
Kenzie Togami
267ccf2298
First attempt at integrating Piston as the only command system 2019-04-15 01:21:15 -07:00
NotMyFault
86727c5fb8 Minors
- Update links
- Remove update part from settings
2019-04-14 19:10:40 +02:00
Jesse Boyd
03f0a2a62d
Update to latest paper 2019-04-15 01:45:17 +10:00
Jesse Boyd
f6b844e53c
Fix chunk yPos 2019-04-14 21:46:57 +10:00
Jesse Boyd
fab197034e
fix NMS queue palette size 2019-04-14 21:43:06 +10:00
Matthew Miller
3e4004ad9e Start work on improving the formatting system. May switch to Kashike's as Bukkit is shit 2019-04-14 19:33:44 +10:00
Jesse Boyd
6502f0b5c6
Fixes #122 2019-04-14 13:10:37 +10:00
Jesse Boyd
72a44d65fd
Fix other ProtocolSupport compatibility issues 2019-04-14 13:07:02 +10:00
Jesse Boyd
ce0dda5931
Fix ProtocolSupport compatibility 2019-04-14 12:13:41 +10:00
Jesse Boyd
df8e04cc67
Fix ProtocolSupport issue 2019-04-14 00:51:39 +10: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
Jesse Boyd
f9f6aead0f
Some optimizations for 1.13 2019-04-13 16:44:23 +10: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
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
31797d4231
WIP on 1.13 CFI 2019-04-10 18:32:21 +10:00
Jesse Boyd
093542c337
fix compile + use mutable vector for affine transform + fix bstats package 2019-04-07 20:43:59 +10:00
NotMyFault
ee630b9236
Fixes #106 2019-04-07 01:38:25 +02: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
16b01b9de2
Fix pasting nbt 2019-04-06 02:33:17 +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
95c819684c
Use BiomeType here 2019-04-05 03:17:21 +11:00
Jesse Boyd
33f5322fda
WIP merge (i'll finish this later) 2019-04-05 01:24:47 +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
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
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
wizjany
7ad364917f Ignore synthetic classes when loading BukkitImplAdapter.
(cherry picked from commit 319f2efe43)
2019-04-02 15:45:04 -04:00
matt
c997a2583c I like change 2019-04-01 21:28:49 -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
a636a30e9f
Dont try removing player entity 2019-04-01 20:39:49 +11:00
Jesse Boyd
d1e51884de
Merge pull request #86 from IntellectualSites/tile-entity-fix-extracted
Fix the tile entity deal-io only
2019-04-01 13:42:13 +11:00
Jesse Boyd
92a7bd5e44
minor tweak for mutable vectors 2019-04-01 03:09:20 +11:00
Sauilitired
4137d0a91a
Fix the tile entity deal-io only 2019-03-31 10:45:42 +02:00
Sauilitired
6dd7190fc5
Fix the tile entity deal-io only, and also took the liberty to make
sure that the splash file doesn't prevent building. xoxo.
2019-03-31 10:39:52 +02:00
wizjany
961da1b93f Add BukkitPlayer constructor without plugin.
tbh I don't know why we even need to keep the plugin object around.
2019-03-30 17:32:10 -04:00
matt
acc8eb0a99 Lambda's and References and Cleanups! Oh My! 2019-03-27 12:17:05 -04:00
matt
8124d3b3c5 Reverted an upstream change due to a sketchy class issue 2019-03-26 15:29:46 -04: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
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
16c22b75da
Merge pull request #79 from IntellectualSites/remove-plotme-support
Remove PlotMe support
2019-03-25 06:09:50 -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
14ab61d154 Remove PlotMe support 2019-03-25 00:02:20 +01:00
NotMyFault
68c8950cdc Add IncendoPaster
Co-Authored-By: Alexander Söderberg <citymonstret@hotmail.com>
2019-03-24 23:02:32 +01: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
Matthew Miller
d186cce393 Merge remote-tracking branch 'origin/feature/slf4j-logging' 2019-03-19 20:32:21 +10:00
wizjany
d1c2a029bf Move some platform stuff to load, put enable back to postworld. 2019-03-15 23:43:57 -04:00
wizjany
c885f70c7b Load Bukkit plugin at startup.
This should allow plugins that use WorldEdit to do things on world load.
2019-03-15 18:38:06 -04:00
Kenzie Togami
d6804737cf
Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
wizjany
6937cfc9a9 Need internal ID for EntityType here too. 2019-03-09 10:46:40 -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
IronApollo
3ffb5ff00d Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing 2019-02-27 08:09:04 -05:00
wizjany
90797d12f4 Skip legacy materials when setting up registries.
Doesn't make a difference normally, but avoids errors in special envs.
2019-02-25 18:41:20 -05: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
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
wizjany
319f2efe43 Ignore synthetic classes when loading BukkitImplAdapter. 2019-02-14 18:07:07 -05:00
IronApollo
2d586ff53e Registry changes & additions 2019-02-03 08:53:04 -05:00
Kenzie Togami
4b5b7b8003 Clean up other compiler warnings 2019-02-03 06:06:07 -05:00
Kenzie Togami
94ebb81e92 Add generics to other rawtypes 2019-02-03 05:54:05 -05:00
Kenzie Togami
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -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
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
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
Kenzie Togami
e9fbde3ac8 Remove recursion in VaultResolver
Correctly call into `perms` instead of creating an infinite recursion.
2019-02-02 08:53:31 -05:00
Matthew Miller
10484eb58b Added a Vault resolver to WEPIF. Means any Vault-enabled perm plugin will theoretically work with it 2019-02-02 08:49:53 -05: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
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
cd1d45b856 Updated Paper-API to 1.13.2, minor edits to FastAsyncVoxelSniper 2019-01-16 07:12:02 -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
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
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
SirYwell
d4971a4e2f Temporary removal of tab complete listener 2019-01-03 10:18:54 +01:00
Kenzie Togami
386668d221
Clean up other compiler warnings 2018-12-26 16:50:24 -08:00
Kenzie Togami
de7d9421b1
Add generics to other rawtypes 2018-12-26 16:45:46 -08:00
Kenzie Togami
3fefcbf971
Remove all raw usages of BSH, improve API generics 2018-12-26 16:39:10 -08:00
IronApollo
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05: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
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
NotMyFault
7eac605474 Fixing NBT 2018-12-19 16:33:15 +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
Matthew Miller
7d468357e3 Added "fast mode corrections" 2018-12-09 16:27:02 +10: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
Kenzie Togami
b192466ce2
Remove recursion in VaultResolver
Correctly call into `perms` instead of creating an infinite recursion.
2018-11-30 13:15:09 -08:00
Matthew Miller
ee8602b77b Added a Vault resolver to WEPIF. Means any Vault-enabled perm plugin will theoretically work with it 2018-11-18 15:58:15 +10:00
NotMyFault
ec22c4f180
Merge pull request #19 from IronApollo/master
Fix for '//mask ?' resulting in pattern error
Fixes CommandSuggestionEvent 
Update FaweLocalBlockQueue to support Plotsquared restrictions
2018-11-14 07:41:42 +01:00
Kenzie Togami
2c8b2fe089
Move vectors to static creators, for caching 2018-11-03 23:00:24 -07:00
Kenzie Togami
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
NotMyFault
69168c7262 Updating & fixing repo
- Updated Paper download link going to 1.13
- Updated translations from boy0001/FastAsyncWorldEdit
-
2018-11-02 13:20:54 +01:00
IronApollo
9896a1339e Updates to FaweLocalBlockQueue to allow FAWE-P2 compatibility 2018-11-01 07:24:56 -04:00
IronApollo
dcd041e847 Potential fix for CommandSuggestionEvent errors 2018-11-01 07:22:50 -04:00
IronApollo
34c8ecc694 Fixed invoke method missing argument 2018-10-25 07:12:08 -04:00
IronApollo
be73d29354 1.13.2 setType adaptation 2018-10-24 18:25:50 -04:00
Kenzie Togami
1fa1ff895b
Flush or disable buffers in tools 2018-10-20 19:47:17 -07:00
IronApollo
ea0133b740 Changes to completely separate SyncTabCompleteListener from Paper 2018-10-19 18:24:58 -04:00
IronApollo
3add6fd32b Check for the AsyncTabCompleteEvent class before attempting to create the Listener 2018-10-17 13:42:21 -04:00
Matthew Miller
dd2fcbac23
Merge pull request #430 from sk89q/feature/chunk-batching-mode
Chunk Batching
2018-10-15 13:50:10 +10:00
Matthew Miller
f8bf547c9e Added some missing bukkit registries 2018-10-14 17:55:57 +10:00
Jesse Boyd
dfb0c5671b
Fixes boy0001/FastAsyncWorldedit#1116 2018-10-14 03:42:23 +11:00
Jesse Boyd
7cf7c0712f
fix fixwater/lava + tile paste 2018-10-13 19:50:13 +11:00
Matthew Miller
0fe1fe33cc Replace BukkitImplementationTester with paperLib 2018-10-12 16:09:52 +10:00
Kenzie Togami
7d4906cfe9
Add chunk batching flag, enable by default 2018-10-10 11:38:23 -07:00
Matthew Miller
79a4121098 Return null if the material is null. 2018-10-04 20:29:40 +10:00
Kenzie Togami
2cad9a2c09
Switch to a license plugin for headers 2018-10-04 00:29:34 -07:00
Jesse Boyd
dce39e5c69
Fix physics freeze 2018-10-03 14:58:19 +10:00
Kenzie Togami
388187d26b
Cleanup javadoc warnings in worldedit-bukkit 2018-10-01 15:31:26 -07:00
Matthew Miller
42e0cceeab Bukkit really needs methods to get by key/get key 2018-09-26 15:03:01 +10:00
Matthew Miller
cc1a54b5f0 Added an implementation tester to Bukkit, to determine which impl is in use. (For WE,WG,CB to use Paper/Spigot specific APIs) 2018-09-23 22:48:04 +10:00
Matthew Miller
02c6f11bb9 Added bStats 2018-09-20 22:59:42 +10:00
Jesse Boyd
5b5336cc83
some fixes
Use sponge schematic format instead of structure block
Fix VS undo running on main thread
Fix missing sections when setting blocks
2018-09-18 12:49:33 +10:00
Jesse Boyd
ffa9eace6f
Fix /none 2018-09-08 03:17:27 +10:00
Jesse Boyd
fc949e3efc
Fixes #1112 2018-09-08 03:11:56 +10:00
Jesse Boyd
7af1b3dcc8
Add heightmap web util command 2018-09-07 06:40:13 +10:00
Jesse Boyd
594d72d2fe
Fix free build restrictions 2018-09-05 07:09:24 +10:00
Jesse Boyd
dfb1195242
Break on event cancel 2018-09-05 05:12:02 +10:00
Jesse Boyd
82ede1d42b
freebuild region restrictions 2018-09-05 05:10:15 +10:00
Jesse Boyd
b24d322d29
Update from sk89q/master 2018-09-03 00:10:38 +10:00
Jesse Boyd
418cfa6d03
Update towny hook / fix pattern traverser 2018-08-29 01:04:25 +10:00
Matthew Miller
fdb9d77710 Finish the BlockData caching in Bukkit 2018-08-28 18:45:24 +10:00
Jesse Boyd
abd886acd7
some hasty refactoring 2018-08-28 02:56:28 +10:00
Pieter12345
6c7a49733c Fix plugin enabling on Bukkit without compatible adapter
When loading WorldEdit on a Bukkit server which it does not have an adapter for, a stacktrace is printed to console and WorldEdit does not load. This commit fixes that by registering the BukkitServerInterface before attempting to find a matching adapter.
2018-08-26 21:34:33 +02:00
Jesse Boyd
a61c856adc
Allow certain commands to bypass queuing 2018-08-24 19:33:52 +10:00
Jesse Boyd
c3db5c0cf1
Fix persistent brushes 2018-08-24 07:18:14 +10:00
Jesse Boyd
dbd31ea347
Fixes boy0001/FastAsyncWorldedit#1090 2018-08-24 01:22:30 +10:00
Matthew Miller
58a5d9961b Minor formatting and neatness changes. 2018-08-23 20:15:44 +10:00
Jesse Boyd
f43faae917
Update favs 2018-08-23 06:02:04 +10:00
Brendan Grieve
b08825e13e Add new MaskManager: WorldguardFlag 2018-08-22 12:42:52 +08:00
Jesse Boyd
a9e99c7cd7
Load dummy jar on first launch 2018-08-22 04:18:10 +10:00
Jesse Boyd
1d6f2e4274
Fix setbiome 2018-08-22 03:51:52 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn) 2018-08-22 03:22:37 +10:00
Matthew Miller
d3b3d57041
Merge pull request #420 from sk89q/server-side-cui
Added a server side version of WorldEditCUI with limited functionality
2018-08-20 14:46:08 +10:00
Matthew Miller
7b83f97c35 Fixed NotABlockException not getting thrown 2018-08-19 14:41:09 +10:00
Matthew Miller
a354267e85 Try sending fake operator packets to support non-OP 2018-08-19 13:41:38 +10:00
Matthew Miller
4d0df10f88 Fixed sessions not saving on shutdown 2018-08-19 13:01:08 +10:00
Matthew Miller
034c165bee
Merge pull request #396 from boy0001/FallbackRegistrationListener-fix
Fix FallbackRegistrationListener
2018-08-18 20:46:48 +10:00
Matthew Miller
f8585adc79 Remove debug code 2018-08-18 15:27:26 +10:00
Matthew Miller
7f419618cc Switch to using fake blocks, no more world pollution 2018-08-18 15:22:49 +10:00
Jesse Boyd
b8cc785717
Use Uri instead of BufferedImage for parameter 2018-08-17 22:48:33 +10:00
Jesse Boyd
ae65708d82
Fix some command parsing issues
Tab complete runs on main thread - that could be an issue
2018-08-17 20:13:33 +10:00
Jesse Boyd
43d5459595
Fix __reserved__ being solid 2018-08-17 19:21:45 +10:00
Jesse Boyd
36ede1b27d
Fixes boy0001/FastAsyncWorldedit#1078 2018-08-17 18:27:48 +10:00
Jesse Boyd
29a364865d
Also register case sensitive 2018-08-17 03:30:55 +10:00
Jesse Boyd
60699f915d
comment this out 2018-08-17 03:28:34 +10:00
Jesse Boyd
c2a1fbf7cc
Fixes #1077 2018-08-17 02:55:06 +10:00
Jesse Boyd
4ffb9bce6c
Various minor
Fix image brush
Fix some java 9 issues
Fix metrics being disabled
Fix compile: duplicate method in SimpleBlockMaterial
Load as both FastAsyncWorldEdit and WorldEdit
2018-08-16 23:21:39 +10:00
Jesse Boyd
2172ebba83
Fix some issues with java 9 / reflection 2018-08-16 19:56:31 +10:00
Matthew Miller
bc5609114b Add a material to check if air is air, because there are now 3 types of air. 2018-08-16 15:42:11 +10:00
Jesse Boyd
f254027f4b
Fix //wand 2018-08-16 00:04:40 +10:00
Jesse Boyd
659ed09bf1
Fix compile 2018-08-16 00:04:16 +10:00
Jesse Boyd
be574391ed
Update WorldGuard hook 2018-08-15 23:30:42 +10:00
Jesse Boyd
13d2ae20d5
Make end tag singleton 2018-08-15 17:02:17 +10:00
Jesse Boyd
8d68191b2c
Implement spawnParticle 2018-08-15 14:22:42 +10:00
Jesse Boyd
a67441bbff
Merge remote-tracking branch 'refs/remotes/sk89q/master'
# Conflicts:

#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
2018-08-15 14:02:51 +10:00
Matthew Miller
c31161d068 Moved report framework to WorldEdit and fixed a few bugs. 2018-08-15 12:45:18 +10:00
Jesse Boyd
131fd39f63
Various minor
Add entity registry
Re-add AbstractLoggingExtent
Fill in missing nbt on entity load
2018-08-14 19:24:10 +10:00
Jesse Boyd
55d34343dd
Fix some api compatibility issues 2018-08-14 17:18:49 +10:00
Jesse Boyd
22511b2e19
Make this public 2018-08-14 12:07:11 +10:00
Jesse Boyd
198c53ff58
Fix wrong import 2018-08-14 12:00:48 +10:00
Jesse Boyd
1740c845d2
What are the dud BlockCategories? 2018-08-14 11:00:44 +10:00
Jesse Boyd
76a55b7712
Merge remote-tracking branch 'refs/remotes/sk89q/master'
# Conflicts:

#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
#	worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
2018-08-14 01:36:00 +10:00
Matthew Miller
96388df4b0 Add adapters for EntityType 2018-08-13 22:29:48 +10:00
Jesse Boyd
f72977e69a
Register BlockExplodeEvent in separate class 2018-08-13 03:46:57 +10:00
Jesse Boyd
7fb3899bb7
Use BlockState for player inventory getBlock 2018-08-13 03:31:26 +10:00
Jesse Boyd
e7c27b08bf
Remove stub injector methods 2018-08-13 02:36:39 +10:00
Jesse Boyd
712ae5aec5
Register individual methods for chunk listener 2018-08-13 00:36:00 +10:00
Jesse Boyd
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
Matthew Miller
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
Matthew Miller
526aa6cf49 If we fail to set NBT Data, try it without the adapter/NBT Data 2018-08-06 18:29:07 +10:00
Matthew Miller
88fc1771b5 Wrap createEntity in BukkitWorld to detect corrupt entities. 2018-08-05 14:24:09 +10:00
Matthew Miller
b2769befdb Added a few utility methods. 2018-08-04 11:43:42 +10:00
Matthew Miller
1480606b52 Fixed a few more issues found looking over the changeset. 2018-08-04 11:43:42 +10:00
Matthew Miller
65420af09e Fixed //fill and //rotate 2018-08-04 11:43:41 +10:00
Matthew Miller
663dd1f4d8 Added an entity, weathertype, and gamemode registry. 2018-08-04 11:43:41 +10:00
Matthew Miller
572bf04482 Cleanup the bukkit implementation, and update to the 1.13 release items/blocks. 2018-08-04 11:43:41 +10:00
Matthew Miller
c3d832c3fd State system is done. It works. Finally. Still a few rough edges that need fixing however. 2018-08-04 11:43:41 +10:00
Matthew Miller
6b5f218809 Basically finish the state system. Just 1 more bug that I'm encountering. 2018-08-04 11:43:41 +10:00
Matthew Miller
4938f419ad Almost finished the state system. Just got to have it actually load in the values. 2018-08-04 11:43:41 +10:00
Matthew Miller
3e1d438565 Get it to a point where it works minimally on 1.13 Spigot. 2018-08-04 11:43:41 +10:00
Matthew Miller
59ca29577c Remove weird TODO import and moved BlockType == Material to BukkitUtil 2018-08-04 11:43:40 +10:00
Matthew Miller
ca06a05117 Update the Bukkit adapter to the Spigot API Preview 2018-08-04 11:43:40 +10:00
kashike
a48c319e7e package move 2018-08-04 11:43:40 +10:00
Matthew Miller
7db443a69a Migrate the logic for which pass a block goes into. Also updated it and made it use tags where possible. 2018-08-04 11:43:40 +10:00
Matthew Miller
57c13ef8f4 Continue moving out of legacy BlockType 2018-08-04 11:43:40 +10:00
Matthew Miller
11f5d05e7b Update BlockState to remove legacy ID usage. 2018-08-04 11:43:40 +10:00
Matthew Miller
93b225ca3c Expose a way of switching between ItemType and BlockType for ItemBlocks. 2018-08-04 11:43:39 +10:00
Matthew Miller
b06937d1c8 Setup a legacy mapper system. The file does not exist yet. 2018-08-04 11:43:39 +10:00