diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
| commit | 148aa7636d15ccf0593b31f39529aea10eba3c19 (patch) | |
| tree | be6bd89b1566812d7843dc0cb292fc1f841d6079 /src/main/java/gregtech/api/util/GT_OreDictUnificator.java | |
| parent | 08217ad00eb35780f2162d5b136a18ef51fe34a1 (diff) | |
| parent | bf25038fc1f45d690c762fcf4e4d2c427aba19fe (diff) | |
| download | GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.gz GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.bz2 GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.zip | |
Merge branch 'Pollution-code' into experimental
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; } |