Commit Graph

4811 Commits

Author SHA1 Message Date
2a194b0434 Add pattern that randomly chooses states.
Also works with fuzzy states.

Syntax is `*type`, e.g. `//set *stone_slab` or with states,
`//set *oak_fence[waterlogged=false]`
2019-03-26 18:11:32 -04:00
9fcf805148 Pattern doesn't need to be deprecated 2019-03-26 16:35:22 -04:00
464719c02a Revert upstream change 2019-03-26 21:00:28 +01:00
8124d3b3c5 Reverted an upstream change due to a sketchy class issue 2019-03-26 15:29:46 -04:00
3420b8329b Remove most of PseudoRandom, a few minor cleaning changes, and an upstream change 2019-03-26 13:41:09 -04:00
0d88a6bce2 Merging upstream changes 2019-03-26 13:27:09 -04:00
4629c1f7e4 Few fixes for the Forge version. 2019-03-26 21:09:41 +10:00
8eccdc7444 Add -f flag to //count to allow fuzzy inputs.
Also re-implement //distr -c. And remove outdated help text on //copy.
2019-03-25 22:38:51 -04:00
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
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
16c22b75da Merge pull request #79 from IntellectualSites/remove-plotme-support
Remove PlotMe support
2019-03-25 06:09:50 -04:00
4c3b09895d Merge pull request #76 from IntellectualSites/new-vector-system2
Revert "Make end tag singleton"
2019-03-25 06:09:13 -04:00
14ab61d154 Remove PlotMe support 2019-03-25 00:02:20 +01:00
68c8950cdc Add IncendoPaster
Co-Authored-By: Alexander Söderberg <citymonstret@hotmail.com>
2019-03-24 23:02:32 +01:00
a64ff8f299 Make master build (probably) 2019-03-24 20:58:05 +01:00
692ba6fda3 Checkstyle. 2019-03-22 14:03:43 -04:00
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
feaf848e26 Merge pull request #73 from IntellectualSites/fix-center
Fixes #17, and an annoying typo in SnipeData :)
2019-03-21 08:32:08 -04:00
44bfc2f753 Fixes #17, and an annoying typo in SnipeData :) 2019-03-21 07:20:47 +01:00
9b473cecbd Fixes and changes to forest/forestgen.
* Sync up implementations of the two commands.
* Fix generating trees in spots with replaceable blocks.
* Make message when you mistype tree-type arg more correct.

Fixes WORLDEDIT-3869.
2019-03-20 21:05:11 -04:00
1934006d14 Better enforce the Request lifetime.
Previously, the current request would just get a new EditSession when
one was created. Now, a Request is reset before and after:
 - a command is used and
 - an interact is fired with the platform
This means each action taken will get a single, non-reusable Request.

Note that this only applies to actions taken through the platform.
API users will not be using requests anyway, since things like Masks,
etc. will be constructed directly instead of being passed through the
platform's parsers and so on. (e.g. if a plugin loads a schematic into
the world with a mask, they should create the EditSession and mask it
directly, and not use that Mask again for another EditSession in another
World).

Also, get rid of a bunch of (some now-)unnecessary EditSession creation
during command dispatching.

Note that this also fixed the dynamic selection mask, which apparently
has been broken for some unknown amount of time.
2019-03-20 19:13:54 -04:00
25631af31c Add RequestExtent to be used when a delayed EditSession is needed.
For example, if you set a mask that takes an extent (many of them),
and then move to another world, the mask will test blocks in the old
world and return bad results.
2019-03-20 19:13:54 -04:00
e758e6c1a2 Merge pull request #65 from aurorasmiles/new-vector-system
(dirty) Fix for VaultAPI build issue
2019-03-20 01:12:43 -04:00
c4e7acd15b (dirty) Fix for VaultAPI build issue
As discuseed in Discord, placing the Vault-API Dependency over the dummypermscompat fixes the compiling issue
2019-03-19 19:37:17 +01:00
83bdb3c8e8 Merge pull request #11 from IntellectualSites/incendo-paste
Make debugpaste use Incendo Paste Viewer, rather than Hastebin.
2019-03-19 10:36:21 -04:00
d186cce393 Merge remote-tracking branch 'origin/feature/slf4j-logging' 2019-03-19 20:32:21 +10:00
d1c2a029bf Move some platform stuff to load, put enable back to postworld. 2019-03-15 23:43:57 -04:00
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
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
9d2d43f0db Add -f to //schem save to confirm overwriting.
Overwriting existing schematics now checks delete perm.
Also allow delete to be run from console.

Fixes WORLDEDIT-3868.
2019-03-15 17:08:11 -04:00
18414fe3b5 Fix symlink detection. 2019-03-15 09:10:51 -04:00
fba12b1282 More shading fixes 2019-03-13 20:15:01 -07:00
4be72fb983 Shade logger bridges as well 2019-03-13 19:56:58 -07:00
d6804737cf Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
4191f017f1 [Forge] Fix sub-commands by registering even less 2019-03-13 18:54:23 -07:00
4f0506ec8b Fix versions in toml. Use internalversion (with git hash). 2019-03-12 17:30:45 -04:00
1c5d3368a0 Defer permissions check when making LocalSession.
Also use Java7 Paths to get rid of some funky logic.
2019-03-11 21:31:43 -04:00
a5cec7728d Merge pull request #452 from EngineHub/forge-1.13
Added support for Forge 1.13
2019-03-11 22:52:30 +10:00
6e24472af5 Bump to latest forge and cleanup some old files. 2019-03-11 22:45:41 +10:00
a59d994d84 Hook up the biome registry. 2019-03-11 00:15:21 -04:00
6192ba8dc1 Checkstyle fixes and warnings.
Should get 'working' builds now.
2019-03-11 00:02:51 -04:00
6937cfc9a9 Need internal ID for EntityType here too. 2019-03-09 10:46:40 -05:00
a22b5535fe Shh checkstyle, I'm a C# dev now. 2019-03-08 16:14:16 -05:00
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
eebba8e324 Move vault to permscompat. 2019-03-07 23:55:58 -05:00
de08c8b8c7 Add better control over expression timeouts. (#451)
Add better control over expression timeouts.
* //timeout command can be used to change player's current timeout.
* Config now also has a max timeout, can be bypassed with permission
* Timeout of < 0 will let expressions run indefinitely.
* Said expressions won't run on a separate thread, slightly reducing the
  overhead from context switching. For large //gen commands, for example,
  this can actually increase speed.
2019-03-06 19:58:32 -05:00
8a528b26b6 Update P2 repo and minors 2019-03-06 17:35:42 +01:00
c98a311146 Update to working PlotSquared repo; Update to PlotSquared C>Captions class rename; Cleaning and minor modifications to SpongeSchematicReader 2019-03-06 03:06:47 -05:00
bb33897221 Handle all commands like pre-1.13 for now 2019-03-04 19:57:22 -08:00
4878f38250 Fix platform registration, config setup 2019-03-04 19:36:06 -08:00