From c828461c0cab53b13608138e9a201a519f376632 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 22:19:28 +0000 Subject: [PATCH] Holding shift on a recipe page with multiple recipes will pause the recipe changing code. It'll also stop petals/rune pieces from rotating. --- .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 1 + .../botania/common/lexicon/page/PageCraftingRecipe.java | 3 +++ .../botania/common/lexicon/page/PageElvenRecipe.java | 3 +++ .../common/lexicon/page/PageManaInfusionRecipe.java | 3 +++ .../botania/common/lexicon/page/PagePetalRecipe.java | 7 ++++--- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 502ea23d0..1b5480c6b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -305,6 +305,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeTeruTeruBozu; public static IRecipe recipeAvatar; public static IRecipe recipeSextant; + public static List recipesAltGrassSeeds; // Garden of Glass public static IRecipe recipeRootToSapling; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 69794f323..fdded50c7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -108,6 +108,9 @@ public class PageCraftingRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 5d87a62a0..12921c3ed 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -100,6 +100,9 @@ public class PageElvenRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index b959bb773..bdb94278d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -139,6 +139,9 @@ public class PageManaInfusionRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index f22c9680e..b3822be5c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -68,7 +68,7 @@ public class PagePetalRecipe extends PageRecipe { List inputs = recipe.getInputs(); int degreePerInput = (int) (360F / inputs.size()); - float currentDegree = ConfigHandler.lexiconRotatingItems ? (float) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) : 0; + float currentDegree = ConfigHandler.lexiconRotatingItems ? (GuiScreen.isShiftKeyDown() ? ticksElapsed : (float) (ticksElapsed + ClientTickHandler.partialTicks)) : 0; for(Object obj : inputs) { Object input = obj; @@ -95,8 +95,6 @@ public class PagePetalRecipe extends PageRecipe { return new ItemStack(ModBlocks.altar); } - - @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { // NO-OP @@ -105,6 +103,9 @@ public class PagePetalRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++;