Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Allow API users to set ResourcePackOption's, add a GeyserDefineResourcePacksEvent #4978

Open
wants to merge 76 commits into
base: master
Choose a base branch
from

Commits on Oct 10, 2023

  1. Configuration menu
    Copy the full SHA
    68516a8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    02d6473 View commit details
    Browse the repository at this point in the history
  3. - Don't require configuring the packId, just the link instead

    - Deprecate GeyserLoadResourcePacksEvent in favor of GeyserDefineResourcePacksEvent
    - Load CDNentries properly
    onebeastchris committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    dbfc153 View commit details
    Browse the repository at this point in the history
  4. Remove forRemoval

    onebeastchris committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    f74d36a View commit details
    Browse the repository at this point in the history
  5. Rename cdn-resource-packs to resource-pack-urls, fix test, remove dup…

    …licate deprecation annotation
    onebeastchris committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    94f2ea9 View commit details
    Browse the repository at this point in the history
  6. Rename CDN entry list

    onebeastchris committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    fd69b0c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Configuration menu
    Copy the full SHA
    c0227d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Remove CDNEntry; those do not work as expected.

    Instead:
    - add UrlPackCodec & GeyserUrlPackCodec
    - try and provide the resource pack via a stream from the url - either because the client does not support packs via the url, or because it failed to get the packs
    onebeastchris committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    b9c5bdd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    27c1562 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Configuration menu
    Copy the full SHA
    5d06edd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    880de2d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    76a62ab View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Configuration menu
    Copy the full SHA
    3670914 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Change fallback system

    onebeastchris committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    498a415 View commit details
    Browse the repository at this point in the history
  2. Testing: Don't require application/zip or size or weird zip forma…

    …t, since it seems to work without it !?
    onebeastchris committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    0004f5b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cdd2aba View commit details
    Browse the repository at this point in the history
  4. We need to ensure no invalid packs end up being loaded - otherwise, c…

    …haos ensues since the client will either show bogus resource pack size values (invalid sizes), or skip resource packs altogether (if not properly zipped).
    onebeastchris committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    15b8b93 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Configuration menu
    Copy the full SHA
    d4f0d8a View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Merge remote-tracking branch 'upstream/master' into rp

    # Conflicts:
    #	core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java
    #	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
    onebeastchris committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    0ac91eb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    626189f View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. More robust downloading/caching

    - better exception catching
    - proper error handling
    - caching of packs if size, etag, and last modified are the same
    onebeastchris committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    f121299 View commit details
    Browse the repository at this point in the history
  2. oops

    onebeastchris committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    303327a View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Configuration menu
    Copy the full SHA
    d2622a4 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Configuration menu
    Copy the full SHA
    4d99250 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Allow null content key

    onebeastchris committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    2e776c4 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Merge remote-tracking branch 'upstream/master' into rp

    # Conflicts:
    #	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
    #	core/src/main/java/org/geysermc/geyser/registry/loader/ProviderRegistryLoader.java
    onebeastchris committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    a4fa2e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Configuration menu
    Copy the full SHA
    b8fa18a View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Configuration menu
    Copy the full SHA
    c6511a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/master' into rp

    # Conflicts:
    #	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
    #	core/src/main/java/org/geysermc/geyser/util/WebUtils.java
    onebeastchris committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    507a79e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    86f6458 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6053b7d View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Minor cleanup

    onebeastchris committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    2683b59 View commit details
    Browse the repository at this point in the history
  2. Add url codec creation method with no content key, remove boolean ret…

    …urn to registerAll, fix typo
    onebeastchris committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    ba78dba View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f56c182 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    de54a5b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    86f1389 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Configuration menu
    Copy the full SHA
    27659d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Configuration menu
    Copy the full SHA
    9241957 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3638d4d View commit details
    Browse the repository at this point in the history
  3. Fix typo's

    onebeastchris committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    8b87c08 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b6d404e View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Configuration menu
    Copy the full SHA
    e214fbe View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Configuration menu
    Copy the full SHA
    1608746 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Configuration menu
    Copy the full SHA
    f116382 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5b52769 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. Configuration menu
    Copy the full SHA
    5649574 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Configuration menu
    Copy the full SHA
    61f5294 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Configuration menu
    Copy the full SHA
    226bf38 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Configuration menu
    Copy the full SHA
    bddd9ac View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Configuration menu
    Copy the full SHA
    b43e2db View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. Configuration menu
    Copy the full SHA
    6133487 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f8d729 View commit details
    Browse the repository at this point in the history
  3. minor fixes

    onebeastchris committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    87829c9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    20e4919 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Attempt at making a proper builder for resource pack options (content…

    … key, default subpack), and a ResourcePackOption system to register packs with further options
    onebeastchris committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    033d2d6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c316d09 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a868ced View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    250a9b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Configuration menu
    Copy the full SHA
    fb4e42d View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Remove options taking a ResourcePack, use uuids

    Add uuid shortcut to ResourcePack interface
    Make the priority a double, add LOWEST and HIGHEST priorities
    onebeastchris committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    6c5a05a View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/rp' into subpacks-r…

    …ewrite-merge-urlpacks
    
    # Conflicts:
    #	api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionLoadResourcePacksEvent.java
    #	core/src/main/java/org/geysermc/geyser/event/type/SessionLoadResourcePacksEventImpl.java
    #	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
    #	core/src/main/java/org/geysermc/geyser/pack/GeyserResourcePack.java
    #	core/src/main/java/org/geysermc/geyser/registry/loader/ProviderRegistryLoader.java
    #	core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
    onebeastchris committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    9279c70 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c13f928 View commit details
    Browse the repository at this point in the history
  4. one more change

    onebeastchris committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    1867c6d View commit details
    Browse the repository at this point in the history
  5. revert bad changes

    onebeastchris committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    139976a View commit details
    Browse the repository at this point in the history
  6. Merge remote-tracking branch 'refs/remotes/upstream/master' into subp…

    …acks-rewrite-merge-urlpacks
    
    # Conflicts:
    #	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
    onebeastchris committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    ca55d9f View commit details
    Browse the repository at this point in the history
  7. merge master

    onebeastchris committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e1f86a8 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Add UrlFallbackOption

    onebeastchris committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3160537 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/upstream/master' into subp…

    …acks-rewrite-merge-urlpacks
    onebeastchris committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    1faaea7 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Address reviews

    onebeastchris committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    18776a8 View commit details
    Browse the repository at this point in the history
  2. Add option#(uuid, type) method to api, add logger.debug(message, obje…

    …cts...) method to easily debug-log messages without debug checks preventing formatting overhead
    onebeastchris committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    19954a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. smol cleanup: don't register packs if their options failed to registe…

    …r; clean up holders, fluent accessors
    onebeastchris committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    3bf5da1 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Configuration menu
    Copy the full SHA
    936c716 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/upstream/master' into subp…

    …acks-rewrite-merge-urlpacks
    
    # Conflicts:
    #	core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java
    onebeastchris committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    6d4ae96 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. update comment

    onebeastchris committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    739de66 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/master' into subp…

    …acks-rewrite-merge-urlpacks
    
    # Conflicts:
    #	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
    #	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
    #	core/src/main/java/org/geysermc/geyser/registry/Registries.java
    onebeastchris committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    b90d25b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5a298de View commit details
    Browse the repository at this point in the history