Forge direction (#1895)

* ForgeDirection

Also refactor the clusterfuck that was `getCoordinateScan`

Co-authored by: Jason Mitchell <mitchej@gmail.com>

* Fix rendering of Frame Boxes

Frame boxes needed their own implementation of getTexture with int connexion mask,
which is returning an error texture for the MetaTileEntity, because pipes (FrameBox
**is** a pipe) do use this method to return different textures based on connexion
status.

---------

Co-authored-by: Léa Gris <lea.gris@noiraude.net>

9 files changed, 38 insertions, 39 deletions

diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
index dbd8ffecf6..31a44f3dbc 100644
--- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
+++ b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
@@ -90,7 +90,7 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
     }
 
     @Override
-    public IIcon getIcon(int aSide, int aMeta) {
+    public IIcon getIcon(int ordinalSide, int aMeta) {
         return mIcons[aMeta % mIcons.length].getIcon();
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
index f1646529ea..4b3c713f22 100644
--- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
@@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
@@ -139,14 +140,14 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
     }
 
     @Override
-    public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide,
-        float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
+        int ordinalSide, float hitX, float hitY, float hitZ) {
         use(aStack, 0, aPlayer);
         isItemStackUsable(aStack);
         ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
         try {
             if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
-                if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ)) {
+                if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) {
                     if (aStack.stackSize <= 0) aPlayer.destroyCurrentEquippedItem();
                     return true;
                 }
@@ -162,13 +163,23 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
 
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
+        int ordinalSide, float hitX, float hitY, float hitZ) {
         use(aStack, 0, aPlayer);
         isItemStackUsable(aStack);
         ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
         try {
-            if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
-                if (tBehavior.onItemUseFirst(this, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ)) {
+            if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) if (tBehavior.onItemUseFirst(
+                this,
+                aStack,
+                aPlayer,
+                aWorld,
+                aX,
+                aY,
+                aZ,
+                ForgeDirection.getOrientation(ordinalSide),
+                hitX,
+                hitY,
+                hitZ)) {
                     if (aStack.stackSize <= 0) aPlayer.destroyCurrentEquippedItem();
                     return true;
                 }
diff --git a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
index 07a0c3bd9b..6ec06c91a5 100644
--- a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
+++ b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
@@ -46,8 +46,8 @@ public class GT_SolderingTool_Item extends GT_Tool_Item {
 
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
-        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        int ordinalSide, float hitX, float hitY, float hitZ) {
+        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ);
         return false;
     }
 }
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java
index 29df584326..0716ca9dc1 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java
@@ -38,8 +38,8 @@ public class GT_Spray_Bug_Item extends GT_Tool_Item {
      */
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
-        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        int ordinalSide, float hitX, float hitY, float hitZ) {
+        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ);
         if (aWorld.isRemote) {
             return false;
         }
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
index 0a68e222f8..6bdca0da1c 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
@@ -32,22 +32,10 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
                     */
     }
 
-    /*
-     * @Override public ItemStack getEmptiedItem(ItemStack aStack) { return ItemList.Spray_Empty.get(1); } public void
-     * switchMode(ItemStack aStack, EntityPlayer aPlayer) { setMode(aStack, (getMode(aStack) + 1) % 3); switch
-     * (getMode(aStack)) { case 0: GT_Utility.sendChatToPlayer(aPlayer, "Single Block Mode"); break; case 1:
-     * GT_Utility.sendChatToPlayer(aPlayer, "4m Line Mode"); break; case 2: GT_Utility.sendChatToPlayer(aPlayer,
-     * "3mx3m Area Mode"); break; } }
-     * @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList,
-     * aStack); switch (getMode(aStack)) { case 0: aList.add("Single Block Mode"); break; case 1:
-     * aList.add("4m Line Mode"); break; case 2: aList.add("3mx3m Area Mode"); break; } }
-     * @Override public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) { if
-     * (aPlayer.isSneaking()) switchMode(aStack, aPlayer); return super.onItemRightClick(aStack, aWorld, aPlayer); }
-     */
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
-        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        int ordinalSide, float hitX, float hitY, float hitZ) {
+        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ);
         if (aPlayer.isSneaking()) return false;
         if (aWorld.isRemote) {
             return false;
@@ -82,9 +70,9 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
             return true;
         }
 
-        aX += ForgeDirection.getOrientation(aSide).offsetX;
-        aY += ForgeDirection.getOrientation(aSide).offsetY;
-        aZ += ForgeDirection.getOrientation(aSide).offsetZ;
+        aX += ForgeDirection.getOrientation(ordinalSide).offsetX;
+        aY += ForgeDirection.getOrientation(ordinalSide).offsetY;
+        aZ += ForgeDirection.getOrientation(ordinalSide).offsetZ;
 
         ItemStack tStack = GT_ModHandler.getIC2Item("constructionFoam", 1);
         if (tStack != null && tStack.getItem() instanceof ItemBlock) {
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java
index 1f6d49e8da..2fecc77c14 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java
@@ -32,8 +32,8 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item {
 
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
-        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        int ordinalSide, float hitX, float hitY, float hitZ) {
+        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ);
         if (aWorld.isRemote) {
             return false;
         }
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java
index dd10b419d4..6589beb94c 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java
@@ -28,8 +28,8 @@ public class GT_Spray_Hydration_Item extends GT_Tool_Item {
 
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
-        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        int ordinalSide, float hitX, float hitY, float hitZ) {
+        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ);
         if (aWorld.isRemote) {
             return false;
         }
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java
index 402b655692..dab2515b72 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java
@@ -52,14 +52,14 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item {
 
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
-        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        int ordinalSide, float hitX, float hitY, float hitZ) {
+        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ);
         if (aWorld.isRemote) {
             return false;
         }
-        aX += ForgeDirection.getOrientation(aSide).offsetX;
-        aY += ForgeDirection.getOrientation(aSide).offsetY;
-        aZ += ForgeDirection.getOrientation(aSide).offsetZ;
+        aX += ForgeDirection.getOrientation(ordinalSide).offsetX;
+        aY += ForgeDirection.getOrientation(ordinalSide).offsetY;
+        aZ += ForgeDirection.getOrientation(ordinalSide).offsetZ;
         Block aBlock = aWorld.getBlock(aX, aY, aZ);
         if (aBlock == null) return false;
         byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
index 1607ae7d5b..29f6348d82 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
@@ -46,8 +46,8 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item {
 
     @Override
     public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ) {
-        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        int ordinalSide, float hitX, float hitY, float hitZ) {
+        super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ);
         if (aWorld.isRemote) {
             return false;
         }