Commit Graph
68 Commits
Author SHA1 Message Date
Octavia Togami 47a17cdf35 Adopt Crankcase for WorldEdit build logic (#2988) 2026-07-07 10:12:05 +00:00
Brokkonaut fee61cf0cc call ConfigurationLoadEvent after the configuration is loaded on start (#2897)
* call ConfigurationLoadEvent after the configuration is loaded on server start

* call ConfigurationLoadEvent on all platforms
2026-01-23 18:39:04 +10:00
Maddy Miller 5173bdd4ca Update config defaults 2026-01-09 17:44:35 +10:00
Maddy Miller 9d74089a1f Only load the LegacyMapper when needed (#2887) 2026-01-05 09:28:02 +00:00
Maddy Miller 5214c55db7 Merge branch 'version/7.3.x' 2026-01-03 16:05:10 +10:00
Octavia Togami 978b4e6dae Add ErrorProne and fix all problems 2026-01-02 20:30:56 -08:00
Maddy Miller c561b0d96c Use a separate tree registry for tree placement (#2829)
* Use a separate tree registry for tree placement

* Initialize the registries on the other platforms

* Add the tree type system to the registry converter

* Allow CoralTree features

* Add 1.21.9 adapter changes

* Apply PR feedback

* Re-add existing Bukkit implementation
2025-10-25 08:19:40 +00:00
Maddy Miller b6541914ad Add NIO ClipboardFormat methods, and deprecate File ones (#2767) 2025-06-26 09:43:09 +00:00
Maddy Miller f778687b3f Deprecate the concept of bundled block data (#2447)
* wip

* do all platforms but bukkit & cli

* use the paperweight adapters for material information on bukkit

* Move bundled block data load to CLI

* Drop this part, let it load when needed

* Stray warning suppression

* Swap to using an MC utility function for full block detection
2025-01-09 11:06:53 +00:00
Madeline Miller 6f210ad398 Merge branch 'version/7.3.x' 2024-08-09 22:58:08 +10:00
Octavia Togami 350dfa107c Revert "Shutdown executor service on disable (#2570)"
This does not work as this breaks moving between SP servers. Fixes #2586

This reverts commit 84ad34c36f.
2024-07-29 21:44:46 -07:00
Octavia Togami c9fdcc6ab4 Merge branch 'version/7.3.x' 2024-07-20 10:21:25 -07:00
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
Madeline Miller 00148305ce Fix build errors from merge 2024-06-01 14:45:03 +10:00
Madeline Miller e2e9163354 [CLI] Fix deprecation warning 2024-05-06 20:24:46 +10:00
Madeline Miller dc81e9389a Merge branch 'version/7.3.x' 2024-05-01 23:04:16 +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
Maddy Miller b37f00a4b2 Cleanup WorldEdit-CLI data version systems (#2347)
* Start cleanup of WorldEdit-CLI data versions

* Use a record for the data file

* Use cassette-deck to download data files rather than bundling

Sketchy implementation atm, better will follow - this "works" as-is without any special handling of missing versions. Intention is to get the "next closest version" when it's not available

* Fix up build errors

* Review changes

* Fix a potential race condition
2024-04-02 06:05:35 +00: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 MillerandOctavia Togami 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 MillerandOctavia Togami 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