Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge
2019-11-19 21:23:47 +00:00
Kenzie Togami
122f3b2562
8af68fc884
2019-11-19 04:43:30 +00:00
Jesse Boyd
1b07846746
some adapter refactoring
2019-11-19 04:40:40 +00:00
Matthew Miller
ded86d4872
Fixed issues brought up in review
2019-11-18 19:50:52 +10: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
329df8d33b
various minor
...
Increase target size
remove unnecessary brush sync
send chunk on biome change
2019-11-17 20:29:25 +00:00
Jesse Boyd
3f92f12e89
synchronize char blocks
2019-11-17 20:02:33 +00:00
Jesse Boyd
e661652c12
Fix setting blocks in null sections
2019-11-17 19:30:28 +00:00
Jesse Boyd
69c225c00f
Fix //vis
2019-11-17 17:22:21 +00:00
Matthew Miller
96e56bdd0c
Rebase translation work for easier rebasing
2019-11-16 22:42:14 +10:00
Jesse Boyd
0b1a36bb7d
WIP VisualExtent
2019-11-16 00:20:14 +00:00
Matthew Miller
77ef0ae417
Bypass Bukkit in more situations ( #532 )
...
* Bypass Bukkit in more situations
* Use orElseGet
* Apply the same optimisation in the reverse BlockData adapter, and use lambdas instead of AIC
* Remove bukkit type checks
* Improve reliability of fallbacks
2019-11-15 12:02:46 +10:00
Jesse Boyd
601890fe64
Fix biome sending
2019-11-14 19:21:28 +00:00
Jesse Boyd
b1244c7780
Remove unused methods from IFawe
2019-11-14 10:54:09 +00:00
MattBDev
630245bb9f
Attempt to fix compile and other small changes
2019-11-11 16:22:03 -05:00
MattBDev
a23a4e5496
misc changes.
2019-11-11 16:02:28 -05:00
Jesse Boyd
d61dac5aa5
Fix CFI generation
2019-11-08 22:30:39 +00:00
Jesse Boyd
faa63b0c35
CFI changeset
2019-11-08 05:27:04 +00:00
Jesse Boyd
82f5c4ebed
Fix compile
2019-11-07 10:28:17 +00:00
Jesse Boyd
0bfb1dbdd1
Fix BlockArrayClipboard offset
2019-11-05 15:08:44 +00:00
Jesse Boyd
92b34e4fa9
Regen using EditSession
2019-11-05 08:03:00 +00:00
Jesse Boyd
1e16095cba
Fix palette / region iteration
2019-11-04 07:47:31 +00:00
Jesse Boyd
930dfb7f7c
Various minor
...
thread local cleans on close
remove unnecessary loop on set
remove unnecessary get on set
clean CFI cache on generate
2019-11-03 16:59:11 +00:00
MattBDev
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
32d837414b
static blocktype initialization
...
instead of using hacky reflection
2019-11-02 20:35:51 +01:00
Jesse Boyd
b97b40e413
various
...
use vector.add for compatibility with vs-flattened
flush before remember
share meta objects across players
fix wg compatibility
2019-11-02 19:31:32 +01:00
Jesse Boyd
f8e1654a4e
Update BukkitGetBlocks_1_14.java
2019-11-02 18:37:17 +01:00
Jesse Boyd
934559fea6
Add vs perms
2019-11-02 18:37:07 +01:00
Jesse Boyd
df9e9e510a
Limit processing
2019-11-02 12:13:42 +01:00
Jesse Boyd
0c1fdcc498
remove broken debug
2019-11-01 22:56:07 +01:00
Jesse Boyd
9cf02fe654
WIP Anvil API
2019-10-31 21:04:02 +01:00
Jesse Boyd
c383fab2c2
cfi packet listener
2019-10-30 12:58:21 +01:00
Jesse Boyd
72951cdf23
Various
...
fake chunk packet
aliases
cfi wip
2019-10-30 12:26:52 +01:00
Jesse Boyd
8356004ec9
chunk sending / cfi
2019-10-26 14:21:49 +01:00
MattBDev
ca843f1b90
Minor changes for readability
2019-10-23 22:34:44 -04:00
Jesse Boyd
938dde68b2
Don't force load
...
didn't realize this loads the chunk, I just need to delay unloading until the operation is complete
2019-10-23 16:44:36 +01:00
Jesse Boyd
2080e9786b
commanding-pipeline diff
2019-10-23 05:23:52 +01:00
MattBDev
7d60053aaf
Fixed the mixup of backslash and forward slash
2019-10-09 21:51:37 -04:00
MattBDev
c928564b59
Delete "in"
2019-10-09 20:47:23 -04:00
MattBDev
ccd8f2c2a9
Attempt to fix command execution.
2019-10-09 20:43:28 -04:00
MattBDev
183d733825
Add a check to prevent PlotSquared Features from trying to load.
2019-10-09 16:28:33 -04:00
MattBDev
da3019ae3d
More compile fixes and upstream mergesa
2019-10-09 16:15:26 -04:00
MattBDev
11d30d2f94
Disabled FAWE commands until the plugin can actually set a block again
2019-10-07 15:09:52 -04:00
Kenzie Togami
0767f56711
Update to Piston 0.5.2 + Doctools/Deprecation improvements ( #523 )
...
* Update to Piston 0.5.2
* [Doctools] Fix output, be verbose about deprecations
* Improve deprecation system, doctools output
(cherry picked from commit 03c0cce53e
)
2019-10-07 12:57:47 -04:00
MattBDev
3431bd0644
Remove old plugin support and migrate to Piston (non-FAWE)
2019-10-07 12:27:18 -04:00
Kenzie Togami
03c0cce53e
Update to Piston 0.5.2 + Doctools/Deprecation improvements ( #523 )
...
* Update to Piston 0.5.2
* [Doctools] Fix output, be verbose about deprecations
* Improve deprecation system, doctools output
2019-10-05 19:06:18 +10:00
MattBDev
51a5c22677
I hope these are the last few errors
2019-10-03 20:37:19 -04:00
wizjany
da0ef12239
Add Bukkit watchdog implementation.
2019-09-30 16:47:24 -04: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
8b96cdc9a5
*
...
A tribute to Jesse
2019-09-20 21:52:35 -04:00
MattBDev
c926cddbd6
Item Registry Test is now functional
2019-09-19 14:56:03 -04:00
MattBDev
3bcfcd3008
Fixed bug with wands and updated tests
2019-09-18 15:09:04 -04:00
MattBDev
4357c4b049
Fixed not being able to login.
2019-09-15 12:50:37 -04:00
MattBDev
e72f1b32df
I hate when md_5 actually decides to do stuff.
2019-09-13 23:12:49 -04:00
MattBDev
14ed3f1d9c
Remove FawePlayer and API modifications
2019-09-13 23:05:16 -04:00
MattBDev
ae2d765533
Removed duplicated method and implemented missing ones
2019-09-03 12:17:21 -04:00
MattBDev
06a92d29b1
Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
# worldedit-libs/core/build.gradle.kts
2019-09-02 15:24:53 -04:00
MattBDev
c20f4c6b7f
Fixed a null pointer. Merged in a bunch of CLI stuff.
2019-09-02 15:22:43 -04:00
Jesse Boyd
68eea925e1
update adapter and platform manager
2019-08-29 13:57:03 +01:00
Jesse Boyd
4e49d16505
fix dependencies
2019-08-26 05:45:03 +01:00
Matthew Miller
0620478763
feature(cli): Added a CLI version of WorldEdit, and allowed most commands to be run from console ( #508 )
...
* Re-do commits to avoid awful rebase
* You can load and save a schematic file now. Still gotta setup ability to use commands as a console actor.
* Add a world override concept to LocalSession, and allow a lot more commands to be performed by actors.
* Fixed commands, and set the loaded schematic as the world override in CLI
* Properly load tags
* Added 1.14.4 data values
* Allow a majority of commands to be performed by the console.
* Fixed a lot of PR requested changes
* Added a Locatable interface and use that for getting the location of the player in commands.
* Added script support. Currently requires a newline at the end of the script.
* Shade everything to allow this to run locally - should probably minimize this to an extent later.
* Actually hook up the version
* Added a //world command to set the override
* Fixed a missed checkstyle issue
* Added CommandBlock support to Bukkit
* Make command block support configurable
* Minor cleanup and implementing a few of the final functions
* Fixed most issues from PR
* Improve UX, saving is now automatic and unknown command messages show
* Better save docs and support any clipboard format
* Include the entire formats list
* Arrays.copyOf
* Clear the world override if the selector is called on another world.
* Update logging extent to allow basic logging with non-player actors
2019-08-25 19:58:28 +10:00
Jesse Boyd
ae89c16390
merge
2019-08-23 08:36:33 +01: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
wizjany
17cfdee347
Update/remove more dead links.
2019-08-06 23:07:26 -04:00
wizjany
95d5adb30c
Update docs links to point to enginehub.
2019-08-06 21:49:43 -04:00
Jesse Boyd
74fe88ae01
merge
2019-08-07 01:28:12 +10:00
Jesse Boyd
cdb9abc117
9a4473b73f
2019-07-30 07:44:19 +10:00
Jesse Boyd
da858f2131
Check isEmpty for sign color
2019-07-29 05:07:46 +10:00
Kenzie Togami
76b608f90b
Fix suggestions on Bukkit for good
2019-07-27 23:31:38 -07:00
wizjany
0f420f02ff
Fix some load-order issues probably.
...
Edge cases might still exist around plugins which use WE for initial
world-gen, or in general plugins that try to access the platform
before it's ready.
2019-07-27 11:45:21 -04:00
MattBDev
9a4473b73f
Formatting
2019-07-25 15:09:12 -04:00
MattBDev
ff5860113d
It started on work with commands then I got carried away.
2019-07-25 14:44:10 -04:00
wizjany
2cc6a367c6
Move floatAt logic to AbstractPlayer, add isAllowedToFly and setFlying.
2019-07-23 22:16:26 -04:00
wizjany
e504c29df6
Fix potential race condition.
...
I guess.
2019-07-23 21:41:39 -04:00
MattBDev
9816eb3102
More work on commands
2019-07-23 16:26:18 -04:00
MattBDev
b230999ca0
Mainly formatting and some work on schematic commands
2019-07-22 22:22:32 -04:00
MattBDev
46f5b12b36
Convert tabs to whitespace.
2019-07-22 16:42:40 -04: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
wizjany
a65351e43e
Don't load old adapters.
2019-07-19 21:19:09 -04:00
wizjany
7c41949f40
Update bukkit adapters for 1.14.4.
2019-07-19 20:44:39 -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
871c25e1cd
Initial support for 1.14.2.
2019-05-27 19:52:58 -04: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
41cfcb6d55
Use a jar for bukkit impl adapters.
...
120 class files is a bit much.
2019-05-14 18:34:53 -04:00
wizjany
931b7ee694
Update for 1.14.1
2019-05-14 00:09:21 -04:00
wizjany
f9d0d340e7
Add DFUs. Currently used by //restore.
2019-05-13 23:07:53 -04:00
wizjany
5c97418cca
Fix NBT list conversion in 1.14.
2019-05-13 18:49:43 -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
c325b789b2
Revert lighting changes and add a 1.14 adapter
2019-04-25 23:15:09 +10: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
48bc4015c2
Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking
2019-04-23 00:18:13 +10:00
Jesse Boyd
aa1fec2dad
Remove check
2019-04-23 00:17:54 +10:00
NotMyFault
f56460c9ac
Fix permission packs
2019-04-21 15:38:50 +02: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
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
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
d7fa6e52ec
Try removing softdepend
2019-04-12 10:29:26 +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
bf53194650
Again #47
2019-04-01 21:41:44 +11:00
Jesse Boyd
a636a30e9f
Dont try removing player entity
2019-04-01 20:39:49 +11:00
Jesse Boyd
321ba326ed
Fixes #47
2019-04-01 20:10:23 +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
678a78a982
Update adapters.
...
Don't update unchanged blocks, do change NBT, no need to light.
Also clean up the forge side a bit.
2019-03-15 20:56:49 -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
a09489a9af
Updated the adapters
2019-02-16 20:51:39 +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
wizjany
39131eb1e5
Revert "Remove synthetic classes from adapters."
...
This reverts commit 1ae0e88b
2019-02-14 17:56:48 -05:00
Matthew Miller
1ae0e88b63
Remove synthetic classes from adapters.
2019-02-13 21:06:25 +10:00
Matthew Miller
c53a40b577
Bypass the Spigot API for block setting for speed boosts on non-Paper platforms.
2019-02-11 20:17:36 +10: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
36430863a1
Update adapters
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
5acd0d8537
Update adapters for the broken Spigot builds.
2018-12-09 16:08:11 +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