Skip to content

Commit 3249c1c

Browse files
committed
Bugfix & New versions
1 parent 2d247d5 commit 3249c1c

File tree

19 files changed

+80
-65
lines changed

19 files changed

+80
-65
lines changed

.idea/misc.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ Currently, the following Minecraft versions are actively supported with new feat
6565
|-------------------|---------------------------------------------|
6666
| 1.14.4 | ✔️ Long Term Support |
6767
| 1.15.2 | ✔️ Long Term Support |
68-
| 1.16.5 | ✔️ Long Term Support |
68+
| 1.16.4-5 | ✔️ Long Term Support |
6969
| 1.17.1 | ✔️ Long Term Support |
7070
| 1.18.2 | ✔️ Long Term Support |
7171
| 1.19.4 | ✔️ Long Term Support |
72-
| 1.20.1 | ✔️ Long Term Support |
73-
| 1.20.6 | ✔️ Long Term Support |
74-
| 1.21.1, 1.21.4-7 | 🕒 When Minecraft 1.23 snapshot is released |
75-
| 1.21.8 | 🕒 To be determined |
72+
| 1.20-1.20.1 | ✔️ Long Term Support |
73+
| 1.20.5-6 | ✔️ Long Term Support |
74+
| 1.21-1.21.8 | 🕒 When Minecraft 1.23 snapshot is released |
75+
| 1.21.9-10 | 🕒 To be determined |
7676

7777
### End-of-life versions
7878

README_zh.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
6161

6262
目前,以下 Minecraft 版本正在积极地获得新功能和错误修复的支持
6363

64-
| Minecraft 版本 | **支持至** |
65-
|------------------|-------------------------|
66-
| 1.14.4 | ✔️ 长期支持 |
67-
| 1.15.2 | ✔️ 长期支持 |
68-
| 1.16.5 | ✔️ 长期支持 |
69-
| 1.17.1 | ✔️ 长期支持 |
70-
| 1.18.2 | ✔️ 长期支持 |
71-
| 1.19.4 | ✔️ 长期支持 |
72-
| 1.20.1 | ✔️ 长期支持 |
73-
| 1.20.6 | ✔️ 长期支持 |
74-
| 1.21.1, 1.21.4-7 | 🕒 Minecraft 1.23 快照发布时 |
75-
| 1.21.8 | 🕒 待定 |
64+
| Minecraft 版本 | **支持至** |
65+
|--------------|-------------------------|
66+
| 1.14.4 | ✔️ 长期支持 |
67+
| 1.15.2 | ✔️ 长期支持 |
68+
| 1.16.4-5 | ✔️ 长期支持 |
69+
| 1.17.1 | ✔️ 长期支持 |
70+
| 1.18.2 | ✔️ 长期支持 |
71+
| 1.19.4 | ✔️ 长期支持 |
72+
| 1.20-1.20.1 | ✔️ 长期支持 |
73+
| 1.20.5-6 | ✔️ 长期支持 |
74+
| 1.21-1.21.8 | 🕒 Minecraft 1.23 快照发布时 |
75+
| 1.21.9-10 | 🕒 待定 |
7676

7777
### 已结束支持的版本
7878

build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ plugins {
33

44
// https://github.com/ReplayMod/preprocessor
55
// https://github.com/Fallen-Breath/preprocessor
6-
id("com.replaymod.preprocess") version("0a04a5668b")
6+
id("com.replaymod.preprocess") version("d452ef7612")
77

88
// https://github.com/GradleUp/shadow
9-
id("com.gradleup.shadow") version("8.3.6") apply(false)
9+
id("com.gradleup.shadow") version("9.1.0") apply(false)
1010

1111
// https://github.com/hierynomus/license-gradle-plugin
1212
id("com.github.hierynomus.license") version("0.16.1") apply(false)
1313

1414
// https://github.com/Fallen-Breath/yamlang
15-
id("me.fallenbreath.yamlang") version("1.4.1") apply(false)
15+
id("me.fallenbreath.yamlang") version("1.5.0") apply(false)
1616

1717
// https://github.com/firstdarkdev/modpublisher
18-
id("com.hypherionmc.modutils.modpublisher") version("2.1.7") apply(false)
18+
id("com.hypherionmc.modutils.modpublisher") version("2.1.8") apply(false)
1919

2020
id("maven-publish")
21+
id("idea")
2122
}
2223

