From b5a0cb1f6ee4c27eba93f58e3aaf8f0f4d3d780d Mon Sep 17 00:00:00 2001
From: catandA <3047354896@qq.com>
Date: Wed, 8 Feb 2023 00:46:42 +0800
Subject: Add Chinese translation
---
.../resources/assets/skyblocker/lang/zh_cn.json | 85 ++++++++++++++++++++++
1 file changed, 85 insertions(+)
create mode 100644 src/main/resources/assets/skyblocker/lang/zh_cn.json
diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json
new file mode 100644
index 00000000..86475c3e
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json
@@ -0,0 +1,85 @@
+{
+ "key.categories.skyblocker": "Skyblocker",
+ "key.hotbarSlotLock": "锁定快捷栏",
+ "key.wikiLookup": "查阅Wiki",
+
+ "text.autoconfig.skyblocker.title": "Skyblocker设置",
+
+ "text.autoconfig.skyblocker.category.general": "通用",
+ "text.autoconfig.skyblocker.option.general.bars": "生命，法力，防御以及经验条",
+ "text.autoconfig.skyblocker.option.general.bars.enableBars": "启用属性条",
+ "text.autoconfig.skyblocker.option.general.bars.barpositions": "配置属性条位置",
+ "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "生命条位置",
+ "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "法力条位置",
+ "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "防御条位置",
+ "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "经验条位置",
+ "text.autoconfig.skyblocker.option.general.quicknav": "快速导航",
+ "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "启用快速导航",
+ "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "查看背包预览无需按住shift键",
+ "text.autoconfig.skyblocker.option.general.itemTooltip": "物品提示信息",
+ "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "显示NPC价格",
+ "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "显示平均BIN（立即购买）价格",
+ "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "平均类型",
+ "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "你可以选择查看多少天的平均价格",
+ "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "显示最低BIN（立即购买）价格",
+ "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "显示集市购买/卖出价格",
+ "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "显示博物馆与日期信息",
+ "text.autoconfig.skyblocker.option.general.hitbox": "碰撞箱",
+ "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "启用1.8的农田碰撞箱",
+ "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "启用1.8的拉杆碰撞箱",
+ "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §c物品提示里的价格信息会在最多60秒内更新。如果没有，请检查latest.log",
+ "skyblocker.itemTooltip.noData": "§c没有数据",
+
+ "text.autoconfig.skyblocker.category.richPresence": "Discord活动状态",
+ "text.autoconfig.skyblocker.option.richPresence.info": "Skyblock信息",
+ "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "如果您正在循环模式，这个值将不会生效",
+ "text.autoconfig.skyblocker.option.richPresence.cycleMode": "循环Skyblock信息",
+ "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "已启用",
+ "text.autoconfig.skyblocker.option.richPresence.customMessage": "自定义消息",
+
+ "text.autoconfig.skyblocker.option.general.itemList": "物品列表",
+ "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "启用物品列表",
+
+ "text.autoconfig.skyblocker.category.locations": "位置",
+ "text.autoconfig.skyblocker.option.locations.dungeons": "地牢",
+ "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Croesus助手",
+ "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "用灰色显示出已经打开过的箱子",
+ "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "启用地图",
+ "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "解决三怪人迷题",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "解决烈焰人迷题",
+ "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "解决常识迷题",
+ "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "终端助手",
+ "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "解决颜色迷题",
+ "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "解决排序迷题",
+ "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "解决开头字母迷题",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines": "矮人矿道",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "显示钻头燃料",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "解决Fetchur的迷题",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "解决Puzzler的迷题",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "矮人HUD",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "已启用",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "启用背景",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X",
+ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y",
+
+ "text.autoconfig.skyblocker.category.messages": "消息",
+ "text.autoconfig.skyblocker.option.messages.hideAbility": "隐藏技能冷却",
+ "text.autoconfig.skyblocker.option.messages.hideHeal": "隐藏治疗消息",
+ "text.autoconfig.skyblocker.option.messages.hideAOTE": "隐藏AOTE消息",
+ "text.autoconfig.skyblocker.option.messages.hideImplosion": "隐藏内爆技能消息",
+ "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "隐藏熔融波技能消息",
+ "text.autoconfig.skyblocker.option.messages.hideAds": "从公屏聊天中隐藏广告",
+ "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "隐藏传送点消息",
+ "text.autoconfig.skyblocker.option.messages.hideCombo": "隐藏连杀消息",
+ "text.autoconfig.skyblocker.option.messages.hideAutopet": "隐藏自动宠物消息",
+ "text.autoconfig.skyblocker.option.messages.hideMana": "在动作栏中隐藏魔力消耗信息",
+ "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "被已经提供了更好方案的属性条代替",
+
+ "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2有新版本可用！",
+ "skyblocker.update.update_link": " §2§n点击这里§r",
+ "skyblocker.update.update_message_end" : " §a来了解最新功能",
+ "skyblocker.update.hover_text": "打开Modrinth",
+ "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "更新通知",
+
+ "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2自动设置你的API秘钥！"
+}
\ No newline at end of file
--
cgit
From 17892d619f700a4f1e37e9ff1946796a5849b87b Mon Sep 17 00:00:00 2001
From: catandA <3047354896@qq.com>
Date: Wed, 8 Feb 2023 01:00:19 +0800
Subject: Update zh_cn.json
---
src/main/resources/assets/skyblocker/lang/zh_cn.json | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json
index 86475c3e..59ec1bf2 100644
--- a/src/main/resources/assets/skyblocker/lang/zh_cn.json
+++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json
@@ -37,6 +37,21 @@
"text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "已启用",
"text.autoconfig.skyblocker.option.richPresence.customMessage": "自定义消息",
+ "text.autoconfig.skyblocker.category.quickNav" : "快速导航",
+ "text.autoconfig.skyblocker.option.quickNav.enableQuickNav" : "启用快速导航",
+ "text.autoconfig.skyblocker.option.quickNav.button1" : "按钮1",
+ "text.autoconfig.skyblocker.option.quickNav.button2" : "按钮2",
+ "text.autoconfig.skyblocker.option.quickNav.button3" : "按钮3",
+ "text.autoconfig.skyblocker.option.quickNav.button4" : "按钮4",
+ "text.autoconfig.skyblocker.option.quickNav.button5" : "按钮5",
+ "text.autoconfig.skyblocker.option.quickNav.button6" : "按钮6",
+ "text.autoconfig.skyblocker.option.quickNav.button7" : "按钮7",
+ "text.autoconfig.skyblocker.option.quickNav.button8" : "按钮8",
+ "text.autoconfig.skyblocker.option.quickNav.button9" : "按钮9",
+ "text.autoconfig.skyblocker.option.quickNav.button10" : "按钮10",
+ "text.autoconfig.skyblocker.option.quickNav.button11" : "按钮11",
+ "text.autoconfig.skyblocker.option.quickNav.button12" : "按钮12",
+
"text.autoconfig.skyblocker.option.general.itemList": "物品列表",
"text.autoconfig.skyblocker.option.general.itemList.enableItemList": "启用物品列表",
@@ -82,4 +97,4 @@
"text.autoconfig.skyblocker.option.general.enableUpdateNotification": "更新通知",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2自动设置你的API秘钥！"
-}
\ No newline at end of file
+}
--
cgit
From 3c8b84e79a43965a6f7084b683a2742d84d3f812 Mon Sep 17 00:00:00 2001
From: catandA <3047354896@qq.com>
Date: Wed, 8 Feb 2023 15:03:04 +0800
Subject: Delete buildrelease.yml
---
.github/workflows/buildrelease.yml | 93 --------------------------------------
1 file changed, 93 deletions(-)
delete mode 100644 .github/workflows/buildrelease.yml
diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
deleted file mode 100644
index c9e3584b..00000000
--- a/.github/workflows/buildrelease.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Build Release
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
-on:
- release:
- types: [created]
- workflow_dispatch:
-
-jobs:
- # This workflow contains a single job called "build"
- build:
- # The type of runner that the job will run on
- runs-on: ubuntu-latest
- # Steps represent a sequence of tasks that will be executed as part of the job
- steps:
- # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- - uses: actions/checkout@v2
- - name: Set up JDK 17
- uses: actions/setup-java@v2
- with:
- distribution: 'adopt'
- java-version: '17'
-
- - name: Grant execute permission for gradlew
- run: chmod +x gradlew
-
- - name: Build with Gradle
- run: ./gradlew build
-
- - uses: actions/upload-artifact@v2
- with:
- name: Artifacts
- path: build/libs/
-
- - name: Read Changelog
- id: read_changelog
- shell: bash
- run: |
- CHANGELOG=$(sed '/___/Q' CHANGELOG.md | grep -v '# ')
- echo "Changelog:\n$CHANGELOG"
- CHANGELOG="${CHANGELOG//'%'/'%25'}"
- CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
- CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
- echo "::set-output name=changelog::$CHANGELOG"
-
- - uses: actions/github-script@v2
- id: fname
- with:
- result-encoding: string
- script: |
- const fs = require("fs")
- return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0]
- - name: Release
- id: uploadrelease
- uses: softprops/action-gh-release@v1
- with:
- body: ${{ steps.read_changelog.outputs.changelog }}
- files: build/libs/${{ steps.fname.outputs.result }}
-
- - name: Publish to Modrinth
- id: modrinth
- env:
- MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
- CHANGELOG: ${{ steps.read_changelog.outputs.changelog }}
- run: ./gradlew modrinth
-
- - name: Get version tag
- id: version_tag
- run: |
- [[ ! "$GITHUB_REF" =~ refs/tags ]] && exit
- echo "::set-output name=value::${GITHUB_REF#refs/tags/}"
-
- - name: Discord notification
- env:
- DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
- uses: Ilshidur/action-discord@master
- with:
- args: |
- "@here"
- "Skyblocker ${{ steps.version_tag.outputs.value }}"
- ""
- "Changelog"
- "```md"
- "${{ steps.read_changelog.outputs.changelog }}"
- "```"
- ":inbox_tray: Download latest version on Modrinth or Github:"
- "<:modrinth:900697862206287882> <${{ steps.modrinth.outputs.url }}>"
- "<:github:900697885706952725> <${{ steps.uploadrelease.outputs.url }}>"
- ""
- ""
--
cgit
From e6e2c9e2549bae6b8941811bad86760f45b5bfb6 Mon Sep 17 00:00:00 2001
From: catandA <3047354896@qq.com>
Date: Wed, 8 Feb 2023 15:13:47 +0800
Subject: Revert "Delete buildrelease.yml"
This reverts commit 3c8b84e79a43965a6f7084b683a2742d84d3f812.
---
.github/workflows/buildrelease.yml | 93 ++++++++++++++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
create mode 100644 .github/workflows/buildrelease.yml
diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
new file mode 100644
index 00000000..c9e3584b
--- /dev/null
+++ b/.github/workflows/buildrelease.yml
@@ -0,0 +1,93 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Build Release
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+ release:
+ types: [created]
+ workflow_dispatch:
+
+jobs:
+ # This workflow contains a single job called "build"
+ build:
+ # The type of runner that the job will run on
+ runs-on: ubuntu-latest
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - uses: actions/checkout@v2
+ - name: Set up JDK 17
+ uses: actions/setup-java@v2
+ with:
+ distribution: 'adopt'
+ java-version: '17'
+
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+
+ - name: Build with Gradle
+ run: ./gradlew build
+
+ - uses: actions/upload-artifact@v2
+ with:
+ name: Artifacts
+ path: build/libs/
+
+ - name: Read Changelog
+ id: read_changelog
+ shell: bash
+ run: |
+ CHANGELOG=$(sed '/___/Q' CHANGELOG.md | grep -v '# ')
+ echo "Changelog:\n$CHANGELOG"
+ CHANGELOG="${CHANGELOG//'%'/'%25'}"
+ CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
+ CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
+ echo "::set-output name=changelog::$CHANGELOG"
+
+ - uses: actions/github-script@v2
+ id: fname
+ with:
+ result-encoding: string
+ script: |
+ const fs = require("fs")
+ return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0]
+ - name: Release
+ id: uploadrelease
+ uses: softprops/action-gh-release@v1
+ with:
+ body: ${{ steps.read_changelog.outputs.changelog }}
+ files: build/libs/${{ steps.fname.outputs.result }}
+
+ - name: Publish to Modrinth
+ id: modrinth
+ env:
+ MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+ CHANGELOG: ${{ steps.read_changelog.outputs.changelog }}
+ run: ./gradlew modrinth
+
+ - name: Get version tag
+ id: version_tag
+ run: |
+ [[ ! "$GITHUB_REF" =~ refs/tags ]] && exit
+ echo "::set-output name=value::${GITHUB_REF#refs/tags/}"
+
+ - name: Discord notification
+ env:
+ DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+ uses: Ilshidur/action-discord@master
+ with:
+ args: |
+ "@here"
+ "Skyblocker ${{ steps.version_tag.outputs.value }}"
+ ""
+ "Changelog"
+ "```md"
+ "${{ steps.read_changelog.outputs.changelog }}"
+ "```"
+ ":inbox_tray: Download latest version on Modrinth or Github:"
+ "<:modrinth:900697862206287882> <${{ steps.modrinth.outputs.url }}>"
+ "<:github:900697885706952725> <${{ steps.uploadrelease.outputs.url }}>"
+ ""
+ ""
--
cgit