2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 20 Dec 2017 17:36:49 -0500
|
|
|
|
Subject: [PATCH] Ability to apply mending to XP API
|
|
|
|
|
|
|
|
This allows plugins that give players the ability to apply the experience
|
|
|
|
points to the Item Mending formula, which will repair an item instead
|
|
|
|
of giving the player experience points.
|
|
|
|
|
|
|
|
Both an API To standalone mend, and apply mending logic to .giveExp has been added.
|
|
|
|
|
2022-11-20 00:53:20 +01:00
|
|
|
== AT ==
|
|
|
|
public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
|
|
|
|
public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
|
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2023-11-25 23:34:42 +01:00
|
|
|
index 3836c1d2c2565333072fbbae1fc163125663ba3c..e4e36c273af4dc2253030823d51dd25a166c391e 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2023-11-25 23:34:42 +01:00
|
|
|
@@ -1542,7 +1542,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2022-01-23 01:59:56 +01:00
|
|
|
@Override
|
|
|
|
- public void giveExp(int exp) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ public int applyMending(int amount) {
|
2022-01-23 01:59:56 +01:00
|
|
|
+ ServerPlayer handle = this.getHandle();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Logic copied from EntityExperienceOrb and remapped to unobfuscated methods/properties
|
2022-01-23 01:59:56 +01:00
|
|
|
+ final var stackEntry = net.minecraft.world.item.enchantment.EnchantmentHelper
|
|
|
|
+ .getRandomItemWith(net.minecraft.world.item.enchantment.Enchantments.MENDING, handle);
|
|
|
|
+ final net.minecraft.world.item.ItemStack itemstack = stackEntry != null ? stackEntry.getValue() : net.minecraft.world.item.ItemStack.EMPTY;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (!itemstack.isEmpty() && itemstack.getItem().canBeDepleted()) {
|
2023-06-08 00:12:41 +02:00
|
|
|
+ net.minecraft.world.entity.ExperienceOrb orb = net.minecraft.world.entity.EntityType.EXPERIENCE_ORB.create(handle.level());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ orb.value = amount;
|
|
|
|
+ orb.spawnReason = org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM;
|
|
|
|
+ orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
|
|
|
|
+
|
2021-06-17 19:11:00 +02:00
|
|
|
+ int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
|
2022-10-02 09:56:36 +02:00
|
|
|
+ org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, stackEntry.getKey(), i);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ i = event.getRepairAmount();
|
2021-06-12 18:56:13 +02:00
|
|
|
+ orb.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (!event.isCancelled()) {
|
2021-06-17 19:11:00 +02:00
|
|
|
+ amount -= orb.durabilityToXp(i);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ itemstack.setDamageValue(itemstack.getDamageValue() - i);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return amount;
|
|
|
|
+ }
|
|
|
|
+
|
2022-01-23 01:59:56 +01:00
|
|
|
+ @Override
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public void giveExp(int exp, boolean applyMending) {
|
|
|
|
+ if (applyMending) {
|
|
|
|
+ exp = this.applyMending(exp);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2021-06-12 17:06:20 +02:00
|
|
|
this.getHandle().giveExperiencePoints(exp);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|