From bcfd9e7bf96d7fca257aa90dac330d8840a01ab5 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Tue, 28 Dec 2021 11:58:37 +0100
Subject: [PATCH] fixed item names being surrounded by braces

---
 src/main/java/de/ellpeck/prettypipes/misc/ItemOrder.java      | 2 +-
 .../java/de/ellpeck/prettypipes/packets/PacketButton.java     | 2 +-
 .../ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java  | 2 +-
 .../ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java | 4 ++--
 .../prettypipes/terminal/containers/ItemTerminalGui.java      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/ellpeck/prettypipes/misc/ItemOrder.java b/src/main/java/de/ellpeck/prettypipes/misc/ItemOrder.java
index c7c56e0..bf40ba1 100644
--- a/src/main/java/de/ellpeck/prettypipes/misc/ItemOrder.java
+++ b/src/main/java/de/ellpeck/prettypipes/misc/ItemOrder.java
@@ -6,7 +6,7 @@ import java.util.Comparator;
 
 public enum ItemOrder {
     AMOUNT(Comparator.comparingInt(ItemStack::getCount)),
-    NAME(Comparator.comparing(s -> s.getDisplayName().getString())),
+    NAME(Comparator.comparing(s -> s.getHoverName().getString())),
     MOD(Comparator.comparing(s -> s.getItem().getCreatorModId(s)));
 
     public final Comparator<ItemStack> comparator;
diff --git a/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java b/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java
index a819423..ed98a6f 100644
--- a/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java
+++ b/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java
@@ -83,7 +83,7 @@ public class PacketButton {
                 NetworkHooks.openGui((ServerPlayer) player, new MenuProvider() {
                     @Override
                     public Component getDisplayName() {
-                        return stack.getDisplayName();
+                        return stack.getHoverName();
                     }
 
                     @Nullable
diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java
index 4a1384c..08f5826 100644
--- a/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java
+++ b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java
@@ -149,7 +149,7 @@ public abstract class AbstractPipeGui<T extends AbstractPipeContainer<?>> extend
         private void drawForeground(PoseStack matrix, int mouseX, int mouseY) {
             if (mouseX < this.x || mouseY < this.y || mouseX >= this.x + 28 || mouseY >= this.y + 32)
                 return;
-            AbstractPipeGui.this.renderTooltip(matrix, this.moduleStack.getDisplayName(), mouseX - AbstractPipeGui.this.leftPos, mouseY - AbstractPipeGui.this.topPos);
+            AbstractPipeGui.this.renderTooltip(matrix, this.moduleStack.getHoverName(), mouseX - AbstractPipeGui.this.leftPos, mouseY - AbstractPipeGui.this.topPos);
         }
 
         private boolean onClicked(double mouseX, double mouseY, int button) {
diff --git a/src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java b/src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java
index cc61949..8037f7a 100644
--- a/src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java
+++ b/src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java
@@ -157,7 +157,7 @@ public class ItemTerminalBlockEntity extends BlockEntity implements IPipeConnect
         this.updateItems();
         var requested = this.requestItemImpl(stack, onItemUnavailable(player));
         if (requested > 0) {
-            player.sendMessage(new TranslatableComponent("info." + PrettyPipes.ID + ".sending", requested, stack.getDisplayName()).setStyle(Style.EMPTY.applyFormat(ChatFormatting.GREEN)), UUID.randomUUID());
+            player.sendMessage(new TranslatableComponent("info." + PrettyPipes.ID + ".sending", requested, stack.getHoverName()).setStyle(Style.EMPTY.applyFormat(ChatFormatting.GREEN)), UUID.randomUUID());
         } else {
             onItemUnavailable(player).accept(stack);
         }
@@ -308,6 +308,6 @@ public class ItemTerminalBlockEntity extends BlockEntity implements IPipeConnect
     }
 
     public static Consumer<ItemStack> onItemUnavailable(Player player) {
-        return s -> player.sendMessage(new TranslatableComponent("info." + PrettyPipes.ID + ".not_found", s.getDisplayName()).setStyle(Style.EMPTY.applyFormat(ChatFormatting.RED)), UUID.randomUUID());
+        return s -> player.sendMessage(new TranslatableComponent("info." + PrettyPipes.ID + ".not_found", s.getHoverName()).setStyle(Style.EMPTY.applyFormat(ChatFormatting.RED)), UUID.randomUUID());
     }
 }
diff --git a/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java b/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java
index 94688a4..3c5e109 100644
--- a/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java
+++ b/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java
@@ -244,7 +244,7 @@ public class ItemTerminalGui extends AbstractContainerScreen<ItemTerminalContain
                     search = search.substring(1);
                 } else {
                     // don't use formatted text here since we want to search for name
-                    toCompare = s.getLeft().getDisplayName().getString();
+                    toCompare = s.getLeft().getHoverName().getString();
                 }
                 return !toCompare.toLowerCase(Locale.ROOT).contains(search.toLowerCase(Locale.ROOT));
             });