Screwdrivers can do their thing like wrenches do

Author: basdxz

src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java

@@ -129,6 +129,15 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
     /**
      * When a Player rightclicks the Facing with a Screwdriver.
      */
+    default void onScrewdriverRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+        onScrewdriverRightClick(aWrenchingSide, aPlayer, aX, aY, aZ);
+    }
+
+    /**
+     * When a Player rightclicks the Facing with a Screwdriver.
+     * TODO: Re-wire machines to override the other method instead
+     */
+    @Deprecated
     void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ);
 
     /**

src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java

@@ -1489,7 +1489,7 @@ public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY
                     if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)) {
                         if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
                             setCoverDataAtSide(aSide, getCoverBehaviorAtSideNew(aSide).onCoverScrewdriverClick(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this, aPlayer, aX, aY, aZ));
-                            mMetaTileEntity.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
+                            mMetaTileEntity.onScrewdriverRightClick(aSide, GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ), aPlayer, aX, aY, aZ);
                             GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord);
                         }
                         return true;

src/main/java/gregtech/common/GT_Client.java

@@ -43,6 +43,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -621,15 +622,15 @@ public void onDrawBlockHighlight(DrawBlockHighlightEvent aEvent) {
             return;
 
         if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList) ||
-                GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList)) {
+                GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList) ||
+                GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList)) {
             if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0)
                 drawGrid(aEvent, false, false, aEvent.player.isSneaking());
             return;
         }
 
         if ((aEvent.currentItem == null && aEvent.player.isSneaking()) ||
-                GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList) ||
-                GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList)) {
+                GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList)) {
             if (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0)
                 for (byte i = 0; i < 6; i++)
                     if (((ICoverable) aTileEntity).getCoverIDAtSide(i) > 0) {