Skip to content

Commit ccf5ada

Browse files
object-Objectobject-Object
committed
Merge branch 'main' into 1.19
2 parents 7a27a6e + 49c5f2e commit ccf5ada

File tree

2 files changed

+74
-39
lines changed

2 files changed

+74
-39
lines changed

‎Common/src/main/resources/assets/hexdebug/lang/zh_cn.flatten.json5‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"item.hexdebug": {
33
debugger: "调试杖",
4+
evaluator: "运行杖",
45
},
56

6-
"itemGroup.hexdebug.hexdebug": "咒术调试",
7+
"itemGroup.hexdebug.hexdebug": "咒法调试",
78

89
text: {
910
hexdebug: {
@@ -13,13 +14,24 @@
1314
},
1415

1516
"autoconfig.hexdebug": {
16-
title: "咒术调试配置",
17+
title: "咒法调试配置",
1718
category: {
1819
client: "客户端",
1920
},
2021
option: {
2122
client: {
22-
debugPort: "调试端口",
23+
openDebugPort: {
24+
"": "开放调试端口",
25+
"@Tooltip": "是否开放端口。若设为false，调试杖会失去作用。",
26+
},
27+
debugPort: {
28+
"": "调试端口",
29+
"@Tooltip": "开放以连接至调试客户端（如VSCode）的端口号（1024-65535）。",
30+
},
31+
smartDebuggerSneakScroll: {
32+
"": "调试杖智能潜行滚轮",
33+
"@Tooltip": "若当前主手持有调试杖，且未在调试咒术，则优先处理副手中法术书一类物品的“潜行滚动滚轮”操作。",
34+
},
2335
},
2436
},
2537
},
@@ -58,8 +70,14 @@
5870
debugging: {
5971
"": "调试物品",
6072
page: {
61-
"1": "部分文献中有些不太明确的描述，称古代人会使用一件奇怪的物品协助他们发现复杂$(hex)咒术/$中的问题。我应已成功复刻出了它，定名为$(item)调试杖/$。$(br2)它的工作方式与$(l:items/hexcasting)$(item)造物/$类似。不过，它还能从副手中的物品（比如$(l:items/focus)$(item)核心/$）里直接施放$(hex)咒术/$。$(br2)$(item)调试杖/$自身没有太大用处，有些可惜；它似乎需要某种$(l:https://marketplace.visualstudio.com/items?itemName=object-Object.hex-casting)外部工具/$才能正常运作。",
73+
debugger: "部分文献中有些不太明确的描述，称古代人会使用一件奇怪的物品协助他们发现复杂$(hex)咒术/$中的问题。我应已成功复刻出了它，定名为$(item)调试杖/$。$(br2)\
74+
它的工作方式与$(l:items/hexcasting)$(item)造物/$类似。不过，它还能从副手中的物品（比如$(l:items/focus)$(item)核心/$）里直接施放$(hex)咒术/$。$(br2)\
75+
有些可惜的是，$(item)调试杖/$自身没有太大用处；它似乎需要某种$(l:https://marketplace.visualstudio.com/items?itemName=object-Object.hex-casting)外部工具/$才能正常运作。",
6276
thwack: "$(italic)哐当！/$",
77+
evaluator: "我又新制造了一种法杖——$(l:items/debugging#evaluator)$(item)运行杖/$，用以补充$(l:items/debugging#debugger)$(item)调试杖/$的功能。$(br2)\
78+
调试$(hex)咒术/$时，此法杖绘制的图案会运行于$(l:items/debugging#debugger)$(item)调试杖/$当前的栈和$(l:patterns/readwrite#hexcasting:local)$(thing)渡鸦之思/$。$(br2)\
79+
清空咒术网格后，$(l:items/debugging#debugger)$(item)调试杖/$似乎会回到$(l:items/debugging#evaluator)$(item)运行杖/$绘制首个图案前的状态。当然，这种操作无法撤回已造成实际影响的法术。",
80+
thwonk: "$(italic)哐啷！/$"
6381
},
6482
},
6583
},
@@ -75,11 +93,12 @@
7593
before: "在运行此图案前，暂停$(l:items/debugging#debugger)$(item)调试杖/$。",
7694
after: "在运行此图案后，也即在运行下一图案之前，暂停$(l:items/debugging#debugger)$(item)调试杖/$。",
7795
},
78-
"craft/debugger": "制作一支能施放$(hex)咒术/$的$(l:items/debugging#debugger)$(item)调试杖/$。这个图案和我之前用过的$(l:patterns/spells/hexcasting)某些图案/$有些相似。$(br2)消耗大约 10 个$(l:items/amethyst)$(item)充能紫水晶/$。",
96+
"craft/debugger": "制作一支能施放$(hex)咒术/$的$(l:items/debugging#debugger)$(item)调试杖/$。这个图案和我之前用过的$(l:patterns/spells/hexcasting)某些图案/$有些相似。\
97+
$(br2)消耗大约 10 个$(l:items/amethyst)$(item)充能紫水晶/$。",
7998
},
8099
},
81100
},
82101
},
83102
},
84103
},
85-
}
104+
}

