diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-05-13 17:51:51 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-05-13 17:51:51 +0200 |
| commit | 17edbc2d4840a19a435973003f756acdfa6e393f (patch) | |
| tree | 6d0b35a18f7e975e3f6f6ae2f61b3c2dc509d08f /src/main/java/gregtech/api/util/GT_Recipe.java | |
| parent | 60348c09ba6cabf571d8dcb8e0251db2bd70d511 (diff) | |
| download | GT5-Unofficial-17edbc2d4840a19a435973003f756acdfa6e393f.tar.gz GT5-Unofficial-17edbc2d4840a19a435973003f756acdfa6e393f.tar.bz2 GT5-Unofficial-17edbc2d4840a19a435973003f756acdfa6e393f.zip | |
Fixed a bug that caused there to be two identical recipes for TiF4
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_Recipe.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 6a8a599b39..23d5c12110 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -20,6 +20,7 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; @@ -1482,7 +1483,16 @@ public class GT_Recipe implements Comparable<GT_Recipe> { if (itemData != null && itemData.hasValidPrefixMaterialData() && itemData.mMaterial.mMaterial == Materials.Empty) { continue; } else { - adjustedInputs.add(input); + if (itemData != null && itemData.hasValidPrefixMaterialData() && itemData.mPrefix == OrePrefixes.cell) { + ItemStack dustStack = itemData.mMaterial.mMaterial.getDust(input.stackSize); + if (dustStack != null) { + adjustedInputs.add(dustStack); + } else { + adjustedInputs.add(input); + } + } else { + adjustedInputs.add(input); + } } } } |