diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 68af7ee..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04", - "features": { - "ghcr.io/devcontainers/features/common-utils:2": {}, - "ghcr.io/devcontainers/features/git:1": {}, - "ghcr.io/devcontainers/features/git-lfs:1": {}, - "ghcr.io/devcontainers/features/python:1": {}, - "ghcr.io/ParadigmMC/devcontainers/mcman": {}, - "ghcr.io/devcontainers/features/java:1": {} - }, - "customizations": { - "vscode": { - "settings": { - "evenBetterToml.schema.associations": { - "^.*server.toml$": "https://raw.githubusercontent.com/ParadigmMC/mcman/main/servertoml.schema.json" - } - }, - "extensions": [ - "tamasfe.even-better-toml", - "ms-vscode.notepadplusplus-keybindings" - ] - } - } -} diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..51b1109 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# Disable Git line ending conversion in the pack directory +# This prevents packwiz index hashes changing when committing from Windows +pack/** -text diff --git a/.github/workflows/instance.yml b/.github/workflows/instance.yml deleted file mode 100644 index 3079b6a..0000000 --- a/.github/workflows/instance.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Update Instance - -on: - workflow_dispatch: - push: - branches: - - main - paths: - - profile/** - - .github/workflows/instance.yml - -jobs: - update-instance: - runs-on: ubuntu-latest - - permissions: - pages: write - contents: write - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Zip profile directory - run: zip -r profile.zip profile/ - - - run: | - mkdir public - mv profile.zip public/ - cp public/profile.zip "public/Modfest 1.20 - Sky and Sea.zip" - - - name: Publish to GitHub Pages - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: public - publish_branch: gh-pages - destination_dir: content - keep_files: true - commit_message: "Publish profile to GitHub Pages" diff --git a/.github/workflows/packwiz.yml b/.github/workflows/packwiz.yml deleted file mode 100644 index 0bad0bf..0000000 --- a/.github/workflows/packwiz.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Export Packwiz - -on: - push: - branches: - - main - paths: - - config/** - - server.toml - - .github/workflows/packwiz.yml - workflow_dispatch: - -jobs: - packwiz-export: - runs-on: ubuntu-latest - - permissions: - contents: write - - steps: - - uses: actions/checkout@v2 - - - name: Install mcman - run: | - wget https://github.com/ParadigmMC/mcman/releases/latest/download/mcman - sudo mv ./mcman /usr/bin/ - sudo chmod +x /usr/bin/mcman - - - name: Clear existing pack folder - run: rm -rf pack - - - name: Run mcman export packwiz - run: mcman export packwiz - env: - MODPACK_VERSION: "0.0.2" - - - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: Update packwiz pack - diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml new file mode 100644 index 0000000..43c5e7a --- /dev/null +++ b/.github/workflows/static.yml @@ -0,0 +1,49 @@ +name: Deploy packwiz pack to github pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["main"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: import main + uses: actions/checkout@v3 + with: + ref: main + path: main + sparse-checkout: 'pack' + sparse-checkout-cone-mode: false + - name: import main - clean + run: rm -rf cdn/main/.git + - name: Setup Pages + uses: actions/configure-pages@v3 + - name: Upload artifact + uses: actions/upload-pages-artifact@v2 + with: + # Upload entire repository + path: '.' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index b31fc88..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,70 +0,0 @@ -on: - workflow_dispatch: - push: - branches: main - -name: Test the server -jobs: - test: - env: - upload_to_mclogs: true - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - lfs: true - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - - name: Cache - id: cache - uses: actions/cache@v3 - with: - key: mcman-build-${{ hashFiles('server.toml') }} - path: | - ./server - ~/.cache/mcman - restore-keys: | - mcman-build-${{ hashFiles('server.toml') }} - mcman-build- - mcman- - - name: Install mcman - run: | - wget https://github.com/ParadigmMC/mcman/releases/latest/download/mcman - sudo mv ./mcman /usr/bin/ - sudo chmod +x /usr/bin/mcman - - name: Test the server - id: test - run: | - mcman run --test - - run: | - echo "### Server Logs" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "```" >> $GITHUB_STEP_SUMMARY - touch server/logs/latest.log - cat server/logs/latest.log >> $GITHUB_STEP_SUMMARY - echo "```" >> $GITHUB_STEP_SUMMARY - - if: steps.test.outcome == 'failure' - run: | - for filename in ./server/crash-reports/*; do - echo "### $filename" >> $GITHUB_STEP_SUMMARY - echo "```" >> $GITHUB_STEP_SUMMARY - cat $filename >> $GITHUB_STEP_SUMMARY - echo "```" >> $GITHUB_STEP_SUMMARY - done - - name: Archive log - uses: actions/upload-artifact@v3 - with: - name: latest.log - path: | - server/logs/latest.log - - name: Archive crash reports - uses: actions/upload-artifact@v3 - if: steps.test.outcome == 'failure' - with: - name: crash - path: | - server/crash-reports/* diff --git a/.gitignore b/.gitignore index 49b069b..6325c66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,4 @@ -# mcman: Exclude mcman build outputs -**/server -# mcman: Exclude exported mrpacks -*.mrpack -# mcman: Exclude local dotenv files -**/.env - -# prism launcher instance -profile.zip +.idea/ +.DS_Store -# intellij IDEs -.idea +*.mrpack diff --git a/README.md b/README.md index d6be22f..a9f93ac 100644 --- a/README.md +++ b/README.md @@ -1,97 +1,2 @@ -# ModFest 1.20: Sky and Sea - -[![mcman badge](https://img.shields.io/badge/uses-mcman-purple?logo=github)](https://github.com/ParadigmMC/mcman) - -## Structure - -| [Packwiz Pack URL](https://raw.githack.com/ModFest/modfest-skyandsea/main/pack/pack.toml) | [Prism Launcher Instance zip](https://modfest.github.io/modfest-skyandsea/content/profile.zip) | -| --- | --- | - -- `profile` - Prism launcher profile -- `config` - Server config files -- `pack` - Packwiz pack generated by mcman -- `server` - mcman build output (local) - -## Contributing - -Here are some things to note: - -- Currently, this repo is using [mcman](https://github.com/ParadigmMC/mcman) and its documentation can be found [here](https://paradigmmc.github.io/mcman/) -- mcman generates the packwiz pack found under `pack/` automatically using `packwiz.yml` action -- the prism profile is generated using the `profile/` folder automatically using `instance.yml` -- server's list of mods and options can be found in `server.toml` -- configuration files are found under `config/` -- run `mcman build` to get all the server files under `server/` -- run `mcman run --test` to test if the server can start without crashing -- run `mcman md` to update the markdown found below - -![diagram of infra](image.png) - ---- - -## Server - - -| Version | Type | Loader | -| ------- | ------------------------------- | -------- | -| 1.20.4 | [Fabric](https://fabricmc.net/) | `0.15.3` | - - -## List of Mods - - -| Name | Description | Version | -| ------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------- | -| [Cerulean](https://modrinth.com/mod/cerulean) | Stars, automation, trinkets, and a dream... | it1V9161 | -| [Partnership](https://modrinth.com/mod/partnership) | Drive ships with partners. Defend your port with cannons and explore the world with new ships! | yMU48SrD | -| [Seagulls](https://modrinth.com/mod/seagulls) | A stupid Minecraft mod adding annoying seagulls | yP2sUiVD | -| [Pescatore](https://modrinth.com/mod/pescatore) | Another fishing minigame in Minecraft! | X6Nwdhrz | -| [Contrail](https://modrinth.com/mod/contrail) | This mod adds contrails to Minecraft. | UNlU07tE | -| [PET Bottle Rocket](https://modrinth.com/mod/pet-bottle-rocket) | Make a Water Bottle Rocket! Inspired by STEM Learning. | R0eL60ot | -| [Rapscallions and Rockhoppers (Penguins)](https://modrinth.com/mod/rapscallions-and-rockhoppers) | A fresh, new take on the 2023 Mob Vote's Penguin. | qEfshhwq | -| [Boatism](https://modrinth.com/mod/boatism) | Add new and fully customizable Boat Engines to Minecraft. Traveling by sea will never be the same again! | Ht1D8Dus | -| [Glide](https://modrinth.com/mod/glide) | Paragliding | SSgjgT31 | -| [Pescatore](https://modrinth.com/mod/pescatore) | Another fishing minigame in Minecraft! | X6Nwdhrz | -| [Clouded Isles](https://modrinth.com/mod/clouded-isles) | inspired by terraria's sky islands, this mod adds new equipment and blocks obtained from the "sky isle" structure. made for modfest 1.20 | a5PWns3Z | -| [Glide Away!](https://modrinth.com/mod/glide-away) | Get your Hang Glider and glide away from the dangers! A server side Fabric mod! | jXRfaWdl | -| [Anshar](https://modrinth.com/mod/anshar) | Write yourself into the Akashic Record with the power of beacons! | t6F0gIBS | -| [Reel Fishing](https://modrinth.com/mod/reel) | Reel Fishing adds a fishing minigame, modular fishing rods, new fish, terrible puns and more. | QigKV8wN | -| [FLUIwID](https://modrinth.com/mod/fluiwid) | Don't like being solid? Be water instead! | BwvIvKNi | -| [Schmarrn Fireworks](https://modrinth.com/mod/schmarrn-fireworks) | Add Items to special Firework Rockets! | ayB8Dm59 | -| [Pesky Seagulls](https://modrinth.com/mod/pesky-seagulls) | Adds bothersome seagulls | KLntrhIl | -| [Clouded Isles](https://modrinth.com/mod/clouded-isles) | inspired by terraria's sky islands, this mod adds new equipment and blocks obtained from the "sky isle" structure. made for modfest 1.20 | a5PWns3Z | -| [Pesky Seagulls](https://modrinth.com/mod/pesky-seagulls) | Adds bothersome seagulls | KLntrhIl | -| [Moonrise](https://modrinth.com/mod/moonrise) | A mod that allows the moon to move across the sky, separate from the sun! (Made for ModFest 23!) | FbllYDtE | -| [PotatoesPlus](https://modrinth.com/mod/potatoesplus) | Add some special potatoes to your game! | VfB11R7N | -| [Wizcraft](https://modrinth.com/mod/wizcraft) | Functional magic tools | S5yx6Hq5 | -| [resurfaced](https://modrinth.com/mod/resurfaced) | Making underwater exploration easier in a simple way | XstshMSP | -| [Blocky Bass](https://modrinth.com/mod/blocky-bass) | Adds Big Mouth Blocky Bass to the game. Fish him up, feed him a disc, watch him sing! | V8mKhZR1 | -| [Mutagen](https://modrinth.com/mod/mutagen) | Brew a new kind of splash potion that turns peaceful mobs into useful mutated versions! | hgcY7Gea | -| [Pescatore](https://modrinth.com/mod/pescatore) | Another fishing minigame in Minecraft! | X6Nwdhrz | -| [Reel Fishing](https://modrinth.com/mod/reel) | Reel Fishing adds a fishing minigame, modular fishing rods, new fish, terrible puns and more. | QigKV8wN | -| [Flutter & Flounder](https://modrinth.com/mod/flutterandflounder) | Fight for your life against waves of powerful fish, all in an attempt to meet your quota for some sweet, sweet rewards. | S33yyx2G | -| [Capiche](https://modrinth.com/mod/capiche) | Add some (one) interesting caps | ItXNThQy | -| [Skybox at Home](https://modrinth.com/mod/skybox_athome) | Yet another skybox mod, but it displays your customiezd 360° panoramic images with equirectangular projection. No, we have skybox at home! | A9YpZkm1 | -| [Gods Of Olympus](https://modrinth.com/mod/gods-of-olympus) | Gods of the sky and sea | Xn2UTgH0 | -| [Boids](https://modrinth.com/mod/boids) | Boids simulation for flocking fish | OeCnoEPH | -| [Birds \| Boids Addon](https://modrinth.com/mod/birds-boids-addon) | Adds birds | vXooxCiH | -| [Arctic](https://modrinth.com/mod/arctic) | A mini overhaul of cold biomes. | WWFqiy4s | -| [Toxic Sky & Plastic Seas](https://modrinth.com/mod/toxsky) | Garbage patches in the ocean near you. | yGe0HVjV | -| [Gadgets of the Sky](https://modrinth.com/mod/gadgets-of-the-sky) | Adds various gadgets, useful for travel, combat and more. | KrtWsfxN | -| [Whalestrom](https://modrinth.com/mod/whalestrom) | Adds flying whales to the game! | 29fBggbX | -| [Cerulean](https://modrinth.com/mod/cerulean) | Stars, automation, trinkets, and a dream... | it1V9161 | -| [env.json](https://modrinth.com/mod/env.json) | A small FabricMC library allowing to convert an `env.json` file into a Java Object. It is mostly used by Environment Driven Assets and Environment Driven Data. | t6ECu50t | -| [Environment Driven Assets](https://modrinth.com/mod/env-driven-assets) | Environment Driven Assets is a FabricMC mod which implements the env.json library in order to apply it on vanilla asset types. | GpoGWc3F | -| [Operation: Starcleave](https://modrinth.com/mod/operation-starcleave) | Cleave open the sky, and unite Earth with the Heavens. | mEjD68Hw | -| [Arctic](https://modrinth.com/mod/arctic) | A mini overhaul of cold biomes. | WWFqiy4s | -| [Clouded Isles](https://modrinth.com/mod/clouded-isles) | inspired by terraria's sky islands, this mod adds new equipment and blocks obtained from the "sky isle" structure. made for modfest 1.20 | a5PWns3Z | -| [Blocky Bass](https://modrinth.com/mod/blocky-bass) | Adds Big Mouth Blocky Bass to the game. Fish him up, feed him a disc, watch him sing! | V8mKhZR1 | -| [Perihelion](https://modrinth.com/mod/perihelion) | A dimension mod focused around traveling to the sun | fFBFJaJ5 | -| [Starcaller](https://modrinth.com/mod/starcaller) | Pull stars from the sky and reshape them just like the old tales. Navigate using named stars. Start a color turf-war. Paint art. | MjDyRyZv | -| [Loggerhead Luminancies](https://modrinth.com/mod/loggerhead-luminancies) | Adds a sea lantern variant crafted using scutes that can float in water. | cWb8HuiP | -| [WeatherSync](https://modrinth.com/mod/weathersync) | Server-side mod to sync peoples' weather to the real world! | vqS5f5pQ | -| [Anshar](https://modrinth.com/mod/anshar) | Write yourself into the Akashic Record with the power of beacons! | t6F0gIBS | -| [Environment Driven Assets](https://modrinth.com/mod/env-driven-assets) | Environment Driven Assets is a FabricMC mod which implements the env.json library in order to apply it on vanilla asset types. | GpoGWc3F | -| [Fishhead](https://modrinth.com/mod/fishhead) | Have you ever wanted to be a horse? Well we don't know much about horses actually, but we can help you become one with the fish! This mod lets you wear pufferfish. | J13DyBPM | -| [The Sky's The Limit](https://modrinth.com/mod/the-skys-the-limit) | The sky wasn't limiting enough, so I put a ceiling on it! | 4eOE93dU | - +# modfest-1-20 +The official ModFest 1.20 modpack! diff --git a/config/config/emi.css b/config/config/emi.css deleted file mode 100644 index e826654..0000000 --- a/config/config/emi.css +++ /dev/null @@ -1,3 +0,0 @@ -#ui { - effect-location: left-compressed; -} diff --git a/config/config/gofo/config.json b/config/config/gofo/config.json deleted file mode 100644 index 13830a6..0000000 --- a/config/config/gofo/config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "poseidonEvents": false, - "zeusEvents": false -} diff --git a/config/config/openloader/data/shards-modfest-1-20/data/mf120/shard_type/mf120_sea.json b/config/config/openloader/data/shards-modfest-1-20/data/mf120/shard_type/mf120_sea.json deleted file mode 100644 index 37d5094..0000000 --- a/config/config/openloader/data/shards-modfest-1-20/data/mf120/shard_type/mf120_sea.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "mf120:visitor": { - "text_color": "#43f099", - "glow_color": "#00ff48", - "collect_particle": "minecraft:glow", - "collect_sound": { - "sound_id": "scattered_shards:collect_visitor" - }, - "list_order": 1 - }, - "mf120:challenge": { - "text_color": "#48dbd1", - "glow_color": "#fff596", - "collect_particle": "minecraft:enchanted_hit", - "collect_sound": { - "sound_id": "scattered_shards:collect_challenge" - }, - "list_order": 2 - }, - "mf120:secret": { - "text_color": "#5f57ff", - "glow_color": "#bafffa", - "collect_particle": "minecraft:wax_off", - "collect_sound": { - "sound_id": "scattered_shards:collect_secret" - }, - "list_order": 3 - } -} diff --git a/config/config/openloader/data/shards-modfest-1-20/data/mf120/shard_type/mf120_sky.json b/config/config/openloader/data/shards-modfest-1-20/data/mf120/shard_type/mf120_sky.json deleted file mode 100644 index fe6c2de..0000000 --- a/config/config/openloader/data/shards-modfest-1-20/data/mf120/shard_type/mf120_sky.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "mf120:visitor_alt": { - "text_color": "#6de851", - "glow_color": "#00ff48", - "collect_particle": "minecraft:totem_of_undying", - "collect_sound": { - "sound_id": "scattered_shards:collect_visitor" - }, - "list_order": 1 - }, - "mf120:challenge_alt": { - "text_color": "#5174e8", - "glow_color": "#0026ff", - "collect_particle": "minecraft:glow", - "collect_sound": { - "sound_id": "scattered_shards:collect_challenge" - }, - "list_order": 2 - }, - "mf120:secret_alt": { - "text_color": "#eb4034", - "glow_color": "#f08", - "collect_particle": "minecraft:witch", - "collect_sound": { - "sound_id": "scattered_shards:collect_secret" - }, - "list_order": 3 - } -} diff --git a/config/config/openloader/data/shards-modfest-1-20/pack.mcmeta b/config/config/openloader/data/shards-modfest-1-20/pack.mcmeta deleted file mode 100644 index 83e54b0..0000000 --- a/config/config/openloader/data/shards-modfest-1-20/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 18, - "description": "ModFest 1.20 Scattered Shards data" - } -} diff --git a/config/config/openloader/resources/Unsanded-1.1.1-custom.zip b/config/config/openloader/resources/Unsanded-1.1.1-custom.zip deleted file mode 100644 index b4e144d..0000000 Binary files a/config/config/openloader/resources/Unsanded-1.1.1-custom.zip and /dev/null differ diff --git a/config/config/openloader/resources/VanillaTweaks_r938838.zip b/config/config/openloader/resources/VanillaTweaks_r938838.zip deleted file mode 100644 index f4687c1..0000000 Binary files a/config/config/openloader/resources/VanillaTweaks_r938838.zip and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_0.png b/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_0.png deleted file mode 100644 index b64daab..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_0.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_1.png b/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_1.png deleted file mode 100644 index ae9fc33..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_1.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_2.png b/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_2.png deleted file mode 100644 index 5cdd98b..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_2.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_3.png b/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_3.png deleted file mode 100644 index a1a51cb..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_3.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_4.png b/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_4.png deleted file mode 100644 index 5bf39f7..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_4.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_5.png b/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_5.png deleted file mode 100644 index 380c5f8..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/gui/title/background/panorama_5.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/map/map_icons.png b/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/map/map_icons.png deleted file mode 100644 index 3a458be..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/minecraft/textures/map/map_icons.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/font/emoji.json b/config/config/openloader/resources/modfest-assets/assets/modfest/font/emoji.json deleted file mode 100644 index 988738f..0000000 --- a/config/config/openloader/resources/modfest-assets/assets/modfest/font/emoji.json +++ /dev/null @@ -1 +0,0 @@ -{"providers":[{"type":"bitmap","file":"modfest:emoji/ace_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/agender_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/aroace_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/aro_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/bi_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/blanketcon.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/blob_waaaaa.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/demi_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/femboy_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/furry_pride.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/genderfluid_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/genderflux_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/genderqueer_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/intersex_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/lesbian_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/lil_pineapple.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/modfest-generic.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/nb_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/neurodiversity_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/ohno.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/pan_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/pineapple.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/plural_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/queer_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/queer_prog_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/trans_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/uh.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/vincian_heart.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/whyfest.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/winnger.png","height":9,"ascent":8,"chars":[""]},{"type":"bitmap","file":"modfest:emoji/yeefuckinghaw.png","height":9,"ascent":8,"chars":[""]}]} \ No newline at end of file diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/font/icons.json b/config/config/openloader/resources/modfest-assets/assets/modfest/font/icons.json deleted file mode 100644 index 2e16caa..0000000 --- a/config/config/openloader/resources/modfest-assets/assets/modfest/font/icons.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "providers": [ - { - "type": "space", - "advances": { - ".": -168, - "_": -32, - "-": -8, - "'": -1 - } - }, - { - "type": "bitmap", - "file": "modfest:icons/icon.png", - "ascent": 20, - "height": 32, - "chars": [ - "0" - ] - } - ] -} diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/ace_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/ace_heart.png deleted file mode 100644 index db7fa78..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/ace_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/agender_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/agender_heart.png deleted file mode 100644 index b14075b..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/agender_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/aro_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/aro_heart.png deleted file mode 100644 index e4d8a88..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/aro_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/aroace_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/aroace_heart.png deleted file mode 100644 index 7721255..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/aroace_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/bi_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/bi_heart.png deleted file mode 100644 index e7158e9..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/bi_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/blanketcon.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/blanketcon.png deleted file mode 100644 index d853668..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/blanketcon.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/blob_waaaaa.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/blob_waaaaa.png deleted file mode 100644 index 768a5ec..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/blob_waaaaa.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/demi_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/demi_heart.png deleted file mode 100644 index fa58e1e..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/demi_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/femboy_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/femboy_heart.png deleted file mode 100644 index 7738a6b..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/femboy_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/furry_pride.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/furry_pride.png deleted file mode 100644 index aefa706..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/furry_pride.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderfluid_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderfluid_heart.png deleted file mode 100644 index bf0d72c..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderfluid_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderflux_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderflux_heart.png deleted file mode 100644 index 4cef84f..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderflux_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderqueer_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderqueer_heart.png deleted file mode 100644 index 51425e6..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/genderqueer_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/intersex_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/intersex_heart.png deleted file mode 100644 index 8fff1b0..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/intersex_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/lesbian_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/lesbian_heart.png deleted file mode 100644 index 4426670..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/lesbian_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/lil_pineapple.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/lil_pineapple.png deleted file mode 100644 index c47a0ee..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/lil_pineapple.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/modfest-generic.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/modfest-generic.png deleted file mode 100644 index 094848e..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/modfest-generic.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/nb_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/nb_heart.png deleted file mode 100644 index b3208a6..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/nb_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/neurodiversity_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/neurodiversity_heart.png deleted file mode 100644 index f7af027..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/neurodiversity_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/ohno.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/ohno.png deleted file mode 100644 index fc05658..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/ohno.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/pan_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/pan_heart.png deleted file mode 100644 index d703bbd..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/pan_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/pineapple.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/pineapple.png deleted file mode 100644 index 735a075..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/pineapple.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/plural_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/plural_heart.png deleted file mode 100644 index e84db02..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/plural_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/queer_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/queer_heart.png deleted file mode 100644 index 2f54d50..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/queer_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/queer_prog_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/queer_prog_heart.png deleted file mode 100644 index 40709d5..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/queer_prog_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/trans_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/trans_heart.png deleted file mode 100644 index 37e6bfa..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/trans_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/uh.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/uh.png deleted file mode 100644 index 21adcc1..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/uh.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/vincian_heart.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/vincian_heart.png deleted file mode 100644 index 87a92a5..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/vincian_heart.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/whyfest.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/whyfest.png deleted file mode 100644 index aad9418..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/whyfest.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/winnger.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/winnger.png deleted file mode 100644 index c02c9dd..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/winnger.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/yeefuckinghaw.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/yeefuckinghaw.png deleted file mode 100644 index 8d4642d..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/yeefuckinghaw.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/icons/cover.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/icons/cover.png deleted file mode 100644 index d72943b..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/icons/cover.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/icons/icon.png b/config/config/openloader/resources/modfest-assets/assets/modfest/textures/icons/icon.png deleted file mode 100644 index 3935cec..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/modfest/textures/icons/icon.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/assets/skybox_athome/skyboxes/ur_anshar.json b/config/config/openloader/resources/modfest-assets/assets/skybox_athome/skyboxes/ur_anshar.json deleted file mode 100644 index ad7c18e..0000000 --- a/config/config/openloader/resources/modfest-assets/assets/skybox_athome/skyboxes/ur_anshar.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Ur-Anshar", - "texture": "skybox_athome:skyboxes/ur_anshar.png", - "description": "..." -} \ No newline at end of file diff --git a/config/config/openloader/resources/modfest-assets/assets/skybox_athome/skyboxes/ur_anshar.png b/config/config/openloader/resources/modfest-assets/assets/skybox_athome/skyboxes/ur_anshar.png deleted file mode 100644 index 44f37b9..0000000 Binary files a/config/config/openloader/resources/modfest-assets/assets/skybox_athome/skyboxes/ur_anshar.png and /dev/null differ diff --git a/config/config/openloader/resources/modfest-assets/gen_emoji.js b/config/config/openloader/resources/modfest-assets/gen_emoji.js deleted file mode 100644 index 9680bf1..0000000 --- a/config/config/openloader/resources/modfest-assets/gen_emoji.js +++ /dev/null @@ -1,20 +0,0 @@ -const font = {}; -font.providers = []; -const style = {}; -let char = 0xe000; - -for await (const f of Deno.readDir('assets/modfest/textures/emoji')) { - const value = String.fromCodePoint(char++); - font.providers.push({ - type: 'bitmap', - file: 'modfest:emoji/' + f.name, - height: 9, - ascent: 8, - chars: [value], - }); - - style[f.name.substring(0, f.name.length - 4)] = value; -} - -Deno.writeTextFileSync("assets/modfest/font/emoji.json", JSON.stringify(font)) -Deno.writeTextFileSync("styled_chat_emoji.json", JSON.stringify(style)) diff --git a/config/config/openloader/resources/modfest-assets/pack.mcmeta b/config/config/openloader/resources/modfest-assets/pack.mcmeta deleted file mode 100644 index 6849ef0..0000000 --- a/config/config/openloader/resources/modfest-assets/pack.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "pack": { - "description": "Custom assets for Modfest", - "pack_format": 22, - "supported_formats": { - "min_inclusive": 21, - "max_inclusive": 100 - } - } -} \ No newline at end of file diff --git a/config/config/openloader/resources/modfest-assets/styled_chat_emoji.json b/config/config/openloader/resources/modfest-assets/styled_chat_emoji.json deleted file mode 100644 index dfe1d38..0000000 --- a/config/config/openloader/resources/modfest-assets/styled_chat_emoji.json +++ /dev/null @@ -1 +0,0 @@ -{"ace_heart":"","agender_heart":"","aroace_heart":"","aro_heart":"","bi_heart":"","blanketcon":"","blob_waaaaa":"","demi_heart":"","femboy_heart":"","furry_pride":"","genderfluid_heart":"","genderflux_heart":"","genderqueer_heart":"","intersex_heart":"","lesbian_heart":"","lil_pineapple":"","modfest-generic":"","nb_heart":"","neurodiversity_heart":"","ohno":"","pan_heart":"","pineapple":"","plural_heart":"","queer_heart":"","queer_prog_heart":"","trans_heart":"","uh":"","vincian_heart":"","whyfest":"","winnger":"","yeefuckinghaw":""} \ No newline at end of file diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/lang/en_us.json b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/lang/en_us.json deleted file mode 100644 index 6932a1e..0000000 --- a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/lang/en_us.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "shard_type.mf120.visitor.description": "Visitor Shard (Sea)", - "shard_type.mf120.challenge.description": "Challenge Shard (Sea)", - "shard_type.mf120.secret.description": "Secret Shard (Sea)", - "shard_type.mf120.visitor_alt.description": "Visitor Shard (Sky)", - "shard_type.mf120.challenge_alt.description": "Challenge Shard (Sky)", - "shard_type.mf120.secret_alt.description": "Secret Shard (Sky)" -} diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_backing.png deleted file mode 100644 index 20c5aa3..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_front.png deleted file mode 100644 index 9fa441e..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_mini_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_mini_backing.png deleted file mode 100644 index 3e746a4..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_mini_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_mini_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_mini_front.png deleted file mode 100644 index 0b6de24..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_alt_mini_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_backing.png deleted file mode 100644 index de445c6..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_front.png deleted file mode 100644 index 10f11f6..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_mini_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_mini_backing.png deleted file mode 100644 index 62e8635..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_mini_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_mini_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_mini_front.png deleted file mode 100644 index ff95116..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/challenge_mini_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_backing.png deleted file mode 100644 index e58b7c4..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_front.png deleted file mode 100644 index e04a02e..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_mini_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_mini_backing.png deleted file mode 100644 index 0d098e0..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_mini_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_mini_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_mini_front.png deleted file mode 100644 index b974b6c..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_alt_mini_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_backing.png deleted file mode 100644 index 21e52b4..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_front.png deleted file mode 100644 index 29cd030..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_mini_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_mini_backing.png deleted file mode 100644 index f0827c6..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_mini_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_mini_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_mini_front.png deleted file mode 100644 index af236d4..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/secret_mini_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_backing.png deleted file mode 100644 index 37e9899..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_front.png deleted file mode 100644 index 764b045..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_mini_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_mini_backing.png deleted file mode 100644 index d66bb55..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_mini_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_mini_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_mini_front.png deleted file mode 100644 index f857b53..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_alt_mini_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_backing.png deleted file mode 100644 index 57f412b..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_front.png deleted file mode 100644 index 8867d64..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_mini_backing.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_mini_backing.png deleted file mode 100644 index 783f79e..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_mini_backing.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_mini_front.png b/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_mini_front.png deleted file mode 100644 index 586e905..0000000 Binary files a/config/config/openloader/resources/shards-modfest-1-20/assets/mf120/textures/gui/shards/visitor_mini_front.png and /dev/null differ diff --git a/config/config/openloader/resources/shards-modfest-1-20/pack.mcmeta b/config/config/openloader/resources/shards-modfest-1-20/pack.mcmeta deleted file mode 100644 index 6d1cc47..0000000 --- a/config/config/openloader/resources/shards-modfest-1-20/pack.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "pack": { - "pack_format": 22, - "supported_formats": { - "min_inclusive": 21, - "max_inclusive": 100 - }, - "description": "ModFest 1.20 Scattered Shards assets" - } -} diff --git a/config/config/openloader/resources/twemojis.zip b/config/config/openloader/resources/twemojis.zip deleted file mode 100644 index baa5476..0000000 Binary files a/config/config/openloader/resources/twemojis.zip and /dev/null differ diff --git a/config/config/picturesign.json b/config/config/picturesign.json deleted file mode 100644 index 45ad73f..0000000 --- a/config/config/picturesign.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "enabled": true, - "enableVideoSigns": true, - "translucency": true, - "fullBrightPicture": false, - "helperUi": true, - "exceedVanillaLineLength": true, - "debug": false, - "maxThreads": 4, - "signRenderDistance": 64, - "safeMode": true, - "safeProviders": [ - "https://modfest.b-cdn.net/" - ], - "missingImageMode": "BLACK", - "pictureShader": "PosColTexLight" -} diff --git a/config/config/quickerconnectbutton.json5 b/config/config/quickerconnectbutton.json5 deleted file mode 100644 index c2d7f65..0000000 --- a/config/config/quickerconnectbutton.json5 +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ip": "modfest.pb4.eu" -} diff --git a/config/config/roles.json b/config/config/roles.json deleted file mode 100644 index 67010f5..0000000 --- a/config/config/roles.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "netadmin": { - "level": 99999, - "overrides": { - "permission_level": 4, - "permission_keys": { - "modfest.netadmin": "allow", - "worldedit.*": "allow", - "scattered_shards.*": "allow" - }, - "command_feedback": true, - "commands": { - ".*": "allow" - } - } - }, - "organizer": { - "level": 100, - "overrides": { - "permission_level": 3, - "permission_keys": { - "modfest.organizer": "allow", - "worldedit.*": "allow", - "scattered_shards.*": "allow" - }, - "entity_selectors": true, - "commands": { - "role.*": "allow", - "item-use.*": "allow" - } - } - }, - "fixer": { - "level": 10, - "overrides": { - "permission_level": 2, - "permission_keys": { - "worldedit.*": "allow", - "scattered_shards.command.collect": "allow", - "scattered_shards.command.uncollect.*": "allow", - "scattered_shards.command.block": "allow", - "scattered_shards.modify_shard": "allow", - "armor_stand_editor.*": "allow" - }, - "command_feedback": true, - "entity_selectors": false, - "commands": { - "gamemode.*": "allow", - "tp @[^e].*": "allow", - "anshar network list": "allow", - "timelock.*": "allow", - "flounderfest (start|stop)": "allow", - "weathersync timer (get|reset)": "allow", - "kill.*": "deny" - } - } - }, - "builder": { - "level": 5, - "overrides": { - "permission_keys": { - "modfest.builder": "allow", - "scattered_shards.command.uncollect.*": "allow" - }, - "command_feedback": true, - "entity_selectors": false, - "commands": { - "gamemode adventure": "allow" - } - } - }, - "everyone": { - "overrides": { - "permission_keys": { - "modfest.everyone": "allow", - "worldedit.*": "deny", - "scattered_shards.*": "deny", - "armor_stand_editor.*": "deny" - }, - "commands": { - "help": "allow", - "warp.*": "allow", - "weathersync (enable|disable|sync)": "allow", - "weathersync location (get|set)": "allow", - "polymer.*": "deny" - } - } - } -} diff --git a/config/config/styled-chat.json b/config/config/styled-chat.json deleted file mode 100644 index b6472aa..0000000 --- a/config/config/styled-chat.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "CONFIG_VERSION_DONT_TOUCH_THIS": 3, - "_comment": "Before changing anything, see https://github.com/Patbox/StyledChat#configuration", - "text_formatting": { - "legacy_formatting": false, - "parse_links": true, - "parse_mentions": false, - "markdown": true, - "respect_colors_client_setting": true - }, - "auto_completion": { - "tags": false, - "tag_aliases": false, - "emoticons": true - }, - "default": { - "display_name": "${default}", - "message_formats": { - "chat": "<${player}> ${message}", - "joined_the_game": "", - "joined_after_name_change": "", - "joined_for_first_time": "", - "left_game": "", - "base_death": "${default_message}", - "advancement_task": "", - "advancement_challenge": "", - "advancement_goal": "", - "sent_team_chat": "\\'>${team}':'${displayName}':'${message}'>", - "received_team_chat": "\\'>${team}':'${displayName}':'${message}'>", - "sent_private_message": "", - "received_private_message": "", - "say_command": "[${player}] ${message}", - "me_command": "", - "pet_death": "${default_message}" - }, - "link_style": "${link}", - "mention_style": "%player:displayname%", - "spoiler_style": "${spoiler}", - "spoiler_symbol": "▌", - "formatting": { - "dark_red": false, - "green": false, - "underline": true, - "dark_green": false, - "black": false, - "yellow": false, - "bold": true, - "italic": true, - "dark_blue": false, - "dark_purple": false, - "gold": false, - "red": false, - "aqua": false, - "gray": false, - "light_purple": false, - "blue": false, - "white": false, - "dark_aqua": false, - "dark_gray": false, - "spoiler": true, - "strikethrough": true - }, - "emoticons": { - "$emojibase:builtin:joypixels": "${emoji}", - "$default:from_file:styled_chat_emoji.json": "${emoji}", - "real_shrug": "¯\\\\_(ツ)_/¯", - "table_flip": "(╯°□°）╯︵ ┻━┻", - "mcsword": "🗡", - "mcbow": "🏹", - "mctrident": "🔱", - "mcrod": "🎣", - "mcpotion": "🧪", - "mcshears": "✂", - "mcbucket": "🪣", - "mcbell": "🔔", - "item": "[%player:equipment_slot mainhand%]", - "pos": "%player:pos_x% %player:pos_y% %player:pos_z%" - }, - "custom_message_types": {} - }, - "styles": [ - { - "require": { - "type": "permission", - "permission": "modfest.netadmin" - }, - "message_formats": { - "chat": "\\<${player}\\> ${message}" - }, - "formatting": {}, - "emoticons": {}, - "custom_message_types": {} - }, - { - "require": { - "type": "permission", - "permission": "modfest.organizer" - }, - "message_formats": { - "chat": "\\<${player}\\> ${message}" - }, - "formatting": {}, - "emoticons": {}, - "custom_message_types": {} - }, - { - "require": { - "type": "permission", - "permission": "modfest.builder" - }, - "display_name": "${default}", - "message_formats": { - "chat": "\\<${player}\\> ${message}" - }, - "formatting": {}, - "emoticons": {}, - "custom_message_types": {} - } - ] -} \ No newline at end of file diff --git a/config/config/styled-nicknames.json b/config/config/styled-nicknames.json deleted file mode 100644 index 3f4aea8..0000000 --- a/config/config/styled-nicknames.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "CONFIG_VERSION_DONT_TOUCH_THIS": 1, - "_comment": "Before changing anything, see https://github.com/Patbox/StyledNicknames#configuration", - "allowByDefault": true, - "nicknameFormat": "${nickname}*", - "maxLength": 32, - "changeDisplayName": true, - "changePlayerListName": false, - "allowLegacyFormatting": false, - "nicknameChangedMessage": "Your nickname has been changed to ${nickname}", - "nicknameResetMessage": "Your nickname has been removed!", - "defaultEnabledFormatting": { - "dark_red": true, - "color": false, - "underline": false, - "yellow": true, - "hard_gradient": false, - "italic": false, - "dark_blue": true, - "dark_purple": true, - "gold": true, - "red": true, - "aqua": true, - "hover": true, - "gray": true, - "light_purple": true, - "white": true, - "dark_gray": true, - "strikethrough": false, - "obfuscated": false, - "change_page": false, - "green": true, - "dark_green": true, - "gradient": false, - "black": true, - "bold": false, - "rainbow": false, - "blue": true, - "dark_aqua": true, - "reset": true - }, - "tooLongMessage": "This nickname is too long!" -} diff --git a/config/config/styled_chat_emoji.json b/config/config/styled_chat_emoji.json deleted file mode 100644 index dfe1d38..0000000 --- a/config/config/styled_chat_emoji.json +++ /dev/null @@ -1 +0,0 @@ -{"ace_heart":"","agender_heart":"","aroace_heart":"","aro_heart":"","bi_heart":"","blanketcon":"","blob_waaaaa":"","demi_heart":"","femboy_heart":"","furry_pride":"","genderfluid_heart":"","genderflux_heart":"","genderqueer_heart":"","intersex_heart":"","lesbian_heart":"","lil_pineapple":"","modfest-generic":"","nb_heart":"","neurodiversity_heart":"","ohno":"","pan_heart":"","pineapple":"","plural_heart":"","queer_heart":"","queer_prog_heart":"","trans_heart":"","uh":"","vincian_heart":"","whyfest":"","winnger":"","yeefuckinghaw":""} \ No newline at end of file diff --git a/config/config/styledplayerlist/config.json b/config/config/styledplayerlist/config.json deleted file mode 100644 index 45b7ee0..0000000 --- a/config/config/styledplayerlist/config.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "config_version": 2, - "__comment": "Before changing anything, see https://github.com/Patbox/StyledPlayerList#configuration", - "default_style": "default", - "messages": { - "switch": "Your player list style has been changed to: ${style}", - "unknown": "This style doesn't exist!", - "no_permission": "You don't have required permissions!" - }, - "player": { - "modify_name": false, - "modify_right_text": false, - "passthrough": false, - "hidden": false, - "format": "%styled-nicknames:display_name%", - "right_text": "", - "update_on_chat_message": false, - "update_tick_time": -1, - "styles": [] - }, - "client_show_in_singleplayer": true -} \ No newline at end of file diff --git a/config/config/styledplayerlist/styles/default.json b/config/config/styledplayerlist/styles/default.json deleted file mode 100644 index 0f4039f..0000000 --- a/config/config/styledplayerlist/styles/default.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "style_name": "Default", - "update_tick_time": 20, - "list_header": [ - "", - "", - "-0 Modfest", - "", - "<#253a73> [ <#c5d5ff>%server:online%/%server:max_players%<#253a73> ] ", - "" - ], - "list_footer": [ - "", - " ", - "", - "<#c5d5ff>TPS: %server:tps_colored% <#253a73>| <#c5d5ff>Ping: <#ffba26>%player:ping%", - "" - ], - "hidden_in_commands": false -} \ No newline at end of file diff --git a/config/config/teabridge.json b/config/config/teabridge.json deleted file mode 100644 index ccdc936..0000000 --- a/config/config/teabridge.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "discord": { - "token": "${TEABRIDGE_TOKEN}", - "webhook": "${TEABRIDGE_WEBHOOK}", - "pkMessageDelay": 2000, - "pkMessageDelayMilliseconds": true - }, - "avatars": { - "avatarUrl": "https://visage.surgeplay.com/face/128/%s.png", - "useTextureId": true - }, - "game": { - "serverStartingMessage": "Server is starting...", - "serverStartMessage": "Server has started!", - "serverStopMessage": "Server has stopped!", - "serverCrashMessage": "Server has crashed!", - "mirrorJoin": true, - "mirrorLeave": true, - "mirrorDeath": true, - "mirrorAdvancements": false, - "mirrorCommandMessages": false - }, - "crashes": { - "uploadToMclogs": true - }, - "debug": false -} diff --git a/config/config/waila/waila.json b/config/config/waila/waila.json deleted file mode 100644 index d3b161d..0000000 --- a/config/config/waila/waila.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "general": { - "displayTooltip": true, - "shiftForDetails": false, - "hideShiftText": false, - "displayMode": "HOLD_KEY", - "hideFromPlayerList": true, - "hideFromDebug": true, - "enableTextToSpeech": false, - "rateLimit": 250 - }, - "overlay": { - "position": { - "align": { - "x": "CENTER", - "y": "TOP" - }, - "anchor": { - "x": "CENTER", - "y": "TOP" - }, - "x": 0, - "y": 0, - "bossBarsOverlap": false - }, - "color": { - "backgroundAlpha": 204, - "themes": [], - "activeTheme": "waila:vanilla" - }, - "scale": 1.0 - }, - "formatter": { - "modName": "§9§o%s", - "blockName": "§f%s", - "fluidName": "§f%s", - "entityName": "§f%s", - "registryName": "§8%s" - }, - "configVersion": 1 -} \ No newline at end of file diff --git a/config/config/waila/waila_plugins.json b/config/config/waila/waila_plugins.json deleted file mode 100644 index 8ae073a..0000000 --- a/config/config/waila/waila_plugins.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "waila": { - "show_blocks": true, - "show_fluids": false, - "show_entities": true, - "show_icon": true, - "icon_position": "MIDDLE", - "show_mod_name": true, - "show_item_mod_name": false, - "show_registry": false - }, - "minecraft": { - "item_entity": true, - "pet.owner": true, - "pet.hide_unknown_owner": false, - "attribute.block_position": false, - "attribute.block_state": false, - "attribute.entity_position": false, - "attribute.health": true, - "attribute.absorption": true, - "attribute.armor": true, - "attribute.compact": false, - "attribute.icon_per_line": 25, - "attribute.long_health_max": 100, - "attribute.long_armor_max": 100, - "attribute.horse_jump_height": true, - "attribute.horse_speed": true, - "furnace_contents": true, - "jukebox.record": true, - "timer.grow": false, - "timer.breed": false, - "override.invisible_entity": true, - "override.trapped_chest": true, - "override.powder_snow": true, - "override.infested": true, - "override.vehicle": true, - "breaking_progress.enabled": true, - "breaking_progress.color": -1426063361, - "breaking_progress.bottom_only": false, - "spawner_type": true, - "crop_progress": true, - "redstone.lever": true, - "redstone.repeater": true, - "redstone.comparator": true, - "redstone.level": true, - "player_head.name": true, - "level.composter": true, - "level.honey": true, - "note_block.type": true, - "note_block.note": "SHARP", - "note_block.int_value": false - }, - "wthit-plugins": { - "break_progress": false, - "breeding_cooldown": false, - "growing_cooldown": false, - "breeding_item": true, - "armor_stats": true, - "author": false, - "harvestability": true, - "hardness": false - } -} \ No newline at end of file diff --git a/config/config/wizcraft.json5 b/config/config/wizcraft.json5 deleted file mode 100644 index d6cf10f..0000000 --- a/config/config/wizcraft.json5 +++ /dev/null @@ -1,3 +0,0 @@ -{ - expendWandChargeInSurvival: false -} diff --git a/config/options.txt b/config/options.txt deleted file mode 100644 index c1e2202..0000000 --- a/config/options.txt +++ /dev/null @@ -1,17 +0,0 @@ -version:3700 -key_key.advancements:key.keyboard.unknown -key_key.waila.show_overlay:key.keyboard.r -key_axiom.keybind.context:key.keyboard.z -key_axiom.keybind.toggle_no_clip_cap:key.keyboard.unknown -key_axiom.keybind.toggle_angel_placement_cap:key.keyboard.unknown -key_axiom.keybind.toggle_fast_place_cap:key.keyboard.unknown -key_axiom.keybind.toggle_infinite_reach_cap:key.keyboard.unknown -key_axiom.keybind.toggle_tinker_cap:key.keyboard.unknown -key_axiom.keybind.toggle_no_updates_cap:key.keyboard.unknown -key_axiom.keybind.toggle_force_place_cap:key.keyboard.unknown -key_axiom.keybind.toggle_replace_mode_cap:key.keyboard.unknown -key_axiom.keybind.toggle_bulldozer_cap:key.keyboard.unknown -key_axiom.keybind.nudge_with_scroll:key.keyboard.unknown -key_axiom.keybind.nudge_forwards:key.keyboard.unknown -key_axiom.keybind.nudge_backwards:key.keyboard.unknown -key_key.wizcraft.tool_control:key.keyboard.left.alt diff --git a/config/server-icon.png b/config/server-icon.png deleted file mode 100644 index 2228267..0000000 Binary files a/config/server-icon.png and /dev/null differ diff --git a/config/server.properties b/config/server.properties deleted file mode 100644 index 675dd41..0000000 --- a/config/server.properties +++ /dev/null @@ -1,6 +0,0 @@ -server-port=${PORT:25565} -motd=Modfest 1.20: Sky and Sea\u00A7r\n\u00A78\u00A7oShowcase Server -level-name=modfest-1-20/modfest-1-20-v3 -enable-command-block=true -max-players=64 -spawn-protection=0 diff --git a/enable_hooks.sh b/enable_hooks.sh new file mode 100644 index 0000000..1d1718f --- /dev/null +++ b/enable_hooks.sh @@ -0,0 +1,5 @@ +#!/bin/sh +# + +echo "Enabling Hooks" +git config core.hooksPath git/hooks \ No newline at end of file diff --git a/git/hooks/pre-commit b/git/hooks/pre-commit new file mode 100644 index 0000000..59353f7 --- /dev/null +++ b/git/hooks/pre-commit @@ -0,0 +1,9 @@ +#!/bin/sh +# + +. git-sh-setup +echo "Refreshing Packwiz Index" +cd pack +packwiz refresh +git add index.toml +git add pack.toml diff --git a/git/hooks/pre-merge-commit b/git/hooks/pre-merge-commit new file mode 100644 index 0000000..8a62677 --- /dev/null +++ b/git/hooks/pre-merge-commit @@ -0,0 +1,7 @@ +#!/bin/sh +# + +. git-sh-setup +test -x "$GIT_WORK_TREE/git/hooks/pre-commit" && + exec "$GIT_WORK_TREE/git/hooks/pre-commit" +: diff --git a/image.png b/image.png deleted file mode 100644 index 84bb882..0000000 Binary files a/image.png and /dev/null differ diff --git a/make_profile.bat b/make_profile.bat deleted file mode 100644 index e68382f..0000000 --- a/make_profile.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -setlocal - -set SOURCE_FOLDER=profile -set ZIP_FILE=profile.zip - -powershell Compress-Archive -Force profile/* "Modfest 1.20 - Sky and Sea.zip" - -echo Done -endlocal diff --git a/make_profile.sh b/make_profile.sh deleted file mode 100644 index b22d353..0000000 --- a/make_profile.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -SOURCE_FOLDER=profile -ZIP_FILE="Modfest 1.20 - Sky and Sea.zip" - -zip -r "$ZIP_FILE" "$SOURCE_FOLDER" - -echo "Done" diff --git a/profile/.minecraft/unsup.ini b/profile/.minecraft/unsup.ini deleted file mode 100644 index 19c9b6b..0000000 --- a/profile/.minecraft/unsup.ini +++ /dev/null @@ -1,11 +0,0 @@ -version=1 -preset=minecraft - -source_format=packwiz -source=https://raw.githack.com/ModFest/modfest-skyandsea/main/pack/pack.toml - -subtitle=ModFest 1.20: Sky and Sea -update_mmc_pack=true - -[colors] -progress=5484ff diff --git a/profile/instance.cfg b/profile/instance.cfg deleted file mode 100644 index 448547b..0000000 --- a/profile/instance.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[General] -iconKey=modfest_1_20 -name=ModFest 1.20: Sky and Sea -InstanceType=OneSix -JoinServerOnLaunch=false -OverrideCommands=false -OverrideConsole=false -notes=meow -OverrideGameTime=false -OverrideJavaArgs=false -OverrideJavaLocation=false -OverrideMemory=false -OverrideMiscellaneous=false -OverrideNativeWorkarounds=false -OverridePerformance=false -OverrideWindow=false -UseAccountForInstance=false diff --git a/profile/mmc-pack.json b/profile/mmc-pack.json deleted file mode 100644 index fbb11d0..0000000 --- a/profile/mmc-pack.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "components": [ - { - "cachedName": "LWJGL 3", - "cachedVersion": "3.3.2", - "cachedVolatile": true, - "dependencyOnly": true, - "uid": "org.lwjgl3", - "version": "3.3.2" - }, - { - "cachedName": "Minecraft", - "cachedRequires": [ - { - "suggests": "3.3.2", - "uid": "org.lwjgl3" - } - ], - "cachedVersion": "1.20.4", - "important": true, - "uid": "net.minecraft", - "version": "1.20.4" - }, - { - "cachedName": "Intermediary Mappings", - "cachedRequires": [ - { - "equals": "1.20.4", - "uid": "net.minecraft" - } - ], - "cachedVersion": "1.20.4", - "cachedVolatile": true, - "dependencyOnly": true, - "uid": "net.fabricmc.intermediary", - "version": "1.20.4" - }, - { - "cachedName": "Fabric Loader", - "cachedRequires": [ - { - "uid": "net.fabricmc.intermediary" - } - ], - "cachedVersion": "0.15.3", - "uid": "net.fabricmc.fabric-loader", - "version": "0.15.3" - }, - { - "cachedName": "Una's Simple Updater (unsup)", - "cachedVersion": "0.2.3", - "uid": "com.unascribed.unsup" - } - ], - "formatVersion": 1 -} diff --git a/profile/modfest_1_20.png b/profile/modfest_1_20.png deleted file mode 100644 index 2228267..0000000 Binary files a/profile/modfest_1_20.png and /dev/null differ diff --git a/profile/patches/com.unascribed.unsup.json b/profile/patches/com.unascribed.unsup.json deleted file mode 100644 index c7b3333..0000000 --- a/profile/patches/com.unascribed.unsup.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "formatVersion": 1, - "name": "Una's Simple Updater (unsup)", - "uid": "com.unascribed.unsup", - "version": "0.2.3", - "+agents": [ - { - "name": "com.unascribed:unsup:0.2.3", - "url": "https://repo.sleeping.town" - } - ] -} diff --git a/scripts/submissions.py b/scripts/submissions.py deleted file mode 100755 index cbaae79..0000000 --- a/scripts/submissions.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/python3 - -import requests -import json -from subprocess import run, PIPE -import re - -EXCLUDE = [ - "rapscallions-and-rockhoppers" # Pulls latest from NeoForge ver -] - -platform_data = json.loads(requests.get("https://platform.modfest.net/submissions").text) -participant_data = json.loads(requests.get("https://platform.modfest.net/event/1.20").text) - -submissions = [] -for participant_id, participant in participant_data["participants"].items(): - for mod in participant["submissions"]: - submissions.append(mod) - -input_str = "" -with open('server.toml', 'r') as f: - input_str = f.read() - for mod in platform_data: - if mod["id"] in submissions and not mod["slug"] in input_str and not mod["slug"] in EXCLUDE: - run(['mcman', 'i', 'url', mod["download_url"].replace(mod["id"], mod["slug"])]) - -with open('server.toml', 'r') as f: - input_str = f.read() - for mod in platform_data: - if mod["id"] in submissions and not mod["slug"] in EXCLUDE: - # Regexes may not be the intended solution, but they sure are a solution - input_str = re.sub( - r"\[\[mods\]\]\ntype = \"modrinth\"\nid = \"%modid%\"\nversion = \".{8}\"" - .replace("%modid%", mod["slug"]), - "[[mods]]\ntype = \"modrinth\"\nid = \"%modid%\"\nversion = \"%version%\"" - .replace("%modid%", mod["slug"]) - .replace("%version%", mod["version_id"]), - input_str) - -with open('server.toml', 'w') as f: - f.write(input_str) diff --git a/server.toml b/server.toml deleted file mode 100644 index 160e457..0000000 --- a/server.toml +++ /dev/null @@ -1,474 +0,0 @@ -name = "modfest-skyandsea" -mc_version = "1.20.4" - -[jar] -type = "fabric" -loader = "0.15.3" -installer = "latest" - -[variables] -PORT = "25565" - -[launcher] -eula_args = true -nogui = true - -[[mods]] -type = "modrinth" -id = "fabric-api" -version = "0.92.0+1.20.4" - -[[mods]] -type = "modrinth" -id = "fabric-language-kotlin" -version = "1.10.17+kotlin.1.9.22" - -[[mods]] -type = "modrinth" -id = "modmenu" -version = "9.0.0" - -[[mods]] -type = "url" -url = "https://jaskarth.com/pub/mods/player-roles-1.6.8.jar" - -[[mods]] -type = "modrinth" -id = "glowcase" -version = "1.3.1+1.20.4" - -[[mods]] -type = "modrinth" -id = "modernfix" -version = "5.10.2+mc1.20.4" - -[[mods]] -type = "modrinth" -id = "spark" -version = "1.10.58-fabric" - -[[mods]] -type = "modrinth" -id = "sodium" -version = "mc1.20.3-0.5.5" - -[[mods]] -type = "modrinth" -id = "axiom" -version = "2.2.1" - -[[mods]] -type = "modrinth" -id = "worldedit" -version = "7.2.18" - -[[mods]] -type = "modrinth" -id = "emi" -version = "jXyglcrU" - -[[mods]] -type = "modrinth" -id = "lithium" -version = "nMhjKWVE" - -[[mods]] -type = "modrinth" -id = "indium" -version = "tD2IqHXC" - -[[mods]] -type = "modrinth" -id = "badpackets" -version = "SvSHT7FN" - -[[mods]] -type = "modrinth" -id = "yacl" -version = "3.3.1+1.20.4-fabric" - -[[mods]] -type = "modrinth" -id = "forge-config-api-port" -version = "v20.4.2-1.20.4-Fabric" - -[[mods]] -type = "modrinth" -id = "smartbrainlib" -version = "1.13" - -[[mods]] -type = "modrinth" -id = "cloth-config" -version = "13.0.121+fabric" - -[[mods]] -type = "modrinth" -id = "geckolib" -version = "Z4SMiN06" - -[[mods]] -type = "modrinth" -id = "trinkets" -version = "3.8.0" - -[[mods]] -type = "modrinth" -id = "wthit" -version = "fabric-10.0.1" - -[[mods]] -type = "modrinth" -id = "teabridge" -version = "1.2.3" - -[[mods]] -type = "modrinth" -id = "styled-nicknames" -version = "1.4.0+1.20.3" - -[[mods]] -type = "modrinth" -id = "styledplayerlist" -version = "jcLxMRaH" - -[[mods]] -type = "modrinth" -id = "styled-chat" -version = "2.4.0+1.20.3" - -[[mods]] -type = "modrinth" -id = "drogstyle" -version = "1.3.4+1.20.4" - -[[mods]] -type = "modrinth" -id = "crunchy-crunchy-advancements" -version = "1.6.2+1.20.2" - -[[mods]] -type = "modrinth" -id = "owo-lib" -version = "0.12.0+1.20.3" - -[[mods]] -type = "modrinth" -id = "switchy" -version = "2.9.0+1.20.4" - -[[mods]] -type = "modrinth" -id = "switchy-proxy" -version = "1.7.0+1.20.4" - -[[mods]] -type = "modrinth" -id = "fabrictailor" -version = "2.3.0" - -[[mods]] -type = "modrinth" -id = "ears" -version = "1.4.6+fabric-1.20.2" - -[[mods]] -type = "modrinth" -id = "sidekick" -version = "jRAvZUss" - -[[mods]] -type = "modrinth" -id = "blocky-bass" -version = "1oRMoeLe" - -[[mods]] -type = "modrinth" -id = "starcaller" -version = "vREBSPTX" - -[[mods]] -type = "modrinth" -id = "contrail" -version = "UNlU07tE" - -[[mods]] -type = "modrinth" -id = "toxsky" -version = "PE1DBsz4" - -[[mods]] -type = "modrinth" -id = "pet-bottle-rocket" -version = "ayFHupvB" - -[[mods]] -type = "modrinth" -id = "skybox_athome" -version = "6n8dceuR" - -[[mods]] -type = "modrinth" -id = "arctic" -version = "WWFqiy4s" - -[[mods]] -type = "modrinth" -id = "seagulls" -version = "yP2sUiVD" - -[[mods]] -type = "modrinth" -id = "gadgets-of-the-sky" -version = "pvgE6was" - -[[mods]] -type = "modrinth" -id = "env.json" -version = "CBQek3jU" - -[[mods]] -type = "modrinth" -id = "potatoesplus" -version = "xxvfihTT" - -[[mods]] -type = "modrinth" -id = "loggerhead-luminancies" -version = "SDe7ekMa" - -[[mods]] -type = "modrinth" -id = "glide-away" -version = "go1RyWf6" - -[[mods]] -type = "modrinth" -id = "weathersync" -version = "2QCmzo0d" - -[[mods]] -type = "modrinth" -id = "boids" -version = "shuI7hpt" - -[[mods]] -type = "modrinth" -id = "birds-boids-addon" -version = "qQcUk86d" - -[[mods]] -type = "modrinth" -id = "cerulean" -version = "p0HRA1Ep" - -[[mods]] -type = "modrinth" -id = "clouded-isles" -version = "QfRJNSiE" - -[[mods]] -type = "modrinth" -id = "schmarrn-fireworks" -version = "T9HJgbsq" - -[[mods]] -type = "modrinth" -id = "anshar" -version = "J0Jvgvde" - -[[mods]] -type = "modrinth" -id = "fishhead" -version = "kjkXFzU8" - -[[mods]] -type = "modrinth" -id = "gods-of-olympus" -version = "ApCuzPaA" - -[[mods]] -type = "modrinth" -id = "wizcraft" -version = "pmjcrzw5" - -[[mods]] -type = "modrinth" -id = "perihelion" -version = "fFBFJaJ5" - -[[mods]] -type = "modrinth" -id = "mutagen" -version = "hgcY7Gea" - -[[mods]] -type = "modrinth" -id = "pescatore" -version = "X6Nwdhrz" - -[[mods]] -type = "modrinth" -id = "env-driven-assets" -version = "0.0.4-alpha" - -[[mods]] -type = "modrinth" -id = "pesky-seagulls" -version = "7P1tHX4H" - -[[mods]] -type = "modrinth" -id = "flutterandflounder" -version = "1ezwQFg1" - -[[mods]] -type = "modrinth" -id = "fluiwid" -version = "TPTTGEjW" - -[[mods]] -type = "modrinth" -id = "partnership" -version = "1.1.2" - -[[mods]] -type = "modrinth" -id = "reel" -version = "6hErUDYk" - -[[mods]] -type = "modrinth" -id = "boatism" -version = "A2V6yzFa" - -[[mods]] -type = "modrinth" -id = "the-skys-the-limit" -version = "ogKJHhlk" - -[[mods]] -type = "modrinth" -id = "capiche" -version = "ItXNThQy" - -[[mods]] -type = "modrinth" -id = "whalestrom" -version = "vc7VVtO7" - -[[mods]] -type = "modrinth" -id = "glide" -version = "SSgjgT31" - -[[mods]] -type = "modrinth" -id = "resurfaced" -version = "OBxLGK7I" - -[[mods]] -type = "modrinth" -id = "operation-starcleave" -version = "zDTQt1Wh" - -[[mods]] -type = "modrinth" -id = "moonrise" -version = "Dys1Pyys" - -[[mods]] -type = "modrinth" -id = "rapscallions-and-rockhoppers" -version = "1.1.2-fabric" - -[[mods]] -type = "modrinth" -id = "wild-magix" -version = "9r95bb54" - -[[mods]] -type = "url" -url = "https://unascribed.b-cdn.net/picturesign-2.0.0-beta.1%2Bunascribedtheora5-1.20.4.jar" -filename = "picturesign-2.0.0-beta.1+unascribedtheora5-1.20.4.jar" -desc = "PictureSign" - -[[mods]] -type = "modrinth" -id = "demobox" -version = "8mqBSol8" - -[[mods]] -type = "modrinth" -id = "worldborderfix" -version = "RtezEgTq" - -[[mods]] -type = "modrinth" -id = "open-loader" -version = "GXnnEfyc" - -[[mods]] -type = "modrinth" -id = "armorstandeditor" -version = "GwsOPBYy" - -[[mods]] -type = "ghrel" -repo = "TheEpicBlock/not-flying" -tag = "1.0.1" -asset = "first" - -[[mods]] -type = "modrinth" -id = "itemuserestrictor" -version = "tBkHeKyy" - -[[mods]] -type = "modrinth" -id = "quicker-connect-button" -version = "3pWxa5Bi" - -[[mods]] -type = "modrinth" -id = "architectury-api" -version = "ueVsvU6j" - -[[mods]] -type = "modrinth" -id = "jamlib" -version = "CWHmKkv9" - -[[mods]] -type = "ghrel" -repo = "ModFest/scattered-shards" -tag = "1.5.2" -asset = "first" - -[[mods]] -type = "ghrel" -repo = "ModFest/fireblanket" -tag = "0.4.5-actual" -asset = "first" - -[[mods]] -type = "modrinth" -id = "timelock" -version = "dRtWDhHw" - -[[mods]] -type = "modrinth" -id = "simple-voice-chat" -version = "LZEbiSAJ" - -[worlds.modfest-1-20.download] -type = "ghrel" -repo = "ModFest/modfest-1-20" -tag = "base" -asset = "modfest-1-20-base-world.zip" - -[markdown] -files = ["README.md"] -auto_update = false - -[options]