diff --git a/.buildignore b/.buildignore deleted file mode 100644 index ba0eba8..0000000 --- a/.buildignore +++ /dev/null @@ -1,3 +0,0 @@ -.buildignore -.gitignore -README.md \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..f5835b3 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,59 @@ +# https://github.com/flytegg/resource-pack-deploy/blob/master/.github/workflows/main.yml +name: Resourcepack Deploy + +on: + push: + branches: + - master # Adjust this branch name if needed + - dev/restructure + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 0 # A non-shallow repository clone is required + + - name: Run PackSquash + uses: ComunidadAylas/PackSquash-action@v4 + with: + packsquash_version: latest # Uses the latest PackSquash release supported by the action + shader_source_transformation_strategy: keep_as_is + + - name: Create ZIP file + run: | + COMMIT_ID=$(git rev-parse --short HEAD) + ZIP_NAME="RP.zip" + echo "ZIP_NAME=${ZIP_NAME}" >> $GITHUB_ENV + zip -r "${ZIP_NAME}" . + + - name: Upload ZIP artifact + uses: actions/upload-artifact@v2 + with: + name: resource-pack-artifact + path: ${{ env.ZIP_NAME }} + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.RESOURCE_ZIPPER }} + with: + tag_name: release-${{ github.sha }} + release_name: Release ${{ github.sha }} + draft: false + prerelease: false + + - name: Upload Release Artifact + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.RESOURCE_ZIPPER }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ${{ github.workspace }}/${{ env.ZIP_NAME }} + asset_name: ${{ env.ZIP_NAME }} + asset_content_type: application/zip diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d163863..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build/ \ No newline at end of file diff --git a/README.md b/README.md index e156bc0..3f2d49a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ -# texture-pack -The texture pack for EinfachGustaf.live +# EinfachGustaf.live texture pack +This is the texture pack of [EinfachGustaf.live](https://einfachgustaf.live) + +## Download +Download the latest pack version [here](https://github.com/EinfachGustaf/texture-pack/releases/latest/download/RP.zip) diff --git a/assets/minecraft/textures/bedrock_battle/bedrockbattle_crits.png b/assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_crits.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/bedrockbattle_crits.png rename to assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_crits.png diff --git a/assets/minecraft/textures/bedrock_battle/bedrockbattle_kills.png b/assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_kills.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/bedrockbattle_kills.png rename to assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_kills.png diff --git a/assets/minecraft/textures/bedrock_battle/bedrockbattle_mining.png b/assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_mining.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/bedrockbattle_mining.png rename to assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_mining.png diff --git a/assets/minecraft/textures/bedrock_battle/bedrockbattle_place.png b/assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_place.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/bedrockbattle_place.png rename to assets/einfachgustaf-bedrockbattle/textures/bedrockbattle_place.png diff --git a/assets/minecraft/textures/bedrock_battle/team_blue.png b/assets/einfachgustaf-bedrockbattle/textures/team_blue.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/team_blue.png rename to assets/einfachgustaf-bedrockbattle/textures/team_blue.png diff --git a/assets/minecraft/textures/bedrock_battle/team_green.png b/assets/einfachgustaf-bedrockbattle/textures/team_green.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/team_green.png rename to assets/einfachgustaf-bedrockbattle/textures/team_green.png diff --git a/assets/minecraft/textures/bedrock_battle/team_red.png b/assets/einfachgustaf-bedrockbattle/textures/team_red.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/team_red.png rename to assets/einfachgustaf-bedrockbattle/textures/team_red.png diff --git a/assets/minecraft/textures/bedrock_battle/team_yellow.png b/assets/einfachgustaf-bedrockbattle/textures/team_yellow.png similarity index 100% rename from assets/minecraft/textures/bedrock_battle/team_yellow.png rename to assets/einfachgustaf-bedrockbattle/textures/team_yellow.png diff --git a/assets/minecraft/textures/bughunting/1_bugs_found.png b/assets/einfachgustaf-bughunting/textures/1_bugs_found.png similarity index 100% rename from assets/minecraft/textures/bughunting/1_bugs_found.png rename to assets/einfachgustaf-bughunting/textures/1_bugs_found.png diff --git a/assets/minecraft/textures/bughunting/3_bugs_found.png b/assets/einfachgustaf-bughunting/textures/3_bugs_found.png similarity index 100% rename from assets/minecraft/textures/bughunting/3_bugs_found.png rename to assets/einfachgustaf-bughunting/textures/3_bugs_found.png diff --git a/assets/minecraft/textures/bughunting/5_bugs_found.png b/assets/einfachgustaf-bughunting/textures/5_bugs_found.png similarity index 100% rename from assets/minecraft/textures/bughunting/5_bugs_found.png rename to assets/einfachgustaf-bughunting/textures/5_bugs_found.png diff --git a/assets/minecraft/textures/bughunting/alpha_tester.png b/assets/einfachgustaf-bughunting/textures/alpha_tester.png similarity index 100% rename from assets/minecraft/textures/bughunting/alpha_tester.png rename to assets/einfachgustaf-bughunting/textures/alpha_tester.png diff --git a/assets/minecraft/textures/events/event_win_1.png b/assets/einfachgustaf-global/textures/events/event_win_1.png similarity index 100% rename from assets/minecraft/textures/events/event_win_1.png rename to assets/einfachgustaf-global/textures/events/event_win_1.png diff --git a/assets/minecraft/textures/events/golden_shark.png b/assets/einfachgustaf-global/textures/events/golden_shark.png similarity index 100% rename from assets/minecraft/textures/events/golden_shark.png rename to assets/einfachgustaf-global/textures/events/golden_shark.png diff --git a/assets/minecraft/textures/ranks/admin.png b/assets/einfachgustaf-global/textures/ranks/admin.png similarity index 100% rename from assets/minecraft/textures/ranks/admin.png rename to assets/einfachgustaf-global/textures/ranks/admin.png diff --git a/assets/minecraft/textures/ranks/builder.png b/assets/einfachgustaf-global/textures/ranks/builder.png similarity index 100% rename from assets/minecraft/textures/ranks/builder.png rename to assets/einfachgustaf-global/textures/ranks/builder.png diff --git a/assets/minecraft/textures/ranks/contributor.png b/assets/einfachgustaf-global/textures/ranks/contributor.png similarity index 100% rename from assets/minecraft/textures/ranks/contributor.png rename to assets/einfachgustaf-global/textures/ranks/contributor.png diff --git a/assets/minecraft/textures/ranks/creativity.png b/assets/einfachgustaf-global/textures/ranks/creativity.png similarity index 100% rename from assets/minecraft/textures/ranks/creativity.png rename to assets/einfachgustaf-global/textures/ranks/creativity.png diff --git a/assets/minecraft/textures/ranks/developer.png b/assets/einfachgustaf-global/textures/ranks/developer.png similarity index 100% rename from assets/minecraft/textures/ranks/developer.png rename to assets/einfachgustaf-global/textures/ranks/developer.png diff --git a/assets/minecraft/textures/ranks/founder.png b/assets/einfachgustaf-global/textures/ranks/founder.png similarity index 100% rename from assets/minecraft/textures/ranks/founder.png rename to assets/einfachgustaf-global/textures/ranks/founder.png diff --git a/assets/minecraft/textures/ranks/kelp.png b/assets/einfachgustaf-global/textures/ranks/kelp.png similarity index 100% rename from assets/minecraft/textures/ranks/kelp.png rename to assets/einfachgustaf-global/textures/ranks/kelp.png diff --git a/assets/minecraft/textures/ranks/media.png b/assets/einfachgustaf-global/textures/ranks/media.png similarity index 100% rename from assets/minecraft/textures/ranks/media.png rename to assets/einfachgustaf-global/textures/ranks/media.png diff --git a/assets/minecraft/textures/ranks/moderator.png b/assets/einfachgustaf-global/textures/ranks/moderator.png similarity index 100% rename from assets/minecraft/textures/ranks/moderator.png rename to assets/einfachgustaf-global/textures/ranks/moderator.png diff --git a/assets/minecraft/textures/ranks/ocean.png b/assets/einfachgustaf-global/textures/ranks/ocean.png similarity index 100% rename from assets/minecraft/textures/ranks/ocean.png rename to assets/einfachgustaf-global/textures/ranks/ocean.png diff --git a/assets/minecraft/textures/ranks/partner.png b/assets/einfachgustaf-global/textures/ranks/partner.png similarity index 100% rename from assets/minecraft/textures/ranks/partner.png rename to assets/einfachgustaf-global/textures/ranks/partner.png diff --git a/assets/minecraft/textures/ranks/poseidon.png b/assets/einfachgustaf-global/textures/ranks/poseidon.png similarity index 100% rename from assets/minecraft/textures/ranks/poseidon.png rename to assets/einfachgustaf-global/textures/ranks/poseidon.png diff --git a/assets/minecraft/textures/ranks/shark.png b/assets/einfachgustaf-global/textures/ranks/shark.png similarity index 100% rename from assets/minecraft/textures/ranks/shark.png rename to assets/einfachgustaf-global/textures/ranks/shark.png diff --git a/assets/minecraft/textures/ranks/starfish.png b/assets/einfachgustaf-global/textures/ranks/starfish.png similarity index 100% rename from assets/minecraft/textures/ranks/starfish.png rename to assets/einfachgustaf-global/textures/ranks/starfish.png diff --git a/assets/einfachgustaf-lobby/textures/bg_navigator.png b/assets/einfachgustaf-lobby/textures/bg_navigator.png new file mode 100644 index 0000000..a77ef15 Binary files /dev/null and b/assets/einfachgustaf-lobby/textures/bg_navigator.png differ diff --git a/assets/minecraft/font/default.json b/assets/minecraft/font/default.json index 7836546..4fd87ac 100644 --- a/assets/minecraft/font/default.json +++ b/assets/minecraft/font/default.json @@ -2,185 +2,192 @@ "providers": [ { "type": "bitmap", - "file": "minecraft:bughunting/1_bugs_found.png", + "file": "einfachgustaf-bughunting:1_bugs_found.png", "ascent": 8, "height": 8, "chars": ["\uE001"] }, { "type": "bitmap", - "file": "minecraft:bughunting/3_bugs_found.png", + "file": "einfachgustaf-bughunting:3_bugs_found.png", "ascent": 8, "height": 8, "chars": ["\uE002"] }, { "type": "bitmap", - "file": "minecraft:bughunting/5_bugs_found.png", + "file": "einfachgustaf-bughunting:5_bugs_found.png", "ascent": 8, "height": 8, "chars": ["\uE003"] }, { "type": "bitmap", - "file": "minecraft:bughunting/alpha_tester.png", + "file": "einfachgustaf-bughunting:alpha_tester.png", "ascent": 8, "height": 8, "chars": ["\uE004"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/bedrockbattle_crits.png", + "file": "einfachgustaf-bedrockbattle:bedrockbattle_crits.png", "ascent": 8, "height": 8, "chars": ["\uE005"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/bedrockbattle_kills.png", + "file": "einfachgustaf-bedrockbattle:bedrockbattle_kills.png", "ascent": 8, "height": 8, "chars": ["\uE006"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/bedrockbattle_mining.png", + "file": "einfachgustaf-bedrockbattle:bedrockbattle_mining.png", "ascent": 8, "height": 8, "chars": ["\uE007"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/bedrockbattle_place.png", + "file": "einfachgustaf-bedrockbattle:bedrockbattle_place.png", "ascent": 8, "height": 8, "chars": ["\uE008"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/team_red.png", + "file": "einfachgustaf-bedrockbattle:team_red.png", "ascent": 8, "height": 8, "chars": ["\uE009"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/team_blue.png", + "file": "einfachgustaf-bedrockbattle:team_blue.png", "ascent": 8, "height": 8, "chars": ["\uE010"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/team_yellow.png", + "file": "einfachgustaf-bedrockbattle:team_yellow.png", "ascent": 8, "height": 8, "chars": ["\uE011"] }, { "type": "bitmap", - "file": "minecraft:bedrock_battle/team_green.png", + "file": "einfachgustaf-bedrockbattle:team_green.png", "ascent": 8, "height": 8, "chars": ["\uE012"] }, { "type": "bitmap", - "file": "minecraft:ranks/shark.png", + "file": "einfachgustaf-global:ranks/shark.png", "ascent": 8, "height": 8, "chars": ["\uE013"] }, { "type": "bitmap", - "file": "minecraft:ranks/founder.png", + "file": "einfachgustaf-global:ranks/founder.png", "ascent": 8, "height": 8, "chars": ["\uE014"] }, { "type": "bitmap", - "file": "minecraft:ranks/admin.png", + "file": "einfachgustaf-global:ranks/admin.png", "ascent": 8, "height": 8, "chars": ["\uE015"] }, { "type": "bitmap", - "file": "minecraft:ranks/moderator.png", + "file": "einfachgustaf-global:ranks/moderator.png", "ascent": 8, "height": 8, "chars": ["\uE016"] }, { "type": "bitmap", - "file": "minecraft:ranks/creativity.png", + "file": "einfachgustaf-global:ranks/creativity.png", "ascent": 8, "height": 8, "chars": ["\uE017"] }, { "type": "bitmap", - "file": "minecraft:ranks/builder.png", + "file": "einfachgustaf-global:ranks/builder.png", "ascent": 8, "height": 8, "chars": ["\uE018"] }, { "type": "bitmap", - "file": "minecraft:ranks/starfish.png", + "file": "einfachgustaf-global:ranks/starfish.png", "ascent": 8, "height": 8, "chars": ["\uE019"] }, { "type": "bitmap", - "file": "minecraft:ranks/media.png", + "file": "einfachgustaf-global:ranks/media.png", "ascent": 8, "height": 8, "chars": ["\uE020"] }, { "type": "bitmap", - "file": "minecraft:ranks/poseidon.png", + "file": "einfachgustaf-global:ranks/poseidon.png", "ascent": 8, "height": 8, "chars": ["\uE021"] }, { "type": "bitmap", - "file": "minecraft:ranks/ocean.png", + "file": "einfachgustaf-global:ranks/ocean.png", "ascent": 8, "height": 8, "chars": ["\uE022"] }, { "type": "bitmap", - "file": "minecraft:ranks/kelp.png", + "file": "einfachgustaf-global:ranks/kelp.png", "ascent": 8, "height": 8, "chars": ["\uE023"] }, { "type": "bitmap", - "file": "minecraft:ranks/contributor.png", + "file": "einfachgustaf-global:ranks/contributor.png", "ascent": 8, "height": 8, "chars": ["\uE024"] }, { "type": "bitmap", - "file": "minecraft:ranks/partner.png", + "file": "einfachgustaf-global:ranks/partner.png", "ascent": 8, "height": 8, "chars": ["\uE025"] }, { "type": "bitmap", - "file": "minecraft:ranks/developer.png", + "file": "einfachgustaf-global:ranks/developer.png", "ascent": 8, "height": 8, "chars": ["\uE026"] - } + }, + { + "type": "bitmap", + "file": "einfachgustaf-lobby:bg_navigator.png", + "ascent": 10, + "height": 256, + "chars": ["\uE027"] + } ] } \ No newline at end of file diff --git a/assets/minecraft/models/item/paper.json b/assets/minecraft/models/item/paper.json deleted file mode 100644 index fe0a608..0000000 --- a/assets/minecraft/models/item/paper.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper" - }, - "overrides": [ - { "predicate": { "custom_model_data": 1}, "model": "item/paper/1" }, - { "predicate": { "custom_model_data": 2}, "model": "item/paper/2" }, - { "predicate": { "custom_model_data": 3}, "model": "item/paper/3" }, - { "predicate": { "custom_model_data": 4}, "model": "item/paper/4" }, - { "predicate": { "custom_model_data": 5}, "model": "item/paper/5" }, - { "predicate": { "custom_model_data": 6}, "model": "item/paper/6" }, - { "predicate": { "custom_model_data": 7}, "model": "item/paper/7" }, - { "predicate": { "custom_model_data": 8}, "model": "item/paper/8" } - ] -} diff --git a/assets/minecraft/models/item/paper/1.json b/assets/minecraft/models/item/paper/1.json deleted file mode 100644 index 9a9edd2..0000000 --- a/assets/minecraft/models/item/paper/1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/1" - } -} \ No newline at end of file diff --git a/assets/minecraft/models/item/paper/2.json b/assets/minecraft/models/item/paper/2.json deleted file mode 100644 index 188493a..0000000 --- a/assets/minecraft/models/item/paper/2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/2" - } -} \ No newline at end of file diff --git a/assets/minecraft/models/item/paper/3.json b/assets/minecraft/models/item/paper/3.json deleted file mode 100644 index 0734b68..0000000 --- a/assets/minecraft/models/item/paper/3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/3" - } -} \ No newline at end of file diff --git a/assets/minecraft/models/item/paper/4.json b/assets/minecraft/models/item/paper/4.json deleted file mode 100644 index 25daeb7..0000000 --- a/assets/minecraft/models/item/paper/4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/4" - } -} \ No newline at end of file diff --git a/assets/minecraft/models/item/paper/5.json b/assets/minecraft/models/item/paper/5.json deleted file mode 100644 index fe3615a..0000000 --- a/assets/minecraft/models/item/paper/5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/5" - } -} diff --git a/assets/minecraft/models/item/paper/6.json b/assets/minecraft/models/item/paper/6.json deleted file mode 100644 index 5fa4f6b..0000000 --- a/assets/minecraft/models/item/paper/6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/6" - } -} diff --git a/assets/minecraft/models/item/paper/7.json b/assets/minecraft/models/item/paper/7.json deleted file mode 100644 index ac28bc6..0000000 --- a/assets/minecraft/models/item/paper/7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/7" - } -} diff --git a/assets/minecraft/models/item/paper/8.json b/assets/minecraft/models/item/paper/8.json deleted file mode 100644 index afdd514..0000000 --- a/assets/minecraft/models/item/paper/8.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "item/paper/8" - } -} diff --git a/assets/minecraft/textures/donator/donate_lvl1.png b/assets/minecraft/textures/donator/donate_lvl1.png deleted file mode 100644 index 3e5a630..0000000 Binary files a/assets/minecraft/textures/donator/donate_lvl1.png and /dev/null differ diff --git a/assets/minecraft/textures/donator/donate_lvl2.png b/assets/minecraft/textures/donator/donate_lvl2.png deleted file mode 100644 index cae594a..0000000 Binary files a/assets/minecraft/textures/donator/donate_lvl2.png and /dev/null differ diff --git a/assets/minecraft/textures/donator/donate_lvl3.png b/assets/minecraft/textures/donator/donate_lvl3.png deleted file mode 100644 index c052183..0000000 Binary files a/assets/minecraft/textures/donator/donate_lvl3.png and /dev/null differ diff --git a/assets/minecraft/textures/donator/donate_lvl4.png b/assets/minecraft/textures/donator/donate_lvl4.png deleted file mode 100644 index e40880b..0000000 Binary files a/assets/minecraft/textures/donator/donate_lvl4.png and /dev/null differ diff --git a/assets/minecraft/textures/donator/donate_lvl5.png b/assets/minecraft/textures/donator/donate_lvl5.png deleted file mode 100644 index d1aa343..0000000 Binary files a/assets/minecraft/textures/donator/donate_lvl5.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/1.png b/assets/minecraft/textures/item/paper/1.png deleted file mode 100644 index ab40dac..0000000 Binary files a/assets/minecraft/textures/item/paper/1.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/2.png b/assets/minecraft/textures/item/paper/2.png deleted file mode 100644 index 6d7f1fc..0000000 Binary files a/assets/minecraft/textures/item/paper/2.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/3.png b/assets/minecraft/textures/item/paper/3.png deleted file mode 100644 index 2c15960..0000000 Binary files a/assets/minecraft/textures/item/paper/3.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/4.png b/assets/minecraft/textures/item/paper/4.png deleted file mode 100644 index cae7c19..0000000 Binary files a/assets/minecraft/textures/item/paper/4.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/5.png b/assets/minecraft/textures/item/paper/5.png deleted file mode 100644 index 5d5a6fc..0000000 Binary files a/assets/minecraft/textures/item/paper/5.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/6.png b/assets/minecraft/textures/item/paper/6.png deleted file mode 100644 index d4dce67..0000000 Binary files a/assets/minecraft/textures/item/paper/6.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/7.png b/assets/minecraft/textures/item/paper/7.png deleted file mode 100644 index 624f910..0000000 Binary files a/assets/minecraft/textures/item/paper/7.png and /dev/null differ diff --git a/assets/minecraft/textures/item/paper/8.png b/assets/minecraft/textures/item/paper/8.png deleted file mode 100644 index 4655e1a..0000000 Binary files a/assets/minecraft/textures/item/paper/8.png and /dev/null differ