1 files changed, 17 insertions, 15 deletions

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);