Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename enchantment convenience patch

Browse Source
This commit is contained in:
granny
2024-06-16 17:23:00 -07:00
parent c9917352de
commit 25ecbc4237
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0017-Add-utility-methods-to-deal-with-enchantments-a-bit-.patch → patches/server/0017-Enchantment-convenience-methods.patch
View File

@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Krakenied <Krakenied1@gmail.com> From: Krakenied <Krakenied1@gmail.com>
Date: Sat, 15 Jun 2024 14:31:48 +0200 Date: Sat, 15 Jun 2024 14:31:48 +0200
Subject: [PATCH] Add utility methods to deal with enchantments a bit easier Subject: [PATCH] Enchantment convenience methods
diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
index fce49b17905ab97e691aa8499a5dfed67adf0c40..97542361144a950f5b60021874688775226f292d 100644 index fce49b17905ab97e691aa8499a5dfed67adf0c40..9635c076703beee96af9f5d0bdee4cf97ccd98ad 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java --- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java +++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
@@ -559,4 +559,14 @@ public class EnchantmentHelper { @@ -559,4 +559,14 @@ public class EnchantmentHelper {
@@ -13,7 +13,7 @@ index fce49b17905ab97e691aa8499a5dfed67adf0c40..97542361144a950f5b60021874688775
void accept(Holder<Enchantment> enchantment, int level); void accept(Holder<Enchantment> enchantment, int level);
} }
+ +
+ // Purpur start - Add utility methods to deal with enchantments a bit easier + // Purpur start - Enchantment convenience methods
+ public static Holder.Reference<Enchantment> getEnchantmentHolder(ResourceKey<Enchantment> enchantment) { + public static Holder.Reference<Enchantment> getEnchantmentHolder(ResourceKey<Enchantment> enchantment) {
+ return net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(enchantment); + return net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(enchantment);
+ } + }
@@ -21,5 +21,5 @@ index fce49b17905ab97e691aa8499a5dfed67adf0c40..97542361144a950f5b60021874688775
+ public static int getItemEnchantmentLevel(ResourceKey<Enchantment> enchantment, ItemStack stack) { + public static int getItemEnchantmentLevel(ResourceKey<Enchantment> enchantment, ItemStack stack) {
+ return getItemEnchantmentLevel(getEnchantmentHolder(enchantment), stack); + return getItemEnchantmentLevel(getEnchantmentHolder(enchantment), stack);
+ } + }
+ // Purpur end - Add utility methods to deal with enchantments a bit easier + // Purpur end - Enchantment convenience methods
} }

4
patches/server/0055-Mending-mends-most-damages-equipment-first.patch
View File

@@ -49,7 +49,7 @@ index 312b57b4ef340935f4335989ce1d6a4b8b61532c..00665c3e81264b440cd27431f7632f3b
return Mth.clamp((Integer) this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage()); return Mth.clamp((Integer) this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage());
} }
diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
index 97542361144a950f5b60021874688775226f292d..a33419a7a15aec82c7eaecffd927bd8fb8285c0b 100644 index 9635c076703beee96af9f5d0bdee4cf97ccd98ad..76c43565aaffbca63d99134cca49d96328355b49 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java --- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java +++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
@@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry; @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry;
@@ -63,7 +63,7 @@ index 97542361144a950f5b60021874688775226f292d..a33419a7a15aec82c7eaecffd927bd8f
@@ -569,4 +570,51 @@ public class EnchantmentHelper { @@ -569,4 +570,51 @@ public class EnchantmentHelper {
return getItemEnchantmentLevel(getEnchantmentHolder(enchantment), stack); return getItemEnchantmentLevel(getEnchantmentHolder(enchantment), stack);
} }
// Purpur end - Add utility methods to deal with enchantments a bit easier // Purpur end - Enchantment convenience methods
+ +
+ // Purpur start - Add option to mend the most damaged equipment first + // Purpur start - Add option to mend the most damaged equipment first
+ public static Optional<EnchantedItemInUse> getMostDamagedItemWith(DataComponentType<?> componentType, LivingEntity entity) { + public static Optional<EnchantedItemInUse> getMostDamagedItemWith(DataComponentType<?> componentType, LivingEntity entity) {