diff --git a/magiclib-better-dev/build.gradle b/magiclib-better-dev/build.gradle index 4a2d01e3..0e6dff6d 100644 --- a/magiclib-better-dev/build.gradle +++ b/magiclib-better-dev/build.gradle @@ -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")) @@ -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") @@ -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")) } diff --git a/magiclib-better-dev/versions/1.21.4-fabric/gradle.properties b/magiclib-better-dev/versions/1.21.4-fabric/gradle.properties new file mode 100644 index 00000000..40513e01 --- /dev/null +++ b/magiclib-better-dev/versions/1.21.4-fabric/gradle.properties @@ -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= diff --git a/magiclib-better-dev/versions/1.21.4-fabric/src/main/resources/magiclib-better-dev.accesswidener b/magiclib-better-dev/versions/1.21.4-fabric/src/main/resources/magiclib-better-dev.accesswidener new file mode 100644 index 00000000..d4342d06 --- /dev/null +++ b/magiclib-better-dev/versions/1.21.4-fabric/src/main/resources/magiclib-better-dev.accesswidener @@ -0,0 +1 @@ +accessWidener v2 named diff --git a/magiclib-better-dev/versions/1.21.4-neoforge/gradle.properties b/magiclib-better-dev/versions/1.21.4-neoforge/gradle.properties new file mode 100644 index 00000000..a3485ecd --- /dev/null +++ b/magiclib-better-dev/versions/1.21.4-neoforge/gradle.properties @@ -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= diff --git a/magiclib-better-dev/versions/1.21.4-neoforge/src/main/resources/magiclib-better-dev.accesswidener b/magiclib-better-dev/versions/1.21.4-neoforge/src/main/resources/magiclib-better-dev.accesswidener new file mode 100644 index 00000000..d4342d06 --- /dev/null +++ b/magiclib-better-dev/versions/1.21.4-neoforge/src/main/resources/magiclib-better-dev.accesswidener @@ -0,0 +1 @@ +accessWidener v2 named diff --git a/magiclib-better-dev/versions/mapping-1.21.4-fabric-neoforge.txt b/magiclib-better-dev/versions/mapping-1.21.4-fabric-neoforge.txt new file mode 100644 index 00000000..d2217f91 --- /dev/null +++ b/magiclib-better-dev/versions/mapping-1.21.4-fabric-neoforge.txt @@ -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 diff --git a/magiclib-legacy-compat/build.gradle b/magiclib-legacy-compat/build.gradle index 71e5c750..019222b3 100644 --- a/magiclib-legacy-compat/build.gradle +++ b/magiclib-legacy-compat/build.gradle @@ -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")) @@ -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) } diff --git a/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties index aba45dcb..7055e692 100644 --- a/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties @@ -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=\ carpet@1.21.2-1.4.158+v241022(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ - malilib@0.22.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) + malilib@0.22.3(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.21.4-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.21.4-fabric/gradle.properties new file mode 100644 index 00000000..1bd48e5a --- /dev/null +++ b/magiclib-legacy-compat/versions/1.21.4-fabric/gradle.properties @@ -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=\ + carpet@1.21.4-1.4.161+v241203(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.23.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.21.4-fabric/src/main/resources/magiclib-legacy-compat.accesswidener b/magiclib-legacy-compat/versions/1.21.4-fabric/src/main/resources/magiclib-legacy-compat.accesswidener new file mode 100644 index 00000000..d4342d06 --- /dev/null +++ b/magiclib-legacy-compat/versions/1.21.4-fabric/src/main/resources/magiclib-legacy-compat.accesswidener @@ -0,0 +1 @@ +accessWidener v2 named diff --git a/magiclib-malilib-extra/build.gradle b/magiclib-malilib-extra/build.gradle index 88af0080..8a2c997a 100644 --- a/magiclib-malilib-extra/build.gradle +++ b/magiclib-malilib-extra/build.gradle @@ -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) @@ -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") @@ -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) } diff --git a/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3Edit.java b/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3Edit.java index 020801c9..4d4fc0b7 100644 --- a/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3Edit.java +++ b/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3Edit.java @@ -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); } diff --git a/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3iListEdit.java b/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3iListEdit.java index 57a2c4af..bdf93dbe 100644 --- a/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3iListEdit.java +++ b/magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/GuiVec3iListEdit.java @@ -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); } diff --git a/magiclib-malilib-extra/versions/1.14.4-fabric/build.gradle b/magiclib-malilib-extra/versions/1.14.4-fabric/build.gradle index bcc4625b..474993e1 100644 --- a/magiclib-malilib-extra/versions/1.14.4-fabric/build.gradle +++ b/magiclib-malilib-extra/versions/1.14.4-fabric/build.gradle @@ -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. diff --git a/magiclib-malilib-extra/versions/1.21.3-neoforge/gradle.properties b/magiclib-malilib-extra/versions/1.21.3-neoforge/gradle.properties new file mode 100644 index 00000000..b94bce95 --- /dev/null +++ b/magiclib-malilib-extra/versions/1.21.3-neoforge/gradle.properties @@ -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=\ + mafglib@0.2.1-mc1.21.3(optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.21.3-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener b/magiclib-malilib-extra/versions/1.21.3-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener new file mode 100644 index 00000000..d4342d06 --- /dev/null +++ b/magiclib-malilib-extra/versions/1.21.3-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener @@ -0,0 +1 @@ +accessWidener v2 named diff --git a/magiclib-malilib-extra/versions/1.21.4-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.21.4-fabric/gradle.properties new file mode 100644 index 00000000..df508fa5 --- /dev/null +++ b/magiclib-malilib-extra/versions/1.21.4-fabric/gradle.properties @@ -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=\ + malilib@0.23.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.21.4-fabric/src/main/resources/magiclib-malilib-extra.accesswidener b/magiclib-malilib-extra/versions/1.21.4-fabric/src/main/resources/magiclib-malilib-extra.accesswidener new file mode 100644 index 00000000..d4342d06 --- /dev/null +++ b/magiclib-malilib-extra/versions/1.21.4-fabric/src/main/resources/magiclib-malilib-extra.accesswidener @@ -0,0 +1 @@ +accessWidener v2 named diff --git a/magiclib-malilib-extra/versions/1.21.4-neoforge/gradle.properties b/magiclib-malilib-extra/versions/1.21.4-neoforge/gradle.properties new file mode 100644 index 00000000..55f609a4 --- /dev/null +++ b/magiclib-malilib-extra/versions/1.21.4-neoforge/gradle.properties @@ -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=\ + mafglib@0.2.1-mc1.21.4(optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.21.4-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener b/magiclib-malilib-extra/versions/1.21.4-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener new file mode 100644 index 00000000..d4342d06 --- /dev/null +++ b/magiclib-malilib-extra/versions/1.21.4-neoforge/src/main/resources/magiclib-malilib-extra.accesswidener @@ -0,0 +1 @@ +accessWidener v2 named diff --git a/magiclib-minecraft-api/build.gradle b/magiclib-minecraft-api/build.gradle index d3b73da3..b4db4bde 100644 --- a/magiclib-minecraft-api/build.gradle +++ b/magiclib-minecraft-api/build.gradle @@ -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")) @@ -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") @@ -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")) } diff --git a/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/impl/compat/minecraft/network/chat/StyleCompatImpl.java b/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/impl/compat/minecraft/network/chat/StyleCompatImpl.java index aabfe324..dddf7931 100644 --- a/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/impl/compat/minecraft/network/chat/StyleCompatImpl.java +++ b/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/impl/compat/minecraft/network/chat/StyleCompatImpl.java @@ -293,7 +293,7 @@ public StyleCompat applyFormats(ChatFormatting... chatFormattings) { //$$ break; //$$ case RESET: //$$ this.style = new Style(); - //$$ return this; + //$$ break; //$$ default: //$$ this.style.setColor(chatFormatting); //$$ } diff --git a/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/accessor/StyleAccessor.java b/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/accessor/StyleAccessor.java index 89debcc7..d642dd28 100644 --- a/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/accessor/StyleAccessor.java +++ b/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/accessor/StyleAccessor.java @@ -22,6 +22,9 @@ public interface StyleAccessor { @Invoker(value = "") static Style magiclib$invokeConstructor( @Nullable TextColor color, + //#if MC > 12103 + //$$ @Nullable Integer integer, + //#endif @Nullable Boolean bold, @Nullable Boolean italic, @Nullable Boolean underlined, diff --git a/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/event/render/LevelRendererMixin.java b/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/event/render/LevelRendererMixin.java index f2ba56a7..5da9d6c9 100644 --- a/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/event/render/LevelRendererMixin.java +++ b/magiclib-minecraft-api/src/main/java/top/hendrixshen/magiclib/mixin/minecraft/event/render/LevelRendererMixin.java @@ -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, @@ -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, diff --git a/magiclib-minecraft-api/versions/1.21.4-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.21.4-fabric/gradle.properties new file mode 100644 index 00000000..58d4eb2d --- /dev/null +++ b/magiclib-minecraft-api/versions/1.21.4-fabric/gradle.properties @@ -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= diff --git a/magiclib-minecraft-api/versions/1.21.4-fabric/src/main/resources/magiclib-minecraft-api.accesswidener b/magiclib-minecraft-api/versions/1.21.4-fabric/src/main/resources/magiclib-minecraft-api.accesswidener new file mode 100644 index 00000000..f1438dbd --- /dev/null +++ b/magiclib-minecraft-api/versions/1.21.4-fabric/src/main/resources/magiclib-minecraft-api.accesswidener @@ -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; diff --git a/magiclib-minecraft-api/versions/1.21.4-neoforge/gradle.properties b/magiclib-minecraft-api/versions/1.21.4-neoforge/gradle.properties new file mode 100644 index 00000000..a75d8615 --- /dev/null +++ b/magiclib-minecraft-api/versions/1.21.4-neoforge/gradle.properties @@ -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= diff --git a/magiclib-minecraft-api/versions/1.21.4-neoforge/src/main/resources/magiclib-minecraft-api.accesswidener b/magiclib-minecraft-api/versions/1.21.4-neoforge/src/main/resources/magiclib-minecraft-api.accesswidener new file mode 100644 index 00000000..f1438dbd --- /dev/null +++ b/magiclib-minecraft-api/versions/1.21.4-neoforge/src/main/resources/magiclib-minecraft-api.accesswidener @@ -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; diff --git a/magiclib-minecraft-api/versions/mapping-1.21.4-fabric-neoforge.txt b/magiclib-minecraft-api/versions/mapping-1.21.4-fabric-neoforge.txt new file mode 100644 index 00000000..d2217f91 --- /dev/null +++ b/magiclib-minecraft-api/versions/mapping-1.21.4-fabric-neoforge.txt @@ -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 diff --git a/settings.json b/settings.json index 2b31d211..8b6aa067 100644 --- a/settings.json +++ b/settings.json @@ -17,6 +17,7 @@ "1.20.6-fabric", "1.21.1-fabric", "1.21.3-fabric", + "1.21.4-fabric", "1.17.1-forge", "1.18.2-forge", @@ -25,7 +26,8 @@ "1.20.2-neoforge", "1.20.6-neoforge", "1.21.1-neoforge", - "1.21.3-neoforge" + "1.21.3-neoforge", + "1.21.4-neoforge" ] }, "magiclib-legacy-compat": { @@ -44,7 +46,8 @@ "1.20.4-fabric", "1.20.6-fabric", "1.21.1-fabric", - "1.21.3-fabric" + "1.21.3-fabric", + "1.21.4-fabric" ] }, "magiclib-malilib-extra": { @@ -64,13 +67,16 @@ "1.20.6-fabric", "1.21.1-fabric", "1.21.3-fabric", + "1.21.4-fabric", "1.17.1-forge", "1.18.2-forge", "1.19.4-forge", "1.20.6-neoforge", - "1.21.1-neoforge" + "1.21.1-neoforge", + "1.21.3-neoforge", + "1.21.4-neoforge" ] }, "magiclib-minecraft-api": { @@ -90,6 +96,7 @@ "1.20.6-fabric", "1.21.1-fabric", "1.21.3-fabric", + "1.21.4-fabric", "1.17.1-forge", "1.18.2-forge", @@ -98,7 +105,8 @@ "1.20.2-neoforge", "1.20.6-neoforge", "1.21.1-neoforge", - "1.21.3-neoforge" + "1.21.3-neoforge", + "1.21.4-neoforge" ] } }