From b2c8cfb4ec8b82337a95f51364277964ec968b52 Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej@gmail.com>
Date: Mon, 1 May 2023 02:45:56 -0700
Subject: ForgeDirection  (#608)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ForgeDirection WIP

* Fix GTPP_Render_MachineBlock

Fix handling of getTexture with facing mask for pipes
Kill a bunch of magic numbers

* spotlessApply (#612)

Co-authored-by: GitHub GTNH Actions <>

* Bump bw/tt deps

---------

Co-authored-by: Léa Gris <lea.gris@noiraude.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java    | 15 ++++++++-------
 .../core/util/minecraft/network/CustomPacket.java         |  2 +-
 .../core/util/minecraft/network/PacketTileEntity.java     |  6 ++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/main/java/gtPlusPlus/core/util')

diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
index 6e332a2be0..0df691624f 100644
--- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
+++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.GT_Mod;
@@ -72,8 +73,8 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
     }
 
     @Override
-    public boolean allowCoverOnSide(final byte aSide, final GT_ItemStack aCoverID) {
-        return aSide != this.getBaseMetaTileEntity().getFrontFacing();
+    public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aCoverID) {
+        return side != this.getBaseMetaTileEntity().getFrontFacing();
     }
 
     @Override
@@ -82,7 +83,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
     }
 
     @Override
-    public boolean isFacingValid(final byte aFacing) {
+    public boolean isFacingValid(final ForgeDirection facing) {
         return true;
     }
 
@@ -934,14 +935,14 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
     }
 
     @Override
-    public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
-            final ItemStack aStack) {
+    public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
+            final ForgeDirection side, final ItemStack aStack) {
         return false;
     }
 
     @Override
-    public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
-            final ItemStack aStack) {
+    public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex,
+            final ForgeDirection side, final ItemStack aStack) {
         return false;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java
index cb75d78bfc..5a9721204c 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java
@@ -5,9 +5,9 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import mods.railcraft.common.util.misc.Game;
 import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import io.netty.buffer.Unpooled;
+import mods.railcraft.common.util.misc.Game;
 
 public abstract class CustomPacket {
 
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java
index 03a1251053..91dba8798d 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java
@@ -4,8 +4,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import mods.railcraft.common.util.misc.Game;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -15,6 +13,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gtPlusPlus.api.interfaces.IGregtechPacketEntity;
+import mods.railcraft.common.util.misc.Game;
 
 public class PacketTileEntity extends CustomPacket {
 
@@ -30,6 +29,7 @@ public class PacketTileEntity extends CustomPacket {
         }
     }
 
+    @Override
     public void writeData(DataOutputStream data) throws IOException {
         if (ptile != null) {
             data.writeInt(this.tile.getXCoord());
@@ -40,6 +40,7 @@ public class PacketTileEntity extends CustomPacket {
         }
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void readData(DataInputStream data) throws IOException {
         Minecraft mc = FMLClientHandler.instance().getClient();
@@ -75,6 +76,7 @@ public class PacketTileEntity extends CustomPacket {
         }
     }
 
+    @Override
     public int getID() {
         return 0;
     }
-- 
cgit