Commit Graph

52 Commits

Author SHA1 Message Date
Maddy Miller
84ad34c36f
Shutdown executor service on disable (#2570)
* Shutdown executor service on disable

* also do CLI
2024-07-07 16:16:15 +10:00
Octavia Togami
28ca2e6b96
Clean up Gradle configuration 2024-04-30 22:33:39 -07:00
Octavia Togami
4a48dcb394
Move all versions to version catalogs 2024-04-30 22:33:29 -07:00
Octavia Togami
0b0f052300 Fix warnings in platforms 2024-04-02 14:33:24 +10:00
Madeline Miller
d312553fc5
Merge branch 'version/7.2.x' 2023-06-09 21:55:13 +10:00
TomyLobo
1899fa3b8f Keep extending cuboid selector after //cli selectworld 2023-04-12 14:23:33 +10:00
Maddy Miller
82727ffb63
Few cleanups over the code and use more Java 9+ features (#2248)
* Few cleanups over the code and use more Java 9+ features

* Address feedback

* cleanup switch case

* Remove TODO
2023-02-26 18:17:14 +10:00
Madeline Miller
98611c2ab2
Only mark CLI clipboard world as dirty when the underlying calls return a success state 2023-01-15 16:24:59 +10:00
Madeline Miller
bc9a6dd5a0
Merge branch 'version/7.2.x' 2022-06-12 15:01:33 +10:00
Octavia Togami
d3ab1e5783
1.19 data updates 2022-06-07 21:32:29 -07:00
Madeline Miller
98c93d011b
Merge remote-tracking branch 'origin/version/7.2.x' into chore/merging-to-master 2021-12-21 20:16:52 +10:00
wizjany
20c42b51c8
Extract log4j version to Versions.kt.
Also bump to match underlying platform versions to resolve runtime
version mismatches.
2021-12-12 18:49:32 -05:00
Octavia Togami
09bdf0a629
Merge branch 'version/7.2.x'
Oh god this was so awful
2021-11-20 17:23:24 -08:00
Octavia Togami
6c08b68244
Set Multi-Release in CLI manifest
Fixes #1890
2021-09-06 16:41:28 -07:00
Madeline Miller
a383d9164a Merge branch 'version/7.2.x' 2021-07-18 16:06:48 +10:00
Madeline Miller
cfd209824c Fix deployment of -cli artefacts 2021-07-18 16:06:03 +10:00
Octavia Togami
8a830814df
Merge branch 'version/7.2.x' 2021-07-13 14:38:26 -07:00
Octavia Togami
0790e6e5d8
Fix CLI Mess (#1811)
* Fix CLI awfulness

* Fix indentation

* Licenses
2021-07-01 09:44:44 -07:00
Madeline Miller
b8a9c0070c Merge branch 'version/7.2.x' 2021-06-19 15:19:32 +10:00
Octavia Togami
c8e5f277c1
Update MCUtils for 1.17 (#1774)
* Update MCUtils for 1.17

* Re-add deprecated grass_path
2021-06-11 12:38:22 -07:00
Octavia Togami
95160027d9
Register platforms and commands in a more proper way (#1766)
* Register platforms and commands in a more proper way

Platforms are now register "on load"/initialize/etc., and preferreds are
chosen just prior to command registration events. This allows us to
properly hook in to reload. Additionally, we now have the capability to
reload data with /minecraft:reload, though this is not yet implemented.

* Correct javadocs on queryCapability

* Flatten BukkitImplAdapter Lifecycled
2021-06-04 17:12:23 -07:00
Matthew Miller
97a4df96c3 Merge branch 'version/7.2.x' 2021-04-05 13:14:38 +10:00
Octavia Togami
609c7b8cc4
Scrapped Logging Framework 4 Java (#1715)
* The scramble is complete

* Fix version decl for Bukkit Log4J

* Swap out to a compatibility layer for LogManager

Slightly slower, but compatible across all Java versions

* Piston released with SL4JF removal

* Clean up declarations a bit
2021-03-28 20:35:48 -07:00
Octavia Togami
3194af3aa7
Merge branch 'version/7.2.x' 2021-03-10 01:59:36 -08:00
Matthew Miller
d3810865c8
Show a message with install instructions when running the jar file (#1682)
* Show a message with install instructions when running the jar file

* Typo

* Fixed checkstyle issue

* Slightly modify message to adapt to the type of install

* Clean up the display code a lot

* Allow line breaks before semi

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2021-02-22 22:05:23 -08:00
Octavia Togami
0cabb82f9e
Merge branch 'version/7.2.x' 2021-02-11 00:42:34 -08:00
Octavia Togami
9534a9cfce
Update so many dependencies, merge Forge/Fabric for final jar (#1651)
* Update so many dependencies, merge Forge/Fabric for final

* Clean up contrib docs for Gradle change

* Fix setting compat flags while using toolchain

* Fix deprecation in doc printer

* Restore proper forge JAR name

* Add dist classifier for mod jar

* Properly relocate new bStats

* Fix jar used from fabric

* Fix fabric bom

* Dup the shaded classes for consistency

* Sync Forge/Fabric log4j versions, de-dup

* Downgrade both log4j. This will work

* Update some plugins as well

* Drop the fabric force stuff

* Use duplicate strategy to directly merge jar
2021-01-25 02:14:09 -08:00
Matthew Miller
7a268b0b5d
Add WorldEdit version and platform to schematics (#1635)
* Add WorldEdit version and platform to schematics

* Use an actual platform ID rather than name, for more accurate info.

* Put the platform data within another nested tag

* Use a best-effort legacy platform ID

* Review changes

* Move the getId impl to Platform

* Review notes

* Review notes

* 😓
2021-01-02 21:01:40 +10:00
Octavia Togami
bc64990e7e
Move to packaged translations (#1555)
* Move to packaged translations

* License that file

* Fix some checkstyle too

* Support reloading translation files

* Add missing dash for unpack directory

* Mark unpacked zips as owner-only
2020-10-08 17:42:23 -07:00
Matthew Miller
46c3fccae1 Updated MCUtils data for 1.16.2 2020-08-17 18:13:01 +10:00
Matthew Miller
a8bba3bacb Fixed CLI 2020-08-16 23:29:33 +10:00
Octavia Togami
f2ce020da0 Officially propagate GPL downwards to all files 2020-08-13 21:06:39 -07:00
Matthew Miller
0a9fa869c9
Fixed an issue where upwards resolved schematics would break schem list (#1481)
* Fixed an issue where upwards resolved schematics would break schem list

* Missed diff

* PR changes

* Further fixes

* Improve sorting logic

* Pass in comparator rather than using sort type

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2020-08-13 18:01:37 +10:00
Octavia Togami
288ed7fa9f Re-shuffle regen methods to fix deprecation order
Everything delegates to the original EditSession signature. The new
RegenOptions + EditSession variant is removed, as it was never
officially published. A delegation check was installed in the
NAFC-marked method.
2020-07-26 13:22:26 +10:00
Octavia Togami
7134ff4494
Remove all compile deps, use api/impl as appropriate 2020-07-15 18:48:47 -07:00
Octavia Togami
d111d86876
Add deprecation to CLI sender 2020-07-09 20:16:38 -07:00
Octavia Togami
eb52afa296 Create a brand new checkstyle config
And also apply it!
2020-07-07 20:38:57 -07:00
Octavia Togami
781abd511d Add final to many fields 2020-07-07 20:38:57 -07:00
Octavia Togami
bf6cd1ea08
Regeneration Options (#1415)
* Add RegenOptions to the API

* Integerate regen options into //regen

* Rename isRegenBiomes to shouldRegenBiomes

* Go through the EditSession for setting biomes

* Respect 3D biome support in regen

* Add RegenOptions implementation for 1.16 Bukkit adapter.

Co-authored-by: wizjany <wizjany@gmail.com>
2020-07-03 22:17:34 -07:00
Octavia Togami
a6236b6796
Propagate 3D biome support up extent stack
Fixes #1399

Also improved Fabric gradle b/c why not
2020-06-28 15:51:50 -07:00
Matthew Miller
efec53b186 Bump data to 1.16.1 with MCUtils 2020-06-25 18:20:46 +10:00
Octavia Togami
6513513b3e
Mojang AB and the Column Biome Fuzzer (#1376)
* Allow API detection of the biome fuzzer in use

This allows us to warn, fix, or optimize biome edits to the overworld.

* Drop edits to Y = 0 for biomes in overworld

* Re-work ArbitraryBiomeShape to simplify logic

Also fixes not being able to use THE_VOID with it
2020-06-23 23:33:20 -07:00
Matthew Miller
f5e36ed8a8
Add 3D biomes support (Adds #1358) (#1361)
* Initial work on 3D biomes. Not implemented for Bukkit, and history is unfinished

* Further implement 3D Biomes. It's now usable on Forge/Fabric

* Fix a few cases of apply. Gotta fix the deprecated methods at some point

* Add Bukkit support

* Add clipboard support. Schematics are still not great, but the Sponge schem format doesn't support this yet.

* Fix the last of the issues

* Fixed up review comments

* Fixed review notes

* Simplify

* max is inclusive

* Standardize non-abstract compatibility handling

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2020-06-22 09:25:49 +10:00
Matthew Miller
267fe1ffe0
feat(i18n): use a translation loader to allow CB/WG to use WorldEdit's TranslationManager (#1327)
* feat(i18n): use a translation loader to allow CB/WG to use WorldEdit's TranslationManager

* Replace the old ResourceLoader with the new one

* Make ResourceLoader per-platform

* Update worldedit-core/src/main/java/com/sk89q/worldedit/util/io/WorldEditResourceLoader.java

* Improve the impl to allow a default

* Update based on review suggestions

* Local resource should be pathName too

* Delegate to getRootResource, and prevent pathName from starting with /

* HTML

* Format javadoc a little better

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2020-05-14 17:40:11 +10:00
Matthew Miller
865c3a24d2
Replace fast mode with a side effect system, with fine-grained control (#547)
* Speed up initial change buffering by removing streams and optional wrapping

* Bump the adapters for an experimental performance boost (Purely Bukkit 1.15.2)

* Bump adapters for fixes

* Bump adapters for further performance boosts

* Migrate fast mode to a BlockUpdates section, allowing fine-grained control

* Rename to SideEffect and clean up usage of the set

* Implement a 'usable' state

* Add a test command to demonstrate SideEffects. This is non-final

* Move //sideeffect into //fast

* Improve the box for //fast

* Switch to a system that includes "delayed" as a mode

* Remove the concept of configurable side effects, all are configurable. And each platform specifies what it supports.

* Implement side effects on other platforms (and spigot versions)

* Only use the side effects from the world editing platform

* Update from review

* Rename WorldApplyingExtent to SideEffectExtent

* More review fixes

* Update the World#applySideEffects return type to return the applied side effects

* Fixed requested changes

* Fixed checkstyle

* Improve setBlock javadocs

* Further improve

* Switch parameter name

* Fixed typo in translation key

* Temporarily remove DELAYED

* static final

* Side Effects = 7.2.0 snapshot
2020-03-08 16:09:36 +10:00
TheMolkaPL
a06b8342d3 Remove no-double-slash option from configs 2020-03-03 09:06:51 -05:00
Matthew Miller
d7089a65a7 Bump dataversion for WorldEdit CLI, and minify all of the JSON files 2020-01-24 21:10:04 +10:00
Matthew Miller
42cf205311 Added 1.15 bundled data 2019-12-11 21:13:51 +10:00
Matthew Miller
679b00bde6
feat(i18n): add support for translatable text replacement (#478)
* Rebase translation work for easier rebasing

* Fixed gradle setup

* Further translations

* Add a few more strings

* Remove support for pluralisation to match Minecraft and alleviate issues with over-complexity

* Further translations

* Added a tonne more translations

* Added the remaining translation nodes

* When custom files are found, use the base files for default values.

* Only download translations if a key is provided

* Fixed typo in brush radius too large

* Allow translation files to be missing entries, and use the english version in place.

* Fixed issues brought up in review

* Reverse translation order (#533)

* Fix a lot of PR comments

* Add JD to the Operation warned field due to no private fields in J8

* Only warn when there are messages
2019-12-09 12:46:18 +10: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