Skip to content

Commit 066de49

Browse files
committed
chore: update mod version to v3.0.0
1 parent c26f75a commit 066de49

8 files changed

Lines changed: 19 additions & 15 deletions

File tree

build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,14 @@ tasks.processResources {
6262
from("opt-carpet-addition.accesswidener")
6363

6464
inputs.property("version", modver)
65-
inputs.property("minecraft_requirement_version", minecraftVer)
65+
inputs.property("minecraft_requirement_version", project.property("minecraft_requirement_version"))
66+
inputs.property("loader_requirement_version", project.property("loader_requirement_version"))
6667

6768
filesMatching("fabric.mod.json") {
6869
val valueMap = mapOf(
6970
"version" to modver,
70-
"minecraft_requirement_version" to minecraftVer,
71+
"minecraft_requirement_version" to project.property("minecraft_requirement_version"),
72+
"loader_requirement_version" to project.property("loader_requirement_version")
7173
)
7274
expand(valueMap)
7375
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ loader_version=0.19.2
1212
loader_requirement_version=>=0.15
1313

1414
# Mod Metadata
15-
mod_version=2.0.0
15+
mod_version=3.0.0
1616
maven_group=io.github.optijava
1717
archives_base_name=opt-carpet-addition

src/main/java/io/github/optijava/opt_carpet_addition/RuleTranslator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public static Map<String, String> getTranslationFromResourcePath(String lang) {
2424
} catch (IOException e) {
2525
return Collections.emptyMap();
2626
}
27-
// TODO: 使用了弃用的api
2827
Gson gson = new GsonBuilder().setLenient().create();
2928
return gson.fromJson(jsonData, new TypeToken<Map<String, String>>() {}.getType());
3029
}

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeAllCurseOfBindingArmorWhenPlayerDeadInWall/ServerPlayer_Mixin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.github.optijava.opt_carpet_addition.mixins.rule.removeAllCurseOfBindingArmorWhenPlayerDeadInWall;
22

3-
// TODO migrate to 26.1 !!!test in client!!!
4-
53
//? if >= 26.1 {
64
import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
75
import net.minecraft.server.level.ServerPlayer;

src/main/resources/assets/opt-carpet-addition/lang/en_us.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"carpet.rule.customItemDiscardTime.name": "Custom Item Despawn Time",
4747
"carpet.rule.customItemDiscardTime.desc": "Modify item despawn time, default -1 (unit: ticks)",
4848
"carpet.rule.allowBlockUpdateLogger.name": "Allow Block Update Logger",
49-
"carpet.rule.allowBlockUpdateLogger.desc": "Enabling this rule is not recommended as it may affect performance. Once enabled, nobody can use the block update logger.",
49+
"carpet.rule.allowBlockUpdateLogger.desc": "Enabling this rule is not recommended as it may affect performance. Once disabled, nobody can use the block update logger.",
5050
"carpet.rule.removeBats.name": "Remove Bats",
5151
"carpet.rule.removeBats.desc": "Disable bat spawning",
5252
"carpet.rule.playerTpRateLimitTime.name": "Teleport Command Rate Limit",

src/main/resources/assets/opt-carpet-addition/lang/zh_cn.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"carpet.rule.customItemDiscardTime.name": "自定义物品消失时间",
4747
"carpet.rule.customItemDiscardTime.desc": "修改物品消失时间,默认值 -1(单位:tick)",
4848
"carpet.rule.allowBlockUpdateLogger.name": "允许方块更新记录器",
49-
"carpet.rule.allowBlockUpdateLogger.desc": "不推荐启用此规则,否则可能影响性能。启用后所有人都无法使用方块更新记录器",
49+
"carpet.rule.allowBlockUpdateLogger.desc": "不推荐启用此规则,否则可能影响性能。禁用后所有人都无法使用方块更新记录器",
5050
"carpet.rule.removeBats.name": "移除蝙蝠",
5151
"carpet.rule.removeBats.desc": "禁用蝙蝠生成",
5252
"carpet.rule.playerTpRateLimitTime.name": "传送命令速率限制",

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
],
2525
"accessWidener": "opt-carpet-addition.accesswidener",
2626
"depends": {
27-
"fabricloader": ">=0.19.2",
27+
"fabricloader": "${loader_requirement_version}",
2828
"minecraft": "${minecraft_requirement_version}",
2929
"carpet": "*",
3030
"fabric-api": "*"

unobfuscated.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ plugins {
99

1010
val minecraftVer = stonecutter.current.version
1111
val modver = "${property("mod_version")}"
12-
val mod = "${modver}+${minecraftVer}+build.${SimpleDateFormat("yyMMddHHmm").format(Date())}"
12+
13+
val modBuildNameSuffix = "v${modver}+build.${SimpleDateFormat("yyMMddHHmm").format(Date())}-${minecraftVer}"
1314
val archivesBaseName = project.findProperty("archives_base_name")
1415

1516
base {
16-
archivesName.set("${archivesBaseName}+${mod}")
17+
archivesName.set("${archivesBaseName}+${modBuildNameSuffix}")
1718
}
1819

1920
repositories {
@@ -59,14 +60,16 @@ tasks.processResources {
5960
from("opt-carpet-addition.accesswidener")
6061

6162
inputs.property("version", modver)
62-
inputs.property("minecraft_requirement_version", minecraftVer)
63+
inputs.property("minecraft_requirement_version", project.property("minecraft_requirement_version"))
64+
inputs.property("loader_requirement_version", project.property("loader_requirement_version"))
6365

6466
filesMatching("fabric.mod.json") {
6567
val valueMap = mapOf(
66-
"version" to modver,
67-
"minecraft_requirement_version" to minecraftVer,
68+
"version" to modver,
69+
"minecraft_requirement_version" to project.property("minecraft_requirement_version"),
70+
"loader_requirement_version" to project.property("loader_requirement_version")
6871
)
69-
expand(valueMap)
72+
expand(valueMap)
7073
}
7174
}
7275

@@ -88,3 +91,5 @@ tasks.jar {
8891
}
8992
}
9093
}
94+
95+
println(stonecutter.tree.versions.toString())

0 commit comments

Comments
 (0)