mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix more weirdness with the anvil colors patch

Browse Source
This commit is contained in:
BillyGalbreath 2022-11-16 12:19:27 -06:00
parent a4d8cefe26
commit 79accf69dc
No known key found for this signature in database
GPG Key ID: 1968A5C4D57BB3FA
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0087-Allow-anvil-colors.patch
View File

@ -5,10 +5,10 @@ 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
index 0363d2263b2d6bd6166fa21d7849297e95eddd77..92efc8caf43661b24e95653f7a43bc4cfa0f4110 100644
index 0363d2263b2d6bd6166fa21d7849297e95eddd77..2c5a8be7799aef8d39007761bd9e3396ce5d755e 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -280,6 +280,36 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -280,6 +280,44 @@ public class AnvilMenu extends ItemCombinerMenu {
} else if (!this.itemName.equals(itemstack.getHoverName().getString())) {
b1 = 1;
i += b1;
@ -17,9 +17,17 @@ index 0363d2263b2d6bd6166fa21d7849297e95eddd77..92efc8caf43661b24e95653f7a43bc4c
+ org.bukkit.craftbukkit.entity.CraftHumanEntity player = this.player.getBukkitEntity();
+ String name = this.itemName;
+ boolean removeItalics = false;
+ if (player.hasPermission("purpur.anvil.remove_italics") && (name.startsWith("&r") || name.startsWith("<r>") || name.startsWith("<reset>"))) {
+ name = name.substring(2);
+ removeItalics = true;
+ if (player.hasPermission("purpur.anvil.remove_italics")) {
+ if (name.startsWith("&r")) {
+ name = name.substring(2);
+ removeItalics = true;
+ } else if (name.startsWith("<r>")) {
+ name = name.substring(3);
+ removeItalics = true;
+ } else if (name.startsWith("<reset>")) {
+ name = name.substring(7);
+ removeItalics = true;
+ }
+ }
+ if (this.player.level.purpurConfig.anvilAllowColors) {
+ if (player.hasPermission("purpur.anvil.color")) {
@ -31,7 +39,7 @@ index 0363d2263b2d6bd6166fa21d7849297e95eddd77..92efc8caf43661b24e95653f7a43bc4c
+ }
+ net.kyori.adventure.text.Component component;
+ if (this.player.level.purpurConfig.anvilColorsUseMiniMessage && player.hasPermission("purpur.anvil.minimessage")) {
+ component = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name);
+ component = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.bukkit.ChatColor.stripColor(name));
+ } else {
+ component = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(name);
+ }

4
patches/server/0159-Config-to-allow-for-unsafe-enchants.patch
View File

@ -27,7 +27,7 @@ index 7c012f1e37b0085c0939797b0dae8996b4953ab8..155b0a1aa58b891e98a55e10f112f611
++i;
} else if (targets.size() == 1) {
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index 92efc8caf43661b24e95653f7a43bc4cfa0f4110..ad76e9608c8941fe45469c39e80851d1bef1db54 100644
index 2c5a8be7799aef8d39007761bd9e3396ce5d755e..277bd715c0c1dc3724718f643a279b36b8cb1ebc 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -209,7 +209,8 @@ public class AnvilMenu extends ItemCombinerMenu {
@ -60,7 +60,7 @@ index 92efc8caf43661b24e95653f7a43bc4cfa0f4110..ad76e9608c8941fe45469c39e80851d1
i2 = enchantment.getMaxLevel();
}
@@ -352,7 +353,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -360,7 +361,7 @@ public class AnvilMenu extends ItemCombinerMenu {
sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
this.broadcastChanges();
// Purpur start

4
patches/server/0179-Make-anvil-cumulative-cost-configurable.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Make anvil cumulative cost configurable
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index ad76e9608c8941fe45469c39e80851d1bef1db54..99949a3424ca04b570cc23d8df77ef24a450cf2c 100644
index 277bd715c0c1dc3724718f643a279b36b8cb1ebc..7e518a1382b2bbb5151c8bb3c651c2646b2f2f1b 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -362,7 +362,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -370,7 +370,7 @@ public class AnvilMenu extends ItemCombinerMenu {
}
public static int calculateIncreasedRepairCost(int cost) {