Merge pull request #193 from GTNewHorizons/fluid_shenanigans

Fluid shenanigans

2 files changed, 55 insertions, 13 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index c03ea8d981..d2ac134dbe 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -20,6 +20,7 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_OreDictUnificator;

 import gregtech.api.util.GT_Utility;

+import gregtech.common.covers.GT_Cover_Fluidfilter;

 import net.minecraft.block.Block;

 import net.minecraft.entity.Entity;

 import net.minecraft.entity.item.EntityItem;

@@ -34,6 +35,7 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;

 import net.minecraftforge.common.util.ForgeDirection;

 import net.minecraftforge.fluids.Fluid;

+import net.minecraftforge.fluids.FluidRegistry;

 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

@@ -76,6 +78,18 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
             aNBT.setByte("mColor", mColor);

             aNBT.setByte("mStrongRedstone", mStrongRedstone);

             aNBT.setBoolean("mWorks", !mWorks);

+

+            for(int i=0;i < mCoverData.length; i++) {

+                if (GregTech_API.getCoverBehavior(mCoverSides[i]) instanceof GT_Cover_Fluidfilter) {

+                    final int fluidId = mCoverData[i] >>> 3;

+                    final Fluid fluid = FluidRegistry.getFluid(fluidId);

+                    if(fluid != null) {

+                        final String fluidName = FluidRegistry.getFluidName(fluid);

+                        aNBT.setString(String.format("fluidFilter%d", i), fluidName);

+                    }

+                }

+            }

+

         } catch (Throwable e) {

             GT_Log.err.println("Encountered CRITICAL ERROR while saving MetaTileEntity, the Chunk whould've been corrupted by now, but I prevented that. Please report immediately to GregTech Intergalactical!!!");

             e.printStackTrace(GT_Log.err);

@@ -134,7 +148,16 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
             if (mCoverSides.length != 6) mCoverSides = new int[]{0, 0, 0, 0, 0, 0};

             if (mSidedRedstone.length != 6) mSidedRedstone = new byte[]{0, 0, 0, 0, 0, 0};

 

-            for (byte i = 0; i < 6; i++) mCoverBehaviors[i] = GregTech_API.getCoverBehavior(mCoverSides[i]);

+            for (byte i = 0; i < 6; i++) {

+                mCoverBehaviors[i] = GregTech_API.getCoverBehavior(mCoverSides[i]);

+                if(mCoverBehaviors[i] instanceof GT_Cover_Fluidfilter) {

+                    final String filterKey = String.format("fluidFilter%d", i);

+                    if (aNBT.hasKey(filterKey)) {

+                        mCoverData[i] = (mCoverData[i] & 7) | (FluidRegistry.getFluidID(aNBT.getString(filterKey)) << 3);

+                    }

+                }

+            }

+

 

             if (mID != 0 && createNewMetatileEntity(mID)) {

                 NBTTagList tItemList = aNBT.getTagList("Inventory", 10);

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index f9f3c64b7d..a398f7d17f 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -6,7 +6,7 @@ import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.*;
-
+import static gregtech.api.enums.GT_Values.E;
 
 public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
 
@@ -20,11 +20,36 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
     private final int ANY_INPUT_FILTER_OUTPUT = 6;
     private final int ANY_INPUT_INVERT_OUTPUT = 7;
 
-            
+    public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        int aFilterMode = aCoverVariable & 7;
+        int aFilterFluid = aCoverVariable >>> 3;
+        final Fluid fluid = FluidRegistry.getFluid(aFilterFluid);
+        if(fluid == null) return E;
+        
+        final FluidStack sFluid = new FluidStack(fluid, 1000);
+        return(String.format("Filtering Fluid: %s  Mode: %s", sFluid.getLocalizedName(), getFilterMode(aFilterMode)));
+    }
+
+
     public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
         return aCoverVariable;
     }
 
+    public String getFilterMode(int aFilterMode) {
+        switch(aFilterMode) {
+            case FILTER_INPUT_DENY_OUTPUT: return(trans("043", "Filter input, Deny output"));
+            case INVERT_INPUT_DENY_OUTPUT: return(trans("044", "Invert input, Deny output"));
+            case FILTER_INPUT_ANY_OUTPUT: return(trans("045", "Filter input, Permit any output"));
+            case INVERT_INPUT_ANY_OUTPUT: return(trans("046", "Invert input, Permit any output"));
+            case DENY_INPUT_FILTER_OUTPUT: return(trans("219", "Deny input, Filter output"));
+            case DENY_INPUT_INVERT_OUTPUT: return(trans("220", "Deny input, Invert output"));
+            case ANY_INPUT_FILTER_OUTPUT: return(trans("221", "Permit any input, Filter output"));
+            case ANY_INPUT_INVERT_OUTPUT: return(trans("222", "Permit any input, Invert output"));
+            default: return("UNKNOWN");
+        }
+
+    }
+
     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         int aFilterMode = aCoverVariable & 7;
         aCoverVariable ^= aFilterMode;
@@ -32,17 +57,11 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
         if (aFilterMode < 0) {
             aFilterMode = 7;
         }
-        switch(aFilterMode) {
-            case FILTER_INPUT_DENY_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("043", "Filter input, Deny output")); break;
-            case INVERT_INPUT_DENY_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("044", "Invert input, Deny output")); break;
-            case FILTER_INPUT_ANY_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("045", "Filter input, Permit any output")); break;
-            case INVERT_INPUT_ANY_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("046", "Invert input, Permit any output")); break;
-            case DENY_INPUT_FILTER_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("219", "Deny input, Filter output")); break;
-            case DENY_INPUT_INVERT_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("220", "Deny input, Invert output")); break;
-            case ANY_INPUT_FILTER_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("221", "Permit any input, Filter output")); break;
-            case ANY_INPUT_INVERT_OUTPUT: GT_Utility.sendChatToPlayer(aPlayer, trans("222", "Permit any input, Invert output")); break;
-        }
+
+        GT_Utility.sendChatToPlayer(aPlayer, getFilterMode(aFilterMode));
+
         aCoverVariable|=aFilterMode;
+
         return aCoverVariable;
     }