Merge pull request #78 from minecraft7771/MultiRotationImprovement

Multiblock rotation improvement

1 files changed, 21 insertions, 6 deletions

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index b74ac5023a..e8228d0f03 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -34,6 +34,7 @@ import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Pollution;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -175,16 +176,16 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     @Override
     public void setExtendedFacing(ExtendedFacing newExtendedFacing) {
         if (extendedFacing != newExtendedFacing) {
+            if(mMachine)
+                stopMachine();
             extendedFacing = newExtendedFacing;
-            IGregTechTileEntity base = getBaseMetaTileEntity();
+            final IGregTechTileEntity base = getBaseMetaTileEntity();
             mMachine = false;
+            mUpdated = false;
+            mUpdate = 100;
             if (getBaseMetaTileEntity().isServerSide()) {
-                //NetworkDispatcher.INSTANCE.sendToAllAround(new AlignmentMessage.AlignmentData(this),
-                //        base.getWorld().provider.dimensionId,
-                //        base.getXCoord(), base.getYCoord(), base.getZCoord(), 512);
                 StructureLibAPI.sendAlignment((IAlignmentProvider) base,
-                        new NetworkRegistry.TargetPoint(base.getWorld().provider.dimensionId,
-                                base.getXCoord(), base.getYCoord(), base.getZCoord(), 512));
+                        new NetworkRegistry.TargetPoint(base.getWorld().provider.dimensionId, base.getXCoord(), base.getYCoord(), base.getZCoord(), 512));
             } else {
                 base.issueTextureUpdate();
             }
@@ -192,6 +193,20 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     }
 
     @Override
+    public boolean onWrenchRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+        if (aWrenchingSide != getBaseMetaTileEntity().getFrontFacing())
+            return super.onWrenchRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ);
+        if (aPlayer.isSneaking()) {
+            // we won't be allowing horizontal flips, as it can be perfectly emulated by rotating twice and flipping horizontally
+            // allowing an extra round of flip make it hard to draw meaningful flip markers in GT_Proxy#drawGrid
+            toolSetFlip(getFlip().isHorizontallyFlipped() ? Flip.NONE : Flip.HORIZONTAL);
+        } else {
+            toolSetRotation(null);
+        }
+        return true;
+    }
+
+    @Override
     public boolean isFacingValid(byte aFacing) {
         return canSetToDirectionAny(ForgeDirection.getOrientation(aFacing));
     }