‎Jenkinsfile‎

Lines changed: 49 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env groovy
22
// noinspection GroovyAssignabilityCheck
33

4+
RELEASE_BRANCHES = ["main", "1.19"]
5+
46
pipeline {
57
agent any
68
tools {
@@ -40,44 +42,58 @@ pipeline {
4042
sh "./gradlew build"
4143
}
4244
}
43-
stage("Publish: Maven") {
44-
steps {
45-
sh "./gradlew publish"
46-
}
47-
}
48-
stage("Publish: GitHub") {
49-
when {
50-
expression { return params.PUBLISH_GITHUB }
51-
}
52-
environment {
53-
GITHUB_TOKEN = credentials("github-release-pat")
54-
GITHUB_REPOSITORY = "object-Object/HexDebug"
55-
GITHUB_SHA = "${env.GIT_COMMIT}"
56-
}
45+
stage("Check Datagen") {
5746
steps {
58-
sh "./gradlew publishGithub"
47+
sh "./gradlew runAllDatagen"
48+
sh "git add --intent-to-add ."
49+
sh "git diff --name-only --exit-code -- \":!:*/src/generated/resources/.cache/*\""
5950
}
6051
}
61-
stage("Publish: CurseForge") {
52+
stage("Publish") {
6253
when {
63-
expression { return params.PUBLISH_CURSEFORGE }
64-
}
65-
environment {
66-
CURSEFORGE_TOKEN = credentials("curseforge-token")
54+
expression { env.BRANCH_NAME in RELEASE_BRANCHES }
6755
}
68-
steps {
69-
sh "./gradlew publishCurseforge"
70-
}
71-
}
72-
stage("Publish: Modrinth") {
73-
when {
74-
expression { return params.PUBLISH_MODRINTH }
75-
}
76-
environment {
77-
MODRINTH_TOKEN = credentials("modrinth-pat")
78-
}
79-
steps {
80-
sh "./gradlew publishModrinth"
56+
stages {
57+
stage("Publish: Maven") {
58+
steps {
59+
sh "./gradlew publish"
60+
}
61+
}
62+
stage("Publish: GitHub") {
63+
when {
64+
expression { params.PUBLISH_GITHUB }
65+
}
66+
environment {
67+
GITHUB_TOKEN = credentials("github-release-pat")
68+
GITHUB_REPOSITORY = "object-Object/HexDebug"
69+
GITHUB_SHA = "${env.GIT_COMMIT}"
70+
}
71+
steps {
72+
sh "./gradlew publishGithub"
73+
}
74+
}
75+
stage("Publish: CurseForge") {
76+
when {
77+
expression { params.PUBLISH_CURSEFORGE }
78+
}
79+
environment {
80+
CURSEFORGE_TOKEN = credentials("curseforge-token")
81+
}
82+
steps {
83+
sh "./gradlew publishCurseforge"
84+
}
85+
}
86+
stage("Publish: Modrinth") {
87+
when {
88+
expression { params.PUBLISH_MODRINTH }
89+
}
90+
environment {
91+
MODRINTH_TOKEN = credentials("modrinth-pat")
92+
}
93+
steps {
94+
sh "./gradlew publishModrinth"
95+
}
96+
}
8197
}
8298
}
8399
}

0 commit comments

Comments
 (0)