Merge branch 'mergeGTNH' into experimental

5 files changed, 153 insertions, 139 deletions

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
index ff47dfdc97..9e63242279 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -24,26 +24,32 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehavior {
 		if ((aTileEntity instanceof IFluidHandler)) {
 			IFluidHandler tTank1;
 			IFluidHandler tTank2;
+            ForgeDirection directionFrom;
+            ForgeDirection directionTo;
 			if (aCoverVariable > 0) {
 				tTank2 = aTileEntity.getITankContainerAtSide(aSide);
 				tTank1 = (IFluidHandler) aTileEntity;
+                directionFrom = ForgeDirection.UNKNOWN;
+                directionTo = ForgeDirection.getOrientation(aSide).getOpposite();
 			} else {
 				tTank1 = aTileEntity.getITankContainerAtSide(aSide);
 				tTank2 = (IFluidHandler) aTileEntity;
+                directionFrom = ForgeDirection.getOrientation(aSide).getOpposite();
+                directionTo = ForgeDirection.UNKNOWN;
 			}
 			if (tTank1 != null && tTank2 != null) {
-				FluidStack tLiquid = tTank1.drain(ForgeDirection.UNKNOWN, Math.abs(aCoverVariable), false);
+				FluidStack tLiquid = tTank1.drain(directionFrom, Math.abs(aCoverVariable), false);
 				if (tLiquid != null) {
 					tLiquid = tLiquid.copy();
-					tLiquid.amount = tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid, false);
+					tLiquid.amount = tTank2.fill(directionTo, tLiquid, false);
 					if (tLiquid.amount > 0) {
 						if (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10)) {
 							if (aTileEntity.isUniversalEnergyStored(Math.min(1, tLiquid.amount / 10))) {
 								aTileEntity.decreaseStoredEnergyUnits(Math.min(1, tLiquid.amount / 10), true);
-								tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(),	tTank1.drain(ForgeDirection.UNKNOWN, tLiquid.amount, true), true);
+								tTank2.fill(directionTo, tTank1.drain(directionFrom, tLiquid.amount, true), true);
 							}
 						} else {
-							tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tTank1.drain(ForgeDirection.UNKNOWN, tLiquid.amount, true), true);
+							tTank2.fill(directionTo, tTank1.drain(directionFrom, tLiquid.amount, true), true);
 						}
 					}
 				}
@@ -89,43 +95,43 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehavior {
 		return true;
 	}
 
-	public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-		return true;
-	}
+    public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
 
-	public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-		return true;
-	}
+    public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
 
-	public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-		return true;
-	}
+    public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
 
-	public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-		return true;
-	}
+    public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
 
-	public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
-		return true;
-	}
+    public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
+        return true;
+    }
 
-	public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
-		return true;
-	}
+    public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
+        return true;
+    }
 
-	public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-		return false;
-	}
+    public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+    	return false;
+    }
 
-	public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-		return false;
-	}
+    public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+    	return false;
+    }
 
-	public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-		return true;
-	}
+    public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
 
-	public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-		return 1;
-	}
+    public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return 1;
+    }
 }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index dec8819357..9b9e426bc3 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -10,47 +10,47 @@ import net.minecraftforge.fluids.*;
 
 public class GT_Cover_Fluidfilter
         extends GT_CoverBehavior {
-			
+            
     public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
         return aCoverVariable;
     }
 
-	public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+    public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         int aFilterMode = aCoverVariable & 7;
-		aCoverVariable ^=aFilterMode;
-		aFilterMode = (aFilterMode + (aPlayer.isSneaking()? -1 : 1)) % 4;
+        aCoverVariable ^=aFilterMode;
+        aFilterMode = (aFilterMode + (aPlayer.isSneaking()? -1 : 1)) % 4;
         if(aFilterMode < 0){aFilterMode = 3;}
         switch(aFilterMode) {
             case 0: GT_Utility.sendChatToPlayer(aPlayer, "Allow input, no output"); break;
             case 1: GT_Utility.sendChatToPlayer(aPlayer, "Deny input, no output"); break;
-			case 2: GT_Utility.sendChatToPlayer(aPlayer, "Allow input, permit any output"); break;
+            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Allow input, permit any output"); break;
             case 3: GT_Utility.sendChatToPlayer(aPlayer, "Deny input, permit any output"); break;
         }
-		aCoverVariable|=aFilterMode;
+        aCoverVariable|=aFilterMode;
         return aCoverVariable;
     }
