Commit Graph

992 Commits

Author SHA1 Message Date
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
45f947a3b2 migrated settings.gradle to kotlin 2019-08-19 14:00:37 -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
f8758994c3 gradle updates 2019-08-15 15:39:20 -04:00
MattBDev
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
Jesse Boyd
7a57a5dd8c
minor
idk it compiles now
2019-08-10 16:01:42 +10: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
MattBDev
5c6c41a95a Docs, command, and formatting changes. 2019-08-03 22:43:29 -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
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
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
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
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
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
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
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
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
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
MattBDev
ffc2092d93 toggles and timeouts 2019-06-30 14:56:32 -04: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
0feebac44b Make AbstractProperty abstract 2019-06-28 19:00:31 -04:00
MattBDev
be78f2eae1 Added TODO to missing code. 2019-06-28 18:03:24 -04:00
MattBDev
51b1b4262d Revert removal of world field.
This is needed. It shouldn't have been removed because it's nothing new.
2019-06-28 18:03:01 -04:00
Jesse Boyd
13b602cb83
isAffectedBlock 2019-06-29 06:31:07 +10:00
Jesse Boyd
c5b90ba954
use cached maxY 2019-06-29 04:53:44 +10:00
Jesse Boyd
3850944a81
Optimize waterlog remover 2019-06-29 04:49:48 +10:00
Jesse Boyd
8b9a2ff18c
get tool from player 2019-06-29 04:27:46 +10:00
Jesse Boyd
58c6b6278f
a69b239848 2019-06-29 04:20:48 +10:00
Jesse Boyd
f1e98da01f
d0a31691e1 2019-06-29 03:29:53 +10:00
Jesse Boyd
a2efdbc488
a1c15e1c39 2019-06-29 03:10:47 +10:00
Jesse Boyd
8c44c532c4
753b34ef99 2019-06-29 02:35:41 +10:00
Jesse Boyd
5a67363a78
0313320816 2019-06-29 02:24:57 +10:00
Jesse Boyd
ec8422bc13
1f14d4652e 2019-06-29 02:09:56 +10:00
Jesse Boyd
7a9adacc32
Don't read the entire file to check the format 2019-06-29 01:42:22 +10:00
Jesse Boyd
55dad5a972
7f3c4c4828 2019-06-29 01:39:58 +10:00
Jesse Boyd
d9906c9026
229182aa63 2019-06-29 01:19:58 +10:00
Jesse Boyd
2b0a310e0e
filter sphere 2019-06-29 00:16:12 +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
3b2031c22c
c77ee07fcd 2019-06-28 22:43:52 +10:00
Jesse Boyd
fecb380d44
aea5b68ced 2019-06-28 22:43:32 +10:00
MattBDev
e38541aa9b Updates to gradle files. 2019-06-26 21:34:20 -04:00
MattBDev
3a4354268c Attempt to fix null command issues. 2019-06-26 20:18:21 -04:00
MattBDev
d0a31691e1 Small changes 2019-06-26 20:14:00 -04:00
Jesse Boyd
de4dcc0dd5
idk, messing around with region filtering 2019-06-26 20:22:21 +10:00
MattBDev
1932c96d4f Fixed removed import during upstream cleanup. 2019-06-25 13:14:59 -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
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