Skip to content

Commit 60e3f7b

Browse files
authored
Minecraft 1.21.4 support (#138)
* Minecraft 1.21.4 support * magiclib-legacy-compat 1.21.4 * Fix mc-publish info --------- Signed-off-by: Hendrix-Shen <[email protected]>
1 parent 242009e commit 60e3f7b

File tree

30 files changed

+202
-12
lines changed

30 files changed

+202
-12
lines changed

magiclib-better-dev/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ preprocess {
2727
Node mc_12006_fabric = createNode("better-dev-1.20.6-fabric", 1_20_06, "mojang")
2828
Node mc_12101_fabric = createNode("better-dev-1.21.1-fabric", 1_21_01, "mojang")
2929
Node mc_12103_fabric = createNode("better-dev-1.21.3-fabric", 1_21_03, "mojang")
30+
Node mc_12104_fabric = createNode("better-dev-1.21.4-fabric", 1_21_04, "mojang")
3031

3132
mc_11404_fabric.link(mc_11502_fabric, null)
3233
mc_11502_fabric.link(mc_11605_fabric, file("versions/mapping-fabric-1.15.2-1.16.5.txt"))
@@ -41,6 +42,7 @@ preprocess {
4142
mc_12004_fabric.link(mc_12006_fabric, null)
4243
mc_12006_fabric.link(mc_12101_fabric, null)
4344
mc_12101_fabric.link(mc_12103_fabric, null)
45+
mc_12103_fabric.link(mc_12104_fabric, null)
4446

4547
// Forge
4648
Node mc_11701_forge = createNode("better-dev-1.17.1-forge", 1_17_01, "mojang")
@@ -58,9 +60,11 @@ preprocess {
5860
Node mc_12006_neoforge = createNode("better-dev-1.20.6-neoforge", 1_20_06, "mojang")
5961
Node mc_12101_neoforge = createNode("better-dev-1.21.1-neoforge", 1_21_01, "mojang")
6062
Node mc_12103_neoforge = createNode("better-dev-1.21.3-neoforge", 1_21_03, "mojang")
63+
Node mc_12104_neoforge = createNode("better-dev-1.21.4-neoforge", 1_21_04, "mojang")
6164

6265
mc_12002_fabric.link(mc_12002_neoforge, file("versions/mapping-1.20.2-fabric-neoforge.txt"))
6366
mc_12006_fabric.link(mc_12006_neoforge, file("versions/mapping-1.20.6-fabric-neoforge.txt"))
6467
mc_12101_fabric.link(mc_12101_neoforge, file("versions/mapping-1.21.1-fabric-neoforge.txt"))
6568
mc_12103_fabric.link(mc_12103_neoforge, file("versions/mapping-1.21.3-fabric-neoforge.txt"))
69+
mc_12104_fabric.link(mc_12104_neoforge, file("versions/mapping-1.21.4-fabric-neoforge.txt"))
6670
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Dependency Versions
2+
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
3+
dependencies.minecraft_version=1.21.4
4+
5+
# Fabric API 0.113.0+1.21.4
6+
dependencies.api.fabric_version=0.113.0+1.21.4
7+
# Mod Menu 13.0.0-beta.1
8+
# modmenu-13.0.0-beta.1.jar
9+
dependencies.api.modmenu_version=13.0.0-beta.1
10+
11+
# IMBlockerFabric 1.0.24
12+
# imblockerfabric-1.0.24.jar
13+
dependencies.runtime.imblocker_version=1.0.24
14+
# In-Game Account Switcher 9.0.2-alpha.1
15+
# IAS-Fabric-1.21.4-9.0.2-alpha.1.jar
16+
dependencies.runtime.inGameAccountSwitcher_version=WBbjirJP
17+
18+
# Publish properties
19+
publish.game_version=1.21.4
20+
publish.dependencies_list=
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
accessWidener v2 named
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Dependency Versions
2+
dependencies.neoforge_version=21.4.46-beta
3+
dependencies.minecraft_dependency=1.21.4
4+
dependencies.minecraft_version=1.21.4
5+
6+
# IMBlocker 4.0.9b
7+
# IMBlocker_4.0.9b+1.21.jar
8+
dependencies.runtime.imblocker_version=4.0.9b+1.21
9+
# In-Game Account Switcher
10+
# TODO
11+
dependencies.runtime.inGameAccountSwitcher_version=0
12+
13+
# Loom Properties
14+
loom.platform=neoforge
15+
16+
# Publish properties
17+
publish.game_version=1.21.4
18+
publish.dependencies_list=
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
accessWidener v2 named
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
net.fabricmc.api.EnvType net.neoforged.api.distmarker.Dist
2+
net.fabricmc.api.Environment net.neoforged.api.distmarker.OnlyIn
3+
net.fabricmc.api.EnvType SERVER net.neoforged.api.distmarker.Dist DEDICATED_SERVER

magiclib-legacy-compat/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ preprocess {
2727
Node mc_12006_fabric = createNode("legacy-1.20.6-fabric", 1_20_06, "mojang")
2828
Node mc_12101_fabric = createNode("legacy-1.21.1-fabric", 1_21_01, "mojang")
2929
Node mc_12103_fabric = createNode("legacy-1.21.3-fabric", 1_21_03, "mojang")
30+
Node mc_12104_fabric = createNode("legacy-1.21.4-fabric", 1_21_04, "mojang")
3031

3132
mc_11404_fabric.link(mc_11502_fabric, null)
3233
mc_11502_fabric.link(mc_11605_fabric, file("versions/mapping-1.15.2-1.16.5.txt"))
@@ -41,4 +42,5 @@ preprocess {
4142
mc_12004_fabric.link(mc_12006_fabric, null)
4243
mc_12006_fabric.link(mc_12101_fabric, null)
4344
mc_12101_fabric.link(mc_12103_fabric, null)
45+
mc_12103_fabric.link(mc_12104_fabric, null)
4446
}

magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ dependencies.api.carpet_version=1.21.2-1.4.158+v241022
1010
publish.game_version=1.21.2,1.21.3
1111
publish.dependencies_list=\
1212
[email protected]+v241022(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\
13-
[email protected].0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
13+
[email protected].3(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Dependency Versions
2+
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
3+
dependencies.minecraft_version=1.21.4
4+
5+
# Carpet - 1.4.161+v241203
6+
# fabric-carpet-1.21.4-1.4.161+v241203.jar
7+
dependencies.api.carpet_version=1.21.4-1.4.161+v241203
8+
9+
# Publish properties
10+
publish.game_version=1.21.4
11+
publish.dependencies_list=\
12+
[email protected]+v241203(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\
13+
[email protected](optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
accessWidener v2 named

magiclib-malilib-extra/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ preprocess {
2727
Node mc_12006_fabric = createNode("malilib-1.20.6-fabric", 1_20_06, "mojang")
2828
Node mc_12101_fabric = createNode("malilib-1.21.1-fabric", 1_21_01, "mojang")
2929
Node mc_12103_fabric = createNode("malilib-1.21.3-fabric", 1_21_03, "mojang")
30+
Node mc_12104_fabric = createNode("malilib-1.21.4-fabric", 1_21_04, "mojang")
3031

3132
mc_11404_fabric.link(mc_11502_fabric, null)
3233
mc_11502_fabric.link(mc_11605_fabric, null)
@@ -41,6 +42,7 @@ preprocess {
4142
mc_12004_fabric.link(mc_12006_fabric, null)
4243
mc_12006_fabric.link(mc_12101_fabric, null)
4344
mc_12101_fabric.link(mc_12103_fabric, null)
45+
mc_12103_fabric.link(mc_12104_fabric, null)
4446

4547
// Forge
4648
Node mc_11701_forge = createNode("malilib-1.17.1-forge", 1_17_01, "mojang")
@@ -54,7 +56,11 @@ preprocess {
5456
// NeoForge
5557
Node mc_12006_neoforge = createNode("malilib-1.20.6-neoforge", 1_20_06, "mojang")
5658
Node mc_12101_neoforge = createNode("malilib-1.21.1-neoforge", 1_21_01, "mojang")
59+
Node mc_12103_neoforge = createNode("malilib-1.21.3-neoforge", 1_21_03, "mojang")
60+
Node mc_12104_neoforge = createNode("malilib-1.21.4-neoforge", 1_21_04, "mojang")
5761

5862
mc_12006_fabric.link(mc_12006_neoforge, null)
5963
mc_12101_fabric.link(mc_12101_neoforge, null)
64+
mc_12103_fabric.link(mc_12103_neoforge, null)
65+
mc_12104_fabric.link(mc_12104_neoforge, null)
6066
}

magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3Edit.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,16 @@ public void render(
136136
}
137137

138138
@Override
139-
protected void drawScreenBackground(int mouseX, int mouseY) {
139+
protected void drawScreenBackground(
140+
//#if MC > 12006
141+
//$$ GuiGraphics guiGraphics,
142+
//#endif
143+
int mouseX,
144+
int mouseY
145+
) {
146+
//#if MC > 12006
147+
//$$ super.drawTexturedBG(guiGraphics, this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, true);
148+
//#endif
140149
RenderUtils.drawOutlinedBox(this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, 0xFF000000, 0xFF999999);
141150
}
142151

magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3iListEdit.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,16 @@ public void render(
140140
}
141141

142142
@Override
143-
protected void drawScreenBackground(int mouseX, int mouseY) {
143+
protected void drawScreenBackground(
144+
//#if MC > 12006
145+
//$$ GuiGraphics guiGraphics,
146+
//#endif
147+
int mouseX,
148+
int mouseY
149+
) {
150+
//#if MC > 12006
151+
//$$ super.drawTexturedBG(guiGraphics, this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, true);
152+
//#endif
144153
RenderUtils.drawOutlinedBox(this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, 0xFF000000, 0xFF999999);
145154
}
146155

magiclib-malilib-extra/versions/1.14.4-fabric/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,14 @@ repositories {
7676
mavenCentral()
7777
}
7878

79+
String malilib_fabric_ga = project.getProperties().getOrDefault("dependencies.api.malilib_version.use_sakura_fork", false) ?
80+
"com.github.sakura-ryoko:malilib" : "maven.modrinth:malilib"
81+
7982
// Module, Property prefix, Resolve condition, Transitive dependencies.
8083
def apiDependencies = [
81-
["maven.modrinth:malilib" , "malilib" , fabricLike && mcVersion < 12104, false],
82-
["com.github.sakura-ryoko:malilib", "malilib" , fabricLike && mcVersion > 12103, false],
83-
["maven.modrinth:mafglib" , "malilib" , forgeLike , false],
84-
["lol.bai:badpackets" , "badpackets", forgeLike && mcVersion > 12004 , false],
84+
[malilib_fabric_ga , "malilib" , fabricLike , false],
85+
["maven.modrinth:mafglib", "malilib" , forgeLike , false],
86+
["lol.bai:badpackets" , "badpackets", forgeLike && mcVersion > 12004 , false],
8587
]
8688

8789
// Module, Property prefix, Resolve condition, Transitive dependencies.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Dependency Versions
2+
dependencies.neoforge_version=21.3.58
3+
dependencies.minecraft_dependency=1.21.3
4+
dependencies.minecraft_version=1.21.3
5+
6+
# Malilib 0.2.1
7+
# MaFgLib-0.2.1-mc1.21.3.jar
8+
dependencies.api.malilib_version=0.2.1-mc1.21.3
9+
10+
# BadPackets neo-0.8.1
11+
# badpackets-neo-0.8.1.jar
12+
dependencies.api.badpackets_version=neo-0.8.1
13+
14+
# Loom Properties
15+
loom.platform=neoforge
16+
17+
# Publish properties
18+
publish.game_version=1.21.3
19+
publish.dependencies_list=\
20+
[email protected](optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
accessWidener v2 named
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Dependency Versions
2+
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
3+
dependencies.minecraft_version=1.21.4
4+
5+
# Malilib 0.23.0
6+
# malilib-fabric-1.21.4-0.23.0.jar
7+
dependencies.api.malilib_version=0.23.0
8+
9+
# Publish properties
10+
publish.game_version=1.21.4
11+
publish.dependencies_list=\
12+
[email protected](optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
accessWidener v2 named
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Dependency Versions
2+
dependencies.neoforge_version=21.4.46-beta
3+
dependencies.minecraft_dependency=1.21.4
4+
dependencies.minecraft_version=1.21.4
5+
6+
# Malilib 0.2.1
7+
# MaFgLib-0.2.1-mc1.21.3.jar
8+
dependencies.api.malilib_version=0.2.1-mc1.21.4
9+
10+
# BadPackets neo-0.8.1
11+
# badpackets-neo-0.8.1.jar
12+
dependencies.api.badpackets_version=neo-0.8.1
13+
14+
# Loom Properties
15+
loom.platform=neoforge
16+
17+
# Publish properties
18+
publish.game_version=1.21.4
19+
publish.dependencies_list=\
20+
[email protected](optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
accessWidener v2 named

magiclib-minecraft-api/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ preprocess {
2727
Node mc_12006_fabric = createNode("mc-api-1.20.6-fabric", 1_20_06, "mojang")
2828
Node mc_12101_fabric = createNode("mc-api-1.21.1-fabric", 1_21_01, "mojang")
2929
Node mc_12103_fabric = createNode("mc-api-1.21.3-fabric", 1_21_03, "mojang")
30+
Node mc_12104_fabric = createNode("mc-api-1.21.4-fabric", 1_21_04, "mojang")
3031

3132
mc_11404_fabric.link(mc_11502_fabric, file("versions/mapping-fabric-1.14.4-1.15.2.txt"))
3233
mc_11502_fabric.link(mc_11605_fabric, file("versions/mapping-fabric-1.15.2-1.16.5.txt"))
@@ -41,6 +42,7 @@ preprocess {
4142
mc_12004_fabric.link(mc_12006_fabric, null)
4243
mc_12006_fabric.link(mc_12101_fabric, null)
4344
mc_12101_fabric.link(mc_12103_fabric, null)
45+
mc_12103_fabric.link(mc_12104_fabric, null)
4446

4547
// Forge
4648
Node mc_11701_forge = createNode("mc-api-1.17.1-forge", 1_17_01, "mojang")
@@ -56,9 +58,11 @@ preprocess {
5658
Node mc_12006_neoforge = createNode("mc-api-1.20.6-neoforge", 1_20_06, "mojang")
5759
Node mc_12101_neoforge = createNode("mc-api-1.21.1-neoforge", 1_21_01, "mojang")
5860
Node mc_12103_neoforge = createNode("mc-api-1.21.3-neoforge", 1_21_03, "mojang")
61+
Node mc_12104_neoforge = createNode("mc-api-1.21.4-neoforge", 1_21_04, "mojang")
5962

6063
mc_12002_fabric.link(mc_12002_neoforge, file("versions/mapping-1.20.2-fabric-neoforge.txt"))
6164
mc_12006_fabric.link(mc_12006_neoforge, file("versions/mapping-1.20.6-fabric-neoforge.txt"))
6265
mc_12101_fabric.link(mc_12101_neoforge, file("versions/mapping-1.21.1-fabric-neoforge.txt"))
6366
mc_12103_fabric.link(mc_12103_neoforge, file("versions/mapping-1.21.3-fabric-neoforge.txt"))
67+
mc_12104_fabric.link(mc_12104_neoforge, file("versions/mapping-1.21.4-fabric-neoforge.txt"))
6468
}

magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/impl/compat/minecraft/network/chat/StyleCompatImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public StyleCompat applyFormats(ChatFormatting... chatFormattings) {
293293
//$$ break;
294294
//$$ case RESET:
295295
//$$ this.style = new Style();
296-
//$$ return this;
296+
//$$ break;
297297
//$$ default:
298298
//$$ this.style.setColor(chatFormatting);
299299
//$$ }

magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/accessor/StyleAccessor.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ public interface StyleAccessor {
2222
@Invoker(value = "<init>")
2323
static Style magiclib$invokeConstructor(
2424
@Nullable TextColor color,
25+
//#if MC > 12103
26+
//$$ @Nullable Integer integer,
27+
//#endif
2528
@Nullable Boolean bold,
2629
@Nullable Boolean italic,
2730
@Nullable Boolean underlined,

magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/event/render/LevelRendererMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ private void preRenderLevel(
5757
boolean renderBlockOutline,
5858
Camera camera,
5959
GameRenderer gameRenderer,
60+
//#if MC < 12104
6061
LightTexture lightTexture,
62+
//#endif
6163
Matrix4f frustumMatrix,
6264
//#if MC > 12004
6365
//$$ Matrix4f projectionMatrix,
@@ -126,7 +128,9 @@ private void postRenderLevel(
126128
boolean renderBlockOutline,
127129
Camera camera,
128130
GameRenderer gameRenderer,
131+
//#if MC < 12104
129132
LightTexture lightTexture,
133+
//#endif
130134
Matrix4f frustumMatrix,
131135
//#if MC > 12004
132136
//$$ Matrix4f projectionMatrix,
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Dependency Versions
2+
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
3+
dependencies.minecraft_version=1.21.4
4+
5+
# Publish properties
6+
publish.game_version=1.21.4
7+
publish.dependencies_list=
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessWidener v2 named
2+
accessible class net/minecraft/server/packs/FilePackResources$SharedZipFileAccess
3+
accessible field net/minecraft/server/packs/FilePackResources$SharedZipFileAccess file Ljava/io/File;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Dependency Versions
2+
dependencies.neoforge_version=21.4.46-beta
3+
dependencies.minecraft_dependency=1.21.4
4+
dependencies.minecraft_version=1.21.4
5+
6+
# Loom Properties
7+
loom.platform=neoforge
8+
9+
# Publish properties
10+
publish.game_version=1.21.4
11+
publish.dependencies_list=
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessWidener v2 named
2+
accessible class net/minecraft/server/packs/FilePackResources$SharedZipFileAccess
3+
accessible field net/minecraft/server/packs/FilePackResources$SharedZipFileAccess file Ljava/io/File;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
net.fabricmc.api.EnvType net.neoforged.api.distmarker.Dist
2+
net.fabricmc.api.Environment net.neoforged.api.distmarker.OnlyIn
3+
net.fabricmc.api.EnvType SERVER net.neoforged.api.distmarker.Dist DEDICATED_SERVER

0 commit comments

Comments
 (0)