diff options
Diffstat (limited to 'src/main/java/gregtech/api/net')
16 files changed, 319 insertions, 220 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 9060144e22..dd7657e95d 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 @@ -37,7 +37,8 @@ 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()); + return new GT_Packet_Block_Event( + 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 5f2549d13c..f692a4c88a 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java +++ b/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java @@ -36,8 +36,7 @@ public class GT_Packet_ClientPreference extends GT_Packet_New { @Override public void process(IBlockAccess aWorld) { - if (mPlayer != null) - GT_Mod.gregtechproxy.setClientPreference(mPlayer.getUniqueID(), mPreference); + if (mPlayer != null) GT_Mod.gregtechproxy.setClientPreference(mPlayer.getUniqueID(), mPreference); } @Override @@ -49,6 +48,7 @@ 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())); + return new GT_Packet_ClientPreference( + 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 bf412c4400..9f32ad4bae 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java +++ b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java @@ -1,7 +1,6 @@ package gregtech.api.net; import com.google.common.io.ByteArrayDataInput; - import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.common.GT_Proxy; @@ -17,7 +16,6 @@ import net.minecraftforge.common.DimensionManager; */ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { - protected int mX; protected short mY; protected int mZ; @@ -31,7 +29,8 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { super(true); } - public GT_Packet_GtTileEntityGuiRequest(int mX, short mY, int mZ, int guiId, int dimID, int playerID, int parentGuiId) { + public GT_Packet_GtTileEntityGuiRequest( + int mX, short mY, int mZ, int guiId, int dimID, int playerID, int parentGuiId) { super(false); this.mX = mX; this.mY = mY; @@ -69,12 +68,9 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readInt(), - aData.readInt(), aData.readInt(), - aData.readInt()); } @@ -91,22 +87,23 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { if (!(tile instanceof IGregTechTileEntity) || ((IGregTechTileEntity) tile).isDead()) return; IGregTechTileEntity gtTile = ((IGregTechTileEntity) tile); - EntityPlayerMP player = (EntityPlayerMP) world.getEntityByID(playerId); + EntityPlayerMP player = (EntityPlayerMP) world.getEntityByID(playerId); // 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) { + if (GT_Proxy.GUI_ID_COVER_SIDE_BASE <= guiId && guiId < GT_Proxy.GUI_ID_COVER_SIDE_BASE + 6) { byte coverSide = (byte) (guiId - GT_Proxy.GUI_ID_COVER_SIDE_BASE); GT_Packet_TileEntityCoverGUI packet = new GT_Packet_TileEntityCoverGUI( - this.mX, this.mY, this.mZ, - coverSide, - gtTile.getCoverIDAtSide(coverSide), - gtTile.getComplexCoverDataAtSide(coverSide), - this.dimId, - this.playerId, - parentGuiId); + this.mX, + this.mY, + this.mZ, + coverSide, + gtTile.getCoverIDAtSide(coverSide), + gtTile.getComplexCoverDataAtSide(coverSide), + this.dimId, + this.playerId, + parentGuiId); GT_Values.NW.sendToPlayer(packet, player); } else if (guiId == 0) { gtTile.openGUI(player); } } - } diff --git a/src/main/java/gregtech/api/net/GT_Packet_New.java b/src/main/java/gregtech/api/net/GT_Packet_New.java index 10beae0e4d..f4e6f2a0e2 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_New.java +++ b/src/main/java/gregtech/api/net/GT_Packet_New.java @@ -1,29 +1,28 @@ package gregtech.api.net; import com.google.common.io.ByteArrayDataInput; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @SuppressWarnings("deprecation") public abstract class GT_Packet_New extends GT_Packet { - public GT_Packet_New(boolean aIsReference) { - super(aIsReference); - } + public GT_Packet_New(boolean aIsReference) { + super(aIsReference); + } - @Override - @Deprecated - public final byte[] encode() { - ByteBuf tOut = Unpooled.buffer(); - encode(tOut); - byte[] bytes = new byte[tOut.readableBytes()]; - tOut.readBytes(bytes); - return bytes; - } + @Override + @Deprecated + public final byte[] encode() { + ByteBuf tOut = Unpooled.buffer(); + encode(tOut); + byte[] bytes = new byte[tOut.readableBytes()]; + tOut.readBytes(bytes); + return bytes; + } - @Override - public abstract void encode(ByteBuf aOut); + @Override + public abstract void encode(ByteBuf aOut); - @Override - public abstract GT_Packet_New decode(ByteArrayDataInput aData); + @Override + public abstract GT_Packet_New decode(ByteArrayDataInput aData); } diff --git a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java index 20efe41679..b79ce20e39 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java +++ b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java @@ -27,10 +27,7 @@ public class GT_Packet_Pollution extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { - return new GT_Packet_Pollution( - new ChunkCoordIntPair(aData.readInt(), aData.readInt()), - aData.readInt() - ); + return new GT_Packet_Pollution(new ChunkCoordIntPair(aData.readInt(), aData.readInt()), aData.readInt()); } @Override 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 cdb744ee32..8084a772bb 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java @@ -1,11 +1,8 @@ package gregtech.api.net; import com.google.common.io.ByteArrayDataInput; -import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.CoverableTileEntity; -import gregtech.api.util.ISerializableObject; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.INetHandler; @@ -41,6 +38,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { this.side = coverSide; this.coverID = coverID; } + public GT_Packet_RequestCoverData(byte coverSide, int coverID, ICoverable tile) { super(false); this.mX = tile.getXCoord(); @@ -69,13 +67,7 @@ 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 @@ -88,7 +80,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { @Override public void process(IBlockAccess aWorld) { if (mPlayer == null) // impossible, but who knows - return; + return; World world = DimensionManager.getWorld(mPlayer.dimension); if (world != null) { final TileEntity tile = world.getTileEntity(mX, mY, mZ); 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 820f4e18d5..ab8b230077 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java @@ -25,7 +25,8 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { super(true); } - public GT_Packet_SendCoverData(int mX, short mY, int mZ, byte coverSide, int coverID, ISerializableObject coverData) { + public GT_Packet_SendCoverData( + int mX, short mY, int mZ, byte coverSide, int coverID, ISerializableObject coverData) { super(false); this.mX = mX; this.mY = mY; @@ -35,6 +36,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { this.coverID = coverID; this.coverData = coverData; } + public GT_Packet_SendCoverData(byte coverSide, int coverID, ISerializableObject coverData, ICoverable tile) { super(false); this.mX = tile.getXCoord(); @@ -69,11 +71,9 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), coverId = aData.readInt(), - GregTech_API.getCoverBehaviorNew(coverId).createDataObject().readFromPacket(aData, null) - ); + 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 1cfe59743c..0561b18ac1 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java @@ -5,7 +5,6 @@ import cpw.mods.fml.common.network.ByteBufUtils; import gregtech.api.interfaces.metatileentity.IConfigurationCircuitSupport; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; import io.netty.buffer.ByteBuf; @@ -20,7 +19,6 @@ import net.minecraftforge.common.DimensionManager; /** * Client -> Server: Update machine configuration data */ - public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New { protected int mX; protected short mY; @@ -97,6 +95,7 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New { machine.getConfigurationCircuits().stream() .filter(stack -> GT_Utility.areStacksEqual(stack, circuit)) .findFirst() - .ifPresent(stack -> ((IGregTechTileEntity) tile).setInventorySlotContents(machine.getCircuitSlot(), stack)); + .ifPresent(stack -> + ((IGregTechTileEntity) 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 911d48223b..d100dd6055 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java @@ -18,76 +18,76 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class GT_Packet_SetLockedFluid extends GT_Packet_New { - protected int mX; - protected short mY; - protected int mZ; - - protected int mFluidID; - - private EntityPlayerMP mPlayer; - - public GT_Packet_SetLockedFluid() { - super(true); - } - - public GT_Packet_SetLockedFluid(IGregTechTileEntity aTile, FluidStack aSource) { - this(aTile.getXCoord(), aTile.getYCoord(), aTile.getZCoord(), aSource.getFluidID()); - } - - public GT_Packet_SetLockedFluid(int x, short y, int z, int aFluidID) { - super(false); - - this.mX = x; - this.mY = y; - this.mZ = z; - - this.mFluidID = aFluidID; - } - - @Override - public byte getPacketID() { - return 14; - } - - @Override - public void encode(ByteBuf aOut) { - aOut.writeInt(mX); - aOut.writeShort(mY); - aOut.writeInt(mZ); - - aOut.writeInt(mFluidID); - } - - @Override - public void setINetHandler(INetHandler aHandler) { - if (aHandler instanceof NetHandlerPlayServer) { - mPlayer = ((NetHandlerPlayServer) aHandler).playerEntity; - } - } - - @Override - public GT_Packet_New decode(ByteArrayDataInput aData) { - return new GT_Packet_SetLockedFluid( - aData.readInt(), - aData.readShort(), - aData.readInt(), - - aData.readInt()); - } - - @Override - public void process(IBlockAccess aWorld) { - if (mPlayer == null) return; - World world = mPlayer.worldObj; - TileEntity tile = world.getTileEntity(mX, mY, mZ); - if (!(tile instanceof IGregTechTileEntity) || ((IGregTechTileEntity) tile).isDead()) return; - IMetaTileEntity mte = ((IGregTechTileEntity) tile).getMetaTileEntity(); - if (!(mte instanceof GT_MetaTileEntity_Hatch_Output)) return; - Fluid tFluid = FluidRegistry.getFluid(mFluidID); - if (tFluid == null) return; + protected int mX; + protected short mY; + protected int mZ; + + protected int mFluidID; + + private EntityPlayerMP mPlayer; + + public GT_Packet_SetLockedFluid() { + super(true); + } + + public GT_Packet_SetLockedFluid(IGregTechTileEntity aTile, FluidStack aSource) { + this(aTile.getXCoord(), aTile.getYCoord(), aTile.getZCoord(), aSource.getFluidID()); + } + + public GT_Packet_SetLockedFluid(int x, short y, int z, int aFluidID) { + super(false); + + this.mX = x; + this.mY = y; + this.mZ = z; + + this.mFluidID = aFluidID; + } + + @Override + public byte getPacketID() { + return 14; + } + + @Override + public void encode(ByteBuf aOut) { + aOut.writeInt(mX); + aOut.writeShort(mY); + aOut.writeInt(mZ); + + aOut.writeInt(mFluidID); + } + + @Override + public void setINetHandler(INetHandler aHandler) { + if (aHandler instanceof NetHandlerPlayServer) { + mPlayer = ((NetHandlerPlayServer) aHandler).playerEntity; + } + } + + @Override + public GT_Packet_New decode(ByteArrayDataInput aData) { + return new GT_Packet_SetLockedFluid(aData.readInt(), aData.readShort(), aData.readInt(), aData.readInt()); + } + + @Override + public void process(IBlockAccess aWorld) { + if (mPlayer == null) return; + World world = mPlayer.worldObj; + TileEntity tile = world.getTileEntity(mX, mY, mZ); + if (!(tile instanceof IGregTechTileEntity) || ((IGregTechTileEntity) tile).isDead()) return; + IMetaTileEntity mte = ((IGregTechTileEntity) tile).getMetaTileEntity(); + if (!(mte instanceof GT_MetaTileEntity_Hatch_Output)) return; + Fluid tFluid = FluidRegistry.getFluid(mFluidID); + if (tFluid == null) return; GT_MetaTileEntity_Hatch_Output hatch = (GT_MetaTileEntity_Hatch_Output) mte; hatch.setLockedFluidName(tFluid.getName()); hatch.mMode = 9; - GT_Utility.sendChatToPlayer(mPlayer, String.format(GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_151.4", "Sucessfully locked Fluid to %s", false), new FluidStack(tFluid, 1).getLocalizedName())); - } + GT_Utility.sendChatToPlayer( + mPlayer, + String.format( + GT_LanguageManager.addStringLocalization( + "Interaction_DESCRIPTION_Index_151.4", "Sucessfully locked Fluid to %s", false), + new FluidStack(tFluid, 1).getLocalizedName())); + } } 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 be66400609..ae779efc75 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_Sound.java +++ b/src/main/java/gregtech/api/net/GT_Packet_Sound.java @@ -5,10 +5,9 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; -import net.minecraft.world.IBlockAccess; - import java.io.DataOutput; import java.io.IOException; +import net.minecraft.world.IBlockAccess; public class GT_Packet_Sound extends GT_Packet_New { private int mX, mZ; @@ -48,7 +47,13 @@ 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()); + return new GT_Packet_Sound( + 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 970b0ca156..f805fee76c 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java @@ -19,7 +19,23 @@ 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) { + 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) { super(false); mX = aX; mY = aY; @@ -33,19 +49,64 @@ public class GT_Packet_TileEntity extends GT_Packet_New { mRID = aRID; mID = aID; mTexture = aTexture; - mTexturePage=aTexturePage; + mTexturePage = aTexturePage; mUpdate = aUpdate; mRedstone = aRedstone; mColor = aColor; } // 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) { - this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, aTexturePage, aUpdate, aRedstone, aColor); + 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) { + this( + 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) { + 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) { this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, (byte) 0, aUpdate, aRedstone, aColor); } @@ -75,15 +136,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 @@ -92,11 +164,33 @@ public class GT_Packet_TileEntity extends GT_Packet_New { final TileEntity tTileEntity = aWorld.getTileEntity(mX, mY, mZ); final Block tBlock; if (tTileEntity instanceof BaseMetaTileEntity) - ((BaseMetaTileEntity) tTileEntity).receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mTexturePage, mUpdate, mRedstone, mColor); + ((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); + ((BaseMetaPipeEntity) tTileEntity) + .receiveMetaTileEntityData( + mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor); else if ((tBlock = aWorld.getBlock(mX, mY, mZ)) instanceof MultiTileEntityBlock) { - ((MultiTileEntityBlock)tBlock).receiveMultiTileEntityData(aWorld, mX, mY, mZ, mRID, mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mTexturePage, mUpdate, mRedstone, mColor); + ((MultiTileEntityBlock) tBlock) + .receiveMultiTileEntityData( + aWorld, + mX, + mY, + mZ, + mRID, + mID, + mC0, + mC1, + mC2, + mC3, + mC4, + mC5, + mTexture, + mTexturePage, + mUpdate, + mRedstone, + mColor); } } } 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 8035030f19..6989acca9e 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java @@ -36,6 +36,7 @@ public class GT_Packet_TileEntityCover extends GT_Packet_New { this.dimID = dimID; } + public GT_Packet_TileEntityCover(byte coverSide, int coverID, int coverData, ICoverable tile) { super(false); this.mX = tile.getXCoord(); @@ -73,11 +74,9 @@ public class GT_Packet_TileEntityCover extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), aData.readInt(), aData.readInt(), - aData.readInt()); } 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 687bceb726..e190648bef 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java @@ -34,8 +34,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { super(true); } - public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID, - int playerID) { + public GT_Packet_TileEntityCoverGUI( + int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID, int playerID) { super(false); this.mX = mX; this.mY = mY; @@ -50,8 +50,15 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { this.parentGuiId = -1; } - public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, - ISerializableObject coverData, int dimID, int playerID) { + public GT_Packet_TileEntityCoverGUI( + int mX, + short mY, + int mZ, + byte coverSide, + int coverID, + ISerializableObject coverData, + int dimID, + int playerID) { super(false); this.mX = mX; this.mY = mY; @@ -65,8 +72,16 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { this.parentGuiId = -1; } - public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, - ISerializableObject coverData, int dimID, int playerID, int parentGuiId) { + public GT_Packet_TileEntityCoverGUI( + int mX, + short mY, + int mZ, + byte coverSide, + int coverID, + ISerializableObject coverData, + int dimID, + int playerID, + int parentGuiId) { super(false); this.mX = mX; this.mY = mY; @@ -80,8 +95,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { this.parentGuiId = parentGuiId; } - - public GT_Packet_TileEntityCoverGUI(byte side, int coverID, int coverData, ICoverable tile, EntityPlayerMP aPlayer) { + public GT_Packet_TileEntityCoverGUI( + byte side, int coverID, int coverData, ICoverable tile, EntityPlayerMP aPlayer) { super(false); this.mX = tile.getXCoord(); @@ -111,8 +126,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { this.parentGuiId = -1; } - public GT_Packet_TileEntityCoverGUI(byte side, int coverID, ISerializableObject coverData, ICoverable tile, - EntityPlayerMP aPlayer) { + public GT_Packet_TileEntityCoverGUI( + byte side, int coverID, ISerializableObject coverData, ICoverable tile, EntityPlayerMP aPlayer) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -155,14 +170,11 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { 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()); } @@ -170,12 +182,12 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { public void process(IBlockAccess aWorld) { if (aWorld instanceof World) { // Using EntityPlayer instead of EntityClientPlayerMP so both client and server can load this - EntityPlayer thePlayer = ((EntityPlayer) ((World)aWorld).getEntityByID(playerID)); + EntityPlayer thePlayer = ((EntityPlayer) ((World) aWorld).getEntityByID(playerID)); TileEntity tile = aWorld.getTileEntity(mX, mY, mZ); if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) { IGregTechTileEntity gtTile = ((IGregTechTileEntity) tile); - gtTile.setCoverDataAtSide(side, coverData); //Set it client side to read later. - + gtTile.setCoverDataAtSide(side, coverData); // Set it client side to read later. + GuiScreen gui = (GuiScreen) getCoverGUI(side, thePlayer, thePlayer.worldObj, gtTile); // 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) { @@ -198,7 +210,12 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { GT_CoverBehaviorBase<?> cover = aGtTile.getCoverBehaviorAtSideNew(aSide); if (cover.hasCoverGUI()) { return cover.getClientGUI( - aSide, aGtTile.getCoverIDAtSide(aSide), aGtTile.getComplexCoverDataAtSide(aSide), aGtTile, aPlayer, aWorld); + aSide, + aGtTile.getCoverIDAtSide(aSide), + aGtTile.getComplexCoverDataAtSide(aSide), + aGtTile, + aPlayer, + aWorld); } return null; } 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 f600fb1d82..2b2338d4ce 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java @@ -17,7 +17,6 @@ import net.minecraftforge.common.DimensionManager; /** * Client -> Server: Update cover data */ - public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { protected int mX; protected short mY; @@ -33,7 +32,8 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { super(true); } - public GT_Packet_TileEntityCoverNew(int mX, short mY, int mZ, byte coverSide, int coverID, ISerializableObject coverData, int dimID) { + public GT_Packet_TileEntityCoverNew( + int mX, short mY, int mZ, byte coverSide, int coverID, ISerializableObject coverData, int dimID) { super(false); this.mX = mX; this.mY = mY; @@ -45,6 +45,7 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { this.dimID = dimID; } + public GT_Packet_TileEntityCoverNew(byte coverSide, int coverID, ISerializableObject coverData, ICoverable tile) { super(false); this.mX = tile.getXCoord(); @@ -90,18 +91,16 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), coverId = aData.readInt(), GregTech_API.getCoverBehaviorNew(coverId).createDataObject().readFromPacket(aData, mPlayer), - aData.readInt()); } @Override public void process(IBlockAccess aWorld) { if (mPlayer == null) // impossible, but who knows - return; + return; World world = DimensionManager.getWorld(dimID); if (world != null) { TileEntity tile = world.getTileEntity(mX, mY, mZ); diff --git a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java b/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java index 537f62ccec..db94051946 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java +++ b/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java @@ -16,46 +16,46 @@ import net.minecraft.world.IBlockAccess; * Client -> Server: send arbitrary data to server and update the currently held item. */ public class GT_Packet_UpdateItem extends GT_Packet_New { - private NBTTagCompound tag; - private EntityPlayerMP mPlayer; - - public GT_Packet_UpdateItem() { - super(true); - } - - public GT_Packet_UpdateItem(NBTTagCompound tag) { - super(false); - this.tag = tag; - } - - @Override - public byte getPacketID() { - return 13; - } - - @Override - public void setINetHandler(INetHandler aHandler) { - if (aHandler instanceof NetHandlerPlayServer) { - mPlayer = ((NetHandlerPlayServer) aHandler).playerEntity; - } - } - - @Override - public void encode(ByteBuf aOut) { - ByteBufUtils.writeTag(aOut, tag); - } - - @Override - public GT_Packet_New decode(ByteArrayDataInput aData) { - return new GT_Packet_UpdateItem(ISerializableObject.readCompoundTagFromGreggyByteBuf(aData)); - } - - @Override - public void process(IBlockAccess aWorld) { - if (mPlayer == null) return; - ItemStack stack = mPlayer.inventory.getCurrentItem(); - if (stack != null && stack.getItem() instanceof INetworkUpdatableItem) { - ((INetworkUpdatableItem) stack.getItem()).receive(stack, mPlayer, tag); - } - } + private NBTTagCompound tag; + private EntityPlayerMP mPlayer; + + public GT_Packet_UpdateItem() { + super(true); + } + + public GT_Packet_UpdateItem(NBTTagCompound tag) { + super(false); + this.tag = tag; + } + + @Override + public byte getPacketID() { + return 13; + } + + @Override + public void setINetHandler(INetHandler aHandler) { + if (aHandler instanceof NetHandlerPlayServer) { + mPlayer = ((NetHandlerPlayServer) aHandler).playerEntity; + } + } + + @Override + public void encode(ByteBuf aOut) { + ByteBufUtils.writeTag(aOut, tag); + } + + @Override + public GT_Packet_New decode(ByteArrayDataInput aData) { + return new GT_Packet_UpdateItem(ISerializableObject.readCompoundTagFromGreggyByteBuf(aData)); + } + + @Override + public void process(IBlockAccess aWorld) { + if (mPlayer == null) return; + ItemStack stack = mPlayer.inventory.getCurrentItem(); + if (stack != null && stack.getItem() instanceof INetworkUpdatableItem) { + ((INetworkUpdatableItem) stack.getItem()).receive(stack, mPlayer, tag); + } + } } 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 3ce0b48821..3d18c9d204 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java +++ b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java @@ -25,13 +25,15 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { super(); } - public GT_Packet_WirelessRedstoneCover(int mX, short mY, int mZ, byte coverSide, int coverID, int dimID, int publicChannel, int checkBoxValue) { + public GT_Packet_WirelessRedstoneCover( + int mX, short mY, int mZ, byte coverSide, int coverID, int dimID, 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) { + public GT_Packet_WirelessRedstoneCover( + byte coverSide, int coverID, ICoverable tile, int publicChannel, int checkBoxValue) { super(coverSide, coverID, 0, tile); mPublicChannel = publicChannel; mCheckBoxValue = checkBoxValue; @@ -70,12 +72,9 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), aData.readInt(), - aData.readInt(), - aData.readInt(), aData.readInt()); } @@ -86,7 +85,8 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { if (world != null && world.blockExists(mX, mY, mZ)) { TileEntity tile = world.getTileEntity(mX, mY, mZ); if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) { - int tPrivateChannel = (mCheckBoxValue > 0) ? mPlayer.getUniqueID().hashCode() & PRIVATE_MASK : 0; + int tPrivateChannel = + (mCheckBoxValue > 0) ? mPlayer.getUniqueID().hashCode() & PRIVATE_MASK : 0; int tCoverData = tPrivateChannel | (mCheckBoxValue & CHECKBOX_MASK) | (mPublicChannel & PUBLIC_MASK); ((IGregTechTileEntity) tile).receiveCoverData(side, coverID, tCoverData); } |