diff options
| author | Techlone <techlone.mc@gmail.com> | 2017-06-04 21:30:51 +0500 |
|---|---|---|
| committer | Techlone <techlone.mc@gmail.com> | 2017-06-04 21:30:51 +0500 |
| commit | dbd2f5800886a36dbe4528aabfb2b30f1e7b0908 (patch) | |
| tree | bb297a5498fe57f75aedf33e4f3f77f8bb89a202 /src/main/java/gregtech/common/covers | |
| parent | 4f6bdedf963842c74bf1cf59f77ead8ad66b48bc (diff) | |
| parent | 30de32fb07bdc82ec7dc79fd698ba0a1ab6b06f6 (diff) | |
| download | GT5-Unofficial-dbd2f5800886a36dbe4528aabfb2b30f1e7b0908.tar.gz GT5-Unofficial-dbd2f5800886a36dbe4528aabfb2b30f1e7b0908.tar.bz2 GT5-Unofficial-dbd2f5800886a36dbe4528aabfb2b30f1e7b0908.zip | |
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src/main/java/gregtech/common/covers')
| -rw-r--r-- | src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java | 8 |
2 files changed, 10 insertions, 2 deletions
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 3af0a7de99..371928ec58 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;
}
|