2021-09-23 06:10:35 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 2 Jul 2020 16:12:10 -0700
Subject: [PATCH] Add PlayerTradeEvent and PlayerPurchaseEvent
Co-authored-by: Alexander <protonull@protonmail.com>
diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
2024-01-21 19:37:09 +01:00
index 9bc5a9592cabe087effc03e5347ea1d75794960b..4e6c2f6b2e54a4c126e9a026b9cad05ce835ad66 100644
2021-09-23 06:10:35 +02:00
--- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
2023-09-22 06:40:51 +02:00
@@ -137,11 +137,24 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
2021-09-23 06:10:35 +02:00
@Override
public void overrideXp(int experience) {}
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ @Override
2021-12-05 04:39:52 +01:00
+ public void processTrade(MerchantOffer recipe, @Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent
+ if (event == null || event.willIncreaseTradeUses()) {
2021-09-23 06:10:35 +02:00
+ recipe.increaseUses();
+ }
2021-12-05 04:39:52 +01:00
+ if (event == null || event.isRewardingExp()) {
2021-09-23 06:10:35 +02:00
+ this.rewardTradeXp(recipe);
+ }
+ this.notifyTrade(recipe);
+ }
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+
@Override
public void notifyTrade(MerchantOffer offer) {
- offer.increaseUses();
2024-01-20 12:50:16 +01:00
+ // offer.increaseUses(); // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
this.ambientSoundTime = -this.getAmbientSoundInterval();
- this.rewardTradeXp(offer);
2024-01-20 12:50:16 +01:00
+ // this.rewardTradeXp(offer); // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
if (this.tradingPlayer instanceof ServerPlayer) {
CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult());
}
diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
2024-01-20 12:50:16 +01:00
index 52e57fa3b25dce10c17682964cbd4bcb4c130dc6..1465dbc29fc34bfe6ebb53e95fa6a4cbf2127a6c 100644
2021-09-23 06:10:35 +02:00
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
2023-12-06 04:00:14 +01:00
@@ -760,6 +760,14 @@ public abstract class AbstractContainerMenu {
2021-09-23 06:10:35 +02:00
public abstract boolean stillValid(Player player);
protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean fromLast) {
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ return this.moveItemStackTo(stack, startIndex, endIndex, fromLast, false);
+ }
+ protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean fromLast, boolean isCheck) {
+ if (isCheck) {
+ stack = stack.copy();
+ }
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
boolean flag1 = false;
int k = startIndex;
2023-12-06 04:00:14 +01:00
@@ -782,18 +790,27 @@ public abstract class AbstractContainerMenu {
2021-09-23 06:10:35 +02:00
slot = (Slot) this.slots.get(k);
itemstack1 = slot.getItem();
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent; clone if only a check
2021-09-23 06:10:35 +02:00
+ if (isCheck) {
+ itemstack1 = itemstack1.copy();
+ }
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
if (!itemstack1.isEmpty() && ItemStack.isSameItemSameTags(stack, itemstack1)) {
int l = itemstack1.getCount() + stack.getCount();
if (l <= stack.getMaxStackSize()) {
stack.setCount(0);
itemstack1.setCount(l);
2024-01-20 12:50:16 +01:00
+ if (!isCheck) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
slot.setChanged();
2024-01-20 12:50:16 +01:00
+ } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
flag1 = true;
} else if (itemstack1.getCount() < stack.getMaxStackSize()) {
stack.shrink(stack.getMaxStackSize() - itemstack1.getCount());
itemstack1.setCount(stack.getMaxStackSize());
2024-01-20 12:50:16 +01:00
+ if (!isCheck) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
slot.setChanged();
2024-01-20 12:50:16 +01:00
+ } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
flag1 = true;
}
}
2023-12-06 04:00:14 +01:00
@@ -824,14 +841,33 @@ public abstract class AbstractContainerMenu {
2021-09-23 06:10:35 +02:00
slot = (Slot) this.slots.get(k);
itemstack1 = slot.getItem();
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ if (isCheck) {
+ itemstack1 = itemstack1.copy();
+ }
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
if (itemstack1.isEmpty() && slot.mayPlace(stack)) {
if (stack.getCount() > slot.getMaxStackSize()) {
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ if (isCheck) {
+ stack.shrink(slot.getMaxStackSize());
+ } else {
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2023-03-14 21:25:13 +01:00
slot.setByPlayer(stack.split(slot.getMaxStackSize()));
2024-01-20 12:50:16 +01:00
+ } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
} else {
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ if (isCheck) {
+ stack.shrink(stack.getCount());
+ } else {
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2023-03-14 21:25:13 +01:00
slot.setByPlayer(stack.split(stack.getCount()));
2024-01-20 12:50:16 +01:00
+ } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
}
2024-01-20 12:50:16 +01:00
+ if (!isCheck) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
slot.setChanged();
2024-01-20 12:50:16 +01:00
+ } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
flag1 = true;
break;
}
diff --git a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
2024-01-20 12:50:16 +01:00
index 743a2adc465be5477d204185967265389d7102de..9c17c14de888ef3fbf4139cbad3889ece1d74aa1 100644
2021-09-23 06:10:35 +02:00
--- a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
@@ -134,12 +134,12 @@ public class MerchantMenu extends AbstractContainerMenu {
itemstack = itemstack1.copy();
2022-12-07 21:16:54 +01:00
if (slot == 2) {
2021-09-23 06:10:35 +02:00
- if (!this.moveItemStackTo(itemstack1, 3, 39, true)) {
2024-01-20 12:50:16 +01:00
+ if (!this.moveItemStackTo(itemstack1, 3, 39, true, true)) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
return ItemStack.EMPTY;
}
2022-12-07 21:16:54 +01:00
- slot1.onQuickCraft(itemstack1, itemstack);
2021-09-23 06:10:35 +02:00
- this.playTradeSound();
2024-01-20 12:50:16 +01:00
+ // slot1.onQuickCraft(itemstack1, itemstack); // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent; moved to after the non-check moveItemStackTo call
2021-09-23 06:10:35 +02:00
+ // this.playTradeSound();
2022-12-07 21:16:54 +01:00
} else if (slot != 0 && slot != 1) {
if (slot >= 3 && slot < 30) {
2021-09-23 06:10:35 +02:00
if (!this.moveItemStackTo(itemstack1, 30, 39, false)) {
@@ -152,6 +152,7 @@ public class MerchantMenu extends AbstractContainerMenu {
return ItemStack.EMPTY;
}
2024-01-20 12:50:16 +01:00
+ if (slot != 2) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent; moved down for slot 2
2021-09-23 06:10:35 +02:00
if (itemstack1.isEmpty()) {
2023-03-14 21:25:13 +01:00
slot1.setByPlayer(ItemStack.EMPTY);
2021-09-23 06:10:35 +02:00
} else {
@@ -163,6 +164,21 @@ public class MerchantMenu extends AbstractContainerMenu {
}
2022-12-07 21:16:54 +01:00
slot1.onTake(player, itemstack1);
2024-01-20 12:50:16 +01:00
+ } // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent; handle slot 2
2022-12-07 21:16:54 +01:00
+ if (slot == 2) { // is merchant result slot
+ slot1.onTake(player, itemstack1);
2021-09-23 06:10:35 +02:00
+ if (itemstack1.isEmpty()) {
2022-12-07 21:16:54 +01:00
+ slot1.set(ItemStack.EMPTY);
2021-09-23 06:10:35 +02:00
+ return ItemStack.EMPTY;
+ }
+
+ this.moveItemStackTo(itemstack1, 3, 39, true, false); // This should always succeed because it's checked above
+
2022-12-07 21:16:54 +01:00
+ slot1.onQuickCraft(itemstack1, itemstack);
2021-09-23 06:10:35 +02:00
+ this.playTradeSound();
2022-12-07 21:16:54 +01:00
+ slot1.set(ItemStack.EMPTY); // itemstack1 should ALWAYS be empty
2021-09-23 06:10:35 +02:00
+ }
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
}
return itemstack;
diff --git a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java
2024-01-20 12:50:16 +01:00
index e49bbb803399ef696665c5844a18b55a551654f6..23c1ba476869c9846a63138a8a11154bfd9379a2 100644
2021-09-23 06:10:35 +02:00
--- a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java
+++ b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java
2021-12-05 04:39:52 +01:00
@@ -47,13 +47,32 @@ public class MerchantResultSlot extends Slot {
2021-09-23 06:10:35 +02:00
@Override
public void onTake(Player player, ItemStack stack) {
- this.checkTakeAchievements(stack);
2024-01-20 12:50:16 +01:00
+ // this.checkTakeAchievements(stack); // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent; move to after event is called and not cancelled
2021-09-23 06:10:35 +02:00
MerchantOffer merchantOffer = this.slots.getActiveOffer();
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ io.papermc.paper.event.player.PlayerPurchaseEvent event = null;
2021-12-05 04:39:52 +01:00
+ if (merchantOffer != null && player instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
+ if (this.merchant instanceof net.minecraft.world.entity.npc.AbstractVillager abstractVillager) {
+ event = new io.papermc.paper.event.player.PlayerTradeEvent(serverPlayer.getBukkitEntity(), (org.bukkit.entity.AbstractVillager) abstractVillager.getBukkitEntity(), merchantOffer.asBukkit(), true, true);
+ } else if (this.merchant instanceof org.bukkit.craftbukkit.inventory.CraftMerchantCustom.MinecraftMerchant) {
+ event = new io.papermc.paper.event.player.PlayerPurchaseEvent(serverPlayer.getBukkitEntity(), merchantOffer.asBukkit(), false, true);
2021-12-05 04:00:10 +01:00
+ }
+ if (event != null) {
+ if (!event.callEvent()) {
+ stack.setCount(0);
+ event.getPlayer().updateInventory();
+ return;
+ }
+ merchantOffer = org.bukkit.craftbukkit.inventory.CraftMerchantRecipe.fromBukkit(event.getTrade()).toMinecraft();
2021-09-23 06:10:35 +02:00
+ }
+ }
2021-12-05 04:39:52 +01:00
+ this.checkTakeAchievements(stack);
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
if (merchantOffer != null) {
ItemStack itemStack = this.slots.getItem(0);
ItemStack itemStack2 = this.slots.getItem(1);
if (merchantOffer.take(itemStack, itemStack2) || merchantOffer.take(itemStack2, itemStack)) {
- this.merchant.notifyTrade(merchantOffer);
2024-01-20 12:50:16 +01:00
+ this.merchant.processTrade(merchantOffer, event); // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
player.awardStat(Stats.TRADED_WITH_VILLAGER);
this.slots.setItem(0, itemStack);
this.slots.setItem(1, itemStack2);
diff --git a/src/main/java/net/minecraft/world/item/trading/Merchant.java b/src/main/java/net/minecraft/world/item/trading/Merchant.java
2023-09-22 06:40:51 +02:00
index 5a350948a4735902f5c612592bc9d100445a0c8a..716b30dcd7e63c66736c448dd136c9f74dc7fe43 100644
2021-09-23 06:10:35 +02:00
--- a/src/main/java/net/minecraft/world/item/trading/Merchant.java
+++ b/src/main/java/net/minecraft/world/item/trading/Merchant.java
2021-11-24 18:37:07 +01:00
@@ -20,6 +20,7 @@ public interface Merchant {
2021-09-23 06:10:35 +02:00
void overrideOffers(MerchantOffers offers);
2021-12-05 04:39:52 +01:00
+ default void processTrade(MerchantOffer merchantRecipe, @Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { this.notifyTrade(merchantRecipe); } // Paper
2021-09-23 06:10:35 +02:00
void notifyTrade(MerchantOffer offer);
void notifyTradeUpdated(ItemStack stack);
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
2024-01-20 12:50:16 +01:00
index adf22ce4f0bcd3bd57dc2030c6c92d3df96566e3..e33ddcd967a427abfda9e6692338da4996a81c6c 100644
2021-09-23 06:10:35 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
2022-07-25 18:44:24 +02:00
@@ -74,10 +74,25 @@ public class CraftMerchantCustom extends CraftMerchant {
2021-09-23 06:10:35 +02:00
return this.trades;
}
2024-01-20 12:50:16 +01:00
+ // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ @Override
2021-12-05 04:39:52 +01:00
+ public void processTrade(MerchantOffer merchantRecipe, @javax.annotation.Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
+ /** Based on {@link net.minecraft.world.entity.npc.AbstractVillager#processTrade(MerchantOffer, io.papermc.paper.event.player.PlayerPurchaseEvent)} */
+ if (getTradingPlayer() instanceof net.minecraft.server.level.ServerPlayer) {
2021-12-05 04:39:52 +01:00
+ if (event == null || event.willIncreaseTradeUses()) {
2021-09-23 06:10:35 +02:00
+ merchantRecipe.increaseUses();
+ }
2021-12-05 04:39:52 +01:00
+ if (event == null || event.isRewardingExp()) {
2023-06-08 22:56:13 +02:00
+ this.tradingPlayer.level().addFreshEntity(new net.minecraft.world.entity.ExperienceOrb(this.tradingPlayer.level(), this.tradingPlayer.getX(), this.tradingPlayer.getY(), this.tradingPlayer.getZ(), merchantRecipe.getXp(), org.bukkit.entity.ExperienceOrb.SpawnReason.VILLAGER_TRADE, this.tradingPlayer, null));
2021-09-23 06:10:35 +02:00
+ }
+ }
+ this.notifyTrade(merchantRecipe);
+ }
2024-01-20 12:50:16 +01:00
+ // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
2021-09-23 06:10:35 +02:00
@Override
public void notifyTrade(MerchantOffer offer) {
// increase recipe's uses
- offer.increaseUses();
2024-01-20 12:50:16 +01:00
+ // offer.increaseUses(); // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent; handled above in processTrade
2021-09-23 06:10:35 +02:00
}
@Override