-	
+    
     public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
        //System.out.println("rightclick");
-    	if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && (((aY > 0.375D) && (aY < 0.625D)) || ((aSide < 2) && (((aZ > 0.375D) && (aZ < 0.625D)) || (aSide == 2) || (aSide == 3)))))) {
+        if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && (((aY > 0.375D) && (aY < 0.625D)) || ((aSide < 2) && (((aZ > 0.375D) && (aZ < 0.625D)) || (aSide == 2) || (aSide == 3)))))) {
             ItemStack tStack = aPlayer.inventory.getCurrentItem();
             if(tStack!=null){
             FluidStack tFluid = FluidContainerRegistry.getFluidForFilledItem(tStack);
             if(tFluid!=null){
-            	//System.out.println(tFluid.getLocalizedName()+" "+tFluid.getFluidID());
-				int aFluid = tFluid.getFluidID();
-            	aCoverVariable = (aCoverVariable & 7) | (aFluid << 3);
+                //System.out.println(tFluid.getLocalizedName()+" "+tFluid.getFluidID());
+                int aFluid = tFluid.getFluidID();
+                aCoverVariable = (aCoverVariable & 7) | (aFluid << 3);
                 aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
-				FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid),1000);
+                FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid),1000);
                 GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName());
             }else if(tStack.getItem() instanceof IFluidContainerItem){
-            	IFluidContainerItem tContainer = (IFluidContainerItem)tStack.getItem();
+                IFluidContainerItem tContainer = (IFluidContainerItem)tStack.getItem();
                 if(tContainer.getFluid(tStack) != null) {
-					int aFluid = tContainer.getFluid(tStack).getFluidID();
-					aCoverVariable = (aCoverVariable & 7) | (aFluid << 3);
-					aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
-					FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid),1000);
-					GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName());
+                    int aFluid = tContainer.getFluid(tStack).getFluidID();
+                    aCoverVariable = (aCoverVariable & 7) | (aFluid << 3);
+                    aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
+                    FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid),1000);
+                    GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName());
                 }
             }
             }
@@ -61,16 +61,16 @@ public class GT_Cover_Fluidfilter
     
     @Override
     public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-    	if(aFluid==null){return true;}
-		int aFilterMode = aCoverVariable & 7;
-		int aFilterFluid = aCoverVariable >>> 3;
-		return aFluid.getID() == aFilterFluid ? (aFilterMode == 0 || aFilterMode == 2 ? true : false) : (aFilterMode == 1 || aFilterMode == 3 ? true : false);
+        if(aFluid==null){return true;}
+        int aFilterMode = aCoverVariable & 7;
+        int aFilterFluid = aCoverVariable >>> 3;
+        return aFluid.getID() == aFilterFluid ? (aFilterMode == 0 || aFilterMode == 2 ? true : false) : (aFilterMode == 1 || aFilterMode == 3 ? true : false);
     }
     
     @Override
     public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-		int aFilterMode = aCoverVariable & 7;
-		return  aFilterMode == 0 || aFilterMode == 1 ? false : true;
+        int aFilterMode = aCoverVariable & 7;
+        return  aFilterMode == 0 || aFilterMode == 1 ? false : true;
     }
     
     public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
index fa68dd9c03..e723654b0e 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
@@ -1,79 +1,79 @@
-package gregtech.common.covers;
-
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-
-public class GT_Cover_ItemMeter
-        extends GT_CoverBehavior {
-    public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
-        int[] tSlots;
-        if (aCoverVariable < 2) {
-            tSlots = aTileEntity.getAccessibleSlotsFromSide(aSide);
-        } else {
-            tSlots = new int[]{aCoverVariable - 2};
-        }
-        int tMax = 0;
-        int tUsed = 0;
-        for (int i : tSlots) {
-            if (i >= 0 && i < aTileEntity.getSizeInventory()) {
-                tMax+=64;
-                ItemStack tStack = aTileEntity.getStackInSlot(i);
-                if (tStack != null)
-                    tUsed += (tStack.stackSize<<6)/tStack.getMaxStackSize();
-            }
-        }
-        if(tUsed==0)//nothing
-            aTileEntity.setOutputRedstoneSignal(aSide, (byte)(aCoverVariable == 1 ? 15 : 0));
-        else if(tUsed >= tMax)//full
-            aTileEntity.setOutputRedstoneSignal(aSide, (byte)(aCoverVariable == 1 ? 0 : 15));
-        else//1-14 range
-            aTileEntity.setOutputRedstoneSignal(aSide, (byte)(aCoverVariable == 1 ? 14-((14*tUsed)/tMax) : 1+((14*tUsed)/tMax)) );
-        return aCoverVariable;
-    }
-
-    public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % (2 + aTileEntity.getSizeInventory());
-        switch(aCoverVariable) {
-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Normal"); break;
-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); break;
-            default: GT_Utility.sendChatToPlayer(aPlayer, "Slot: " + (aCoverVariable - 2)); break;
-        }
-        return aCoverVariable;
-    }
-
-    public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return true;
-    }
-
-    public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return true;
-    }
-
-    public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-        return true;
-    }
-
-    public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-        return true;
-    }
-
-    public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
-        return true;
-    }
-
-    public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
-        return true;
-    }
-
-    public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return true;
-    }
-
-    public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return 5;
-    }
-}
+package gregtech.common.covers;

