From e38d66bbee5d6ee6a9847517c016d44844b582f8 Mon Sep 17 00:00:00 2001 From: Michael Pfaff Date: Fri, 5 Mar 2021 21:10:06 -0500 Subject: [PATCH] Patch dropping entire stacks --- gradle.properties | 2 +- .../pfaff/thinksame/mixin/ScreenMixin.java | 23 +++++++++++++++++++ src/main/resources/thinksame.mixins.json | 3 ++- version.properties | 4 ++-- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 src/main/java/dev/pfaff/thinksame/mixin/ScreenMixin.java diff --git a/gradle.properties b/gradle.properties index 3b60cea..3cac24c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.16.4 yarn_mappings=1.16.4+build.9 loader_version=0.10.8 # Mod Properties -mod_version=1.0.1 +mod_version=1.1.0 maven_group=dev.pfaff archives_base_name=thinksame diff --git a/src/main/java/dev/pfaff/thinksame/mixin/ScreenMixin.java b/src/main/java/dev/pfaff/thinksame/mixin/ScreenMixin.java new file mode 100644 index 0000000..e29046f --- /dev/null +++ b/src/main/java/dev/pfaff/thinksame/mixin/ScreenMixin.java @@ -0,0 +1,23 @@ +package dev.pfaff.thinksame.mixin; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.InputUtil; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Screen.class) +public abstract class ScreenMixin { + @Inject(method = "hasControlDown", at = @At("HEAD"), cancellable = true) + private static void hasControlDown(CallbackInfoReturnable ci) { +// if (MinecraftClient.IS_SYSTEM_MAC) { +// return InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 343) || InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 347); +// } else { +// return InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 341) || InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 345); +// } + + ci.setReturnValue(InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 341) || InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 345)); + } +} diff --git a/src/main/resources/thinksame.mixins.json b/src/main/resources/thinksame.mixins.json index 8034498..3f4c54d 100644 --- a/src/main/resources/thinksame.mixins.json +++ b/src/main/resources/thinksame.mixins.json @@ -5,7 +5,8 @@ "compatibilityLevel": "JAVA_8", "mixins": [], "client": [ - "MouseMixin" + "MouseMixin", + "ScreenMixin" ], "injectors": { "defaultRequire": 1 diff --git a/version.properties b/version.properties index 9c06413..e006ca4 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -#Fri Jan 08 22:28:49 EST 2021 -VERSION_BUILD=4 +#Fri Mar 05 21:09:08 EST 2021 +VERSION_BUILD=7