From a8824ce2da519fa228474474ceb4eb963c5553bd Mon Sep 17 00:00:00 2001 From: Cal Date: Fri, 10 Oct 2025 11:33:50 +1100 Subject: [PATCH] 1.21.11 --- .../main/kotlin/moulconfig.fabric.gradle.kts | 5 +++-- modern/1.21.11/build.gradle.kts | 9 +++++++++ modern/1.21.11/gradle.properties | 4 ++++ .../src/main/resources/moulconfig.accesswidener | 17 +++++++++++++++++ .../platform/MoulConfigRenderContext.java | 3 ++- settings.gradle.kts | 1 + 6 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 modern/1.21.11/build.gradle.kts create mode 100644 modern/1.21.11/gradle.properties create mode 100644 modern/1.21.11/src/main/resources/moulconfig.accesswidener diff --git a/build-src/src/main/kotlin/moulconfig.fabric.gradle.kts b/build-src/src/main/kotlin/moulconfig.fabric.gradle.kts index 51213ed1f..e29e5d1a2 100644 --- a/build-src/src/main/kotlin/moulconfig.fabric.gradle.kts +++ b/build-src/src/main/kotlin/moulconfig.fabric.gradle.kts @@ -11,17 +11,18 @@ plugins { val fabricVersion = property("moulconfig.fabric") as String val minecraftVersion = property("moulconfig.minecraft") as String +val snapshotVersion = findProperty("moulconfig.snapshot") as String? val aF = project.file("src/main/resources/moulconfig.accesswidener") val hasAW = aF.exists() the().minecraft { - version(minecraftVersion) + version(snapshotVersion ?: minecraftVersion) mappings { intermediary() yarn(property("moulconfig.yarn") as String) } fabric { - loader("0.17.2") + loader("0.17.3") if (hasAW) accessWidener(aF) } diff --git a/modern/1.21.11/build.gradle.kts b/modern/1.21.11/build.gradle.kts new file mode 100644 index 000000000..dc382bf9f --- /dev/null +++ b/modern/1.21.11/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + id("moulconfig.fabric") +} +fabricDeps { + impl("fabric-command-api-v2") +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(21)) + diff --git a/modern/1.21.11/gradle.properties b/modern/1.21.11/gradle.properties new file mode 100644 index 000000000..5c416c1ad --- /dev/null +++ b/modern/1.21.11/gradle.properties @@ -0,0 +1,4 @@ +moulconfig.minecraft=1.21.11 +moulconfig.yarn=2 +moulconfig.fabric=0.135.1+1.21.11 +moulconfig.snapshot=25w41a \ No newline at end of file diff --git a/modern/1.21.11/src/main/resources/moulconfig.accesswidener b/modern/1.21.11/src/main/resources/moulconfig.accesswidener new file mode 100644 index 000000000..15d698cdc --- /dev/null +++ b/modern/1.21.11/src/main/resources/moulconfig.accesswidener @@ -0,0 +1,17 @@ +accessWidener v2 named + +accessible method net/minecraft/client/gui/DrawContext setScissor (Lnet/minecraft/client/gui/ScreenRect;)V +accessible field net/minecraft/client/gui/DrawContext scissorStack Lnet/minecraft/client/gui/DrawContext$ScissorStack; +accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V +accessible class net/minecraft/client/gui/DrawContext$ScissorStack +accessible method net/minecraft/client/gui/DrawContext fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/texture/TextureSetup;IIIIILjava/lang/Integer;)V +accessible field net/minecraft/client/gui/DrawContext$ScissorStack stack Ljava/util/Deque; +accessible method net/minecraft/client/gui/DrawContext fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V +accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIIFFFFI)V +accessible field net/minecraft/client/render/GameRenderer guiState Lnet/minecraft/client/gui/render/state/GuiRenderState; +accessible field net/minecraft/client/gl/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet; +accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase; +accessible class net/minecraft/client/render/RenderLayer$MultiPhase +accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters +accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder build (Z)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters; +accessible field net/minecraft/client/gui/DrawContext state Lnet/minecraft/client/gui/render/state/GuiRenderState; diff --git a/modern/templates/java/io/github/notenoughupdates/moulconfig/platform/MoulConfigRenderContext.java b/modern/templates/java/io/github/notenoughupdates/moulconfig/platform/MoulConfigRenderContext.java index e632a9448..1f12d6ff2 100644 --- a/modern/templates/java/io/github/notenoughupdates/moulconfig/platform/MoulConfigRenderContext.java +++ b/modern/templates/java/io/github/notenoughupdates/moulconfig/platform/MoulConfigRenderContext.java @@ -213,13 +213,14 @@ public void drawTexturedTintedRect(MyResourceLocation texture, float x, float y, var identifier = MoulConfigPlatform.unwrap(texture); mc.getTextureManager() .getTexture(identifier) + #if MC < 12111 .setFilter( switch (filter) { case LINEAR -> true; case NEAREST -> false; }, false - ); + )#endif; drawContext.drawTexturedQuad( #if MC217 RenderPipelines.GUI_TEXTURED #else RenderLayer::getGuiTextured #endif, identifier, diff --git a/settings.gradle.kts b/settings.gradle.kts index 9ec7ebd29..9efa83258 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,6 +31,7 @@ listOf( "1.21.5", "1.21.7", "1.21.10", + "1.21.11", ).forEach { version -> val modPath = "modern:$version" include(modPath)