+

+import gregtech.api.interfaces.tileentity.ICoverable;

+import gregtech.api.util.GT_CoverBehavior;

+import gregtech.api.util.GT_Utility;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraftforge.fluids.Fluid;

+

+public class GT_Cover_ItemMeter

+        extends GT_CoverBehavior {

+    public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {

+        int[] tSlots;

+        if (aCoverVariable < 2) {

+            tSlots = aTileEntity.getAccessibleSlotsFromSide(aSide);

+        } else {

+            tSlots = new int[]{aCoverVariable - 2};

+        }

+        int tMax = 0;

+        int tUsed = 0;

+        for (int i : tSlots) {

+            if (i >= 0 && i < aTileEntity.getSizeInventory()) {

+                tMax+=64;

+                ItemStack tStack = aTileEntity.getStackInSlot(i);

+                if (tStack != null)

+                    tUsed += (tStack.stackSize<<6)/tStack.getMaxStackSize();

+            }

+        }

+        if(tUsed==0)//nothing

+            aTileEntity.setOutputRedstoneSignal(aSide, (byte)(aCoverVariable == 1 ? 15 : 0));

+        else if(tUsed >= tMax)//full

+            aTileEntity.setOutputRedstoneSignal(aSide, (byte)(aCoverVariable == 1 ? 0 : 15));

+        else//1-14 range

+            aTileEntity.setOutputRedstoneSignal(aSide, (byte)(aCoverVariable == 1 ? 14-((14*tUsed)/tMax) : 1+((14*tUsed)/tMax)) );

+        return aCoverVariable;

+    }

+

+    public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {

+        aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % (2 + aTileEntity.getSizeInventory());

+        switch(aCoverVariable) {

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Normal"); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); break;

+            default: GT_Utility.sendChatToPlayer(aPlayer, "Slot: " + (aCoverVariable - 2)); break;

+        }

+        return aCoverVariable;

+    }

+

+    public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

+        return true;

+    }

+

+    public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

+        return true;

+    }

+

+    public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {

+        return true;

+    }

+

+    public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {

+        return true;

+    }

+

+    public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {

+        return true;

+    }

+

+    public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {

+        return true;

+    }

+

+    public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

+        return true;

+    }

+

+    public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

+        return 5;

+    }

+}

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
index 9c61f4feee..d76a05117b 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
@@ -57,8 +57,8 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
         if(aCoverVariable <0){aCoverVariable = 2;}
         switch(aCoverVariable) {
             case 0: GT_Utility.sendChatToPlayer(aPlayer, "Emit if any Player is close"); break;
-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Emit if you are close"); break;
-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Emit if other player is close"); break;
+            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Emit if other player is close"); break;
+            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Emit if you are close"); break;
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
index 98307d2ca0..84f0ba36f7 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
@@ -2,10 +2,18 @@ package gregtech.common.covers;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IMachineProgress;
 
 public class GT_Cover_RedstoneReceiverInternal
         extends GT_Cover_RedstoneWirelessBase {
     public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
+        if (aTileEntity instanceof IMachineProgress) {
+            if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) >0)
+                ((IMachineProgress) aTileEntity).enableWorking();
+            else
+                ((IMachineProgress) aTileEntity).disableWorking();
+            ((IMachineProgress) aTileEntity).setWorkDataValue(aInputRedstone);
+        }
         return aCoverVariable;
     }