diff options
5 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java index ea4c7f0e2b..f03e981218 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java @@ -29,7 +29,7 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector extends GT_MetaTileE public short id = -1; public int data = 0; - public byte timeout=3; + public byte timeout=2; public GT_MetaTileEntity_Hatch_DataConnector(int aID, String aName, String aNameRegional, int aTier, String descr) { super(aID, aName, aNameRegional, aTier, 0, descr); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java index cb970e10be..ad05c0f9a0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java @@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_ if (aMetaTileEntity != null) { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputData && opposite == aMetaTileEntity.getBaseMetaTileEntity().getFrontFacing()) { - ((GT_MetaTileEntity_Hatch_InputData) aMetaTileEntity).timeout=3; + ((GT_MetaTileEntity_Hatch_InputData) aMetaTileEntity).timeout=2; ((GT_MetaTileEntity_Hatch_InputData) aMetaTileEntity).data=data; return; } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Data) { 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 6346351859..779cb2ca26 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 @@ -731,8 +731,10 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt mEfficiencyIncrease = 0; getBaseMetaTileEntity().disableWorking(); - for(GT_MetaTileEntity_Hatch_OutputData data:eOutputData) + for(GT_MetaTileEntity_Hatch_OutputData data:eOutputData) { data.timeout = 0; + data.data = 0; + } float mass = 0; if (outputEM == null) return; @@ -805,7 +807,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt private void hatchesStatusUpdate() { for (GT_MetaTileEntity_Hatch_Param param : eParamHatches) { - int paramID = param.param; + final int paramID = param.param; if (paramID < 0) continue; eParamsIn[paramID] = param.value1f; eParamsIn[paramID + 10] = param.value2f; @@ -816,7 +818,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt eAvailableData=getAvailableData(); for(GT_MetaTileEntity_Hatch_OutputData data:eOutputData) - data.timeout=3; + if(data.data>0)data.timeout=2; for (GT_MetaTileEntity_Hatch_Uncertainty uncertainty : eUncertainHatches) eCertainStatus = uncertainty.update(eCertainMode); @@ -1296,6 +1298,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt hatch_elemental.id = -1; for (GT_MetaTileEntity_Hatch_DataConnector hatch_data : eOutputData) { hatch_data.timeout=0; + hatch_data.data=0; hatch_data.id = -1; } for (GT_MetaTileEntity_Hatch_DataConnector hatch_data : eInputData) diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM.png Binary files differindex 5462d44897..63bea9502a 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM_IDLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM_IDLE.png Binary files differindex 1fe517b249..bd9fef30a6 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM_IDLE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MUFFLER_EM_IDLE.png |
