aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java3
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java7
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index c382e90fef..92e0ef36dd 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -278,7 +278,8 @@ public class GregTech_API {
* Getting assigned by the Mod loading
*/
public static boolean sUnificationEntriesRegistered = false, sPreloadStarted = false, sPreloadFinished = false,
- sLoadStarted = false, sLoadFinished = false, sPostloadStarted = false, sPostloadFinished = false;
+ sLoadStarted = false, sLoadFinished = false, sPostloadStarted = false, sPostloadFinished = false,
+ sFullLoadFinished = false;
private static Class<BaseMetaTileEntity> sBaseMetaTileEntityClass = null;
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 53d237096c..c0812dcaef 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -510,8 +510,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
existingInput.inputAmount = Math.addExact(existingInput.inputAmount, itemStack.stackSize);
}
}
- mergedInputCache = newCache.toArray(new RecipeItemInput[0]);
- return mergedInputCache;
+ final RecipeItemInput[] frozenCache = newCache.toArray(new RecipeItemInput[0]);
+ if (GregTech_API.sFullLoadFinished) {
+ mergedInputCache = frozenCache;
+ }
+ return frozenCache;
}
}