Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CommandAPI/CommandAPI
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: CommandAPI/CommandAPI
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev/paper/fix-GHActions
Choose a head ref
  • 14 commits
  • 411 files changed
  • 2 contributors

Commits on Dec 30, 2024

  1. Configuration menu
    Copy the full SHA
    eb56e00 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bf27e55 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    438e955 View commit details
    Browse the repository at this point in the history
  4. Add changelog entry

    DerEchtePilz committed Dec 30, 2024
    Configuration menu
    Copy the full SHA
    f0a5583 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7f06da7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    297df88 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0079069 View commit details
    Browse the repository at this point in the history
  8. Address code review

    DerEchtePilz committed Dec 30, 2024
    Configuration menu
    Copy the full SHA
    c67cc03 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9fc3dc2 View commit details
    Browse the repository at this point in the history
  10. Fix nms versions for spigot-1.21 and spigot-1.21.2

    1.21 was patched by 1.21.1, and 1.21.2 was patched by 1.21.3, so the original NMS versions aren't available anymore. This was correctly updated in `commandapi-bukkit`, but not in `commandapi-spigot`. `commandapi-spigot` should now match `commandapi-bukkit`.
    willkroboth committed Dec 30, 2024
    Configuration menu
    Copy the full SHA
    4500fa0 View commit details
    Browse the repository at this point in the history
  11. Update usage of ConfigurationAdapter in Velocity

    On `dev/dev`, `ConfigurationAdapter#saveDefaultConfig` could be used to save the default settings for a platform to a file. However, since Spigot and Paper have different config options, `DefaultBukkitConfig` was updated to handle both Paper and Spigot configs. Therefore, `BukkitConfigurationAdapter#saveDefaultConfig` did not have a single default config, so the signature of `saveDefaultConfig` was updated to input the instance of `DefaultConfig` that should be written to the file.
    
    This commit fixes a mistake where Velocity was still trying to use the `saveDefaultConfig` method with only two arguments. Since `saveDefaultConfig` no longer always uses *the* default config for the platform, I also renamed the method to `saveConfig`.
    
    Something to think about in code review: `DefaultBukkitConfig` is in `commandapi-bukkit`, but it contains the Paper-specific field `SHOULD_HOOK_PAPER_RELOAD`. This field does not need to exist on Spigot, so should it be moved into a Paper-specific subclass of `DefaultBukkitConfig`, similar to what happens with `CommandAPIBukkitConfig` and `CommandAPIPaperConfig`?
    Also, do we need 4 `CommandAPIMain` classes? Can we put them into a common module like before? Perhaps the command conversion logic can be extracted into the Bukkit module, and the config stuff can be extracted into a `spigot/paper-plugin-common`
    willkroboth committed Dec 30, 2024
    Configuration menu
    Copy the full SHA
    a78062c View commit details
    Browse the repository at this point in the history
  12. Move tests into dev.commandapi.test.tests package

    Makes it easier to distinguish test cases versus classes that help the tests work (e.g. `TestBase`, `MockCommandAPIServer`, etc.)
    willkroboth committed Dec 30, 2024
    Configuration menu
    Copy the full SHA
    d5fc4ab View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    5eddfce View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2025

  1. Update 1.20 test implementations to match new Paper structure

    Created Mock versions for classes that are meant to be implemented in Paper/Spigot.
    Select NMS method implementations are now overridden using a Mockito spy rather than manually reimplementing all methods and directing some to the original object.
    Made some changes and comments in non-test classes based on test results.
    
    TODO:
    - Make Paper/Spigot specific tests for chat arguments
    - Fix CustomArgument tests
    - Update test-impl for other versions
    willkroboth committed Jan 4, 2025
    Configuration menu
    Copy the full SHA
    250dd67 View commit details
    Browse the repository at this point in the history
Loading