Version 1.3.5.9

Author: EssentialGGBot

LICENSE

@@ -1,8 +1,8 @@
 Essential Mod TM
 Source Available License Agreement
-Last Updated: 11th November 2024
+Last Updated: 22nd January 2025
 
-This license has been updated on 11th November 2024 to allow 
+This license has been updated on 22nd January 2025 to allow 
 unmodified forks of the repository.
 
 In the interest of transparency, ModCore Inc., doing business as

README.md

@@ -15,7 +15,7 @@ Before building Essential, you must have [Java Development Kits (JDKs)](https://
 installed for Java versions 21, 17, 16, and 8 (even if you only want to build for a specific Minecraft version).
 Java 21 (or newer) must be the default Java version on your system.
 
-No additional tools are required. Gradle will be automatically be installed by the
+No additional tools are required. Gradle will be automatically installed by the
 [gradle-wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html) program included in the repository and
 available via the `./gradlew` (Linux/Mac) or `gradlew.bat` (Windows) scripts.
 We highly recommend using these instead of a local installation of Gradle to ensure you're using the exact same version

api/api/api.api

@@ -423,13 +423,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
 	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-fabric,1.21.2-fabric,1.21.4-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-fabric,1.21.3-fabric,1.21.4-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-fabric,1.21.2-fabric,1.21.4-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-fabric,1.21.3-fabric,1.21.4-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-fabric,1.21.2-fabric,1.21.4-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-fabric,1.21.3-fabric,1.21.4-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-fabric,1.21.2-fabric,1.21.4-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-fabric,1.21.3-fabric,1.21.4-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;
@@ -446,9 +446,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
 	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-fabric,1.21.2-fabric,1.21.4-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-fabric,1.21.3-fabric,1.21.4-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-fabric,1.21.2-fabric,1.21.4-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-fabric,1.21.3-fabric,1.21.4-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;
@@ -512,7 +512,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
 	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-fabric,1.21.2-fabric,1.21.4-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-fabric,1.21.3-fabric,1.21.4-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;

api/build.gradle.kts

@@ -57,7 +57,6 @@ dependencies {
 
     // Core Gui Libraries
     val ucMcVersion = when (platform.mcVersion) {
-        12104 -> "1.21.2"
         11802 -> "1.18.1"
         else -> mcVersionStr
     }

build-logic/build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
     implementation("org.ow2.asm:asm-commons:9.3")
     implementation ("com.google.guava:guava:30.1.1-jre")
 
-    implementation("gg.essential:essential-gradle-toolkit:0.6.5")
+    implementation("gg.essential:essential-gradle-toolkit:0.6.6")
 }
 
 gradlePlugin {

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

@@ -21,7 +21,7 @@ fun Project.configurePreprocessTree(versions: File) {
         strictExtraMappings.set(true)
 
         val fabric12104 = createNode("1.21.4-fabric", 12104, "yarn")
-        val fabric12102 = createNode("1.21.2-fabric", 12102, "yarn")
+        val fabric12103 = createNode("1.21.3-fabric", 12103, "yarn")
         val fabric12100 = createNode("1.21-fabric", 12100, "yarn")
         val fabric12006 = createNode("1.20.6-fabric", 12006, "yarn")
         val forge12004 = createNode("1.20.4-forge", 12004, "srg")
@@ -48,8 +48,8 @@ fun Project.configurePreprocessTree(versions: File) {
         val forge11202 = createNode("1.12.2-forge", 11202, "srg")
         val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
-        fabric12104.link(fabric12102, versions.resolve("1.21.4-1.21.2.txt"))
-        fabric12102.link(fabric12100)
+        fabric12104.link(fabric12103, versions.resolve("1.21.4-1.21.3.txt"))
+        fabric12103.link(fabric12100)
         fabric12100.link(fabric12006)
         fabric12006.link(fabric12004)
         forge12004.link(fabric12004)

build.gradle.kts

@@ -118,7 +118,7 @@ dependencies {
         val fapiVersion = when (platform.mcVersion) {
             12006 -> "0.97.8+1.20.6"
             12100 -> "0.99.2+1.21"
-            12102 -> "0.106.0+1.21.2"
+            12103 -> "0.106.0+1.21.2"
             12104 -> "0.110.0+1.21.4"
             else -> error("No fabric API version configured!")
         }

changelog/release-1.3.5.9.md

@@ -0,0 +1,17 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## Improvements
+- Improved the screenshot upload notification to open the chat in which the screenshot was sent when clicked
+- Added the ability for emotes to have random variations
+- Added the ability for emotes to lock the player rotation
+- Added the ability for emotes to hide other cosmetics and held items
+
+## Bug Fixes
+- Fixed previewing of emotes in the Wardrobe
+- Fixed Discord Rich Presence integration not working on latest Discord version
+- Fixed "BufferBuilder was empty" crash with certain cosmetics on Minecraft 1.21 and above
+- Fixed a Minecraft bug resulting in black screen under some conditions on Minecraft 1.17 to 1.21.1
+- Fixed player legs clipping through pants cosmetics when running
+- Fixed world difficulty setting being visible when hosting a world with locked difficulty from the main menu
+- Fixed Essential crashing with RandomPatches mod

elementa/layoutdsl/src/main/kotlin/gg/essential/gui/effects/GradientEffect.kt

@@ -41,9 +41,14 @@ class GradientEffect(
         val bottomLeft = this.bottomLeft.get()
         val bottomRight = this.bottomRight.get()
 
+        lateinit var prevBlendState: BlendState
+
         val dither = topLeft != topRight || topLeft != bottomLeft || bottomLeft != bottomRight
         if (dither) {
             shader.bind()
+        } else {
+            prevBlendState = BlendState.active()
+            BlendState.NORMAL.activate()
         }
 
         val buffer = UGraphics.getFromTessellator()
@@ -84,6 +89,8 @@ class GradientEffect(
 
         if (dither) {
             shader.unbind()
+        } else {
+            prevBlendState.activate()
         }
     }
 

elementa/layoutdsl/src/main/kotlin/gg/essential/gui/layoutdsl/containers.kt

@@ -15,8 +15,6 @@ package gg.essential.gui.layoutdsl
 
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.components.ScrollComponent
-import gg.essential.elementa.components.UIBlock
-import gg.essential.elementa.components.Window
 import gg.essential.elementa.constraints.ChildBasedMaxSizeConstraint
 import gg.essential.elementa.constraints.ChildBasedSizeConstraint
 import gg.essential.elementa.constraints.WidthConstraint
@@ -29,8 +27,6 @@ import gg.essential.gui.common.HollowUIContainer
 import gg.essential.gui.common.constraints.AlternateConstraint
 import gg.essential.gui.common.constraints.SpacedCramSiblingConstraint
 import gg.essential.gui.elementa.state.v2.*
-import gg.essential.universal.UMatrixStack
-import java.awt.Color
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -41,7 +37,7 @@ fun LayoutScope.box(modifier: Modifier = Modifier, block: LayoutScope.() -> Unit
     }
 
     val container = TransparentBlock().apply {
-        componentName = "BoxContainer"
+        automaticComponentName("box")
         setWidth(ChildBasedSizeConstraint())
         setHeight(ChildBasedSizeConstraint())
     }
@@ -61,7 +57,7 @@ fun LayoutScope.row(modifier: Modifier, horizontalArrangement: Arrangement = Arr
     }
 
     val rowContainer = TransparentBlock().apply {
-        componentName = "RowContainer"
+        automaticComponentName("row")
         setWidth(ChildBasedSizeConstraint())
         setHeight(ChildBasedMaxSizeConstraint())
     }
@@ -83,7 +79,7 @@ fun LayoutScope.column(modifier: Modifier, verticalArrangement: Arrangement = Ar
     }
 
     val columnContainer = TransparentBlock().apply {
-        componentName = "ColumnContainer"
+        automaticComponentName("column")
         setWidth(ChildBasedMaxSizeConstraint())
         setHeight(ChildBasedSizeConstraint())
     }
@@ -108,7 +104,7 @@ fun LayoutScope.flowContainer(
     }
 
     val flowContainer = TransparentBlock().apply {
-        componentName = "FlowContainer"
+        automaticComponentName("flowContainer")
         setHeight(ChildBasedSizeConstraint())
     }
 
@@ -147,7 +143,7 @@ fun LayoutScope.scrollable(
     val content = HollowUIContainer() childOf outer // actually adds to `inner` because ScrollComponent redirects it
 
     outer.apply {
-        componentName = "scrollable"
+        automaticComponentName("scrollable")
         setWidth(ChildBasedSizeConstraint() boundTo content)
         setHeight(ChildBasedSizeConstraint() boundTo content)
     }
@@ -179,80 +175,10 @@ fun LayoutScope.floatingBox(
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
 
-    fun UIComponent.isMounted(): Boolean =
-        parent == this || (this in parent.children && parent.isMounted())
-
-    // Elementa's floating system is quite tricky to work with because components that are floating are added into a
-    // persistent list but will not automatically be removed from that list when they're removed from the component
-    // tree, and as such will continue to render.
-    // This class tries to work around that by canceling `draw` and automatically un-floating itself in such cases,
-    // as well as automatically adding itself back to the floating list when it is put back into the component tree.
-    class FloatableContainer : UIBlock(Color(0, 0, 0, 0)) {
-        val shouldBeFloating: Boolean
-            get() = floating.get()
-
-        // Keeps track of the current floating state because the parent field of the same name is private
-        @set:JvmName("setFloating_")
-        var isFloating: Boolean = false
-            set(value) {
-                if (field == value) return
-                field = value
-                setFloating(value)
-            }
-
-        override fun animationFrame() {
-            // animationFrame is called from the regular tree traversal, so it's safe to directly update the floating
-            // list from here
-            isFloating = shouldBeFloating
-
-            super.animationFrame()
-        }
-
-        override fun draw(matrixStack: UMatrixStack) {
-            // If we're no longer mounted in the component tree, we should no longer draw
-            if (!isMounted()) {
-                // and if we're still floating (likely the case because that'll be why we're still drawing), then
-                // we also need to un-float ourselves
-                if (isFloating) {
-                    // since this is likely called from the code that iterates over the floating list to draw each
-                    // component, modifying the floating list here would result in a CME, so we need to delay this.
-                    Window.enqueueRenderOperation {
-                        // Note: we must not assume that our shouldBe state hasn't changed since we scheduled this
-                        isFloating = shouldBeFloating && isMounted()
-                    }
-                }
-                return
-            }
-
-            // If we should be floating but aren't right now, then this isn't being called from the floating draw loop
-            // and it should be safe for us to immediately set us as floating.
-            // Doing so will add us to the floating draw loop and thereby allow us to draw later.
-            if (shouldBeFloating && !isFloating) {
-                isFloating = true
-                return
-            }
-
-            // If we should not be floating but are right now, then this is similar to the no-longer-mounted case above
-            // i.e. we want to un-float ourselves.
-            // Except we're still mounted so we do still want to draw the content (this means it'll be floating for one
-            // more frame than it's supposed to but there isn't anything we can really do about that because the regular
-            // draw loop has already concluded by this point).
-            if (!shouldBeFloating && isFloating) {
-                Window.enqueueRenderOperation { isFloating = shouldBeFloating }
-                super.draw(matrixStack)
-                return
-            }
-
-            // All as it should be, can just draw it
-            super.draw(matrixStack)
-        }
-    }
-
-    val container = FloatableContainer().apply {
-        componentName = "floatingBox"
-        setWidth(ChildBasedSizeConstraint())
-        setHeight(ChildBasedSizeConstraint())
+    val box = box(modifier, block)
+    box.automaticComponentName("floatingBox")
+    effect(box) {
+        box.isFloating = floating()
     }
-    container.addChildModifier(Modifier.alignBoth(Alignment.Center))
-    return container(modifier = modifier, block = block)
+    return box
 }