Fix cached recipes not updating permutations in NEI (#957)

* Fix cached recipes not updating permutations in NEI

* another cycle

2 files changed, 31 insertions, 3 deletions

diff --git a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java
index 6aa8d50b98..a550993b07 100644
--- a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java
@@ -1,6 +1,7 @@
 package gregtech.nei;
 
 import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
@@ -39,6 +40,12 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler {
     public static final int sOffsetX = 5;
     public static final int sOffsetY = 11;
 
+    /**
+     * Static version of {@link TemplateRecipeHandler#cycleticks}.
+     * Can be referenced from cached recipes.
+     */
+    public static int cycleTicksStatic = Math.abs((int) System.currentTimeMillis());
+
     static {
         GuiContainerManager.addInputHandler(new GT_RectHandler());
         GuiContainerManager.addTooltipHandler(new GT_RectHandler());
@@ -54,7 +61,7 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler {
         Collections.sort(result);
         return result;
     }
-    
+
     public static void drawText(int aX, int aY, String aString, int aColor) {
         Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor);
     }
@@ -178,6 +185,13 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler {
     }
 
     @Override
+    public void onUpdate() {
+        super.onUpdate();
+        if (!NEIClientUtils.shiftKey())
+            cycleTicksStatic++;
+    }
+
+    @Override
     public int recipiesPerPage() {
         return 1;
     }
@@ -420,7 +434,7 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler {
 
         @Override
         public List<PositionedStack> getIngredients() {
-            return getCycledIngredients(GT_NEI_AssLineHandler.this.cycleticks / 10, this.mInputs);
+            return getCycledIngredients(cycleTicksStatic / 10, this.mInputs);
         }
 
         @Override
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index 8c34c3ecc6..d7927ecd6d 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -1,6 +1,7 @@
 package gregtech.nei;
 
 import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
@@ -61,6 +62,12 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
     private NEIHandlerAbsoluteTooltip mRecipeNameTooltip;
     private static final int RECIPE_NAME_WIDTH = 140;
 
+     /**
+     * Static version of {@link TemplateRecipeHandler#cycleticks}.
+     * Can be referenced from cached recipes.
+     */
+    public static int cycleTicksStatic = Math.abs((int) System.currentTimeMillis());
+
     static {
         GuiContainerManager.addInputHandler(new GT_RectHandler());
         GuiContainerManager.addTooltipHandler(new GT_RectHandler());
@@ -227,6 +234,13 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
     }
 
     @Override
+    public void onUpdate() {
+        super.onUpdate();
+        if (!NEIClientUtils.shiftKey())
+            cycleTicksStatic++;
+    }
+
+    @Override
     public int recipiesPerPage() {
         return 1;
     }
@@ -1023,7 +1037,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
 
         @Override
         public List<PositionedStack> getIngredients() {
-            return getCycledIngredients(GT_NEI_DefaultHandler.this.cycleticks / 10, this.mInputs);
+            return getCycledIngredients(cycleTicksStatic / 10, this.mInputs);
         }
 
         @Override