diff options
| author | Muramasa- <haydenkilloh@gmail.com> | 2016-09-20 17:03:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 17:03:18 +0100 |
| commit | 8f2e13681b91a6e531ee9c199cbf78be077e6381 (patch) | |
| tree | e59861327c07b8a4f63632d0c57afc4b4f274d6c /src/main/java/gregtech/api/util/GT_OreDictUnificator.java | |
| parent | a03fc7fc1dcc57168e567fbdd09afdd895ce2570 (diff) | |
| parent | 312141cd1096a19d07aa0a5186cd3e7eeee51a9d (diff) | |
| download | GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.tar.gz GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.tar.bz2 GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.zip | |
Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_OreDictUnificator.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_OreDictUnificator.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java index dddf2ec576..c8d95140a2 100644 --- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java @@ -260,12 +260,14 @@ public class GT_OreDictUnificator { public static ItemStack getGem(Materials aMaterial, long aMaterialAmount) { ItemStack rStack = null; - if (((aMaterialAmount >= M) || aMaterialAmount >= M * 32)) + if (((aMaterialAmount >= M))) rStack = get(OrePrefixes.gem, aMaterial, aMaterialAmount / M); - if (rStack == null && (((aMaterialAmount * 2) % M == 0) || aMaterialAmount >= M * 16)) - rStack = get(OrePrefixes.gemFlawed, aMaterial, (aMaterialAmount * 2) / M); - if (rStack == null && (((aMaterialAmount * 4) >= M))) - rStack = get(OrePrefixes.gemChipped, aMaterial, (aMaterialAmount * 4) / M); + if (rStack == null) { + if ((((aMaterialAmount * 2) % M == 0) || aMaterialAmount >= M * 16)) + rStack = get(OrePrefixes.gemFlawed, aMaterial, (aMaterialAmount * 2) / M); + if ((((aMaterialAmount * 4) >= M))) + rStack = get(OrePrefixes.gemChipped, aMaterial, (aMaterialAmount * 4) / M); + } return rStack; } |