From c304d6981f9af3858997e3ef04b5dd5eb3a5feb5 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Sun, 18 Aug 2019 18:18:17 +0200 Subject: [PATCH] Version 2.1.13master * Fixed the sort key binding --- gradle.properties | 2 +- .../client/mixin/MixinAbstractContainerScreen.java | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 12b1f027..f829e411 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties mod_id = mousewheelie - mod_version = 1.2.12 + mod_version = 1.2.13 maven_group = de.siphalor archives_base_name = mousewheelie diff --git a/src/main/java/de/siphalor/mousewheelie/client/mixin/MixinAbstractContainerScreen.java b/src/main/java/de/siphalor/mousewheelie/client/mixin/MixinAbstractContainerScreen.java index 004ec856..593a5279 100644 --- a/src/main/java/de/siphalor/mousewheelie/client/mixin/MixinAbstractContainerScreen.java +++ b/src/main/java/de/siphalor/mousewheelie/client/mixin/MixinAbstractContainerScreen.java @@ -24,7 +24,6 @@ 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.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @SuppressWarnings("WeakerAccess") @@ -80,6 +79,8 @@ public void onKeyPressed(int key, int scanCode, int int_3, CallbackInfoReturnabl } return true; }); + } else if(ClientCore.SORT_KEY_BINDING.matchesKey(key, scanCode)) { + mouseWheelie_triggerSort(); } } @@ -126,12 +127,6 @@ public void onMouseClick(double x, double y, int button, CallbackInfoReturnable< } } - @Inject(method = "tick", at = @At("HEAD")) - public void tick(CallbackInfo callbackInfo) { - if(ClientCore.SORT_KEY_BINDING.wasPressed()) - mouseWheelie_triggerSort(); - } - @Override public boolean mouseWheelie_onMouseScroll(double mouseX, double mouseY, double scrollAmount) { if(hasAltDown()) return false;