From 4e3c2c1b792bc3a5cd7fd71c18e91da0b9addc56 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sun, 29 Jan 2023 12:01:04 +0000 Subject: [PATCH] Only check if shift is down once a client tick. --- .../java/minetweaker/mc1710/FMLEventHandler.java | 16 ++++++++++++++++ .../minetweaker/mc1710/ForgeEventHandler.java | 4 +--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/minetweaker/mc1710/FMLEventHandler.java b/src/main/java/minetweaker/mc1710/FMLEventHandler.java index 2b0257a..f90cf5e 100644 --- a/src/main/java/minetweaker/mc1710/FMLEventHandler.java +++ b/src/main/java/minetweaker/mc1710/FMLEventHandler.java @@ -14,8 +14,11 @@ import minetweaker.mc1710.recipes.MCRecipeManager; import net.minecraft.entity.player.EntityPlayerMP; +import org.lwjgl.input.Keyboard; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.TickEvent; /** * @@ -23,6 +26,19 @@ import cpw.mods.fml.common.gameevent.PlayerEvent; */ public class FMLEventHandler { + private static boolean shiftDown = false; + + public static boolean isShiftDown() { + return shiftDown; + } + + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent ev) { + if (ev.phase == TickEvent.Phase.START) { + shiftDown = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); + } + } + @SubscribeEvent public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent ev) { if (ev.player instanceof EntityPlayerMP && MineTweakerConfig.sendLoadScripts) { diff --git a/src/main/java/minetweaker/mc1710/ForgeEventHandler.java b/src/main/java/minetweaker/mc1710/ForgeEventHandler.java index f95d456..33034fb 100644 --- a/src/main/java/minetweaker/mc1710/ForgeEventHandler.java +++ b/src/main/java/minetweaker/mc1710/ForgeEventHandler.java @@ -26,8 +26,6 @@ import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import org.lwjgl.input.Keyboard; - import stanhebben.zenscript.value.*; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; @@ -64,7 +62,7 @@ public class ForgeEventHandler { ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); } - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + if (FMLEventHandler.isShiftDown()) { for (IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); }