From 2be4ac8ee024acdd2fca11de8221000dedc110d3 Mon Sep 17 00:00:00 2001 From: Kevin Delugan Date: Fri, 11 Dec 2020 05:19:06 +0100 Subject: [PATCH 1/3] Added onTrade Scarpet Event --- docs/scarpet/api/Events.md | 7 +++- .../TradeOutputSlot_scarpetEventMixin.java | 33 +++++++++++++++++++ .../java/carpet/script/CarpetEventServer.java | 18 ++++++++++ .../assets/carpet/scripts/event_test.sc | 11 +++++++ src/main/resources/carpet.mixins.json | 1 + 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java diff --git a/docs/scarpet/api/Events.md b/docs/scarpet/api/Events.md index 18e3f2ba..d2f6e4b2 100644 --- a/docs/scarpet/api/Events.md +++ b/docs/scarpet/api/Events.md @@ -114,7 +114,12 @@ adjusted. ### `__on_player_interacts_with_entity(player, entity, hand)` Triggered when player right clicks (interacts) with an entity, even if the entity has no vanilla interaction with the player or the item they are holding. The event is invoked after receiving a packet from the client, before anything happens server side -with that interaction +with that interaction. + +### `__on_player_trades(player, entity, buy, buyB, sell)` +Triggered when player trades with a merchant. The event is invoked after the server allow the trade, but before the inventory +changes and merchant updates its trade-uses counter. +The parameter `entity` can be `null` if the merchant is not an entity. ### `__on_player_collides_with_entity(player, entity)` Triggered every time a player - entity collisions are calculated, before effects of collisions are applied in the game. diff --git a/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java b/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java new file mode 100644 index 00000000..7cf0ff2b --- /dev/null +++ b/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java @@ -0,0 +1,33 @@ +package carpet.mixins; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.TradeOutputSlot; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.village.Merchant; +import net.minecraft.village.TradeOffer; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import static carpet.script.CarpetEventServer.Event.PLAYER_TRADES; + +@Mixin(value = TradeOutputSlot.class) +public abstract class TradeOutputSlot_scarpetEventMixin { + @Shadow @Final private Merchant merchant; + + @Inject(method = "onTakeItem", require = 0, at = @At(value = "INVOKE", + target = "Lnet/minecraft/village/Merchant;trade(Lnet/minecraft/village/TradeOffer;)V"), + locals = LocalCapture.CAPTURE_FAILHARD + ) + private void onTrade(PlayerEntity player, ItemStack stack, CallbackInfoReturnable cir, TradeOffer tradeOffer) { + if(PLAYER_TRADES.isNeeded() && !this.merchant.getMerchantWorld().isClient()) + { + PLAYER_TRADES.onTrade((ServerPlayerEntity) player, merchant, tradeOffer); + } + } +} diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java index 11e89c03..4b6b31b6 100644 --- a/src/main/java/carpet/script/CarpetEventServer.java +++ b/src/main/java/carpet/script/CarpetEventServer.java @@ -18,6 +18,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.block.BlockState; import net.minecraft.entity.EntityType; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.entity.Entity; @@ -35,6 +36,8 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; +import net.minecraft.village.Merchant; +import net.minecraft.village.TradeOffer; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import org.apache.commons.lang3.tuple.Pair; @@ -548,6 +551,20 @@ public class CarpetEventServer ), player::getCommandSource); } }; + public static final Event PLAYER_TRADES = new Event("player_trades", 5, false) + { + @Override + public void onTrade(ServerPlayerEntity player, Merchant merchant, TradeOffer tradeOffer) + { + handler.call( () -> Arrays.asList( + new EntityValue(player), + merchant instanceof MerchantEntity ? new EntityValue((MerchantEntity) merchant) : Value.NULL, + ValueConversions.of(tradeOffer.getOriginalFirstBuyItem()), + ValueConversions.of(tradeOffer.getSecondBuyItem()), + ValueConversions.of(tradeOffer.getSellItem()) + ), player::getCommandSource); + } + }; public static final Event PLAYER_PICKS_UP_ITEM = new Event("player_picks_up_item", 2, false) { @Override @@ -926,6 +943,7 @@ public class CarpetEventServer public void onDamage(Entity target, float amount, DamageSource source) { } public void onRecipeSelected(ServerPlayerEntity player, Identifier recipe, boolean fullStack) {} public void onSlotSwitch(ServerPlayerEntity player, int from, int to) {} + public void onTrade(ServerPlayerEntity player, Merchant merchant, TradeOffer tradeOffer) {} public void onWorldEvent(ServerWorld world, BlockPos pos) { } diff --git a/src/main/resources/assets/carpet/scripts/event_test.sc b/src/main/resources/assets/carpet/scripts/event_test.sc index 3c6c989e..91fccdac 100644 --- a/src/main/resources/assets/carpet/scripts/event_test.sc +++ b/src/main/resources/assets/carpet/scripts/event_test.sc @@ -292,3 +292,14 @@ __on_player_picks_up_item(player, item) -> print(' Player '+player+' injects '+item); ); +__on_player_trades(player, entity, buy, buyB, sell) -> +( + print(''); + print('__on_player_trades(player, item)'); + print('player trades:'); + print(' - player: '+player); + print(' - entity: '+ entity); + print(' - buy: '+ buy); + print(' - buyB: '+ buyB); + print(' - sell: '+ sell); +); diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 024e8f8e..1551b661 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -164,6 +164,7 @@ "BlockItem_scarpetEventMixin", "PlayerManager_scarpetEventsMixin", "PlayerInventory_scarpetEventMixin", + "TradeOutputSlot_scarpetEventMixin", "ChunkTicketManager_scarpetMixin", "StatType_scarpetMixin", From 5e98fbef6618c1f3ac29c6bd87b76aaf1942dcb2 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Sat, 12 Dec 2020 00:42:03 -0400 Subject: [PATCH 2/3] Update src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java --- .../java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java b/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java index 7cf0ff2b..8c6e57c1 100644 --- a/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java +++ b/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java @@ -20,7 +20,7 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_TRADES; public abstract class TradeOutputSlot_scarpetEventMixin { @Shadow @Final private Merchant merchant; - @Inject(method = "onTakeItem", require = 0, at = @At(value = "INVOKE", + @Inject(method = "onTakeItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/village/Merchant;trade(Lnet/minecraft/village/TradeOffer;)V"), locals = LocalCapture.CAPTURE_FAILHARD ) From 0e41ce44273991ef67aeb16601fead1ae455da24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 12 Dec 2020 04:43:35 +0000 Subject: [PATCH 3/3] Merge docs for 'Merge pull request #623 from BisUmTo/onTrade-Scarpet-Event Added onTrade Scarpet Event' --- docs/scarpet/Full.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/scarpet/Full.md b/docs/scarpet/Full.md index 14f87168..3485a4bb 100644 --- a/docs/scarpet/Full.md +++ b/docs/scarpet/Full.md @@ -4051,7 +4051,12 @@ adjusted. ### `__on_player_interacts_with_entity(player, entity, hand)` Triggered when player right clicks (interacts) with an entity, even if the entity has no vanilla interaction with the player or the item they are holding. The event is invoked after receiving a packet from the client, before anything happens server side -with that interaction +with that interaction. + +### `__on_player_trades(player, entity, buy, buyB, sell)` +Triggered when player trades with a merchant. The event is invoked after the server allow the trade, but before the inventory +changes and merchant updates its trade-uses counter. +The parameter `entity` can be `null` if the merchant is not an entity. ### `__on_player_collides_with_entity(player, entity)` Triggered every time a player - entity collisions are calculated, before effects of collisions are applied in the game.