keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #1647 from Parker8283/fluid-icons 

Re-enabled Icon setting for Fluids
This commit is contained in:
LexManos 2015-01-16 15:22:09 -08:00
parent 698b1558cd bfcce919b9
commit c4b0fea9ee
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraftforge/client/ForgeHooksClient.java
View File

@ -46,6 +46,7 @@ import net.minecraftforge.common.ForgeModContainer;
import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.common.ForgeVersion;
import net.minecraftforge.common.ForgeVersion.Status; import net.minecraftforge.common.ForgeVersion.Status;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.FMLClientHandler;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -263,8 +264,8 @@ public class ForgeHooksClient
{ {
MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Post(map)); MinecraftForge.EVENT_BUS.post(new TextureStitchEvent.Post(map));
//FluidRegistry.WATER.setIcons(BlockLiquid.getLiquidIcon("water_still"), BlockLiquid.getLiquidIcon("water_flow")); FluidRegistry.WATER.setIcons(map.getAtlasSprite("minecraft:blocks/water_still"), map.getAtlasSprite("minecraft:blocks/water_flow"));
//FluidRegistry.LAVA.setIcons(BlockLiquid.getLiquidIcon("lava_still"), BlockLiquid.getLiquidIcon("lava_flow")); FluidRegistry.LAVA.setIcons(map.getAtlasSprite("minecraft:blocks/lava_still"), map.getAtlasSprite("minecraft:blocks/lava_flow"));
} }
static int renderPass = -1; static int renderPass = -1;

26
src/main/java/net/minecraftforge/fluids/Fluid.java
View File

@ -6,6 +6,7 @@ import java.util.Map;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -41,8 +42,8 @@ public class Fluid
protected String unlocalizedName; protected String unlocalizedName;
/** The Icons for this fluid. */ /** The Icons for this fluid. */
//protected IIcon stillIcon; protected TextureAtlasSprite stillIcon;
//protected IIcon flowingIcon; protected TextureAtlasSprite flowingIcon;
/** /**
* The light level emitted by this fluid. * The light level emitted by this fluid.
@ -265,41 +266,40 @@ public class Fluid
return 0xFFFFFF; return 0xFFFFFF;
} }
/*
public final Fluid setStillIcon(IIcon stillIcon) public final Fluid setStillIcon(TextureAtlasSprite stillIcon)
{ {
this.stillIcon = stillIcon; this.stillIcon = stillIcon;
return this; return this;
} }
public final Fluid setFlowingIcon(IIcon flowingIcon) public final Fluid setFlowingIcon(TextureAtlasSprite flowingIcon)
{ {
this.flowingIcon = flowingIcon; this.flowingIcon = flowingIcon;
return this; return this;
} }
public final Fluid setIcons(IIcon stillIcon, IIcon flowingIcon) public final Fluid setIcons(TextureAtlasSprite stillIcon, TextureAtlasSprite flowingIcon)
{ {
return this.setStillIcon(stillIcon).setFlowingIcon(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); 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; return this.stillIcon;
} }
public IIcon getFlowingIcon() public TextureAtlasSprite getFlowingIcon()
{ {
return this.flowingIcon; return this.flowingIcon;
} }
*/
/* Stack-based Accessors */ /* Stack-based Accessors */
public int getLuminosity(FluidStack stack){ return getLuminosity(); } public int getLuminosity(FluidStack stack){ return getLuminosity(); }
@ -309,7 +309,7 @@ public class Fluid
public boolean isGaseous(FluidStack stack){ return isGaseous(); } public boolean isGaseous(FluidStack stack){ return isGaseous(); }
public EnumRarity getRarity(FluidStack stack){ return getRarity(); } public EnumRarity getRarity(FluidStack stack){ return getRarity(); }
public int getColor(FluidStack stack){ return getColor(); } public int getColor(FluidStack stack){ return getColor(); }
//public IIcon getIcon(FluidStack stack){ return getIcon(); } public TextureAtlasSprite getIcon(FluidStack stack){ return getIcon(); }
/* World-based Accessors */ /* World-based Accessors */
public int getLuminosity(World world, BlockPos pos){ return getLuminosity(); } public int getLuminosity(World world, BlockPos pos){ return getLuminosity(); }
public int getDensity(World world, BlockPos pos){ return getDensity(); } 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 boolean isGaseous(World world, BlockPos pos){ return isGaseous(); }
public EnumRarity getRarity(World world, BlockPos pos){ return getRarity(); } public EnumRarity getRarity(World world, BlockPos pos){ return getRarity(); }
public int getColor(World world, BlockPos pos){ return getColor(); } 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(); private static Map<String, String> legacyNames = Maps.newHashMap();
static String convertLegacyName(String fluidName) static String convertLegacyName(String fluidName)