add waila support

src/main/java/com/glodblock/github/util/DualityFluidInterface.java

@@ -236,6 +236,11 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
         }
     }
 
+    @Override
+    public AEFluidInventory getInternalFluid() {
+        return this.tanks;
+    }
+
     private boolean hasWorkToDo() {
         for (IAEFluidStack requiredWork : this.requireWork) {
             if (requiredWork != null) {

src/main/java/com/glodblock/github/util/FluidSorters.java

@@ -20,9 +20,9 @@ public class FluidSorters {
             final Fluid f1 = ItemFluidDrop.getAeFluidStack(o1).getFluid();
             final Fluid f2 = ItemFluidDrop.getAeFluidStack(o2).getFluid();
             if (getDirection() == SortDir.ASCENDING) {
-                return this.secondarySort(Util.getFluidModID(f2).compareToIgnoreCase(Util.getFluidModID(f1)), f1, f2);
+                return this.secondarySort(Util.getFluidModName(f2).compareToIgnoreCase(Util.getFluidModName(f1)), f1, f2);
             }
-            return this.secondarySort(Util.getFluidModID(f1).compareToIgnoreCase(Util.getFluidModID(f2)), f2, f1);
+            return this.secondarySort(Util.getFluidModName(f1).compareToIgnoreCase(Util.getFluidModName(f2)), f2, f1);
         }
 
         private int secondarySort(final int compareToIgnoreCase, final Fluid f1, final Fluid f2) {

src/main/java/com/glodblock/github/util/ModAndClassUtil.java

@@ -24,7 +24,7 @@ public final class ModAndClassUtil {
     public static boolean NEI = false;
     public static boolean COFH = false;
     public static boolean GTPP = false;
-
+    public static boolean WAILA = false;
     public static boolean isDoubleButton;
     public static boolean isSaveText;
     public static boolean isSearchStringTooltip;
@@ -132,5 +132,7 @@ public final class ModAndClassUtil {
             COFH = true;
         if (Loader.isModLoaded("miscutils"))
             GTPP = true;
+        if (Loader.isModLoaded("Waila"))
+            WAILA = true;
     }
 }

src/main/java/com/glodblock/github/util/NameConst.java

@@ -35,6 +35,10 @@ public class NameConst {
     public static final String TT_REQUEST_SIZE = TT_KEY + "request_size";
     public static final String TT_BATCH_SIZE = TT_KEY + "batch_size";
 
+    public static final String WAILA_KEY = FluidCraft.MODID + ".waila.";
+    public static final String WAILA_ENABLE = WAILA_KEY + "enable";
+    public static final String WAILA_DISABLE = WAILA_KEY + "disable";
+    public static final String WAILA_SPEED = WAILA_KEY + "speed";
     public static final String RES_KEY = FluidCraft.MODID + ":";
 
     public static final String GUI_KEY = FluidCraft.MODID + ".gui.";

src/main/java/com/glodblock/github/util/Util.java

@@ -10,6 +10,8 @@ import appeng.api.parts.IPart;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.util.item.AEFluidStack;
 import com.glodblock.github.common.item.ItemFluidPacket;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.registry.GameData;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -145,6 +147,23 @@ public final class Util {
         } catch (Exception e) {
             return "";
         }
+    }
+
+    public static ModContainer getFluidMod(Fluid fluid) {
+        return GameData.findModOwner(String.format("%s:%s", getFluidModID(fluid), fluid.getName()));
+    }
+
+    public static int getFluidID(Fluid fluid) {
+        return GameData.getBlockRegistry().getId(fluid.getBlock());
+    }
+
+    public static String getFluidModName(Fluid fluid) {
+        try {
+            ModContainer mod = getFluidMod(fluid);
+            return mod == null ? "Minecraft" : mod.getName();
+        } catch (Exception e) {
+            return "";
+        }
 
     }