diff options
Diffstat (limited to 'src/main')
8 files changed, 12 insertions, 3 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index 8d21cdee5e..59e0285423 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -128,7 +128,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta deathDelay--; } } else if (moveAt == Tick) { - moveAround(aBaseMetaTileEntity); + if(content.hasStacks())moveAround(aBaseMetaTileEntity); getBaseMetaTileEntity().setActive(content.hasStacks()); } } 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 269614d90d..65adfef68f 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 @@ -43,7 +43,7 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_ @Override public boolean canConnect(byte side) { - return isInputFacing(side); + return isOutputFacing(side); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java index 976d56a12c..1d2e8de482 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java @@ -115,7 +115,6 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConn public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { if ((aTick & 31) == 31) { - byte mOld = 0; mConnections = 0; connectionCount = 0; if (aBaseMetaTileEntity.getColorization() < 0) return; diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR.png Binary files differindex b555f62ec8..34bb4464d0 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..53faf7d37c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..97596ba817 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_BAR_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CANDY_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CANDY_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..bb123c5e6e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CANDY_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CANDY_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CANDY_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..97596ba817 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_CANDY_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file |
