Merge pull request #486 from johnch18/mccoverfix

Made machine control covers disable themselves upon power loss

10 files changed, 100 insertions, 13 deletions

diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
index f0ca426616..2bf61f6679 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
@@ -422,4 +422,5 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
     default boolean isMachineBlockUpdateRecursive(){
         return true;
     }
+
 }
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
index 9ab1ac0f67..8a815556e7 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
@@ -155,4 +155,6 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil
                 getMetaTileEntity().getBaseMetaTileEntity() == this &&
                 getMetaTileEntity().isMachineBlockUpdateRecursive();
     }
+
+    default void setShutdownStatus(boolean newStatus) {return;}
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java
index 588158d16c..bae361421c 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java
@@ -66,4 +66,12 @@ public interface IMachineProgress extends IHasWorldObjectAndCoords {
      * sets the visible Active Status of the Machine
      */
     void setActive(boolean aActive);
+
+    /**
+     * Indicates if the object in question was forced to shut down (i.e. loss of power)
+     * */
+    default boolean wasShutdown() {
+        return false;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 26122ae9e9..262eac674c 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -92,6 +92,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
     private UUID mOwnerUuid = GT_Utility.defaultUuid;
     private NBTTagCompound mRecipeStuff = new NBTTagCompound();
 
+    public boolean mWasShutdown = false;
+
     private static final Field ENTITY_ITEM_HEALTH_FIELD;
     static
     {
@@ -1004,6 +1006,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
     public void enableWorking() {
         if (!mWorks) mWorkUpdate = true;
         mWorks = true;
+        mWasShutdown = false;
     }
 
     @Override
@@ -2318,4 +2321,13 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
         if (gp != null)
             gp.invalidate();
     }
+
+    @Override
+    public boolean wasShutdown() {
+         return mWasShutdown;
+    }
+
+    public void setShutdownStatus(boolean newStatus) {
+         mWasShutdown = newStatus;
+    }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 79447a96cb..c9d75dad1a 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -57,6 +57,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
      */
     public final ItemStack[] mInventory;
     public boolean doTickProfilingInThisTick = true;
+
     /**
      * accessibility to this Field is no longer given, see below
      */
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index be7a3642cb..d4a32d20cc 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -341,7 +341,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
         }
         if (mEUt < 0) {
             if (!drainEnergyInput(((long) -mEUt * 10000) / Math.max(1000, mEfficiency))) {
-                stopMachine();
+                criticalStopMachine();
                 return false;
             }
         }
@@ -393,6 +393,11 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
         getBaseMetaTileEntity().disableWorking();
     }
 
