Fix hiding default components

Author: Patbox

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.6-pre3
-yarn_mappings=1.21.6-pre3+build.1
+minecraft_version=1.21.7
+yarn_mappings=1.21.7+build.1
 loader_version=0.16.14
 
 #Fabric api
-fabric_version=0.126.0+1.21.6
+fabric_version=0.128.2+1.21.7
 
 # Mod Properties
-mod_version = 1.10.0+1.21.6
+mod_version = 1.10.1+1.21.7
 maven_group = eu.pb4
 archives_base_name = sgui
 

src/main/java/eu/pb4/sgui/api/elements/AnimatedGuiElementBuilder.java

@@ -444,10 +444,10 @@ public ItemStack asStack() {
         var copy = itemStack.copy();
         if (this.noTooltips) {
             copy.set(DataComponentTypes.TOOLTIP_DISPLAY, new TooltipDisplayComponent(true, ReferenceSortedSets.emptySet()));
-        } else {
+        } else if (this.hideComponentTooltips) {
             var comp = TooltipDisplayComponent.DEFAULT;
             for (var entry : this.itemStack.getComponents()) {
-                if (entry.value() instanceof TooltipAppender && entry.type() != DataComponentTypes.LORE) {
+                if (entry.type() != DataComponentTypes.ITEM_NAME && entry.type() != DataComponentTypes.CUSTOM_NAME && entry.type() != DataComponentTypes.LORE) {
                     comp = comp.with(entry.type(), true);
                 }
             }

src/main/java/eu/pb4/sgui/api/elements/GuiElementBuilder.java

@@ -459,10 +459,10 @@ public ItemStack asStack() {
         var copy = itemStack.copy();
         if (this.noTooltips) {
             copy.set(DataComponentTypes.TOOLTIP_DISPLAY, new TooltipDisplayComponent(true, ReferenceSortedSets.emptySet()));
-        } else {
+        } else if (this.hideComponentTooltips) {
             var comp = TooltipDisplayComponent.DEFAULT;
             for (var entry : this.itemStack.getComponents()) {
-                if (entry.value() instanceof TooltipAppender && entry.type() != DataComponentTypes.LORE) {
+                if (entry.type() != DataComponentTypes.ITEM_NAME && entry.type() != DataComponentTypes.CUSTOM_NAME && entry.type() != DataComponentTypes.LORE) {
                     comp = comp.with(entry.type(), true);
                 }
             }

src/testmod/java/eu/pb4/sgui/testmod/SGuiTest.java

@@ -274,6 +274,7 @@ public void onClose() {
             };
 
             gui.setSlot(0, new GuiElementBuilder(Items.BARRIER, 8).setCallback((x, y, z) -> gui.close()));
+            gui.setSlot(2, new GuiElementBuilder(Items.IRON_AXE).hideDefaultTooltip());
             gui.setSlot(6, new GuiElementBuilder(Items.BARRIER, 9).setCallback((x, y, z) -> gui.onClose()));
 
             gui.setTitle(Text.literal("Close gui to test switching"));