diff --git a/.forgejo/workflows/geyser.yml b/.forgejo/workflows/geyser.yml index ce36206..ce6e66d 100644 --- a/.forgejo/workflows/geyser.yml +++ b/.forgejo/workflows/geyser.yml @@ -16,6 +16,15 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.PIPELINE_TOKEN }} + - name: "Get LFS objects" + uses: https://forgejo.skynet.ie/Skynet/actions/get_lfs@v3 + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + - name: Get all LFS objects + run: | + # Pull in all objects for all branches + git lfs fetch --all - name: setup git config run: | # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default @@ -27,9 +36,16 @@ jobs: branches=() eval "$(git for-each-ref --shell --format='branches+=(%(refname))' refs/remotes/origin/)" for branch in "${branches[@]}"; do + # for debugging + echo "$branch" + if [ "$branch" == "refs/remotes/origin/HEAD" ]; then + continue + fi + # need to convert "'refs/remotes/origin/main" to "main" branch_local=$(echo "$branch" | awk -F'[\\\\/]' ' { print $4 }') git switch $branch_local + git lfs pull git status nix run .#update_plugin -- update geyser diff --git a/.packwizignore b/.packwizignore index 746c876..591a7a4 100644 --- a/.packwizignore +++ b/.packwizignore @@ -1,8 +1,13 @@ -# DOnt add teh IDE's +# No need to have anything outside teh packwiz files inside teh pack +/.forgejo /.idea +/docs +/nix + +.git* # dont add nix stuff flake.* -/nix +# Dont add documentation *.md diff --git a/flake.nix b/flake.nix index 03733d8..e7da961 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ }; nixConfig = { - bash-prompt-suffix = "[Skynet Dev] "; extra-substituters = "https://nix-cache.skynet.ie/skynet-cache"; extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo="; }; @@ -29,6 +28,7 @@ devShells.default = pkgs.mkShell { name = "Skynet Mod env"; packages = packages_local; + shellHook = "export PS1='[Skynet Dev] '"; }; packages = { diff --git a/index.toml b/index.toml index f55d256..6bb1d2b 100644 --- a/index.toml +++ b/index.toml @@ -1,13 +1,5 @@ hash-format = "sha256" -[[files]] -file = ".forgejo/actions/update_branch/action.yml" -hash = "d766aa4529c72ab0b451e518367bd8b58126697181670248397b13db6ab16cb2" - -[[files]] -file = ".forgejo/workflows/geyser.yml" -hash = "552840ea9426de23a692cd4f0dabef497acff0918d9fac9c074ad7a328cb2df5" - [[files]] file = "plugins/essentialsx-discord.pw.toml" hash = "3980e4f0ba4095425a76680031b9c469eda86845879160c34679d626b531c776" @@ -25,7 +17,7 @@ metafile = true [[files]] file = "plugins/geyser.pw.toml" -hash = "7dce743e21119b286b2014756451e7e860ef4a9d06d708eb449e835df5d54f2f" +hash = "cfcebc4e44d75a227f46216b100437fb3d1dc786b10c6e517790f6aca2cbcff3" metafile = true [[files]] diff --git a/nix/packwiz.nix b/nix/packwiz.nix index 93289fe..de16856 100644 --- a/nix/packwiz.nix +++ b/nix/packwiz.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "packwiz"; - version = "0-unstable-2024-10-15"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "Silver-Golden"; repo = "packwiz"; - rev = "453264019e54eae69f495078b0f3fa073f071e73"; - sha256 = "sha256-x6Z8MLaacZFlRYOVkTU+ffYtCJu4FAB3I2W/uQITwns="; + rev = "7ae91a58dbec3b76ce0aaaf15aeba3118021a34f"; + sha256 = "sha256-3zUkePmVJTpU9+mkLyeqlZ1KNVDXNsFvoh8ifwXya1M="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pack.toml b/pack.toml index 6503036..9f8f38d 100644 --- a/pack.toml +++ b/pack.toml @@ -5,7 +5,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "93853b87fdbba621190f0cbacbcee0475f153c3d9eb744a8c2d0c2c4bfad4556" +hash = "8232fce7440db8e2f5f8be1a01d74cf04852e9f8a220f32803614b7a1cecc814" [versions] minecraft = "1.21.5" @@ -13,3 +13,4 @@ purpur = "2428" [options] acceptable-game-versions = ["1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5"] +datapack-folder = "plugins" diff --git a/plugins/geyser.pw.toml b/plugins/geyser.pw.toml index ef58728..6824b5b 100644 --- a/plugins/geyser.pw.toml +++ b/plugins/geyser.pw.toml @@ -3,11 +3,11 @@ filename = "Geyser-Spigot.jar" side = "server" [download] -url = "https://cdn.modrinth.com/data/wKkoqHrH/versions/xIN8Ujrm/Geyser-Spigot.jar" +url = "https://cdn.modrinth.com/data/wKkoqHrH/versions/29cMfxqV/Geyser-Spigot.jar" hash-format = "sha512" -hash = "6ac40376aa5603e1a8de7c4fe39fe4925c76e26b1a66a1a9db43995542195d620c7adf1079ba75c7205d9f62ab16f3897fca3da0c7fa6ad18fab63a6ac2a6304" +hash = "e2b7d92bda3c4ef0f61027ed321816b9d8a88d4c60ab38279caa36c776f767588260fed4f3de183ec518a764695552e2cb7d6165c55f7c2c8a655f97a3109c4c" [update] [update.modrinth] mod-id = "wKkoqHrH" -version = "xIN8Ujrm" +version = "29cMfxqV"