Fix matter junction

4 files changed, 35 insertions, 27 deletions

diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_MultiMachineEM.java
index 59e962a1eb..be1594d065 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_MultiMachineEM.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_MultiMachineEM.java
@@ -13,8 +13,8 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
  */
 
 public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Machine {
-    private static final XSTR ran=new XSTR();
     String mName = "";
+    private static byte cntr=0;
 
     public GT_GUIContainer_MultiMachineEM(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
         super(new GT_Container_MultiMachineEM(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "multimachines/" + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
@@ -65,6 +65,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach
         y-=26;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize+26);
         if (this.mContainer != null && ((GT_Container_MultiMachineEM) this.mContainer).eParamsInStatus!=null) {
+            cntr=(byte)((1+cntr)%6);
             GL11.glColor4f(1f, 1f, 1f, 1f);
 
             if(((GT_Container_MultiMachineEM) mContainer).ePowerPass)
@@ -151,11 +152,19 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach
     private void LEDdrawP(int x,int y,int i,int j,byte status){
         final int v=192,su=8,sv=6,u=11;
         switch(status){
+            case 6:
+                if (cntr<2){
+                    drawTexturedModalRect(x + su * i, y + sv * j, u + su * i, v + sv * j, su, sv);
+                    break;
+                } else if (cntr<4){
+                    drawTexturedModalRect(x + su * i, y + sv * j, u + su * i, v + sv * (8 + j), su, sv);
+                    break;
+                }
             case 1://ok
                 drawTexturedModalRect(x+su*i,y+sv*j,u+su*i,v+sv*(4+j),su,sv);
             break;
             case 2://too low blink
-                if(ran.nextInt(2)==0){
+                if(cntr<3){
                     drawTexturedModalRect(x+su*i,y+sv*j,u+su*i,v+sv*j,su,sv);
                     break;
                 }
@@ -163,19 +172,13 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach
                 drawTexturedModalRect(x+su*i,y+sv*j,u+su*i,v+sv*(2+j),su,sv);
             break;
             case 4://too high blink
-                if(ran.nextInt(2)==0) {
+                if(cntr<3) {
                     drawTexturedModalRect(x+su*i,y+sv*j,u+su*i,v+sv*(8+j),su,sv);
                     break;
                 }
             case 5:// too high
                 drawTexturedModalRect(x+su*i,y+sv*j,u+su*i,v+sv*(6+j),su,sv);
             break;
-            case 6:
-                if(ran.nextInt(2)==0)
-                    drawTexturedModalRect(x+su*i,y+sv*j,u+su*i,v+sv*j,su,sv);
-                else
-                    drawTexturedModalRect(x+su*i,y+sv*j,u+su*i,v+sv*(8+j),su,sv);
-
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java
index 85e049ce70..f379f5140a 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java
@@ -55,7 +55,7 @@ public class GT_MetaTileEntity_EMjunction extends GT_MetaTileEntity_MultiblockBa
                 }
             }
         }
-        return true;
+        return eInputHatches.size() <= 9;
     }
 
     @Override
@@ -70,16 +70,20 @@ public class GT_MetaTileEntity_EMjunction extends GT_MetaTileEntity_MultiblockBa
     @Override
     public void EM_checkParams() {
         for(int i=0;i<10;i++){
-            if(eParamsIn[i]<0)eParamsInStatus[i]=2;
-            else if(eParamsIn[i]==0)eParamsInStatus[i]=0;
-            else if(eParamsIn[i]>eInputHatches.size())eParamsInStatus[i]=4;
-            else eParamsInStatus[i]=1;
+            if((int)eParamsIn[i]<0)eParamsInStatus[i]=PARAM_TOO_LOW;
+            else if((int)eParamsIn[i]==0)eParamsInStatus[i]=PARAM_UNUSED;
+            else if((int)eParamsIn[i]>eInputHatches.size())eParamsInStatus[i]=PARAM_TOO_HIGH;
+            else eParamsInStatus[i]=PARAM_OK;
         }
         for(int i=10;i<20;i++){
-            if(eParamsIn[i]<0)eParamsInStatus[i]=2;
-            else if(eParamsIn[i]==0)eParamsInStatus[i]=3;
-            else if(eParamsIn[i]>eOutputHatches.size())eParamsInStatus[i]=4;
-            else eParamsInStatus[i]=1;
+            if(eParamsInStatus[i-10]==PARAM_OK){
+                if((int)eParamsIn[i]<0) eParamsInStatus[i] = PARAM_TOO_LOW;
+                else if((int)eParamsIn[i]==0)eParamsInStatus[i]=PARAM_LOW;
+                else if((int)eParamsIn[i]>eOutputHatches.size())eParamsInStatus[i]=PARAM_TOO_HIGH;
+                else eParamsInStatus[i]=PARAM_OK;
+            }else{
+                eParamsInStatus[i]=PARAM_UNUSED;
+            }
         }
     }
 
@@ -98,16 +102,16 @@ public class GT_MetaTileEntity_EMjunction extends GT_MetaTileEntity_MultiblockBa
     @Override
     public void EM_outputFunction() {
         for(int i=0;i<10;i++){
-            if(((int) eParamsIn[i] - 1)<0 || ((int) eParamsIn[i] - 1)>=eInputHatches.size()) continue;
-            GT_MetaTileEntity_Hatch_InputElemental in=eInputHatches.get((int) eParamsIn[i] - 1);
-            if(eParamsIn[i+10]==0){
+            final int inIndex=(int)(eParamsIn[i])-1;
+            final int outIndex=(int)(eParamsIn[i+10])-1;
+            if(inIndex<0 || inIndex>eInputHatches.size()) continue;
+            GT_MetaTileEntity_Hatch_InputElemental in=eInputHatches.get(inIndex);
+            if(outIndex==-1){
                 cleanHatchContent(in);
             }else{
-                GT_MetaTileEntity_Hatch_OutputElemental out=eOutputHatches.get((int)eParamsIn[i+10]-1);
-                if (out != null) {
-                    in.getContainerHandler().putUnifyAll(out.getContainerHandler());
-                    out.getContainerHandler().clear();
-                }
+                GT_MetaTileEntity_Hatch_OutputElemental out=eOutputHatches.get(outIndex);
+                out.getContainerHandler().putUnifyAll(in.getContainerHandler());
+                in.getContainerHandler().clear();
             }
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java
index b4b1483ff8..23cb442c3d 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -190,7 +190,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
 
     @Override
     public String[] getInfoData() {
-        if (id>=0){
+        if (id>0){
             if(content==null || content.size()==0) return new String[]{"ID: "+EnumChatFormatting.AQUA+id,"No Stacks"};
             else {
                 final String[] lines=content.getElementalInfo();
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java
index 3c96ab7979..683b4f39af 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java
@@ -51,6 +51,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta
     public final float[] eParamsOut=new float[20];
     public final byte[] eParamsInStatus =new byte[20];
     public final byte[] eParamsOutStatus=new byte[20];
+    protected final byte PARAM_UNUSED=0, PARAM_OK=1, PARAM_TOO_LOW=2, PARAM_LOW=3, PARAM_TOO_HIGH=4, PARAM_HIGH=5, PARAM_WRONG=6;
 
     //TO ENABLE this change value in <init> to false and/or other than 0, can also be added in recipe check or whatever
     public boolean eParameters=true,ePowerPass=false,eSafeVoid=false;