Skip to content

Minecraft 1.21.4 support #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 31, 2024
Merged

Minecraft 1.21.4 support #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5fb13b
Minecraft 1.21.4 support
Hendrix-Shen Dec 28, 2024
99d4700
magiclib-legacy-compat 1.21.4
Hendrix-Shen Dec 30, 2024
d9e48d2
Fix mc-publish info
Hendrix-Shen Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions magiclib-better-dev/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ preprocess {
Node mc_12006_fabric = createNode("better-dev-1.20.6-fabric", 1_20_06, "mojang")
Node mc_12101_fabric = createNode("better-dev-1.21.1-fabric", 1_21_01, "mojang")
Node mc_12103_fabric = createNode("better-dev-1.21.3-fabric", 1_21_03, "mojang")
Node mc_12104_fabric = createNode("better-dev-1.21.4-fabric", 1_21_04, "mojang")

mc_11404_fabric.link(mc_11502_fabric, null)
mc_11502_fabric.link(mc_11605_fabric, file("versions/mapping-fabric-1.15.2-1.16.5.txt"))
Expand All @@ -41,6 +42,7 @@ preprocess {
mc_12004_fabric.link(mc_12006_fabric, null)
mc_12006_fabric.link(mc_12101_fabric, null)
mc_12101_fabric.link(mc_12103_fabric, null)
mc_12103_fabric.link(mc_12104_fabric, null)

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

mc_12002_fabric.link(mc_12002_neoforge, file("versions/mapping-1.20.2-fabric-neoforge.txt"))
mc_12006_fabric.link(mc_12006_neoforge, file("versions/mapping-1.20.6-fabric-neoforge.txt"))
mc_12101_fabric.link(mc_12101_neoforge, file("versions/mapping-1.21.1-fabric-neoforge.txt"))
mc_12103_fabric.link(mc_12103_neoforge, file("versions/mapping-1.21.3-fabric-neoforge.txt"))
mc_12104_fabric.link(mc_12104_neoforge, file("versions/mapping-1.21.4-fabric-neoforge.txt"))
}
20 changes: 20 additions & 0 deletions magiclib-better-dev/versions/1.21.4-fabric/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Dependency Versions
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
dependencies.minecraft_version=1.21.4

# Fabric API 0.113.0+1.21.4
dependencies.api.fabric_version=0.113.0+1.21.4
# Mod Menu 13.0.0-beta.1
# modmenu-13.0.0-beta.1.jar
dependencies.api.modmenu_version=13.0.0-beta.1

# IMBlockerFabric 1.0.24
# imblockerfabric-1.0.24.jar
dependencies.runtime.imblocker_version=1.0.24
# In-Game Account Switcher 9.0.2-alpha.1
# IAS-Fabric-1.21.4-9.0.2-alpha.1.jar
dependencies.runtime.inGameAccountSwitcher_version=WBbjirJP

# Publish properties
publish.game_version=1.21.4
publish.dependencies_list=
1 change: 1 addition & 0 deletions ...ib-better-dev/versions/1.21.4-fabric/src/main/resources/magiclib-better-dev.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
accessWidener v2 named
18 changes: 18 additions & 0 deletions magiclib-better-dev/versions/1.21.4-neoforge/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Dependency Versions
dependencies.neoforge_version=21.4.46-beta
dependencies.minecraft_dependency=1.21.4
dependencies.minecraft_version=1.21.4

# IMBlocker 4.0.9b
# IMBlocker_4.0.9b+1.21.jar
dependencies.runtime.imblocker_version=4.0.9b+1.21
# In-Game Account Switcher
# TODO
dependencies.runtime.inGameAccountSwitcher_version=0

# Loom Properties
loom.platform=neoforge

# Publish properties
publish.game_version=1.21.4
publish.dependencies_list=
1 change: 1 addition & 0 deletions ...-better-dev/versions/1.21.4-neoforge/src/main/resources/magiclib-better-dev.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
accessWidener v2 named
3 changes: 3 additions & 0 deletions magiclib-better-dev/versions/mapping-1.21.4-fabric-neoforge.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
net.fabricmc.api.EnvType net.neoforged.api.distmarker.Dist
net.fabricmc.api.Environment net.neoforged.api.distmarker.OnlyIn
net.fabricmc.api.EnvType SERVER net.neoforged.api.distmarker.Dist DEDICATED_SERVER
2 changes: 2 additions & 0 deletions magiclib-legacy-compat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ preprocess {
Node mc_12006_fabric = createNode("legacy-1.20.6-fabric", 1_20_06, "mojang")
Node mc_12101_fabric = createNode("legacy-1.21.1-fabric", 1_21_01, "mojang")
Node mc_12103_fabric = createNode("legacy-1.21.3-fabric", 1_21_03, "mojang")
Node mc_12104_fabric = createNode("legacy-1.21.4-fabric", 1_21_04, "mojang")

mc_11404_fabric.link(mc_11502_fabric, null)
mc_11502_fabric.link(mc_11605_fabric, file("versions/mapping-1.15.2-1.16.5.txt"))
Expand All @@ -41,4 +42,5 @@ preprocess {
mc_12004_fabric.link(mc_12006_fabric, null)
mc_12006_fabric.link(mc_12101_fabric, null)
mc_12101_fabric.link(mc_12103_fabric, null)
mc_12103_fabric.link(mc_12104_fabric, null)
}
2 changes: 1 addition & 1 deletion magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ dependencies.api.carpet_version=1.21.2-1.4.158+v241022
publish.game_version=1.21.2,1.21.3
publish.dependencies_list=\
[email protected]+v241022(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\
[email protected].0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
[email protected].3(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
13 changes: 13 additions & 0 deletions magiclib-legacy-compat/versions/1.21.4-fabric/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Dependency Versions
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
dependencies.minecraft_version=1.21.4

# Carpet - 1.4.161+v241203
# fabric-carpet-1.21.4-1.4.161+v241203.jar
dependencies.api.carpet_version=1.21.4-1.4.161+v241203

# Publish properties
publish.game_version=1.21.4
publish.dependencies_list=\
[email protected]+v241203(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\
[email protected](optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
1 change: 1 addition & 0 deletions ...acy-compat/versions/1.21.4-fabric/src/main/resources/magiclib-legacy-compat.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
accessWidener v2 named
6 changes: 6 additions & 0 deletions magiclib-malilib-extra/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ preprocess {
Node mc_12006_fabric = createNode("malilib-1.20.6-fabric", 1_20_06, "mojang")
Node mc_12101_fabric = createNode("malilib-1.21.1-fabric", 1_21_01, "mojang")
Node mc_12103_fabric = createNode("malilib-1.21.3-fabric", 1_21_03, "mojang")
Node mc_12104_fabric = createNode("malilib-1.21.4-fabric", 1_21_04, "mojang")

mc_11404_fabric.link(mc_11502_fabric, null)
mc_11502_fabric.link(mc_11605_fabric, null)
Expand All @@ -41,6 +42,7 @@ preprocess {
mc_12004_fabric.link(mc_12006_fabric, null)
mc_12006_fabric.link(mc_12101_fabric, null)
mc_12101_fabric.link(mc_12103_fabric, null)
mc_12103_fabric.link(mc_12104_fabric, null)

// Forge
Node mc_11701_forge = createNode("malilib-1.17.1-forge", 1_17_01, "mojang")
Expand All @@ -54,7 +56,11 @@ preprocess {
// NeoForge
Node mc_12006_neoforge = createNode("malilib-1.20.6-neoforge", 1_20_06, "mojang")
Node mc_12101_neoforge = createNode("malilib-1.21.1-neoforge", 1_21_01, "mojang")
Node mc_12103_neoforge = createNode("malilib-1.21.3-neoforge", 1_21_03, "mojang")
Node mc_12104_neoforge = createNode("malilib-1.21.4-neoforge", 1_21_04, "mojang")

mc_12006_fabric.link(mc_12006_neoforge, null)
mc_12101_fabric.link(mc_12101_neoforge, null)
mc_12103_fabric.link(mc_12103_neoforge, null)
mc_12104_fabric.link(mc_12104_neoforge, null)
}
11 changes: 10 additions & 1 deletion ...lib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3Edit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,16 @@ public void render(
}

@Override
protected void drawScreenBackground(int mouseX, int mouseY) {
protected void drawScreenBackground(
//#if MC > 12006
//$$ GuiGraphics guiGraphics,
//#endif
int mouseX,
int mouseY
) {
//#if MC > 12006
//$$ super.drawTexturedBG(guiGraphics, this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, true);
//#endif
RenderUtils.drawOutlinedBox(this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, 0xFF000000, 0xFF999999);
}

Expand Down
11 changes: 10 additions & 1 deletion ...xtra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3iListEdit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,16 @@ public void render(
}

@Override
protected void drawScreenBackground(int mouseX, int mouseY) {
protected void drawScreenBackground(
//#if MC > 12006
//$$ GuiGraphics guiGraphics,
//#endif
int mouseX,
int mouseY
) {
//#if MC > 12006
//$$ super.drawTexturedBG(guiGraphics, this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, true);
//#endif
RenderUtils.drawOutlinedBox(this.dialogLeft, this.dialogTop, this.dialogWidth, this.dialogHeight, 0xFF000000, 0xFF999999);
}

Expand Down
10 changes: 6 additions & 4 deletions magiclib-malilib-extra/versions/1.14.4-fabric/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,14 @@ repositories {
mavenCentral()
}

String malilib_fabric_ga = project.getProperties().getOrDefault("dependencies.api.malilib_version.use_sakura_fork", false) ?
"com.github.sakura-ryoko:malilib" : "maven.modrinth:malilib"

// Module, Property prefix, Resolve condition, Transitive dependencies.
def apiDependencies = [
["maven.modrinth:malilib" , "malilib" , fabricLike && mcVersion < 12104, false],
["com.github.sakura-ryoko:malilib", "malilib" , fabricLike && mcVersion > 12103, false],
["maven.modrinth:mafglib" , "malilib" , forgeLike , false],
["lol.bai:badpackets" , "badpackets", forgeLike && mcVersion > 12004 , false],
[malilib_fabric_ga , "malilib" , fabricLike , false],
["maven.modrinth:mafglib", "malilib" , forgeLike , false],
["lol.bai:badpackets" , "badpackets", forgeLike && mcVersion > 12004 , false],
]

// Module, Property prefix, Resolve condition, Transitive dependencies.
Expand Down
20 changes: 20 additions & 0 deletions magiclib-malilib-extra/versions/1.21.3-neoforge/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Dependency Versions
dependencies.neoforge_version=21.3.58
dependencies.minecraft_dependency=1.21.3
dependencies.minecraft_version=1.21.3

# Malilib 0.2.1
# MaFgLib-0.2.1-mc1.21.3.jar
dependencies.api.malilib_version=0.2.1-mc1.21.3

# BadPackets neo-0.8.1
# badpackets-neo-0.8.1.jar
dependencies.api.badpackets_version=neo-0.8.1

# Loom Properties
loom.platform=neoforge

# Publish properties
publish.game_version=1.21.3
publish.dependencies_list=\
[email protected](optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github)
1 change: 1 addition & 0 deletions ...ib-extra/versions/1.21.3-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
accessWidener v2 named
12 changes: 12 additions & 0 deletions magiclib-malilib-extra/versions/1.21.4-fabric/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Dependency Versions
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
dependencies.minecraft_version=1.21.4

# Malilib 0.23.0
# malilib-fabric-1.21.4-0.23.0.jar
dependencies.api.malilib_version=0.23.0

# Publish properties
publish.game_version=1.21.4
publish.dependencies_list=\
[email protected](optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github)
1 change: 1 addition & 0 deletions ...ilib-extra/versions/1.21.4-fabric/src/main/resources/magiclib-malilib-extra.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
accessWidener v2 named
20 changes: 20 additions & 0 deletions magiclib-malilib-extra/versions/1.21.4-neoforge/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Dependency Versions
dependencies.neoforge_version=21.4.46-beta
dependencies.minecraft_dependency=1.21.4
dependencies.minecraft_version=1.21.4

# Malilib 0.2.1
# MaFgLib-0.2.1-mc1.21.3.jar
dependencies.api.malilib_version=0.2.1-mc1.21.4

# BadPackets neo-0.8.1
# badpackets-neo-0.8.1.jar
dependencies.api.badpackets_version=neo-0.8.1

# Loom Properties
loom.platform=neoforge

# Publish properties
publish.game_version=1.21.4
publish.dependencies_list=\
[email protected](optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github)
1 change: 1 addition & 0 deletions ...ib-extra/versions/1.21.4-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
accessWidener v2 named
4 changes: 4 additions & 0 deletions magiclib-minecraft-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ preprocess {
Node mc_12006_fabric = createNode("mc-api-1.20.6-fabric", 1_20_06, "mojang")
Node mc_12101_fabric = createNode("mc-api-1.21.1-fabric", 1_21_01, "mojang")
Node mc_12103_fabric = createNode("mc-api-1.21.3-fabric", 1_21_03, "mojang")
Node mc_12104_fabric = createNode("mc-api-1.21.4-fabric", 1_21_04, "mojang")

mc_11404_fabric.link(mc_11502_fabric, file("versions/mapping-fabric-1.14.4-1.15.2.txt"))
mc_11502_fabric.link(mc_11605_fabric, file("versions/mapping-fabric-1.15.2-1.16.5.txt"))
Expand All @@ -41,6 +42,7 @@ preprocess {
mc_12004_fabric.link(mc_12006_fabric, null)
mc_12006_fabric.link(mc_12101_fabric, null)
mc_12101_fabric.link(mc_12103_fabric, null)
mc_12103_fabric.link(mc_12104_fabric, null)

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

mc_12002_fabric.link(mc_12002_neoforge, file("versions/mapping-1.20.2-fabric-neoforge.txt"))
mc_12006_fabric.link(mc_12006_neoforge, file("versions/mapping-1.20.6-fabric-neoforge.txt"))
mc_12101_fabric.link(mc_12101_neoforge, file("versions/mapping-1.21.1-fabric-neoforge.txt"))
mc_12103_fabric.link(mc_12103_neoforge, file("versions/mapping-1.21.3-fabric-neoforge.txt"))
mc_12104_fabric.link(mc_12104_neoforge, file("versions/mapping-1.21.4-fabric-neoforge.txt"))
}
2 changes: 1 addition & 1 deletion ...ain/java/top/hendrixshen/magiclib/impl/compat/minecraft/network/chat/StyleCompatImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public StyleCompat applyFormats(ChatFormatting... chatFormattings) {
//$$ break;
//$$ case RESET:
//$$ this.style = new Style();
//$$ return this;
//$$ break;
//$$ default:
//$$ this.style.setColor(chatFormatting);
//$$ }
Expand Down
3 changes: 3 additions & 0 deletions ...ft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/accessor/StyleAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ public interface StyleAccessor {
@Invoker(value = "<init>")
static Style magiclib$invokeConstructor(
@Nullable TextColor color,
//#if MC > 12103
//$$ @Nullable Integer integer,
//#endif
@Nullable Boolean bold,
@Nullable Boolean italic,
@Nullable Boolean underlined,
Expand Down
4 changes: 4 additions & 0 deletions ...c/main/java/top/hendrixshen/magiclib/mixin/minecraft/event/render/LevelRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ private void preRenderLevel(
boolean renderBlockOutline,
Camera camera,
GameRenderer gameRenderer,
//#if MC < 12104
LightTexture lightTexture,
//#endif
Matrix4f frustumMatrix,
//#if MC > 12004
//$$ Matrix4f projectionMatrix,
Expand Down Expand Up @@ -126,7 +128,9 @@ private void postRenderLevel(
boolean renderBlockOutline,
Camera camera,
GameRenderer gameRenderer,
//#if MC < 12104
LightTexture lightTexture,
//#endif
Matrix4f frustumMatrix,
//#if MC > 12004
//$$ Matrix4f projectionMatrix,
Expand Down
7 changes: 7 additions & 0 deletions magiclib-minecraft-api/versions/1.21.4-fabric/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Dependency Versions
dependencies.minecraft_dependency=>=1.21.4- <1.21.5-
dependencies.minecraft_version=1.21.4

# Publish properties
publish.game_version=1.21.4
publish.dependencies_list=
3 changes: 3 additions & 0 deletions ...ecraft-api/versions/1.21.4-fabric/src/main/resources/magiclib-minecraft-api.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessWidener v2 named
accessible class net/minecraft/server/packs/FilePackResources$SharedZipFileAccess
accessible field net/minecraft/server/packs/FilePackResources$SharedZipFileAccess file Ljava/io/File;
11 changes: 11 additions & 0 deletions magiclib-minecraft-api/versions/1.21.4-neoforge/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Dependency Versions
dependencies.neoforge_version=21.4.46-beta
dependencies.minecraft_dependency=1.21.4
dependencies.minecraft_version=1.21.4

# Loom Properties
loom.platform=neoforge

# Publish properties
publish.game_version=1.21.4
publish.dependencies_list=
3 changes: 3 additions & 0 deletions ...raft-api/versions/1.21.4-neoforge/src/main/resources/magiclib-minecraft-api.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessWidener v2 named
accessible class net/minecraft/server/packs/FilePackResources$SharedZipFileAccess
accessible field net/minecraft/server/packs/FilePackResources$SharedZipFileAccess file Ljava/io/File;
3 changes: 3 additions & 0 deletions magiclib-minecraft-api/versions/mapping-1.21.4-fabric-neoforge.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
net.fabricmc.api.EnvType net.neoforged.api.distmarker.Dist
net.fabricmc.api.Environment net.neoforged.api.distmarker.OnlyIn
net.fabricmc.api.EnvType SERVER net.neoforged.api.distmarker.Dist DEDICATED_SERVER
Loading