+    public void criticalStopMachine() {
+        stopMachine();
+        getBaseMetaTileEntity().setShutdownStatus(true);
+    }
+
     public int getRepairStatus() {
         return (mWrench ? 1 : 0) + (mScrewdriver ? 1 : 0) + (mSoftHammer ? 1 : 0) + (mHardHammer ? 1 : 0) + (mSolderingTool ? 1 : 0) + (mCrowbar ? 1 : 0);
     }
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior.java b/src/main/java/gregtech/api/util/GT_CoverBehavior.java
index c0ad751add..ef332ddb01 100644
--- a/src/main/java/gregtech/api/util/GT_CoverBehavior.java
+++ b/src/main/java/gregtech/api/util/GT_CoverBehavior.java
@@ -15,6 +15,9 @@ import static gregtech.api.enums.GT_Values.E;
  * For Covers with a special behavior.
  */
 public abstract class GT_CoverBehavior {
+
+    public EntityPlayer lastPlayer = null;
+
     /**
      * Called by updateEntity inside the covered TileEntity. aCoverVariable is the Value you returned last time.
      */
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index a9ba9b9bbc..9558df4608 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -1981,6 +1981,12 @@ public class GT_Utility {
             }
             try {
                 if (tTileEntity instanceof IMachineProgress) {
+                    if (((IMachineProgress) tTileEntity).isAllowedToWork()) {
+                        tList.add("Disabled."  + EnumChatFormatting.RED + EnumChatFormatting.RESET);
+                    }
+                    if (((IMachineProgress) tTileEntity).wasShutdown()) {
+                        tList.add("Shut down due to power loss." + EnumChatFormatting.RED + EnumChatFormatting.RESET);
+                    }
                     rEUAmount += 400;
                     int tValue = 0;
                     if (0 < (tValue = ((IMachineProgress) tTileEntity).getMaxProgress()))
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
index 487d457b39..ba943e4286 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
@@ -1,26 +1,47 @@
 package gregtech.common.covers;
 
+import cpw.mods.fml.client.FMLClientHandler;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.GT_GUICover;
 import gregtech.api.gui.widgets.GT_GuiIcon;
 import gregtech.api.gui.widgets.GT_GuiIconButton;
+import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
+import gregtech.api.metatileentity.BaseTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.net.GT_Packet_TileEntityCover;
 import gregtech.api.util.GT_CoverBehavior;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraft.world.WorldServer;
+
+import static gregtech.GT_Mod.GT_FML_LOGGER;
 
 public class GT_Cover_ControlsWork extends GT_CoverBehavior {
     public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
         if (aTileEntity instanceof IMachineProgress) {
-            if ((aInputRedstone > 0) == (aCoverVariable == 0) && aCoverVariable != 2)
-                ((IMachineProgress) aTileEntity).enableWorking();
-            else
+            if (aCoverVariable < 2) {
+                if ((aInputRedstone > 0) == (aCoverVariable == 0))
+                    ((IMachineProgress) aTileEntity).enableWorking();
+                else
+                    ((IMachineProgress) aTileEntity).disableWorking();
+                ((IMachineProgress) aTileEntity).setWorkDataValue(aInputRedstone);
+            }
+            else if (aCoverVariable == 2) {
                 ((IMachineProgress) aTileEntity).disableWorking();
-            ((IMachineProgress) aTileEntity).setWorkDataValue(aInputRedstone);
+            } else {
+                if (((IMachineProgress) aTileEntity).wasShutdown()) {
+                    ((IMachineProgress) aTileEntity).disableWorking();
+                    GT_Utility.sendChatToPlayer(lastPlayer, aTileEntity.getInventoryName() + "at " + String.format("(%d,%d,%d)", aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord()) +  " shut down.");
+                    return 2;
+                } else {
+                    return 3 + doCoverThings(aSide,aInputRedstone, aCoverID, aCoverVariable - 3, aTileEntity, aTimer);
+                }
+            }
         }
         return aCoverVariable;
     }
@@ -58,17 +79,24 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior {
     }
 
     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 3;
+        aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 5;
         if(aCoverVariable <0){aCoverVariable = 2;}
         if (aCoverVariable == 0) {
-            GT_Utility.sendChatToPlayer(aPlayer, trans("003", "Normal"));
+            GT_Utility.sendChatToPlayer(aPlayer, trans("003", "Enable with Signal"));
         }
         if (aCoverVariable == 1) {
-            GT_Utility.sendChatToPlayer(aPlayer, trans("004", "Inverted"));
+            GT_Utility.sendChatToPlayer(aPlayer, trans("004", "Disable with Signal"));
         }
         if (aCoverVariable == 2) {
-            GT_Utility.sendChatToPlayer(aPlayer, trans("005", "No Work at all"));
+            GT_Utility.sendChatToPlayer(aPlayer, trans("005", "Disabled"));
         }
+        if (aCoverVariable == 3) {
+            GT_Utility.sendChatToPlayer(aPlayer, trans("505", "Enable with Signal (Safe)"));
+        }
+        if (aCoverVariable == 4) {
+            GT_Utility.sendChatToPlayer(aPlayer, trans("506", "Disable with Signal (Safe)"));
+        }
+        // TODO: Set lastPlayer
         return aCoverVariable;
     }
 
@@ -110,6 +138,8 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior {
             b = new GT_GuiIconButton(this, 0, startX + spaceX * 0, startY + spaceY * 0, GT_GuiIcon.REDSTONE_ON);
             b = new GT_GuiIconButton(this, 1, startX + spaceX * 0, startY + spaceY * 1, GT_GuiIcon.REDSTONE_OFF);
             b = new GT_GuiIconButton(this, 2, startX + spaceX * 0, startY + spaceY * 2, GT_GuiIcon.CROSS);
+
+            b = new GT_GuiIconCheckButton(this, 3, startX + spaceX * 0, startY + spaceY * 3, GT_GuiIcon.CHECKMARK, GT_GuiIcon.CROSS);
         }
 
         @Override
@@ -118,6 +148,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior {
             this.fontRendererObj.drawString(trans("243", "Enable with Redstone"), 3+startX + spaceX*1, 4+startY+spaceY*0, 0xFF555555);
             this.fontRendererObj.drawString(trans("244", "Disable with Redstone"),3+startX + spaceX*1, 4+startY+spaceY*1, 0xFF555555);
             this.fontRendererObj.drawString(trans("245", "Disable machine"),              3+startX + spaceX*1, 4+startY+spaceY*2, 0xFF555555);
+            this.fontRendererObj.drawString(trans("507", "Safe Mode"), 3+startX + spaceX*1, 4+startY+spaceY*3, 0xFF555555);
         }
 
         @Override
@@ -127,7 +158,14 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior {
 
         public void buttonClicked(GuiButton btn) {
             if (getClickable(btn.id)) {
-                coverVariable = getNewCoverVariable(btn.id);
+                int bID = btn.id;
+                if (bID == 3) {
+                    ((GT_GuiIconCheckButton) btn).setChecked(!((GT_GuiIconCheckButton) btn).isChecked());
+                } else {
+                    coverVariable = getNewCoverVariable(bID);
+                }
+                adjustCoverVariable();
+                // TODO: Set lastPlayer;
                 GT_Values.NW.sendToServer(new GT_Packet_TileEntityCover(side, coverID, coverVariable, tile));
             }
             updateButtons();
@@ -146,7 +184,18 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior {
         }
 
         private boolean getClickable(int id) {
-            return id != coverVariable;
+            return ((id != coverVariable && id != coverVariable - 3) || id == 3);
         }
+
+        private void adjustCoverVariable() {
+            boolean safeMode = ((GT_GuiIconCheckButton) buttonList.get(3)).isChecked();
+            if (safeMode && coverVariable < 2) {
+                coverVariable += 3;
+            }
+            if (!safeMode && coverVariable > 2) {
+                coverVariable -= 3;
+            }
+        }
+
     }
 }
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index 456705eba4..c67fa69fd8 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -198,7 +198,7 @@ public class GT_Achievements {
         if (special) {
             achievement.setSpecial();
         }
-        achievement.registerStat();
+        ((StatBase)achievement).registerStat();
         if (GT_Values.D2) {
             GT_Log.out.println("achievement." + textId + "=");
             GT_Log.out.println("achievement." + textId + ".desc=");
@@ -216,7 +216,7 @@ public class GT_Achievements {
         if (special) {
             achievement.setSpecial();
         }
-        achievement.registerStat();
+        ((StatBase)achievement).registerStat();
         if (GT_Values.D2) {
             GT_Log.out.println("achievement." + textId + "=");
             GT_Log.out.println("achievement." + textId + ".desc=");