diff options
| author | Technus <daniel112092@gmail.com> | 2017-08-23 20:05:21 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-08-23 20:05:21 +0200 |
| commit | 5ee785bbaa42bff8ca9f21c6687bacc790722c64 (patch) | |
| tree | f5af66caca3ab3c18a46d3abb34508fcf41f05a2 /src | |
| parent | 7448e427aed6712b0fc1f206a6000ad1af40291f (diff) | |
| parent | f3bf4b8332052223d7de89154f757e9bcbb92ef7 (diff) | |
| download | GT5-Unofficial-5ee785bbaa42bff8ca9f21c6687bacc790722c64.tar.gz GT5-Unofficial-5ee785bbaa42bff8ca9f21c6687bacc790722c64.tar.bz2 GT5-Unofficial-5ee785bbaa42bff8ca9f21c6687bacc790722c64.zip | |
Merge branch 'master' into nh-recipes
Diffstat (limited to 'src')
5 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index 498ea9387d..91b933a335 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -121,7 +121,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB } @Override - public void checkParams_EM() { + public void updateParameters_EM() { if (eParamsIn[0] <= 0) eParamsInStatus[0] = PARAM_TOO_LOW; else if (eParamsIn[0] < 1) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java index 15d5d36ab5..010ac1bdb0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java @@ -77,7 +77,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB } @Override - public void checkParams_EM() { + public void updateParameters_EM() { for (int i = 0; i < 10; i++) { if ((int) eParamsIn[i] < 0) eParamsInStatus[i] = PARAM_TOO_LOW; else if ((int) eParamsIn[i] == 0) eParamsInStatus[i] = PARAM_UNUSED; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index b654fa6958..6127960f03 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -139,7 +139,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas } @Override - public void checkParams_EM() { + public void updateParameters_EM() { for (int i = 0; i < 10; i++) { if (eParamsIn[i] < 0) eParamsInStatus[i] = PARAM_TOO_LOW; else if (eParamsIn[i] == 0) eParamsInStatus[i] = PARAM_UNUSED; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java index 589752c176..920b2ba33b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java @@ -102,7 +102,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt // My code handles AMPS, if you want overclocking just modify mEUt and mMaxProgressTime, leave amps as usual! // Set mEUt, Efficiencies, required computation, time, check input etc. - public void checkParams_EM() { + public void updateParameters_EM() { } // update status of parameters in guis and "machine state" // Called before check recipe, before outputting, and every second the machine is active @@ -983,7 +983,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt param.input1f = eParamsOut[paramID]; param.input2f = eParamsOut[paramID + 10]; } - checkParams_EM(); + updateParameters_EM(); eAvailableData = getAvailableData_EM(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 40a11e56b3..a63f948bf1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -219,7 +219,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock } @Override - public void checkParams_EM() { + public void updateParameters_EM() { if (eParamsIn[0] <= 300) eParamsInStatus[0] = PARAM_TOO_LOW; else if (eParamsIn[0] < 1000) |