diff options
author | Raven Szewczyk <git@eigenraven.me> | 2023-04-10 17:49:16 +0100 |
---|---|---|
committer | Raven Szewczyk <git@eigenraven.me> | 2023-04-10 17:49:16 +0100 |
commit | 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch) | |
tree | 0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/api/net | |
parent | d795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff) | |
download | GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2 GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip |
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/api/net')
14 files changed, 194 insertions, 206 deletions
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java b/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java index 74876ef2bc..b0b33492f7 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java +++ b/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java @@ -40,11 +40,11 @@ public class GT_Packet_Block_Event extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_Block_Event( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readByte(), - aData.readByte()); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readByte(), + aData.readByte()); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java b/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java index 7322339167..6108802862 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java +++ b/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java @@ -52,6 +52,6 @@ public class GT_Packet_ClientPreference extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_ClientPreference( - new GT_ClientPreference(aData.readBoolean(), aData.readBoolean(), aData.readBoolean())); + new GT_ClientPreference(aData.readBoolean(), aData.readBoolean(), aData.readBoolean())); } } diff --git a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java index bf1a7e4af7..bccb4b2b76 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java +++ b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java @@ -34,7 +34,7 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { } public GT_Packet_GtTileEntityGuiRequest(int mX, short mY, int mZ, int guiId, int dimID, int playerID, - int parentGuiId) { + int parentGuiId) { super(false); this.mX = mX; this.mY = mY; @@ -69,13 +69,13 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_GtTileEntityGuiRequest( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt()); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt()); } @Override @@ -92,22 +92,22 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { final EntityPlayerMP player = (EntityPlayerMP) world.getEntityByID(playerId); final CoverableTileEntity coverableTile = (baseTile instanceof CoverableTileEntity) - ? (CoverableTileEntity) baseTile - : null; + ? (CoverableTileEntity) baseTile + : null; // If the requested Gui ID corresponds to a cover, send the cover data to the client so they can open it. if (GT_Proxy.GUI_ID_COVER_SIDE_BASE <= guiId && guiId < GT_Proxy.GUI_ID_COVER_SIDE_BASE + 6 - && coverableTile != null) { + && coverableTile != null) { final byte coverSide = (byte) (guiId - GT_Proxy.GUI_ID_COVER_SIDE_BASE); final GT_Packet_TileEntityCoverGUI packet = new GT_Packet_TileEntityCoverGUI( - this.mX, - this.mY, - this.mZ, - coverSide, - coverableTile.getCoverIDAtSide(coverSide), - coverableTile.getComplexCoverDataAtSide(coverSide), - this.dimId, - this.playerId, - parentGuiId); + this.mX, + this.mY, + this.mZ, + coverSide, + coverableTile.getCoverIDAtSide(coverSide), + coverableTile.getComplexCoverDataAtSide(coverSide), + this.dimId, + this.playerId, + parentGuiId); GT_Values.NW.sendToPlayer(packet, player); } else if (guiId == 0) { if (baseTile.useModularUI()) { diff --git a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java index b31355adad..6c67dbe6b7 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java +++ b/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java @@ -21,7 +21,7 @@ import io.netty.buffer.ByteBuf; public class GT_Packet_MultiTileEntity extends GT_Packet_New { public static final int COVERS = B[0], REDSTONE = B[1], MODES = B[2], CONTROLLER = B[3], INVENTORY_INDEX = B[4], - INVENTORY_NAME = B[5], BOOLEANS = B[6], SOUND = B[7]; + INVENTORY_NAME = B[5], BOOLEANS = B[6], SOUND = B[7]; private int features = 0; @@ -47,7 +47,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { // For multi tiles public GT_Packet_MultiTileEntity(int aFeatures, int aX, short aY, int aZ, short aRID, short aID, byte aCommonData, - byte aColor) { + byte aColor) { super(false); features = aFeatures; @@ -179,25 +179,25 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { final int packetFeatures = aData.readInt(); final GT_Packet_MultiTileEntity packet = new GT_Packet_MultiTileEntity( - packetFeatures, - // Coords - aData.readInt(), - aData.readShort(), - aData.readInt(), - // Registry & ID - aData.readShort(), - aData.readShort(), - // Common Data - aData.readByte(), - aData.readByte()); + packetFeatures, + // Coords + aData.readInt(), + aData.readShort(), + aData.readInt(), + // Registry & ID + aData.readShort(), + aData.readShort(), + // Common Data + aData.readByte(), + aData.readByte()); if ((packetFeatures & COVERS) == COVERS) { packet.setCoverData( - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt()); + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt()); } if ((packetFeatures & REDSTONE) == REDSTONE) { packet.setRedstoneData(aData.readByte()); @@ -288,11 +288,11 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { } } catch (Exception e) { GT_Mod.GT_FML_LOGGER.error( - "Exception setting tile entity data for tile entity {} at ({}, {}, {})", - tTileEntity, - mX, - mY, - mZ); + "Exception setting tile entity data for tile entity {} at ({}, {}, {})", + tTileEntity, + mX, + mY, + mZ); } } diff --git a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java index e1ac057aa4..3f919dacd4 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java @@ -81,11 +81,11 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_RequestCoverData( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readByte(), - aData.readInt()); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readByte(), + aData.readInt()); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java index 971ed66aec..b348cbb9e3 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java @@ -30,7 +30,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { } public GT_Packet_SendCoverData(int mX, short mY, int mZ, byte coverSide, int coverID, - ISerializableObject coverData) { + ISerializableObject coverData) { super(false); this.mX = mX; this.mY = mY; @@ -83,14 +83,14 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { public GT_Packet_New decode(ByteArrayDataInput aData) { final int coverId; return new GT_Packet_SendCoverData( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readByte(), - coverId = aData.readInt(), - GregTech_API.getCoverBehaviorNew(coverId) - .createDataObject() - .readFromPacket(aData, null)); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readByte(), + coverId = aData.readInt(), + GregTech_API.getCoverBehaviorNew(coverId) + .createDataObject() + .readFromPacket(aData, null)); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java index ac72730705..b2d9a59438 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java @@ -84,10 +84,10 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_SetConfigurationCircuit( - aData.readInt(), - aData.readShort(), - aData.readInt(), - ISerializableObject.readItemStackFromGreggyByteBuf(aData)); + aData.readInt(), + aData.readShort(), + aData.readInt(), + ISerializableObject.readItemStackFromGreggyByteBuf(aData)); } @Override @@ -102,9 +102,9 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New { if (machine == null) return; if (!machine.allowSelectCircuit()) return; machine.getConfigurationCircuits() - .stream() - .filter(stack -> GT_Utility.areStacksEqual(stack, circuit)) - .findFirst() - .ifPresent(stack -> ((IHasInventory) tile).setInventorySlotContents(machine.getCircuitSlot(), stack)); + .stream() + .filter(stack -> GT_Utility.areStacksEqual(stack, circuit)) + .findFirst() + .ifPresent(stack -> ((IHasInventory) tile).setInventorySlotContents(machine.getCircuitSlot(), stack)); } } diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java b/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java index 0252201ba3..04f147b208 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java @@ -88,13 +88,13 @@ public class GT_Packet_SetLockedFluid extends GT_Packet_New { mteToLock.lockFluid(true); mteToLock.setLockedFluidName(tFluid.getName()); GT_Utility.sendChatToPlayer( - mPlayer, - String.format( - GT_LanguageManager.addStringLocalization( - "Interaction_DESCRIPTION_Index_151.4", - "Successfully locked Fluid to %s", - false), - new FluidStack(tFluid, 1).getLocalizedName())); + mPlayer, + String.format( + GT_LanguageManager.addStringLocalization( + "Interaction_DESCRIPTION_Index_151.4", + "Successfully locked Fluid to %s", + false), + new FluidStack(tFluid, 1).getLocalizedName())); mteToLock.onFluidLockPacketReceived(tFluid.getName()); } diff --git a/src/main/java/gregtech/api/net/GT_Packet_Sound.java b/src/main/java/gregtech/api/net/GT_Packet_Sound.java index 808ddc218c..f742c39dba 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_Sound.java +++ b/src/main/java/gregtech/api/net/GT_Packet_Sound.java @@ -52,12 +52,12 @@ public class GT_Packet_Sound extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_Sound( - aData.readUTF(), - aData.readFloat(), - aData.readFloat(), - aData.readInt(), - aData.readShort(), - aData.readInt()); + aData.readUTF(), + aData.readFloat(), + aData.readFloat(), + aData.readInt(), + aData.readShort(), + aData.readInt()); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java index 99a5c55dc6..29562e9b4d 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java @@ -23,7 +23,7 @@ public class GT_Packet_TileEntity extends GT_Packet_New { // For multi tiles public GT_Packet_TileEntity(int aX, short aY, int aZ, short aRID, short aID, int aC0, int aC1, int aC2, int aC3, - int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) { + int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) { super(false); mX = aX; mY = aY; @@ -45,29 +45,29 @@ public class GT_Packet_TileEntity extends GT_Packet_New { // For meta tiles public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, - int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) { + int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) { this( - aX, - aY, - aZ, - (short) 0, - aID, - aC0, - aC1, - aC2, - aC3, - aC4, - aC5, - aTexture, - aTexturePage, - aUpdate, - aRedstone, - aColor); + aX, + aY, + aZ, + (short) 0, + aID, + aC0, + aC1, + aC2, + aC3, + aC4, + aC5, + aTexture, + aTexturePage, + aUpdate, + aRedstone, + aColor); } // For pipes public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, - int aC5, byte aTexture, byte aUpdate, byte aRedstone, byte aColor) { + int aC5, byte aTexture, byte aUpdate, byte aRedstone, byte aColor) { this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, (byte) 0, aUpdate, aRedstone, aColor); } @@ -97,26 +97,26 @@ public class GT_Packet_TileEntity extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_TileEntity( - // Coords - aData.readInt(), - aData.readShort(), - aData.readInt(), - // Registry & ID - aData.readShort(), - aData.readShort(), - // Covers - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - // Everything else - aData.readByte(), - aData.readByte(), - aData.readByte(), - aData.readByte(), - aData.readByte()); + // Coords + aData.readInt(), + aData.readShort(), + aData.readInt(), + // Registry & ID + aData.readShort(), + aData.readShort(), + // Covers + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + // Everything else + aData.readByte(), + aData.readByte(), + aData.readByte(), + aData.readByte(), + aData.readByte()); } @Override @@ -126,38 +126,27 @@ public class GT_Packet_TileEntity extends GT_Packet_New { try { final Block tBlock; if (tTileEntity instanceof BaseMetaTileEntity) ((BaseMetaTileEntity) tTileEntity).receiveMetaTileEntityData( - mID, - mC0, - mC1, - mC2, - mC3, - mC4, - mC5, - mTexture, - mTexturePage, - mUpdate, - mRedstone, - mColor); - else if (tTileEntity instanceof BaseMetaPipeEntity) - ((BaseMetaPipeEntity) tTileEntity).receiveMetaTileEntityData( - mID, - mC0, - mC1, - mC2, - mC3, - mC4, - mC5, - mTexture, - mUpdate, - mRedstone, - mColor); + mID, + mC0, + mC1, + mC2, + mC3, + mC4, + mC5, + mTexture, + mTexturePage, + mUpdate, + mRedstone, + mColor); + else if (tTileEntity instanceof BaseMetaPipeEntity) ((BaseMetaPipeEntity) tTileEntity) + .receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor); } catch (Exception e) { GT_Mod.GT_FML_LOGGER.error( - "Exception setting tile entity data for tile entity {} at ({}, {}, {})", - tTileEntity, - mX, - mY, - mZ); + "Exception setting tile entity data for tile entity {} at ({}, {}, {})", + tTileEntity, + mX, + mY, + mZ); } } diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java index 07d99a3896..0e4bedc16e 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java @@ -74,13 +74,13 @@ public class GT_Packet_TileEntityCover extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_TileEntityCover( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readByte(), - aData.readInt(), - aData.readInt(), - aData.readInt()); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readByte(), + aData.readInt(), + aData.readInt(), + aData.readInt()); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java index 25d4adf8e1..79156e4223 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java @@ -39,7 +39,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { } public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID, - int playerID) { + int playerID) { super(false); this.mX = mX; this.mY = mY; @@ -55,7 +55,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { } public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, - ISerializableObject coverData, int dimID, int playerID) { + ISerializableObject coverData, int dimID, int playerID) { super(false); this.mX = mX; this.mY = mY; @@ -86,7 +86,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { } public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, - ISerializableObject coverData, int dimID, int playerID, int parentGuiId) { + ISerializableObject coverData, int dimID, int playerID, int parentGuiId) { super(false); this.mX = mX; this.mY = mY; @@ -101,7 +101,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { } public GT_Packet_TileEntityCoverGUI(byte side, int coverID, int coverData, ICoverable tile, - EntityPlayerMP aPlayer) { + EntityPlayerMP aPlayer) { super(false); this.mX = tile.getXCoord(); @@ -132,7 +132,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { } public GT_Packet_TileEntityCoverGUI(byte side, int coverID, ISerializableObject coverData, ICoverable tile, - EntityPlayerMP aPlayer) { + EntityPlayerMP aPlayer) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -172,17 +172,17 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { public GT_Packet_New decode(ByteArrayDataInput aData) { int coverID; return new GT_Packet_TileEntityCoverGUI( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readByte(), - coverID = aData.readInt(), - GregTech_API.getCoverBehaviorNew(coverID) - .createDataObject() - .readFromPacket(aData, null), - aData.readInt(), - aData.readInt(), - aData.readInt()); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readByte(), + coverID = aData.readInt(), + GregTech_API.getCoverBehaviorNew(coverID) + .createDataObject() + .readFromPacket(aData, null), + aData.readInt(), + aData.readInt(), + aData.readInt()); } @Override @@ -197,19 +197,19 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { GT_CoverBehaviorBase<?> cover = gtTile.getCoverBehaviorAtSideNew(side); if (cover.hasCoverGUI()) { final GuiScreen gui = (GuiScreen) cover.getClientGUI( - side, - gtTile.getCoverIDAtSide(side), - gtTile.getComplexCoverDataAtSide(side), - gtTile, - thePlayer, - thePlayer.worldObj); + side, + gtTile.getCoverIDAtSide(side), + gtTile.getComplexCoverDataAtSide(side), + gtTile, + thePlayer, + thePlayer.worldObj); // If it's one of this mod's covers, tell it to exit to the GUI with the specified ID (-1 is // ignored) if (gui instanceof GT_GUICover) { ((GT_GUICover) gui).setParentGuiId(parentGuiId); } Minecraft.getMinecraft() - .displayGuiScreen(gui); + .displayGuiScreen(gui); } } } diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java index 453ed88e60..89201710f3 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java @@ -36,7 +36,7 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { } public GT_Packet_TileEntityCoverNew(int mX, short mY, int mZ, byte coverSide, int coverID, - ISerializableObject coverData, int dimID) { + ISerializableObject coverData, int dimID) { super(false); this.mX = mX; this.mY = mY; @@ -91,15 +91,15 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { public GT_Packet_New decode(ByteArrayDataInput aData) { int coverId; return new GT_Packet_TileEntityCoverNew( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readByte(), - coverId = aData.readInt(), - GregTech_API.getCoverBehaviorNew(coverId) - .createDataObject() - .readFromPacket(aData, mPlayer), - aData.readInt()); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readByte(), + coverId = aData.readInt(), + GregTech_API.getCoverBehaviorNew(coverId) + .createDataObject() + .readFromPacket(aData, mPlayer), + aData.readInt()); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java index 6f0f8d215d..5121ce03df 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java +++ b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java @@ -29,14 +29,14 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { } public GT_Packet_WirelessRedstoneCover(int mX, short mY, int mZ, byte coverSide, int coverID, int dimID, - int publicChannel, int checkBoxValue) { + int publicChannel, int checkBoxValue) { super(mX, mY, mZ, coverSide, coverID, 0, dimID); mPublicChannel = publicChannel; mCheckBoxValue = checkBoxValue; } public GT_Packet_WirelessRedstoneCover(byte coverSide, int coverID, ICoverable tile, int publicChannel, - int checkBoxValue) { + int checkBoxValue) { super(coverSide, coverID, 0, tile); mPublicChannel = publicChannel; mCheckBoxValue = checkBoxValue; @@ -72,14 +72,14 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { return new GT_Packet_WirelessRedstoneCover( - aData.readInt(), - aData.readShort(), - aData.readInt(), - aData.readByte(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt()); + aData.readInt(), + aData.readShort(), + aData.readInt(), + aData.readByte(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt()); } @Override @@ -89,8 +89,7 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { TileEntity tile = world.getTileEntity(mX, mY, mZ); if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) { int tPrivateChannel = (mCheckBoxValue > 0) ? mPlayer.getUniqueID() - .hashCode() - & PRIVATE_MASK : 0; + .hashCode() & PRIVATE_MASK : 0; int tCoverData = tPrivateChannel | (mCheckBoxValue & CHECKBOX_MASK) | (mPublicChannel & PUBLIC_MASK); ((IGregTechTileEntity) tile).receiveCoverData(side, coverID, tCoverData); } |