Version 1.3.10.4

Author: EssentialGGBot

api/api/api.api

@@ -424,13 +424,13 @@ public abstract interface class gg/essential/api/utils/GuiUtil {
 	public abstract fun openScreen (Lnet/minecraft/client/gui/screens/Screen;)V
 	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge,1.21.7-forge,1.21.7-neoforge
 	public abstract fun openedScreen ()Lnet/minecraft/client/gui/screens/Screen;
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.11-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
 	public static fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.11-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
 	public static fun open (Lnet/minecraft/client/gui/screen/Screen;)V
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.11-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
 	public abstract fun openScreen (Lnet/minecraft/client/gui/screen/Screen;)V
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.11-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
 	public abstract fun openedScreen ()Lnet/minecraft/client/gui/screen/Screen;
 	@1.12.2-forge,1.8.9-forge
 	public static fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -447,9 +447,9 @@ public final class gg/essential/api/utils/GuiUtil$Companion {
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screens/Screen;
 	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge,1.21.7-forge,1.21.7-neoforge
 	public final fun open (Lnet/minecraft/client/gui/screens/Screen;)V
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.11-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.11-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
 	public final fun open (Lnet/minecraft/client/gui/screen/Screen;)V
 	@1.12.2-forge,1.8.9-forge
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -513,7 +513,7 @@ public final class gg/essential/api/utils/KotlinAdapter : net/minecraftforge/fml
 public abstract interface class gg/essential/api/utils/MinecraftUtils {
 	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge,1.21.7-forge,1.21.7-neoforge
 	public abstract fun getResourceImage (Lnet/minecraft/resources/ResourceLocation;)Ljava/awt/image/BufferedImage;
-	@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
+	@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.11-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
 	public abstract fun getResourceImage (Lnet/minecraft/util/Identifier;)Ljava/awt/image/BufferedImage;
 	@1.12.2-forge,1.16.2-forge,1.8.9-forge
 	public abstract fun getResourceImage (Lnet/minecraft/util/ResourceLocation;)Ljava/awt/image/BufferedImage;

build-logic/src/main/kotlin/essential/preprocessor.kt

@@ -20,6 +20,7 @@ fun Project.configurePreprocessTree(versions: File) {
     configure<RootPreprocessExtension> {
         strictExtraMappings.set(true)
 
+        val fabric12111 = createNode("1.21.11-fabric", 12111, "yarn")
         val fabric12109 = createNode("1.21.9-fabric", 12109, "yarn")
         val neoForge12107 = createNode("1.21.7-neoforge", 12107, "srg")
         val forge12107 = createNode("1.21.7-forge", 12107, "srg")
@@ -65,6 +66,7 @@ fun Project.configurePreprocessTree(versions: File) {
         val forge11202 = createNode("1.12.2-forge", 11202, "srg")
         val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
+        fabric12111.link(fabric12109, versions.resolve("1.21.11-1.21.9.txt"))
         fabric12109.link(fabric12107, versions.resolve("1.21.9-1.21.7.txt"))
         neoForge12107.link(fabric12107)
         forge12107.link(fabric12107)

build.gradle.kts

@@ -132,6 +132,7 @@ dependencies {
             12106 -> "0.126.0+1.21.6"
             12107 -> "0.128.1+1.21.7"
             12109 -> "0.133.13+1.21.9"
+            12111 -> "0.139.4+1.21.11"
             else -> error("No fabric API version configured!")
         }
         include(modImplementation(fabricApi.module("fabric-api-base", fapiVersion))!!)

changelog/release-1.3.10.4.md

@@ -0,0 +1,8 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## New Versions
+- Added support for 1.21.11 Fabric
+
+## Bug Fixes
+- Fixed Essential screens sometimes not rendering properly on Minecraft 1.17-1.20.6

gradle.properties

@@ -1,5 +1,5 @@
 essential.defaults.loom=0
-essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.17.2
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.17.3
 kotlin.stdlib.default.dependency=false
 org.gradle.daemon=false
 org.gradle.parallel=true
@@ -10,4 +10,4 @@ minecraftVersion=11202
 # TODO remove once upgrading to Loom 1.10
 # fabric-api 1.21.5 was built with Loom 1.10, seems to work well enough in dev with our current 1.7 though
 loom.ignoreDependencyLoomVersionValidation=true
-version=1.3.10.3
+version=1.3.10.4

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-universalcraft = "442"
+universalcraft = "446"
 elementa = "712"
 vigilance = "306"
 mixinextras = "0.4.0"

gui/essential/src/main/kotlin/gg/essential/util/guiEssentialPlatform.kt

@@ -93,8 +93,6 @@ interface GuiEssentialPlatform {
 
     fun identifierFromTexture(texture: RenderBackend.Texture): UIdentifier
 
-    fun bindTexture(textureUnit: Int, identifier: UIdentifier)
-
     fun getGlId(identifier: UIdentifier): Int
 
     fun playSound(identifier: UIdentifier)

settings.gradle.kts

@@ -122,6 +122,7 @@ listOf(
     "1.21.7-forge",
     "1.21.7-neoforge",
     "1.21.9-fabric",
+    "1.21.11-fabric",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {

src/main/java/gg/essential/mixins/impl/client/gui/GuiDragDropEntryHandler.java

@@ -326,7 +326,11 @@ private void doDrawDraggedEntry(UMatrixStack matrixStack, GuiDrawScreenEvent eve
         // entry
         //#if MC>=12106
         //$$ GuiRenderState guiRenderState = new GuiRenderState();
-        //$$ DrawContext context = new DrawContext(MinecraftClient.getInstance(), guiRenderState);
+        //$$ DrawContext context = new DrawContext(MinecraftClient.getInstance(), guiRenderState
+            //#if MC>=12111
+            //$$ , event.getMouseX(), event.getMouseY()
+            //#endif
+        //$$ );
         //#if MC>=12109
         //$$ int orgX = draggedEntryState.entry.getX();
         //$$ int orgY = draggedEntryState.entry.getY();
@@ -344,6 +348,9 @@ private void doDrawDraggedEntry(UMatrixStack matrixStack, GuiDrawScreenEvent eve
         //#else
         //$$ draggedEntryState.entry.render(context, 0, y, x, width, height, event.getMouseX(), event.getMouseY(), true, event.getPartialTicks());
         //#endif
+        //#if MC>=12111
+        //$$ context.drawDeferredElements();
+        //#endif
         //$$ renderGuiRenderStateToRenderTarget(matrixStack, guiRenderState);
         //#elseif MC>=12000
         //$$ DrawContext context = event.getDrawContext().getMc();

src/main/java/gg/essential/mixins/transformers/client/MixinMinecraft.java

@@ -188,7 +188,9 @@ private void runTick(CallbackInfo ci) {
     //$$ // Note: This is targeted after the cancelTasks call, such that any tasks we schedule from the event
     //$$ //       won't immediately be cancelled (which could otherwise result in the game locking up, e.g. when
     //$$ //       scheduling a resource pack reload which will then never finish).
-    //#if MC>=12005
+    //#if MC>=12111
+    //$$ @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;ZZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;cancelTasks()V", shift = At.Shift.AFTER))
+    //#elseif MC>=12005
     //$$ @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;cancelTasks()V", shift = At.Shift.AFTER))
     //#else
     //$$ @Inject(method = "unloadWorld(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;dropTasks()V", shift = At.Shift.AFTER))
@@ -344,7 +346,9 @@ private long mouseScroll(long ret) {
     //#else
     private static final String LAUNCH_INTEGRATED_SERVER = "launchIntegratedServer";
     //#endif
-    //#if MC>=12005
+    //#if MC>=12111
+    //$$ private static final String STOP_INTEGRATED_SERVER = "disconnect(Lnet/minecraft/client/gui/screen/Screen;ZZ)V";
+    //#elseif MC>=12005
     //$$ private static final String STOP_INTEGRATED_SERVER = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V";
     //#elseif MC>=11600
     //$$ private static final String STOP_INTEGRATED_SERVER = "unloadWorld(Lnet/minecraft/client/gui/screen/Screen;)V";