2324
version = project.mod_version
@@ -35,11 +36,11 @@ preprocess {
3536
var mc12001 = createNode("1.20.1", 1_20_01, "")
3637
var mc12006 = createNode("1.20.6", 1_20_06, "")
3738
var mc12101 = createNode("1.21.1", 1_21_01, "")
39+
var mc12103 = createNode("1.21.3", 1_21_03, "")
3840
var mc12104 = createNode("1.21.4", 1_21_04, "")
3941
var mc12105 = createNode("1.21.5", 1_21_05, "")
40-
var mc12106 = createNode("1.21.6", 1_21_06, "")
41-
var mc12107 = createNode("1.21.7", 1_21_07, "")
4242
var mc12108 = createNode("1.21.8", 1_21_08, "")
43+
var mc12110 = createNode("1.21.10", 1_21_10, "")
4344

4445
mc12006.link(mc12001, file("versions/mapping_12006_12001.txt"))
4546
mc12001.link(mc11904, file("versions/mapping_12001_11904.txt"))
@@ -50,11 +51,11 @@ preprocess {
5051
mc11502.link(mc11404, file("versions/mapping_11502_11404.txt"))
5152

5253
mc12006.link(mc12101, file("versions/mapping_12006_12101.txt"))
53-
mc12101.link(mc12104, file("versions/mapping_12101_12104.txt"))
54+
mc12101.link(mc12103, file("versions/mapping_12101_12103.txt"))
55+
mc12103.link(mc12104, file("versions/mapping_12103_12104.txt"))
5456
mc12104.link(mc12105, file("versions/mapping_12104_12105.txt"))
55-
mc12105.link(mc12106, file("versions/mapping_12105_12106.txt"))
56-
mc12106.link(mc12107, file("versions/mapping_12106_12107.txt"))
57-
mc12107.link(mc12108, file("versions/mapping_12107_12108.txt"))
57+
mc12105.link(mc12108, file("versions/mapping_12105_12108.txt"))
58+
mc12108.link(mc12110, file("versions/mapping_12108_12110.txt"))
5859
}
5960

6061
tasks.register("buildAndGather") {

changelog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
### General
22

3-
- Performance improvement
3+
- Fix unable to save the config on first startup
4+
- Support for 1.21.10

common.gradle

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ repositories {
2828
url = "https://maven.fallenbreath.me/releases" // Fallen orz
2929
}
3030
maven {
31-
url = 'https://maven.fallenbreath.me/jitpack'
32-
}
33-
maven {
34-
name = "Jitpack"
35-
url = "https://jitpack.io"
31+
name = "Modrinth"
32+
url = "https://api.modrinth.com/maven"
3633
}
3734
maven {
3835
name = "CurseMaven"
@@ -42,10 +39,21 @@ repositories {
4239
}
4340
}
4441
maven {
45-
name = "Modrinth"
46-
url = "https://api.modrinth.com/maven"
42+
name = "Jitpack"
43+
url = "https://jitpack.io"
44+
}
45+
maven {
46+
url = "https://maven.fallenbreath.me/jitpack"
4747
}
48+
}
4849

50+
idea {
51+
module {
52+
if (releasing) {
53+
downloadSources = true
54+
downloadJavadoc = true
55+
}
56+
}
4957
}
5058

5159
// https://github.com/FabricMC/fabric-loader/issues/783
@@ -94,7 +102,7 @@ var MIXIN_COMPATIBILITY_LEVEL = JAVA_COMPATIBILITY
94102
loom {
95103
var commonVmArgs = ["-Dmixin.debug.export=true"]
96104
runConfigs.configureEach {
97-
runDir "../../run"
105+
runDir "../../run/$mcVersion"
98106
vmArgs commonVmArgs
99107
}
100108
runConfigs.server {
@@ -124,7 +132,7 @@ shadowJar {
124132
}
125133

126134
tasks.withType(ShadowJar).configureEach {
127-
enableRelocation = true
135+
enableAutoRelocation = true
128136
relocationPrefix = "authlibproxyforserver.libs"
129137
}
130138

@@ -244,6 +252,8 @@ license {
244252
tasks.classes.dependsOn(tasks.licenseFormatMain)
245253
tasks.testClasses.dependsOn(tasks.licenseFormatTest)
246254

255+
String[] minecraftVersions = String.valueOf(properties.game_versions).split("\n")
256+
247257
// https://github.com/firstdarkdev/modpublisher
248258
publisher {
249259

@@ -266,7 +276,7 @@ publisher {
266276
setChangelog(rootProject.file("changelog.md"))
267277

268278
setProjectVersion(fullProjectVersion)
269-
setGameVersions([project.minecraft_dependency])
279+
setGameVersions(minecraftVersions)
270280
setLoaders("fabric")
271281
setCurseEnvironment("server")
272282

settings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"1.20.1",
1010
"1.20.6",
1111
"1.21.1",
12+
"1.21.3",
1213
"1.21.4",
1314
"1.21.5",
14-
"1.21.6",
15-
"1.21.7",
16-
"1.21.8"
15+
"1.21.8",
16+
"1.21.10"
1717
]
1818
}

src/main/java/com/ayakacraft/authlibproxyforserver/AuthlibProxyForServer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
public final class AuthlibProxyForServer {
3737

38-
private static final Path configPath = Paths.get("config/authlib.proxy.json");
38+
private static final Path configPath = Paths.get("./config/authlib.proxy.json").toAbsolutePath();
3939

4040
public static final Logger LOGGER = LogManager.getLogger("AuthlibProxyForServer");
4141

@@ -71,6 +71,10 @@ public static String readString(Path path) throws IOException {
7171
}
7272

7373
public static void writeString(Path path, String str) throws IOException {
74+
if (Files.notExists(path)) {
75+
path.getParent().toFile().mkdirs();
76+
Files.createFile(path);
77+
}
7478
Files.write(path, str.getBytes(StandardCharsets.UTF_8));
7579
}
7680

versions/1.16.5/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
minecraft_version=1.16.5
44
yarn_mappings=1.16.5+build.10
55
# Fabric Mod Metadata
6-
minecraft_dependency=1.16.5
6+
minecraft_dependency=>=1.16.4 <=1.16.5
77
# Build Information
88
# The target mc versions for the mod during mod publishing, separated with \n
9-
game_versions=1.16.5
9+
game_versions=1.16.4\n1.16.5
1010
# Dependencies
1111
# fabric_api_version=0.42.0+1.16
1212
# Mod Dependency

versions/1.20.1/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
minecraft_version=1.20.1
44
yarn_mappings=1.20.1+build.10
55
# Fabric Mod Metadata
6-
minecraft_dependency=1.20.1
6+
minecraft_dependency=>=1.20 <=1.20.1
77
# Build Information
88
# The target mc versions for the mod during mod publishing, separated with \n
9-
game_versions=1.20.1
9+
game_versions=1.20\n1.20.1
1010
# Dependencies
1111
# fabric_api_version=0.92.6+1.20.1
1212
# Mod Dependency

0 commit comments

Comments
 (0)