diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-09-22 21:17:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 21:17:53 +0200 |
| commit | 2be22979de2aae7963c22ecf035797d13081704c (patch) | |
| tree | a2213459baf5ad7d8d203b5fe00b8018db3fe77e /src | |
| parent | 180245e33c930cfe0d719a43e2554fbd393a95f7 (diff) | |
| parent | f53c8ca20f505754b324624fa5933a1a33368f94 (diff) | |
| download | GT5-Unofficial-2be22979de2aae7963c22ecf035797d13081704c.tar.gz GT5-Unofficial-2be22979de2aae7963c22ecf035797d13081704c.tar.bz2 GT5-Unofficial-2be22979de2aae7963c22ecf035797d13081704c.zip | |
Merge pull request #663 from TheBrochacho/experimental
improvements to the wireless redstone covers
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java index 93a729d0c2..577cff3d7a 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -33,10 +33,13 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && ((aY > 0.375D) && (aY < 0.625D)))) { GregTech_API.sWirelessRedstone.put(Integer.valueOf(aCoverVariable), Byte.valueOf((byte) 0)); - aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | (((Integer)GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem())).hashCode() & PUBLIC_MASK); + + int val = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()) * (1 + aPlayer.inventory.getCurrentItem().getItemDamage()); + + aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | (val & PUBLIC_MASK); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); - GT_Utility.sendChatToPlayer(aPlayer, trans("081", "Frequency: ") + aCoverVariable); + GT_Utility.sendChatToPlayer(aPlayer, trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK)); return true; } return false; @@ -76,7 +79,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | tPublicChannel; } } - GT_Utility.sendChatToPlayer(aPlayer, trans("081", "Frequency: ") + aCoverVariable); + GT_Utility.sendChatToPlayer(aPlayer, trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK)); return aCoverVariable; } |