diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java index 814ed589f0..74e269e932 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java @@ -238,44 +238,51 @@ public class StaticFields59 { return null; } - public static int getHeatingCapacityForCoil(Block aBlock, int aMeta) { + + + public static int getTierForCoil(Block aBlock, int aMeta) { if (aBlock == GregTech_API.sBlockCasings1 && (aMeta >= 12 && aMeta <= 14)) { - return getHeatingCapacityForCoilTier(aMeta == 12 ? 1 : aMeta == 13 ? 2 : 3); + return aMeta == 12 ? 1 : aMeta == 13 ? 2 : 3; } else if (aBlock == getBlockCasings5() && (aMeta >= 0 && aMeta <= 8)) { - return getHeatingCapacityForCoilTier(aMeta); + return aMeta; } return 0; } + public static int getHeatingCapacityForCoil(Block aBlock, int aMeta) { + int aTier = getTierForCoil(aBlock, aMeta); + return aTier > 0 ? getHeatingCapacityForCoilTier(aTier) : 0; + } + public static int getHeatingCapacityForCoilTier(int aCoilTier) { int mHeatingCapacity = 0; switch (aCoilTier) { - case 0: + case 1: mHeatingCapacity = 1800; break; - case 1: + case 2: mHeatingCapacity = 2700; break; - case 2: + case 3: mHeatingCapacity = 3600; break; - case 3: + case 4: mHeatingCapacity = 4500; break; - case 4: + case 5: mHeatingCapacity = 5400; break; - case 5: + case 6: mHeatingCapacity = 7200; break; - case 6: + case 7: mHeatingCapacity = 9000; break; - case 7: + case 8: mHeatingCapacity = 9900; break; - case 8: + case 9: mHeatingCapacity = 10800; break; default: @@ -285,7 +292,6 @@ public class StaticFields59 { if (CORE.GTNH && aCoilTier <= 6) { mHeatingCapacity += 1; } - return mHeatingCapacity; } |