diff options
| -rw-r--r-- | .github/workflows/build.yml | 15 | ||||
| -rw-r--r-- | .prettierrc.yml | 2 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | src/main/resources/assets/skyblockhud/data/trackers.json | 72 | ||||
| -rw-r--r-- | src/main/resources/mcmod.info | 28 | ||||
| -rw-r--r-- | src/main/resources/mixins.skyblockhud.json | 2 | ||||
| -rw-r--r-- | src/main/resources/pack.mcmeta | 8 | ||||
| -rw-r--r-- | trackers.json | 10 |
8 files changed, 69 insertions, 69 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 916c6be..4d0c2f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,15 +3,16 @@ name: Build on: push: branches: - - '*' + - "*" paths-ignore: - - '.gitignore' + - ".gitignore" pull_request: branches: - - '*' + - "*" paths-ignore: - - '.gitignore' + - ".gitignore" workflow_dispatch: +permissions: write-all jobs: build: runs-on: ubuntu-latest @@ -39,11 +40,11 @@ jobs: path: build/libs/*.jar - name: Stop gradle daemons run: ./gradlew --stop - + Check-Formating: runs-on: ubuntu-latest name: Check Formatting - + steps: - uses: actions/checkout@v2 - name: Set up JDK 1.8 @@ -53,7 +54,7 @@ jobs: - name: Prettify the Java Code uses: lwerner-lshigh/prettier_action_java@v1.1.1 with: - prettier_options: '--no-semi --write *.java' + prettier_options: "--write ." branch: ${{ github.head_ref }} dry: ${{ github.event_name != 'push' }} env: diff --git a/.prettierrc.yml b/.prettierrc.yml index f1cb8dc..e4672a8 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -6,4 +6,4 @@ overrides: trailingComma: none tabWidth: 4 endOfLine: lf - printWidth: 999999999 # >:c fine gravy
\ No newline at end of file + printWidth: 999999999 # >:c fine gravy @@ -6,6 +6,7 @@ [](https://discord.gg/moulberry) [](https://www.java.com/) + <!-- Can't do this until public repo [](https://github.com/Moulberry/Hychat) [](https://github.com/Moulberry/Hychat) diff --git a/src/main/resources/assets/skyblockhud/data/trackers.json b/src/main/resources/assets/skyblockhud/data/trackers.json index a407678..a239b26 100644 --- a/src/main/resources/assets/skyblockhud/data/trackers.json +++ b/src/main/resources/assets/skyblockhud/data/trackers.json @@ -5,7 +5,7 @@ "drops": [ { "id": "WISE_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -16,7 +16,7 @@ }, { "id": "UNSTABLE_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -27,7 +27,7 @@ }, { "id": "PROTECTOR_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -38,7 +38,7 @@ }, { "id": "OLD_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -49,7 +49,7 @@ }, { "id": "YOUNG_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -60,7 +60,7 @@ }, { "id": "STRONG_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -71,7 +71,7 @@ }, { "id": "SUPERIOR_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -82,7 +82,7 @@ }, { "id": "CRYSTAL_FRAGMENT", - "displayItem" : { + "displayItem": { "item": "minecraft:quartz", "meta": 0, "enchanted": true @@ -90,7 +90,7 @@ }, { "id": "SUMMONING_EYE", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -106,7 +106,7 @@ "drops": [ { "id": "WOLF_TOOTH", - "displayItem" : { + "displayItem": { "item": "minecraft:ghast_tear", "meta": 0, "enchanted": true @@ -114,7 +114,7 @@ }, { "id": "HAMSTER_WHEEL", - "displayItem" : { + "displayItem": { "item": "minecraft:trapdoor", "meta": 0, "enchanted": true @@ -122,7 +122,7 @@ }, { "id": "CRITICAL;6", - "displayItem" : { + "displayItem": { "item": "minecraft:enchanted_book", "meta": 0, "enchanted": true @@ -130,21 +130,21 @@ }, { "id": "RED_CLAW_EGG", - "displayItem" : { + "displayItem": { "item": "minecraft:spawn_egg", "meta": 96 } }, { "id": "GRIZZLY_BAIT", - "displayItem" : { + "displayItem": { "item": "minecraft:fish", "meta": 1 } }, { "id": "OVERFLUX_CAPACITOR", - "displayItem" : { + "displayItem": { "item": "minecraft:quartz", "meta": 0, "enchanted": true @@ -157,21 +157,21 @@ "drops": [ { "id": "TARANTULA_WEB", - "displayItem" : { + "displayItem": { "item": "minecraft:string", "meta": 0 } }, { "id": "TOXIC_ARROW_POISON", - "displayItem" : { + "displayItem": { "item": "minecraft:dye", "meta": 10 } }, { "id": "SPIDER_CATALYST", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -182,7 +182,7 @@ }, { "id": "BANE_OF_ARTHROPODS;6", - "displayItem" : { + "displayItem": { "item": "minecraft:enchanted_book", "meta": 0, "enchanted": true @@ -190,7 +190,7 @@ }, { "id": "FLY_SWATTER", - "displayItem" : { + "displayItem": { "item": "minecraft:golden_shovel", "meta": 0, "enchanted": true @@ -198,7 +198,7 @@ }, { "id": "TARANTULA_TALISMAN", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -209,7 +209,7 @@ }, { "id": "DIGESTED_MOSQUITO", - "displayItem" : { + "displayItem": { "item": "minecraft:rotten_flesh", "meta": 0 } @@ -221,21 +221,21 @@ "drops": [ { "id": "REVENANT_FLESH", - "displayItem" : { + "displayItem": { "item": "minecraft:rotten_flesh", "meta": 0 } }, { "id": "FOUL_FLESH", - "displayItem" : { + "displayItem": { "item": "minecraft:coal", "meta": 1 } }, { "id": "UNDEAD_CATALYST", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -246,7 +246,7 @@ }, { "id": "SMITE;6", - "displayItem" : { + "displayItem": { "item": "minecraft:enchanted_book", "meta": 0, "enchanted": true @@ -254,7 +254,7 @@ }, { "id": "BEHEADED_HORROR", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -265,7 +265,7 @@ }, { "id": "REVENANT_CATALYST", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -276,7 +276,7 @@ }, { "id": "REVENANT_VISCERA", - "displayItem" : { + "displayItem": { "item": "minecraft:cooked_porkchop", "meta": 0, "enchanted": true @@ -284,7 +284,7 @@ }, { "id": "SHARD_OF_THE_SHREDDED", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -295,7 +295,7 @@ }, { "id": "SMITE;7", - "displayItem" : { + "displayItem": { "item": "minecraft:enchanted_book", "meta": 0, "enchanted": true @@ -303,7 +303,7 @@ }, { "id": "WARDEN_HEART", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -319,14 +319,14 @@ "drops": [ { "id": "SORROW", - "displayItem" : { + "displayItem": { "item": "minecraft:ghast_tear", "meta": 0 } }, { "id": "VOLTA", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -337,7 +337,7 @@ }, { "id": "PLASMA", - "displayItem" : { + "displayItem": { "item": "minecraft:skull", "meta": 3, "skullData": { @@ -349,4 +349,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 74d070a..28064d7 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,16 +1,16 @@ [ -{ - "modid": "skyblockhud", - "name": "Skyblock Hud", - "description": "Hypixel Skyblock RPG HUD", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "", - "updateUrl": "", - "authorList": ["ThatGravyBoat"], - "credits": "Map Icons by ModCruel", - "logoFile": "", - "screenshots": [], - "dependencies": [] -} + { + "modid": "skyblockhud", + "name": "Skyblock Hud", + "description": "Hypixel Skyblock RPG HUD", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "", + "updateUrl": "", + "authorList": ["ThatGravyBoat"], + "credits": "Map Icons by ModCruel", + "logoFile": "", + "screenshots": [], + "dependencies": [] + } ] diff --git a/src/main/resources/mixins.skyblockhud.json b/src/main/resources/mixins.skyblockhud.json index 019687f..3763236 100644 --- a/src/main/resources/mixins.skyblockhud.json +++ b/src/main/resources/mixins.skyblockhud.json @@ -7,4 +7,4 @@ "MixinGuiIngameForge", "MixinNetHandlerPlayClient" ] -}
\ No newline at end of file +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index a37de8a..fad0334 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { - "pack": { - "description": "skyblock hud resources", - "pack_format": 1 - } + "pack": { + "description": "skyblock hud resources", + "pack_format": 1 + } } diff --git a/trackers.json b/trackers.json index decc323..bde6cd8 100644 --- a/trackers.json +++ b/trackers.json @@ -8,8 +8,8 @@ "displayItem": "minecraft:skull", "meta": 3, "skullData": { - "id": "ca156a9a-0286-3005-a839-a6c4dd4c671e", - "texture": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzFkNzYyMGIyZTQ5MzQ5NjNiYjEyNTA4MzEwZDA1NDk0YzA2N2RjMzNlMDA4Y2VjZjJjZDdiNDU0OTY1NGZhYjMifX19" + "id": "ca156a9a-0286-3005-a839-a6c4dd4c671e", + "texture": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzFkNzYyMGIyZTQ5MzQ5NjNiYjEyNTA4MzEwZDA1NDk0YzA2N2RjMzNlMDA4Y2VjZjJjZDdiNDU0OTY1NGZhYjMifX19" } }, { @@ -245,9 +245,7 @@ ] }, { - "location": [ - "YOURISLAND" - ], + "location": ["YOURISLAND"], "event": "traveling zoo", "drops": [ { @@ -259,4 +257,4 @@ ] } ] -}
\ No newline at end of file +} |