supercedes #1350
This commit is contained in:
granny
2023-06-14 13:52:52 -07:00
parent e8d4968908
commit 86628ea3ab

View File

@@ -5,11 +5,11 @@ Subject: [PATCH] Allow anvil colors
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index b500a04b8135604f0159a741b3d228c9e87b2a46..6fc5699ad90127dc48fa9ff5cb6ba5367031ce83 100644 index b500a04b8135604f0159a741b3d228c9e87b2a46..8a7c30e316db4960b0b62ca0e366c19febead214 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -299,6 +299,54 @@ public class AnvilMenu extends ItemCombinerMenu { @@ -294,6 +294,54 @@ public class AnvilMenu extends ItemCombinerMenu {
} else if (itemstack.hasCustomHoverName()) { if (!this.itemName.equals(itemstack.getHoverName().getString())) {
b1 = 1; b1 = 1;
i += b1; i += b1;
+ // Purpur start + // Purpur start
@@ -60,11 +60,11 @@ index b500a04b8135604f0159a741b3d228c9e87b2a46..6fc5699ad90127dc48fa9ff5cb6ba536
+ } + }
+ else + else
+ // Purpur end + // Purpur end
itemstack1.resetHoverName(); itemstack1.setHoverName(Component.literal(this.itemName));
} }
} else if (itemstack.hasCustomHoverName()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b52a5b3cee95528be6edfcc488ab043225c81f67..63d27e2ee263fdc8b165526f04781a1cf3e60894 100644 index c59510a016cb29e8469c3de55e46eae0a52151f5..47e425967c120fa0abec8dacf4385ce3ad47f21e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -299,6 +299,13 @@ public class PurpurWorldConfig { @@ -299,6 +299,13 @@ public class PurpurWorldConfig {