From fcbc9aec91473b6cdd47d8556683c556687614e9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 23 Oct 2015 18:30:20 +0100 Subject: [PATCH] Added a config option to use Shift instead of Ctrl for the quick lookup. --- .../client/core/handler/TooltipAdditionDisplayHandler.java | 5 +++-- .../vazkii/botania/common/core/handler/ConfigHandler.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 07a8025e8..7ee0e9eba 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -37,6 +37,7 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; @@ -106,7 +107,7 @@ public final class TooltipAdditionDisplayHandler { Gui.drawRect(x - 4, y - 4, x + 20, y + 26, 0x44000000); Gui.drawRect(x - 6, y - 6, x + 22, y + 28, 0x44000000); - if(GuiScreen.isCtrlKeyDown()) { + if(ConfigHandler.useShiftForQuickLookup ? GuiScreen.isShiftKeyDown() : GuiScreen.isCtrlKeyDown()) { lexiconLookupTime += ClientTickHandler.delta; int cx = x + 8; @@ -152,7 +153,7 @@ public final class TooltipAdditionDisplayHandler { font.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF); GL11.glScalef(0.5F, 0.5F, 1F); - mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + "Ctrl", (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); + mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : "Ctrl"), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); GL11.glScalef(2F, 2F, 1F); GL11.glEnable(GL11.GL_DEPTH_TEST); diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 6875a7a3e..c1a58f1d1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -47,6 +47,7 @@ public final class ConfigHandler { public static boolean silentSpreaders = false; public static boolean renderBaubles = true; public static boolean enableSeasonalFeatures = true; + public static boolean useShiftForQuickLookup = false; public static int manaBarHeight = 29; public static boolean altFlowerTextures = false; @@ -147,6 +148,9 @@ public final class ConfigHandler { desc = "Set this to false to disable seasonal features, such as halloween and christmas."; enableSeasonalFeatures = loadPropBool("seasonalFeatures.enabled", desc, enableSeasonalFeatures); + desc = "Set this to true to use Shift instead of Ctrl for the inventory lexica botania quick lookup feature."; + useShiftForQuickLookup = loadPropBool("quickLookup.useShift", desc, useShiftForQuickLookup); + desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight);