Skip to content

Commit 5a07453

Browse files
committed
Fix quick villager trading
Fixes gh-20
1 parent 3a4126c commit 5a07453

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

crossversion/common/src/main/java/me/pieking1215/invmove/mixin/client/ButtonJumpKeyFixMixin.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import me.pieking1215.invmove.InvMoveConfig;
55
import net.minecraft.client.Minecraft;
66
import net.minecraft.client.gui.components.AbstractButton;
7+
import net.minecraft.client.gui.screens.inventory.MerchantScreen;
78
import org.spongepowered.asm.mixin.Mixin;
89
import org.spongepowered.asm.mixin.injection.At;
910
import org.spongepowered.asm.mixin.injection.Inject;
@@ -22,8 +23,12 @@ private void keyPressed(int i, int j, int k, CallbackInfoReturnable<Boolean> cir
2223
// but if the player can jump in this inventory we cancel that
2324
// (fix for https://github.com/PieKing1215/InvMove/issues/2)
2425
if (i == 32 && InvMoveConfig.GENERAL.ENABLED.get() && InvMoveConfig.MOVEMENT.ENABLED.get() && InvMoveConfig.MOVEMENT.JUMP.get()) {
25-
if (InvMove.instance().allowMovementInScreen(Minecraft.getInstance().screen)) {
26-
cir.setReturnValue(false);
26+
// TODO: consider doing this a better way
27+
if(!((AbstractButton)(Object)this instanceof MerchantScreen.TradeOfferButton)) {
28+
System.out.println(this + " " + i + " " + j + " " + k);
29+
if (InvMove.instance().allowMovementInScreen(Minecraft.getInstance().screen)) {
30+
cir.setReturnValue(false);
31+
}
2732
}
2833
}
2934
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
accessWidener v1 named
22
accessible field net/minecraft/client/KeyMapping isDown Z
3-
accessible field net/minecraft/client/KeyMapping key Lcom/mojang/blaze3d/platform/InputConstants$Key;
3+
accessible field net/minecraft/client/KeyMapping key Lcom/mojang/blaze3d/platform/InputConstants$Key;
4+
accessible class net/minecraft/client/gui/screens/inventory/MerchantScreen$TradeOfferButton

0 commit comments

Comments
 (0)