diff options
| author | JohannesGaessler <johannesg@balance.gg> | 2017-06-01 10:22:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 10:22:10 +0200 |
| commit | 7eb176f3a2334246229c6fc556c806e5f6a1ff03 (patch) | |
| tree | 5ae4926dc018b68734b38a7e3b6a7c7579a9bc51 /src/main/java/gregtech/common/covers | |
| parent | 3c45c2accb08c37016ccd3f3217c09d18beb3326 (diff) | |
| parent | 9a69e1978db321e8f1462dd982c5a199911ca334 (diff) | |
| download | GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.tar.gz GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.tar.bz2 GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.zip | |
Merge branch 'unstable' into ChemistryUpdate
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;
}
|