Version 1.3.8

Author: EssentialGGBot

changelog/release-1.3.7.md

@@ -1,5 +1,5 @@
 Title: Drag & Drop Update
-Description: Drag and drop resource packs and servers
+Summary: Drag and drop resource packs and servers
 
 ## Improvements
 - Added drag and drop functionality to the resource packs, data packs and server list screens

changelog/release-1.3.8.md

@@ -0,0 +1,9 @@
+Title: Nameplate Improvements
+Summary: Improved nameplate icon and design
+
+## Improvements
+- Improved the nameplate design
+- Improved the Essential icon on nameplates and the tab-list
+
+## Essential Settings
+- Added setting to see your own nameplate in third person

features.properties

@@ -1,4 +1,5 @@
 always=true
+nameplate_improvements=true
 server_discovery=true
 updated_gifting_modal=true
 updated_coins_purchase_modal=true

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.7
+version=1.3.8

gui/essential/src/main/kotlin/gg/essential/config/EssentialConfig.kt

@@ -262,6 +262,8 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
 
     val hideCosmeticParticlesInFirstPerson = property("Cosmetics.General.Hide cosmetic particles in first person", false)
 
+    val showOwnNametag = property("Quality of Life.Nameplate.Show my nameplate in third-person", true)
+
     override val migrations = listOf(
         Migration { config ->
             val overrideGuiScale = config.remove("general.general.gui_scale") as Boolean? ?: return@Migration
@@ -529,6 +531,10 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
             }
 
             subcategory("Nameplates") {
+                switch(showOwnNametag) {
+                    name = "Nameplate in third-person"
+                    description = "Shows your own nameplate when in third-person perspective."
+                }
                 switch(showEssentialIndicatorOnNametagState) {
                     name = "Essential icon on nameplates"
                     description = "Shows the Essential icon on Essential players’ nameplates."

gui/essential/src/main/kotlin/gg/essential/gui/wardrobe/components/cosmeticItem.kt

@@ -508,36 +508,36 @@ private fun LayoutScope.lockedIcons(item: Item, owned: State<Boolean>) {
             Modifier.width(13f).height(13f).color(EssentialPalette.LOCKED_ORANGE).hoverTooltip(data.actionDescription).hoverScope(),
             Modifier.shadow(EssentialPalette.BLACK_SHADOW),
         )
+    }
 
-        val actionModifier = Modifier.width(13f).height(13f).color(EssentialPalette.BANNER_BLUE).hoverScope()
-
-        when (data) {
-            is CosmeticProperty.RequiresUnlockAction.Data.JoinServer -> {
-                iconButton(
-                    EssentialPalette.JOIN_ARROW_5X,
-                    actionModifier.hoverTooltip("Join ${data.serverAddress}"),
-                    Modifier.shadow(EssentialPalette.BLACK_SHADOW),
-                    onLeftClick = {
-                        platform.connectToServer(data.serverAddress, data.serverAddress)
-                        it.stopPropagation()
-                    }
-                )
-            }
+    val actionModifier = Modifier.width(13f).height(13f).color(EssentialPalette.BANNER_BLUE).hoverScope()
 
-            is CosmeticProperty.RequiresUnlockAction.Data.OpenLink -> {
-                iconButton(
-                    EssentialPalette.JOIN_ARROW_5X,
-                    actionModifier.hoverTooltip(data.linkShort),
-                    Modifier.shadow(EssentialPalette.BLACK_SHADOW),
-                    onLeftClick = {
-                        OpenLinkModal.openUrl(URI(data.linkAddress))
-                        it.stopPropagation()
-                    }
-                )
-            }
+    when (data) {
+        is CosmeticProperty.RequiresUnlockAction.Data.JoinServer -> {
+            iconButton(
+                EssentialPalette.JOIN_ARROW_5X,
+                actionModifier.hoverTooltip("Join ${data.serverAddress}"),
+                Modifier.shadow(EssentialPalette.BLACK_SHADOW),
+                onLeftClick = {
+                    platform.connectToServer(data.serverAddress, data.serverAddress)
+                    it.stopPropagation()
+                }
+            )
+        }
 
-            else -> {}
+        is CosmeticProperty.RequiresUnlockAction.Data.OpenLink -> {
+            iconButton(
+                EssentialPalette.JOIN_ARROW_5X,
+                actionModifier.hoverTooltip(data.linkShort),
+                Modifier.shadow(EssentialPalette.BLACK_SHADOW),
+                onLeftClick = {
+                    OpenLinkModal.openUrl(URI(data.linkAddress))
+                    it.stopPropagation()
+                }
+            )
         }
+
+        else -> {}
     }
 }
 

gui/essential/src/main/kotlin/gg/essential/gui/wardrobe/components/cosmeticOrEmoteItemFunctions.kt

@@ -113,7 +113,7 @@ fun handleCosmeticOrEmoteLeftClick(item: Item.CosmeticOrEmote, category: Wardrob
     }
 
     if (wardrobeState.equippedCosmeticsState.get()[slot] == cosmetic.id) {
-        if ((!startedInEmoteWheel && !bundleWasSelected && !emoteWasSelected)) {
+        if (!(slot == CosmeticSlot.ICON) && (!startedInEmoteWheel && !bundleWasSelected && !emoteWasSelected)) {
             // Only unequip the cosmetic if the emote wheel preview was not open when the cosmetic was clicked and a bundle was not selected
             outfitManager.updateEquippedCosmetic(selectedOutfitId, slot, null)
             wardrobeState.selectedItem.set(null)

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

@@ -17,6 +17,8 @@
 import gg.essential.gui.common.EmulatedUI3DPlayer;
 import gg.essential.mixins.impl.client.entity.AbstractClientPlayerExt;
 import gg.essential.mixins.impl.client.renderer.entity.ArmorRenderingUtil;
+import gg.essential.mod.cosmetics.CosmeticSlot;
+import gg.essential.model.ModelInstance;
 import gg.essential.model.backend.PlayerPose;
 import gg.essential.model.util.PlayerPoseManager;
 import gg.essential.network.connectionmanager.profile.ProfileManager;
@@ -43,6 +45,7 @@ public interface CosmeticsRenderState {
     ResourceLocation emissiveCapeTexture();
 
     boolean onlineIndicator();
+    ModelInstance nametagIcon();
 
     boolean isSneaking();
 
@@ -124,6 +127,14 @@ public boolean onlineIndicator() {
             return status != ProfileStatus.OFFLINE;
         }
 
+        @Override
+        public ModelInstance nametagIcon() {
+            if (!EssentialConfig.INSTANCE.getShowEssentialIndicatorOnNametag()) return null;
+            EquippedCosmetic cosmetic = playerExt().getCosmeticsState().getCosmetics().get(CosmeticSlot.ICON);
+            if (cosmetic == null) return null;
+            return playerExt().getWearablesManager().getModels().get(cosmetic.getCosmetic());
+        }
+
         @Override
         public boolean isSneaking() {
             return player.isSneaking();
@@ -167,6 +178,7 @@ final class Snapshot implements CosmeticsRenderState {
         private ResourceLocation skinTexture;
         private ResourceLocation emissiveCapeTexture;
         private boolean onlineIndicator;
+        private ModelInstance nametagIcon;
         private boolean isSneaking;
         private float cosmeticFrozenYaw;
 
@@ -200,6 +212,11 @@ public boolean onlineIndicator() {
             return onlineIndicator;
         }
 
+        @Override
+        public ModelInstance nametagIcon() {
+            return nametagIcon;
+        }
+
         @Override
         public float cosmeticFrozenYaw() {
             return cosmeticFrozenYaw;
@@ -219,6 +236,7 @@ public void update(AbstractClientPlayer entity) {
             skinTexture = live.skinTexture();
             emissiveCapeTexture = live.emissiveCapeTexture();
             onlineIndicator = live.onlineIndicator();
+            nametagIcon = live.nametagIcon();
             isSneaking = live.isSneaking();
             cosmeticFrozenYaw = live.cosmeticFrozenYaw();
         }