Version 1.3.8.3

Author: EssentialGGBot

build.gradle.kts

@@ -87,7 +87,11 @@ dependencies {
     }
     if (platform.mcVersion >= 12105 && (platform.isFabric || platform.isNeoForge)) {
         repositories.modrinth()
-        modCompileOnly("maven.modrinth:iris:1.8.11+1.21.5-${platform.loaderStr}")
+        if (platform.mcVersion >= 12106) {
+            modCompileOnly("maven.modrinth:iris:1.9.0+1.21.6-${platform.loaderStr}")
+        } else {
+            modCompileOnly("maven.modrinth:iris:1.8.11+1.21.5-${platform.loaderStr}")
+        }
     }
 
     testImplementation(kotlin("test"))

changelog/release-1.3.8.3.md

@@ -0,0 +1,12 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## Cosmetics & Emotes
+- Improved transitions when starting and cancelling emotes
+
+## Bug Fixes
+- Fixed error in chat when closing the emote wheel in Fabric 1.21.6
+
+## Compatibility
+- Fixed Essential not appearing on the title screen with FancyMenu installed on Minecraft 1.20.6 & 1.21
+- Fixed a crash with the Iris mod in 1.21.6

elementa/build.gradle.kts

@@ -25,10 +25,10 @@ tasks.create<SyncToExternalRepoTask>("syncCommitsToElementa") {
     replacements.set(listOf(
         "elementa/statev2" to "unstable/statev2",
         "elementa/layoutdsl" to "unstable/layoutdsl",
-        "gg/essential/gui/elementa" to "gg/essential/elementa",
-        "gg.essential.gui.elementa" to "gg.essential.elementa",
-        "gg/essential/gui" to "gg/essential/elementa",
-        "gg.essential.gui" to "gg.essential.elementa",
+        "gg/essential/gui/elementa" to "gg/essential/elementa/unstable",
+        "gg.essential.gui.elementa" to "gg.essential.elementa.unstable",
+        "gg/essential/gui" to "gg/essential/elementa/unstable",
+        "gg.essential.gui" to "gg.essential.elementa.unstable",
         // remove accessed via reflection annotation
         "  @AccessedViaReflection(\"DelegatingStateBase\")" to "",
         "import gg.essential.config.AccessedViaReflection" to ""

gradle.properties

@@ -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.8.2
+version=1.3.8.3

src/main/java/gg/essential/cosmetics/PlayerWearableManager.java

@@ -92,8 +92,8 @@ private void updateCosmetics(AbstractClientPlayer player) {
         // FIXME should use State effect instead of checking every tick
         Map<CosmeticSlot, EquippedCosmetic> newCosmetics = cosmeticsSource.getUntracked();
         Map<CosmeticSlot, EquippedCosmetic> oldCosmetics = oldState.getCosmetics();
-        Set<EnumPart> newArmour = getArmourFromPlayer(player);
-        Set<EnumPart> oldArmour = oldState.getArmor();
+        ArmorSlots newArmour = getArmourFromPlayer(player);
+        ArmorSlots oldArmour = oldState.getArmor();
 
         if (Objects.equals(newCosmetics, oldCosmetics) && Objects.equals(newSkinType, oldSkinType) && Objects.equals(oldArmour, newArmour)) {
             return;
@@ -186,29 +186,18 @@ private void updateCosmetics(AbstractClientPlayer player) {
         }
     }
 
-    private Set<EnumPart> getArmourFromPlayer(AbstractClientPlayer player) {
-
-        Set<EnumPart> equippedSlots = new HashSet<>();
-
+    private ArmorSlots getArmourFromPlayer(AbstractClientPlayer player) {
         int armorSetting = ArmorRenderingUtil.getCosmeticArmorSetting(player);
         if (armorSetting > 0) {
-            return equippedSlots;
+            return new ArmorSlots((byte) 0);
         }
 
-        if (!canRenderCosmetic(player, 0) || !canRenderCosmetic(player, 1)) {
-            equippedSlots.add(EnumPart.LEFT_LEG);
-            equippedSlots.add(EnumPart.RIGHT_LEG);
-        }
-        if (!canRenderCosmetic(player, 2)) {
-            equippedSlots.add(EnumPart.LEFT_ARM);
-            equippedSlots.add(EnumPart.RIGHT_ARM);
-            equippedSlots.add(EnumPart.BODY);
-        }
-        if (!canRenderCosmetic(player, 3)) {
-            equippedSlots.add(EnumPart.HEAD);
-        }
-
-        return equippedSlots;
+        return new ArmorSlots(
+                !canRenderCosmetic(player, 0),
+                !canRenderCosmetic(player, 1),
+                !canRenderCosmetic(player, 2),
+                !canRenderCosmetic(player, 3)
+        );
     }
 
     private boolean canRenderCosmetic(AbstractClientPlayer player, int slot) {

src/main/java/gg/essential/mixins/Plugin.java

@@ -38,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Predicate;
 
 //#if FABRIC
 //$$ import java.lang.management.ManagementFactory;
@@ -175,6 +176,26 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
             }
         }
 
+        //#if MC>=12006 && MC<12102
+        //$$ // mixin is already dummy targeted outside this range
+        //$$ if (mixinClassName.endsWith("Mixin_FancyMainMenu_3_2_1_GuiDrawScreenEvent")) {
+        //$$     // underlying issue was fixed in FancyMenu v3.4.0, but we still need to apply this mixin for 1.20.6 and 1.21, as they do not have v3.4.0+
+        //$$     // this is a check just in case v3.4.0 ever gets backported to 1.20.6 or 1.21, so we don't apply this mixin in that case.
+        //$$     // there were no classes removed in 3.4.0 that could be used to detect the affected version so lets check the mixin directly
+        //$$     return testClass("de.keksuccino.fancymenu.mixin.mixins.common.client.MixinTitleScreen",
+        //$$             clazz -> {
+        //$$                 for (MethodNode method : clazz.methods) {
+        //$$                     if (method.name.equals("wrap_super_render_in_render_FancyMenu")) {
+        //$$                         // this is the mixin that cancels the super.render call in TitleScreen, which is the cause of the issue
+        //$$                         return true;
+        //$$                     }
+        //$$                 }
+        //$$                 return false;
+        //$$             }
+        //$$     );
+        //$$ }
+        //#endif
+
         // Due to changes in FancyMenu, we need a different Mixin for v2.14.10 and above. This version can be identified
         // by the ScreenBackgroundRenderedEvent class.
         if (mixinClassName.endsWith("Mixin_FancyMainMenu_GuiDrawScreenEvent_Pre") && hasClass("de.keksuccino.fancymenu.events.ScreenBackgroundRenderedEvent")) {
@@ -274,13 +295,17 @@ private static void registerGlobalTransformers(List<MixinTransformerWrapper.Tran
     }
 
     static boolean hasClass(String name) {
+        return testClass(name, cls -> true);
+    }
+
+    static boolean testClass(String className, Predicate<ClassNode> test) {
         try {
-            MixinService.getService().getBytecodeProvider().getClassNode(name);
-            return true;
+            ClassNode classNode = MixinService.getService().getBytecodeProvider().getClassNode(className);
+            return test.test(classNode);
         } catch (ClassNotFoundException e) {
             return false;
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Exception when testing class {}: ", className, e);
             return false;
         }
     }

src/main/java/gg/essential/mixins/transformers/compatibility/fancymenu/Mixin_FancyMainMenu_3_2_1_GuiDrawScreenEvent.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 ModCore Inc. All rights reserved.
+ *
+ * This code is part of ModCore Inc.'s Essential Mod repository and is protected
+ * under copyright registration # TX0009138511. For the full license, see:
+ * https://github.com/EssentialGG/Essential/blob/main/LICENSE
+ *
+ * You may not use, copy, reproduce, modify, sell, license, distribute,
+ * commercialize, or otherwise exploit, or create derivative works based
+ * upon, this file or any other in this repository, all of which is reserved by Essential.
+ */
+package gg.essential.mixins.transformers.compatibility.fancymenu;
+
+import gg.essential.mixins.DummyTarget;
+import org.spongepowered.asm.mixin.Mixin;
+
+// 1.20.6 to 1.21 bug fix for fancy menu issue that was fixed on their end in their 1.21.1+ versions only
+@Mixin(DummyTarget.class)
+public class Mixin_FancyMainMenu_3_2_1_GuiDrawScreenEvent {
+}

src/main/kotlin/gg/essential/gui/emotes/EmoteWheel.kt

@@ -126,6 +126,8 @@ class EmoteWheel : WindowScreen(
         }
     }.toListState()
 
+    private var equipping = false
+
     init {
         // Allow the player to move while the emote wheel is open
         //#if MC>=12000
@@ -173,20 +175,6 @@ class EmoteWheel : WindowScreen(
             }.apply { shouldIgnore = { it.isPassThrough() } }
         }
 
-        var equipping = false
-        // Check for keybind release to equip the emote and close the wheel
-        window.addUpdateFunc { _, _ ->
-            if (!equipping && !keybind.keyBinding.isKeyDown) {
-                window.focusedComponent?.let { focused ->
-                    if (focused is EmoteWheelEntry && canEmote(UPlayer.getPlayer()!!)) {
-                        focused.emoteModel?.getUntracked()?.let { equipEmote(it) }
-                    }
-                }
-                displayScreen(null)
-                equipping = true
-            }
-        }
-
         window.onKeyType { _, keyCode ->
             if (MinecraftUtils.isDevelopment() || System.getProperty("elementa.debug", "false") == "true") {
                 if (keyCode == UKeyboard.KEY_F3) {
@@ -206,6 +194,20 @@ class EmoteWheel : WindowScreen(
         }
     }
 
+    override fun onTick() {
+        super.onTick()
+        // Check for keybind release to equip the emote and close the wheel
+        if (!equipping && !keybind.keyBinding.isKeyDown) {
+            window.focusedComponent?.let { focused ->
+                if (focused is EmoteWheelEntry && canEmote(UPlayer.getPlayer()!!)) {
+                    focused.emoteModel?.getUntracked()?.let { equipEmote(it) }
+                }
+            }
+            displayScreen(null)
+            equipping = true
+        }
+    }
+
     // Adapted from OverlayManagerImpl#isPassThrough
     private fun UIComponent.isPassThrough(): Boolean {
         return when (this) {

src/main/kotlin/gg/essential/model/backend/minecraft/MinecraftRenderBackend.kt

@@ -242,6 +242,17 @@ object MinecraftRenderBackend : RenderBackend {
     //$$     ) {
     //$$         override fun draw(buffer: BuiltBuffer) = drawImpl(getPipeline(), buffer)
     //#if MC>=12106
+    //$$         // re: https://github.com/IrisShaders/Iris/blob/052faeb4c4382cc4d186ced14ec7a160615801e3/common/src/main/java/net/irisshaders/iris/mixin/MixinRenderType2.java#L14
+    //$$         // iris applies an interface to [RenderLayer] (linked above), but this "super impl" only
+    //$$         // throws errors, its true functionality is in [RenderLayer.MultiPhase], and we need to implement
+    //$$         // it as well ourselves for these wrapper classes, or redirect to inner where required
+    //$$         fun `iris$getRenderTarget`(): Framebuffer? {
+    //$$             return inner.javaClass.getMethod("iris\$getRenderTarget").invoke(inner) as Framebuffer?
+    //$$         }
+    //$$         fun `iris$getPipeline`(): RenderPipeline? {
+    //$$             return getPipeline()
+    //$$         }
+    //$$
     //$$         private fun getPipeline(): RenderPipeline =
     //#else
     //$$         override fun getTarget(): Framebuffer = inner.target
@@ -303,7 +314,15 @@ object MinecraftRenderBackend : RenderBackend {
     //$$         { inner.endDrawing() },
     //$$     ) {
     //$$         override fun draw(buffer: BuiltBuffer) = drawImpl(entityTranslucentCullPipeline, buffer)
-    //#if MC<12106
+    //#if MC>=12106
+    //$$         // see [ParticleLayer] above
+    //$$         fun `iris$getRenderTarget`(): Framebuffer? {
+    //$$             return inner.javaClass.getMethod("iris\$getRenderTarget").invoke(inner) as Framebuffer?
+    //$$         }
+    //$$         fun `iris$getPipeline`(): RenderPipeline? {
+    //$$             return entityTranslucentCullPipeline
+    //$$         }
+    //#else
     //$$         override fun getTarget(): Framebuffer = inner.target
     //$$         override fun getPipeline(): RenderPipeline = entityTranslucentCullPipeline
     //#endif
@@ -411,7 +430,15 @@ object MinecraftRenderBackend : RenderBackend {
     //$$             inner.draw(buffer)
     //$$             VIEW_OFFSET_Z_LAYERING.endDrawing()
     //$$         }
-    //#if MC<12106
+    //#if MC>=12106
+    //$$         // see [ParticleLayer] above
+    //$$         fun `iris$getRenderTarget`(): Framebuffer? {
+    //$$             return inner.javaClass.getMethod("iris\$getRenderTarget").invoke(inner) as Framebuffer?
+    //$$         }
+    //$$         fun `iris$getPipeline`(): RenderPipeline? {
+    //$$             return inner.javaClass.getMethod("iris\$getPipeline").invoke(inner) as RenderPipeline?
+    //$$         }
+    //#else
     //$$         override fun getTarget(): Framebuffer = inner.target
     //$$         override fun getPipeline(): RenderPipeline = inner.pipeline
     //#endif

src/main/resources/assets/essential/commit.txt

@@ -1 +1 @@
-0a59fb020d
+194bf65221