Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-09-19 13:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,050 Commits 1 Branch 0 Tags 49 MiB
fa8660c7a9
Commit Graph

248 Commits

Author SHA1 Message Date
MattBDev
6dd85e48ba Various changes 
the most notable change is that PlotSquared is being moved to the Bukkit module again to allow for future compatibility with version 5 of the plugin.
 2020-02-12 16:18:36 -05:00
MattBDev
614f5e1c16 Minor changes 2020-02-06 16:33:31 -05:00
MattBDev
490e200a70 Revert "Minor EditSession changes" 
This reverts commit 5ff9b122
 2020-02-05 19:43:50 -05:00
MattBDev
5ff9b1226a Minor EditSession changes 2020-02-05 17:54:19 -05:00
MattBDev
020c674c01 Revert migration of FaweCache to Kotlin 2020-01-29 15:01:38 -05:00
MattBDev
8078cf077a consistency changes 2020-01-26 13:01:16 -05:00
MattBDev
e0f6869573 Revert "More code quality fixes" 
This reverts commit 2d6957ce
 2020-01-23 14:41:57 -05:00
MattBDev
2d6957ce1c More code quality fixes 2020-01-22 21:15:52 -05:00
MattBDev
88359f0215 More Kotlin 2020-01-21 14:30:13 -05:00
Jesse Boyd
195c4a7647
wip history changes 2020-01-06 08:36:16 +00:00
Jesse Boyd
c05cdd8faa
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-01-04 10:12:33 +00:00
Jesse Boyd
88a95221a8
Make masks more stateless 2020-01-04 10:11:13 +00:00
MattBDev
f3e0109be2 A lot of small changes 2020-01-03 15:38:30 -05:00
Jesse Boyd
4a4f5bcc74
Fix #288 sphere min/max y 2019-12-21 05:20:17 +00:00
NotMyFault
f37bc9417c Merge branch 'merge' into 1.15 2019-12-19 19:05:27 +01:00
Jesse Boyd
6ddeb2ebf5
Various minor 
refactor some region dependencies
swithc masking extent to a filter (so it can be parallelized)
Some unfinished refactoring of the filters
remove piston messages from strings.json
 2019-12-16 09:07:51 +00:00
Jesse Boyd
aac30742de
Remove TranslatableComponent override 
use Caption class
 2019-12-16 09:01:41 +00:00
Jesse Boyd
1f19b92b0b
1.13? 2019-11-24 00:57:29 +00:00
Jesse Boyd
1844d4dba7
Various major 
Add regen
Add //history [find|restore|rollback|summary|clear]
 - history commands are interactable
 - inspect brush info is interactable
Commands are now logged to a searchable database
Fix some cases of id/ordinal mismatch
 2019-11-23 04:31:48 +00:00
Jesse Boyd
0c85db920c
save strings.json 2019-11-21 20:37:56 +00:00
Jesse Boyd
1341e38a90
fix compile 2019-11-21 19:56:10 +00:00
Jesse Boyd
37b6c406ac
reduce diff 2019-11-21 07:57:32 +00:00
Jesse Boyd
60759934a3
Fix some merge issues 2019-11-20 00:11:54 +00:00
Jesse Boyd
0e22d4718a
fix some merge issues 2019-11-19 22:07:30 +00:00
Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
Kenzie Togami
d9b0aeca7f
7e3fc6c8e7 2019-11-19 04:49:08 +00:00
Kenzie Togami
122f3b2562
8af68fc884 2019-11-19 04:43:30 +00:00
Jesse Boyd
4c32949210
temp fix for undo 
also fix inspect brush using wrong ids
 2019-11-18 07:23:48 +00:00
Jesse Boyd
0087a0d6ab
Various minor 
fix undo null sections
fix cancel for certain parallel jobs
optimize schem paste
 2019-11-17 22:47:56 +00:00
Jesse Boyd
0b1a36bb7d
WIP VisualExtent 2019-11-16 00:20:14 +00:00
Jesse Boyd
d7b3db215e
Use SingleBlockTypeMask for fixLiquid 2019-11-14 17:57:43 +00:00
Jesse Boyd
2670e66ce2
Fix mask optimize 2019-11-14 17:25:37 +00:00
MattBDev
a23a4e5496 misc changes. 2019-11-11 16:02:28 -05:00
MattBDev
d8d7c8c53f Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline 
 Conflicts:
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java
	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java
	worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
	worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
 2019-11-02 15:58:46 -04:00
MattBDev
f262271519 Message updates 2019-11-02 15:53:25 -04:00
Jesse Boyd
6ed7923a1e
Add //cancel 2019-11-02 12:51:24 +01:00
MattBDev
1b28dcda40 Minor changes to match upstream more closely 2019-10-23 14:29:37 -04:00
Jesse Boyd
8768085479
schem list is still broken 
clickEvent and hoverEvent don't seem to work, I'm probably doing something wrong
 2019-10-23 15:35:04 +01:00
