NotMyFault
3ee920f9e6
Update upstream
2020-01-08 19:36:12 +01:00
Jesse Boyd
900268633d
Fix compile
2020-01-07 00:41:41 +00:00
Jesse Boyd
e69ea37665
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15
2020-01-07 00:09:49 +00:00
Jesse Boyd
5abf6ce2a5
Update Metrics.java
2020-01-07 11:07:03 +11:00
NotMyFault
b292416496
Upstream and some refactoring
...
Note: Maybe this doesn't compile, ij is broken af smh, let's give it a try...
2020-01-04 18:34:30 +01: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
05760c49cd
Fixed compile issues and disabled plotsquared hook
2020-01-03 16:05:25 -05:00
MattBDev
f3e0109be2
A lot of small changes
2020-01-03 15:38:30 -05:00
NotMyFault
3fb5ac6be8
Rename debugpaste value names
2020-01-03 14:48:44 +01:00
Jesse Boyd
9efdd886c5
Fix translate args
2019-12-25 02:34:20 +00:00
KennyTV
8569359d8f
Fix Java 12+ compatibility
2019-12-21 21:21:25 +01:00
Jesse Boyd
39faa740a2
Fix some adapter issues
...
regen 1.13, tile get npe, null block type values
2019-12-21 09:45:59 +00:00
Jesse Boyd
c2cc4f5aeb
Fix craftbook
2019-12-20 05:54:03 +00:00
NotMyFault
f37bc9417c
Merge branch 'merge' into 1.15
2019-12-19 19:05:27 +01:00
Jesse Boyd
8c1a379575
Hide adapter stacktrace
2019-12-19 17:01:22 +00:00
Jesse Boyd
5d039c0e2b
Update plugin.yml
2019-12-19 16:51:54 +00:00
Jesse Boyd
1a64976195
load 1.15 adapter
2019-12-19 16:33:08 +00:00
Jesse Boyd
6a49b71cf2
Fix compile
2019-12-19 16:19:46 +00:00
Jesse Boyd
ea5f7a77be
Merge branch 'merge' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into merge
2019-12-16 09:08:28 +00: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
MattBDev
ee94bc2ddb
More work to get 1.15 working
2019-12-11 17:47:34 -05:00
MattBDev
a137d719cb
Remove 1.13 and 1.14 code
2019-12-11 17:47:14 -05:00
NotMyFault
68144232ba
More 1.15 wip No.2
2019-12-11 17:06:05 +01:00
NotMyFault
053b1a20d6
More 1.15 wip
2019-12-11 14:45:27 +01:00
NotMyFault
5358c51011
1.15 (wip)
...
Adapters and nms needs updating still, alongside some other fixes and changes, but I'm too tired for that now
2019-12-11 02:11:52 +01:00
NotMyFault
a058f13d6e
Updates
2019-12-09 21:34:26 +01:00
NotMyFault
80d7b0582f
i18n upstream merge
2019-12-09 20:07:57 +01:00
Jesse Boyd
21d736cd1d
Merge pull request #275 from IntellectualSites/dependency-cleanup
...
Cleanup outdated/eol dependencies
2019-12-03 11:40:52 +11:00
NotMyFault
0f1715ea9f
Revert "Merge pull request #274 from IntellectualSites/api"
...
This reverts commit 79d9bda9120fcac39592
2019-11-29 14:28:06 +01:00
Jesse Boyd
a36778794b
fix paste tile npe
2019-11-29 02:56:07 +00:00
Jesse Boyd
79d9bda912
Merge pull request #274 from IntellectualSites/api
...
Generate maven artifacts
2019-11-29 13:49:03 +11:00
NotMyFault
0fcac39592
Add more information to plugin.yml
2019-11-28 16:58:03 +01:00
NotMyFault
32880e520b
Remove Regios - Outdated since CB 1.6.2
2019-11-28 16:34:53 +01:00
NotMyFault
1b2710f823
Remove ASkyBlock
...
ASkyBlock does only exist up to 1.12 and won't be continued to higher versions.
2019-11-27 23:50:32 +01:00
NotMyFault
38bdb929f4
Generate maven artifacts
...
I'm not a kotlin dsl expert, but that seems to work.
2019-11-27 23:33:42 +01:00
Jesse Boyd
913ada31fb
Fix lighting 1.14
2019-11-24 02:26:52 +00:00
Jesse Boyd
ee54dcd809
wip generatebiome
...
will finish later
2019-11-24 01:50:05 +00:00
Jesse Boyd
174b3ec573
Delete worldedit-adapters.jar
2019-11-24 11:58:33 +11:00
Jesse Boyd
1f19b92b0b
1.13?
2019-11-24 00:57:29 +00:00
Jesse Boyd
50c9a2c2d2
Fxi regen (again)
2019-11-23 18:41:05 +00:00
Jesse Boyd
2fcd375912
potentially fix regen
2019-11-23 17:50:38 +00:00
Jesse Boyd
944c8c5521
Fixes #255 compass exceptipn
2019-11-23 05:15:48 +00:00
Jesse Boyd
97a4d2e103
Fixed regen
2019-11-23 04:45:43 +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
85382ad109
Fix permissions
2019-11-22 15:30:45 +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
66744bfaa4
Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge
2019-11-21 13:50:05 +00:00
Jesse Boyd
37b6c406ac
reduce diff
2019-11-21 07:57:32 +00:00
Jesse Boyd
52a502a1c6
Refactor confirmation
2019-11-21 06:50:37 +00:00
Jesse Boyd
444aa0dda7
adapter jar ?
...
It doesn't have a maven repo, so idk?
Might be worth making one, or using a url for the dependency
2019-11-20 03:54:34 +00:00
Jesse Boyd
144ea2ef34
Lazy tags + get / set tiles
...
Lazy tags means tiles/ents are not translated into the nms NBTBase until it is needed. Should be faster in cases where getFullBlock is called, but nbt is not always needed.
Commands like Copy and Paste, where the input/output are both nms worlds, can entirely bypass WorldEdit translating to and from the WorldEdit JNBT classes.
2019-11-20 03:40:52 +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
5d8adbc10c
Merge remote-tracking branch 'upstream/master' into merge
2019-11-19 21:25:36 +00:00
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
Kenzie Togami
91a78f725a
Some shading fixes
2019-10-19 00:48:49 -07: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
94e4fb089a
Attempt to fix dependency resolution with PlotSquared
2019-09-21 21:20:59 -04: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
16e24a2400
Created an Item Registry Test (non-functional)
2019-09-19 11:30:22 -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
47e2226be5
fix shadow jar
2019-08-18 02:54:27 +01:00
Jesse Boyd
3b7b115bb6
fix build gradle
2019-08-18 02:15:03 +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
Jesse Boyd
b3601eb858
Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding
2019-08-18 01:57:14 +01:00
Jesse Boyd
4427c0dd38
Update build.gradle
2019-08-18 01:56:06 +01:00
MattBDev
cbbe8b5dfa
upstream changes
2019-08-15 15:24:18 -04:00
Kenzie Togami
f472c20bfb
Memory optimizations ( #505 )
...
* Remove LocatedBlock overhead in LBL map
* Add new space-efficient block map, with thourough testing
* Drop ordering property, add full insertion test
* Add licenses
* Fix mocked platform conflicts
* Disable full block map testing for faster builds
* Re-implement BlockMap with fastutil maps
* Re-write chunk batching to be memory efficient
* Make MultiStageReorder use BlockMap
* Increase LBL load factor, fix long-pack limit detection
* Fix infinite loop in chunk batching
* Save memory in history by cleaning up MSR
* Re-implement LocatedBlockList in BlockMap
* Fix data race with BlockType lazy fields
* Make IDs ALWAYS present, only runtime-consistent. Use for memory efficiency in BlockMap
* Remap inner structure of BlockMap for smaller maps
* Remove containedBlocks fields, not very efficient
* Fix minor de-optimizing bug in stage reorder
* Make long packed y signed
* Add extended Y limit configuration option
* Add licenses
* Store 3 ints for unoptimized BV list
* Add final to BitMath
* Correct int-cast for long-packing
2019-08-12 22:06:40 +10: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
