aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-08-23 20:03:55 +0200
committerTechnus <daniel112092@gmail.com>2017-08-23 20:03:55 +0200
commit6952deff8fca78f0645d0debdaf3216a04fed1a3 (patch)
tree9773e9077c929459c7b07042240fb79e363700d4 /src/main
parent9e776429e4f57dd713f3f26b9535ac5ec4585cfb (diff)
downloadGT5-Unofficial-6952deff8fca78f0645d0debdaf3216a04fed1a3.tar.gz
GT5-Unofficial-6952deff8fca78f0645d0debdaf3216a04fed1a3.tar.bz2
GT5-Unofficial-6952deff8fca78f0645d0debdaf3216a04fed1a3.zip
some refactor
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java12
6 files changed, 12 insertions, 12 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)
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index 07cd858503..7b63af5c88 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -71,8 +71,8 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
}
@Override
- public boolean EM_checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
- return EM_StructureCheckAdvanced(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 7, 1);
+ public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
+ return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 7, 1);
}
@Override
@@ -96,7 +96,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
}
@Override
- public boolean EM_checkRecipe(ItemStack itemStack) {
+ public boolean checkRecipe_EM(ItemStack itemStack) {
hasBeenPausedThiscycle=false;
if(powerSetting<=300 || eParamsInStatus[0] == PARAM_TOO_HIGH || timerSetting<=0 || timerSetting>3000) return false;
if (timerValue <= 0) {
@@ -110,13 +110,13 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
}
@Override
- public void EM_outputFunction() {
+ public void outputAfterRecipe_EM() {
}
@Override
- public void EM_checkParams() {
+ public void updateParameters_EM() {
if (eParamsIn[0] <= 300)
eParamsInStatus[0] = PARAM_TOO_LOW;
else if (eParamsIn[0] < 1000)
@@ -152,7 +152,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
}
@Override
- protected void EM_workJustGotDisabled() {
+ protected void workGotDisabled_EM() {
timerValue=0;
}