diff options
Diffstat (limited to 'src/main/java/gregtech/api/net')
7 files changed, 55 insertions, 43 deletions
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 bccb4b2b76..dc2f88316d 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java +++ b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java @@ -5,6 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -88,7 +89,7 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { final World world = DimensionManager.getWorld(this.dimId); if (world == null) return; final TileEntity tile = world.getTileEntity(this.mX, this.mY, this.mZ); - if (!(tile instanceof BaseTileEntity baseTile) || ((BaseTileEntity) tile).isDead()) return; + if (!(tile instanceof BaseTileEntity baseTile) || baseTile.isDead()) return; final EntityPlayerMP player = (EntityPlayerMP) world.getEntityByID(playerId); final CoverableTileEntity coverableTile = (baseTile instanceof CoverableTileEntity) @@ -97,7 +98,8 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { // 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) { - final byte coverSide = (byte) (guiId - GT_Proxy.GUI_ID_COVER_SIDE_BASE); + final ForgeDirection coverSide = ForgeDirection + .getOrientation((byte) (guiId - GT_Proxy.GUI_ID_COVER_SIDE_BASE)); final GT_Packet_TileEntityCoverGUI packet = new GT_Packet_TileEntityCoverGUI( this.mX, this.mY, 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 3f919dacd4..94ae86c2d9 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java @@ -7,6 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -24,7 +25,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { protected short mY; protected int mZ; - protected byte side; + protected ForgeDirection side; protected int coverID; protected EntityPlayerMP mPlayer; @@ -43,7 +44,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { this.coverID = info.getCoverID(); } - public GT_Packet_RequestCoverData(int mX, short mY, int mZ, byte coverSide, int coverID) { + public GT_Packet_RequestCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID) { super(false); this.mX = mX; this.mY = mY; @@ -53,7 +54,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { this.coverID = coverID; } - public GT_Packet_RequestCoverData(byte coverSide, int coverID, ICoverable tile) { + public GT_Packet_RequestCoverData(ForgeDirection coverSide, int coverID, ICoverable tile) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -74,7 +75,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { aOut.writeShort(mY); aOut.writeInt(mZ); - aOut.writeByte(side); + aOut.writeByte(side.ordinal()); aOut.writeInt(coverID); } @@ -84,7 +85,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), + ForgeDirection.getOrientation(aData.readByte()), aData.readInt()); } 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 b348cbb9e3..47f549b5b4 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java @@ -2,6 +2,7 @@ package gregtech.api.net; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -21,7 +22,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { protected short mY; protected int mZ; - protected byte side; + protected ForgeDirection side; protected int coverID; protected ISerializableObject coverData; @@ -29,7 +30,7 @@ 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, + public GT_Packet_SendCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID, ISerializableObject coverData) { super(false); this.mX = mX; @@ -52,7 +53,8 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { this.coverData = info.getCoverData(); } - public GT_Packet_SendCoverData(byte coverSide, int coverID, ISerializableObject coverData, ICoverable tile) { + public GT_Packet_SendCoverData(ForgeDirection coverSide, int coverID, ISerializableObject coverData, + ICoverable tile) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -74,7 +76,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { aOut.writeShort(mY); aOut.writeInt(mZ); - aOut.writeByte(side); + aOut.writeByte(side.ordinal()); aOut.writeInt(coverID); coverData.writeToByteBuf(aOut); } @@ -86,7 +88,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), + ForgeDirection.getOrientation(aData.readByte()), coverId = aData.readInt(), GregTech_API.getCoverBehaviorNew(coverId) .createDataObject() @@ -97,8 +99,8 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { public void process(IBlockAccess aWorld) { if (aWorld != null) { final TileEntity tile = aWorld.getTileEntity(mX, mY, mZ); - if (tile instanceof CoverableTileEntity && !((CoverableTileEntity) tile).isDead()) { - ((CoverableTileEntity) tile).receiveCoverData(side, coverID, coverData, null); + if (tile instanceof CoverableTileEntity coverable && !coverable.isDead()) { + coverable.receiveCoverData(side, coverID, coverData, null); } } } 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 0e4bedc16e..d3642b62e8 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java @@ -4,6 +4,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -20,14 +21,15 @@ public class GT_Packet_TileEntityCover extends GT_Packet_New { protected short mY; protected int mZ; - protected byte side; + protected ForgeDirection side; protected int coverID, coverData, dimID; public GT_Packet_TileEntityCover() { super(true); } - public GT_Packet_TileEntityCover(int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID) { + public GT_Packet_TileEntityCover(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID, int coverData, + int dimID) { super(false); this.mX = mX; this.mY = mY; @@ -40,7 +42,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) { + public GT_Packet_TileEntityCover(ForgeDirection coverSide, int coverID, int coverData, ICoverable tile) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -64,7 +66,7 @@ public class GT_Packet_TileEntityCover extends GT_Packet_New { aOut.writeShort(mY); aOut.writeInt(mZ); - aOut.writeByte(side); + aOut.writeByte(side.ordinal()); aOut.writeInt(coverID); aOut.writeInt(coverData); @@ -77,7 +79,7 @@ public class GT_Packet_TileEntityCover extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), + ForgeDirection.getOrientation(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 79156e4223..1b61f87541 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -28,7 +29,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { protected short mY; protected int mZ; - protected byte side; + protected ForgeDirection side; protected int coverID, dimID, playerID; protected ISerializableObject coverData; @@ -38,8 +39,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, ForgeDirection coverSide, int coverID, int coverData, + int dimID, int playerID) { super(false); this.mX = mX; this.mY = mY; @@ -54,7 +55,7 @@ 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, + public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID, ISerializableObject coverData, int dimID, int playerID) { super(false); this.mX = mX; @@ -85,7 +86,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { this.parentGuiId = parentGuiId; } - public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, + public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID, ISerializableObject coverData, int dimID, int playerID, int parentGuiId) { super(false); this.mX = mX; @@ -100,7 +101,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { this.parentGuiId = parentGuiId; } - public GT_Packet_TileEntityCoverGUI(byte side, int coverID, int coverData, ICoverable tile, + public GT_Packet_TileEntityCoverGUI(ForgeDirection side, int coverID, int coverData, ICoverable tile, EntityPlayerMP aPlayer) { super(false); @@ -117,7 +118,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { this.parentGuiId = -1; } - public GT_Packet_TileEntityCoverGUI(byte coverSide, int coverID, int coverData, IGregTechTileEntity tile) { + public GT_Packet_TileEntityCoverGUI(ForgeDirection coverSide, int coverID, int coverData, + IGregTechTileEntity tile) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -131,8 +133,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(ForgeDirection side, int coverID, ISerializableObject coverData, + ICoverable tile, EntityPlayerMP aPlayer) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -158,7 +160,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { aOut.writeShort(mY); aOut.writeInt(mZ); - aOut.writeByte(side); + aOut.writeByte(side.ordinal()); aOut.writeInt(coverID); coverData.writeToByteBuf(aOut); @@ -170,12 +172,12 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { @Override public GT_Packet_New decode(ByteArrayDataInput aData) { - int coverID; + final int coverID; return new GT_Packet_TileEntityCoverGUI( aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), + ForgeDirection.getOrientation(aData.readByte()), coverID = aData.readInt(), GregTech_API.getCoverBehaviorNew(coverID) .createDataObject() @@ -191,7 +193,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { // Using EntityPlayer instead of EntityClientPlayerMP so both client and server can load this final EntityPlayer thePlayer = ((EntityPlayer) ((World) aWorld).getEntityByID(playerID)); final TileEntity tile = aWorld.getTileEntity(mX, mY, mZ); - if (tile instanceof IGregTechTileEntity gtTile && !((IGregTechTileEntity) tile).isDead()) { + if (tile instanceof IGregTechTileEntity gtTile && !gtTile.isDead()) { gtTile.setCoverDataAtSide(side, coverData); // Set it client side to read later. GT_CoverBehaviorBase<?> cover = gtTile.getCoverBehaviorAtSideNew(side); @@ -205,8 +207,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { 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); + if (gui instanceof GT_GUICover guiCover) { + guiCover.setParentGuiId(parentGuiId); } Minecraft.getMinecraft() .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 89201710f3..8fd7348b24 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java @@ -7,6 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -25,7 +26,7 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { protected short mY; protected int mZ; - protected byte side; + protected ForgeDirection side; protected int coverID, dimID; protected ISerializableObject coverData; @@ -35,7 +36,7 @@ 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, + public GT_Packet_TileEntityCoverNew(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID, ISerializableObject coverData, int dimID) { super(false); this.mX = mX; @@ -49,7 +50,8 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { this.dimID = dimID; } - public GT_Packet_TileEntityCoverNew(byte coverSide, int coverID, ISerializableObject coverData, ICoverable tile) { + public GT_Packet_TileEntityCoverNew(ForgeDirection coverSide, int coverID, ISerializableObject coverData, + ICoverable tile) { super(false); this.mX = tile.getXCoord(); this.mY = tile.getYCoord(); @@ -80,7 +82,7 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { aOut.writeShort(mY); aOut.writeInt(mZ); - aOut.writeByte(side); + aOut.writeByte(side.ordinal()); aOut.writeInt(coverID); coverData.writeToByteBuf(aOut); @@ -94,7 +96,7 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), + ForgeDirection.getOrientation(aData.readByte()), coverId = aData.readInt(), GregTech_API.getCoverBehaviorNew(coverId) .createDataObject() 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 5121ce03df..08628ace2b 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java +++ b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java @@ -7,6 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -28,14 +29,14 @@ 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, + public GT_Packet_WirelessRedstoneCover(int mX, short mY, int mZ, ForgeDirection 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, + public GT_Packet_WirelessRedstoneCover(ForgeDirection coverSide, int coverID, ICoverable tile, int publicChannel, int checkBoxValue) { super(coverSide, coverID, 0, tile); mPublicChannel = publicChannel; @@ -60,7 +61,7 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { aOut.writeShort(mY); aOut.writeInt(mZ); - aOut.writeByte(side); + aOut.writeByte(side.ordinal()); aOut.writeInt(coverID); aOut.writeInt(dimID); @@ -75,7 +76,7 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { aData.readInt(), aData.readShort(), aData.readInt(), - aData.readByte(), + ForgeDirection.getOrientation(aData.readByte()), aData.readInt(), aData.readInt(), aData.readInt(), |