From bfcce919b9a5cd91a1204ef7f6a0a75d4a07d70d Mon Sep 17 00:00:00 2001
From: Parker Young <Parker8283@users.noreply.github.com>
Date: Fri, 16 Jan 2015 17:30:00 -0500
Subject: [PATCH] Re-enabled Icon setting for Fluids

---
 .../client/ForgeHooksClient.java              |  5 ++--
 .../java/net/minecraftforge/fluids/Fluid.java | 26 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
index 521ef8a4c..39b4d21a5 100644
--- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
+++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
@@ -46,6 +46,7 @@ import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.common.ForgeVersion.Status;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.client.FMLClientHandler;
 
 import org.lwjgl.opengl.GL11;
@@ -263,8 +264,8 @@ public class ForgeHooksClient
     {
         MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Post(map));
 
-        //FluidRegistry.WATER.setIcons(BlockLiquid.getLiquidIcon("water_still"), BlockLiquid.getLiquidIcon("water_flow"));
-        //FluidRegistry.LAVA.setIcons(BlockLiquid.getLiquidIcon("lava_still"), BlockLiquid.getLiquidIcon("lava_flow"));
+        FluidRegistry.WATER.setIcons(map.getAtlasSprite("minecraft:blocks/water_still"), map.getAtlasSprite("minecraft:blocks/water_flow"));
+        FluidRegistry.LAVA.setIcons(map.getAtlasSprite("minecraft:blocks/lava_still"), map.getAtlasSprite("minecraft:blocks/lava_flow"));
     }
 
     static int renderPass = -1;
diff --git a/src/main/java/net/minecraftforge/fluids/Fluid.java b/src/main/java/net/minecraftforge/fluids/Fluid.java
index e627a809d..537e5ddb5 100644
--- a/src/main/java/net/minecraftforge/fluids/Fluid.java
+++ b/src/main/java/net/minecraftforge/fluids/Fluid.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import com.google.common.collect.Maps;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
@@ -41,8 +42,8 @@ public class Fluid
     protected String unlocalizedName;
 
     /** The Icons for this fluid. */
-    //protected IIcon stillIcon;
-    //protected IIcon flowingIcon;
+    protected TextureAtlasSprite stillIcon;
+    protected TextureAtlasSprite flowingIcon;
 
     /**
      * The light level emitted by this fluid.
@@ -265,41 +266,40 @@ public class Fluid
         return 0xFFFFFF;
     }
 
-    /*
-    public final Fluid setStillIcon(IIcon stillIcon)
+
+    public final Fluid setStillIcon(TextureAtlasSprite stillIcon)
     {
         this.stillIcon = stillIcon;
         return this;
     }
 
-    public final Fluid setFlowingIcon(IIcon flowingIcon)
+    public final Fluid setFlowingIcon(TextureAtlasSprite flowingIcon)
     {
         this.flowingIcon = flowingIcon;
         return this;
     }
 
-    public final Fluid setIcons(IIcon stillIcon, IIcon flowingIcon)
+    public final Fluid setIcons(TextureAtlasSprite stillIcon, TextureAtlasSprite flowingIcon)
     {
         return this.setStillIcon(stillIcon).setFlowingIcon(flowingIcon);
     }
 
-    public final Fluid setIcons(IIcon commonIcon)
+    public final Fluid setIcons(TextureAtlasSprite commonIcon)
     {
         return this.setStillIcon(commonIcon).setFlowingIcon(commonIcon);
     }
 
-    public IIcon getIcon(){ return getStillIcon(); }
+    public TextureAtlasSprite getIcon(){ return getStillIcon(); }
 
-    public IIcon getStillIcon()
+    public TextureAtlasSprite getStillIcon()
     {
         return this.stillIcon;
     }
 
-    public IIcon getFlowingIcon()
+    public TextureAtlasSprite getFlowingIcon()
     {
         return this.flowingIcon;
     }
-    */
 
     /* Stack-based Accessors */
     public int getLuminosity(FluidStack stack){ return getLuminosity(); }
@@ -309,7 +309,7 @@ public class Fluid
     public boolean isGaseous(FluidStack stack){ return isGaseous(); }
     public EnumRarity getRarity(FluidStack stack){ return getRarity(); }
     public int getColor(FluidStack stack){ return getColor(); }
-    //public IIcon getIcon(FluidStack stack){ return getIcon(); }
+    public TextureAtlasSprite getIcon(FluidStack stack){ return getIcon(); }
     /* World-based Accessors */
     public int getLuminosity(World world, BlockPos pos){ return getLuminosity(); }
     public int getDensity(World world, BlockPos pos){ return getDensity(); }
@@ -318,7 +318,7 @@ public class Fluid
     public boolean isGaseous(World world, BlockPos pos){ return isGaseous(); }
     public EnumRarity getRarity(World world, BlockPos pos){ return getRarity(); }
     public int getColor(World world, BlockPos pos){ return getColor(); }
-    //public IIcon getIcon(World world, BlockPos pos){ return getIcon(); }
+    public TextureAtlasSprite getIcon(World world, BlockPos pos){ return getIcon(); }
 
     private static Map<String, String> legacyNames = Maps.newHashMap();
     static String convertLegacyName(String fluidName)