Skip to content

Commit

Permalink
feat(client): 1.21.4 fabric/neoforge
Browse files Browse the repository at this point in the history
  • Loading branch information
Apehum committed Dec 4, 2024
1 parent 7bcb6c1 commit 34bb353
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ jobs:
1.20.4
1.21
1.21.1
1.21.2
1.21.3
modrinth-unfeature-mode: 'subset'
modrinth-id: 1bZhdhsH
Expand All @@ -84,6 +86,8 @@ jobs:
1.20.4
1.21
1.21.1
1.21.2
1.21.3
modrinth-unfeature-mode: 'subset'
modrinth-id: 1bZhdhsH
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ jobs:
1.20.4
1.21
1.21.1
1.21.2
1.21.3
modrinth-unfeature-mode: 'subset'
modrinth-id: 1bZhdhsH
Expand All @@ -82,6 +84,8 @@ jobs:
1.20.4
1.21
1.21.1
1.21.2
1.21.3
modrinth-unfeature-mode: 'subset'
modrinth-id: 1bZhdhsH
Expand Down
1 change: 0 additions & 1 deletion client/1.21.2-neoforge/gradle.properties

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions client/1.21.3-neoforge/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
essential.defaults.loom.neoForge=net.neoforged:neoforge:21.3.57
2 changes: 1 addition & 1 deletion client/1.21.4-fabric/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
essential.defaults.loom.minecraft=com.mojang:minecraft:1.21.4-pre1
essential.defaults.loom.minecraft=com.mojang:minecraft:1.21.4
1 change: 1 addition & 0 deletions client/1.21.4-neoforge/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
essential.defaults.loom.neoForge=net.neoforged:neoforge:21.4.2-beta
9 changes: 4 additions & 5 deletions client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ val shadowCommon by configurations.creating
fun slibArtifact(): String {
val minecraftVersion = when (platform.mcVersion) {
11904 -> "1.19.3"
12104 -> "1.21.2"
12103, 12104 -> "1.21.2"
else -> platform.mcVersionStr
}

Expand Down Expand Up @@ -89,8 +89,8 @@ dependencies {
12004 -> "0.95.4+1.20.4"
12006 -> "0.97.7+1.20.6"
12100 -> "0.100.4+1.21"
12102 -> "0.105.3+1.21.2"
12104 -> "0.109.1+1.21.4"
12103 -> "0.110.0+1.21.3"
12104 -> "0.110.5+1.21.4"
else -> throw GradleException("Unsupported platform $platform")
}

Expand All @@ -103,8 +103,7 @@ dependencies {
fabricApiModules("rendering-v1", "networking-api-v1", "lifecycle-events-v1", "key-binding-api-v1")

if (platform.mcVersion >= 12102) {
// https://github.com/lucko/fabric-permissions-api/pull/26
"include"("com.github.sakura-ryoko:fabric-permissions-api:b43d33efb8")
"include"("me.lucko:fabric-permissions-api:0.3.3")
} else {
"include"("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
}
Expand Down
1 change: 1 addition & 0 deletions client/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Versions 2.0.x and 2.1.x are protocol-compatible,
so there’s no need to worry if the server hasn't been updated to 2.1.x.

### Changes in 2.1.2
- 1.21.4 fabric/neoforge.
- Fixed buffer overflow when using AudioSender with delayed first frame.
- Fixed EncoderException on server switch on servers with proxy and proxy-side addons (e.g, groups addon).
- Fixed `pv.activation.*` permission is not being updated on the client without reconnect.
Expand Down
12 changes: 7 additions & 5 deletions client/root.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ group = "$group.client-root"

preprocess {

val neoForge12104 = createNode("1.21.4-neoforge", 12104, "official")
val fabric12104 = createNode("1.21.4-fabric", 12104, "official")

val neoForge12102 = createNode("1.21.2-neoforge", 12102, "official")
val fabric12102 = createNode("1.21.2-fabric", 12102, "official")
val neoForge12103 = createNode("1.21.3-neoforge", 12103, "official")
val fabric12103 = createNode("1.21.3-fabric", 12103, "official")

val neoForge12100 = createNode("1.21-neoforge", 12100, "official")
val fabric12100 = createNode("1.21-fabric", 12100, "official")
Expand Down Expand Up @@ -39,10 +40,11 @@ preprocess {
val forge11605 = createNode("1.16.5-forge", 11605, "official")
val fabric11605 = createNode("1.16.5-fabric", 11605, "official")

fabric12104.link(fabric12102)
fabric12104.link(fabric12103)
neoForge12104.link(neoForge12103)

fabric12102.link(fabric12100)
neoForge12102.link(neoForge12100)
fabric12103.link(fabric12100)
neoForge12103.link(neoForge12100)

neoForge12100.link(fabric12100)
fabric12100.link(fabric12004, file("1.21-1.20.6.txt"))
Expand Down
4 changes: 2 additions & 2 deletions client/versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
mcVersions = ">1.21.3"
neoForgeVersion = "[21,)"

[12102]
mcVersions = ">1.21.1"
[12103]
mcVersions = ">=1.21.2 <=1.21.3"
neoForgeVersion = "[21,)"

[12100]
Expand Down

0 comments on commit 34bb353

Please sign in to comment.