Jesse Boyd
2080e9786b
commanding-pipeline diff 2019-10-23 05:23:52 +01:00
Kenzie Togami
1ba02c54b7
Completely rewrite the expression parser in ANTLR. 2019-10-18 22:27:31 -07:00
MattBDev
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
Kenzie Togami
7e3fc6c8e7
Disable watchdog ticking by default, //watchdog to turn on 2019-09-29 22:10:04 -07:00
Kenzie Togami
8af68fc884
Initial watchdog setup. Bukkit needs adapters, everything needs testing. 2019-09-29 22:09:55 -07:00
MattBDev
24a147465d Fixed a bunch of extends and removed slottableblockbag 2019-09-21 21:00:45 -04:00
MattBDev
14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
MattBDev
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
Jesse Boyd
d434dfcfdd
some minor refactoring 2019-08-18 02:09:09 +01:00
Kenzie Togami
33633acbe7
Add validator extent to every entry point, fix extent ordering 2019-08-12 10:04:29 -07: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
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
a3c58a187e
merge 2019-08-07 01:29:09 +10:00
wizjany
e25a6d21cd Add -e/-b/-m flags to //stack and //move, to match copy and paste. 
Fixes WORLDEDIT-3935.
 2019-08-05 22:47:57 -04:00
wizjany
a1465c02ed Make EditSession#center (//center) set even y blocks. 
At some point this was fixed for x and z but never for y...
 2019-08-05 22:44:51 -04:00
MattBDev
198427dc3d fix more compile errors 2019-07-29 21:05:31 -04:00
MattBDev
12114ec987 Minor changes 2019-07-29 11:19:38 -04:00
wizjany
6631b6bdf0 Make BlockStateHolder extend Pattern. 
Removes the need for wrapping them in BlockPattern.
 2019-07-28 18:20:00 -04:00
MattBDev
46f5b12b36 Convert tabs to whitespace. 2019-07-22 16:42:40 -04:00
Jesse Boyd
0a924915c8
shift extent queue methods 2019-07-19 02:07:31 +10:00
Jesse Boyd
22a7ad7503
optimized biome streaming to schematics 2019-07-18 22:36:50 +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
905fbf5a0b
8108d0a9 2019-07-18 02:31:13 +10:00
Jesse Boyd
68ea3d6e99
revert some changes 2019-07-17 20:50:54 +10:00
MattBDev
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -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
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
c5b90ba954
use cached maxY 2019-06-29 04:53:44 +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
846a1b0769
6c94cca15e 2019-06-29 00:01:51 +10: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
9d1117303c Removed a stupid worldname method. 2019-06-18 23:43:06 -04:00
wizjany
6f7927bc5a Skip poi folders for snapshot restores. 
New to 1.14, Mojang stores .mca files which don't contain chunks in the
poi folder.

Note: we explicitly filter *out* the poi folder, instead of filtering
*to* the regions folder, since old versions of minecraft had regions
directly in the world folder (instead of a regions subfolder).
 2019-06-12 21:51:22 -04: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
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
6c94cca15e Selective upstream merge 
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
 2019-06-04 12:40:11 -04:00
NotMyFault
686c71d965 Move around some debugs 2019-04-27 20:34:56 +02:00
Kenzie Togami
9b0fda9f83
Port utility commands 2019-04-25 19:36:22 -07:00
Kenzie Togami
8c2b725f42
Port toll / tool util commands, add more enums 2019-04-25 12:49:03 -07:00
Jesse Boyd
c6ce0c773f
Fixes #30 2019-04-23 23:49:45 +10:00
Jesse Boyd
274c52163b
Fix setting the same block multiple times sequencially 2019-04-17 01:12:09 +10:00
Jesse Boyd
a831ae17b7
Merge pull request #110 from Mgazul/breaking 
Fix fixLiquid
 2019-04-12 00:55:59 +10:00
Jesse Boyd
31797d4231
WIP on 1.13 CFI 2019-04-10 18:32:21 +10:00
Mgazul
652f27c853 Fix fixLiquid 2019-04-09 11:29:43 +08:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType 2019-04-06 03:34:11 +11:00
Jesse Boyd
9e2832c273
Use BlockVectorSet 2019-04-06 01:01:05 +11:00
Jesse Boyd
2143b9b5b7
finish block registry 2019-04-05 17:51:42 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking 2019-04-05 15:47:04 +11:00
Jesse Boyd
4de5487c51 Change Vector hash codes (#456) 
And add additional unit vectors where needed.
 2019-04-04 08:36:19 -04:00
Jesse Boyd
7086eb8b3e
continue with merge 2019-04-03 22:28:57 +11:00
Jesse Boyd
f361619037
Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11: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
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