diff options
| author | miozune <miozune@gmail.com> | 2022-09-03 18:18:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-03 11:18:08 +0200 |
| commit | 09e190cfe796ce7471802d2e54677ee8073ce172 (patch) | |
| tree | ab63661153aa3d25faa6d7266aab776e5fe1ee53 /src/main/java/gregtech/api/util | |
| parent | 0a079e7603823a025e7574d1cc72d62d6306151d (diff) | |
| download | GT5-Unofficial-09e190cfe796ce7471802d2e54677ee8073ce172.tar.gz GT5-Unofficial-09e190cfe796ce7471802d2e54677ee8073ce172.tar.bz2 GT5-Unofficial-09e190cfe796ce7471802d2e54677ee8073ce172.zip | |
Fix reinforced glass (#1337)
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 9 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 96ff61a026..1ab29c067b 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -731,13 +731,16 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public void reloadOwner() { setOwner(Loader.instance().activeModContainer()); - final List<String> excludedClasses = - Arrays.asList("java.lang.Thread", "gregtech.api.util.GT_Recipe", "gregtech.common.GT_RecipeAdder"); + final List<String> excludedClasses = Arrays.asList( + "java.lang.Thread", + "gregtech.api.util.GT_Recipe", + "gregtech.api.util.GT_Recipe$GT_Recipe_Map", + "gregtech.common.GT_RecipeAdder"); if (GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace) { List<StackTraceElement> toAdd = new ArrayList<>(); for (StackTraceElement stackTrace : Thread.currentThread().getStackTrace()) { if (excludedClasses.stream() - .noneMatch(c -> stackTrace.getClassName().contains(c))) { + .noneMatch(c -> stackTrace.getClassName().equals(c))) { toAdd.add(stackTrace); } } diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index a01ee332ae..847a40cef2 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -149,9 +149,9 @@ public class GT_RecipeRegistrator { public static void registerMaterialRecycling(ItemStack aStack, ItemData aData) { if (GT_Utility.isStackInvalid(aStack) - || GT_Utility.areStacksEqual(new ItemStack(Items.blaze_rod), aStack) || aData == null || !aData.hasValidMaterialData() + || !aData.mMaterial.mMaterial.mAutoGenerateRecycleRecipes || aData.mMaterial.mAmount <= 0 || GT_Utility.getFluidForFilledItem(aStack, false) != null) return; registerReverseMacerating(GT_Utility.copyAmount(1, aStack), aData, aData.mPrefix == null); |