From 9ddb7d863d5ece386ac445dc7ecb8fcc18c40b4e Mon Sep 17 00:00:00 2001 From: Estecka Date: Fri, 8 Nov 2024 00:04:27 +0100 Subject: [PATCH] Fixed multi-target mixin. Again. --- .../shiftingwares/mixin/TradeOfferFactoryWrapper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/estecka/shiftingwares/mixin/TradeOfferFactoryWrapper.java b/src/main/java/fr/estecka/shiftingwares/mixin/TradeOfferFactoryWrapper.java index d0d205f..e5b10dd 100644 --- a/src/main/java/fr/estecka/shiftingwares/mixin/TradeOfferFactoryWrapper.java +++ b/src/main/java/fr/estecka/shiftingwares/mixin/TradeOfferFactoryWrapper.java @@ -21,13 +21,15 @@ public class TradeOfferFactoryWrapper { @WrapOperation( require=1, // 1 *per-class* + remap=false, method={ - /* MerchantEntity.fillRecipesFromPool */ "method_19170(Lnet/minecraft/village/TradeOfferList;[Lnet/minecraft/village/TradeOffers$Factory;I)V", - /* WanderingTraderEntity.fillRecipes */ "method_7237()V", - /* TypedWrapperFactory.create */ "method_7246(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/random/Random;)Lnet/minecraft/village/TradeOffer;", + "method_19170", "fillRecipesFromPool", // MerchantEntity + "method_7237", "fillRecipes", // WanderingTraderEntity + "method_7246", "create", // TypedWrapperFactory }, at=@At( value="INVOKE", + remap=true, target="net/minecraft/village/TradeOffers$Factory.create(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/random/Random;)Lnet/minecraft/village/TradeOffer;" ) )