Merge pull request #1266 from ReikaKalseki/patch-1

Bugfix for non-world liquids
This commit is contained in:
Flow86 2013-10-09 23:04:28 -07:00
commit 3a7c8c76a3

View file

@ -28,6 +28,7 @@ import org.lwjgl.opengl.GL11;
public class FluidRenderer {
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.locationBlocksTexture;
private static final ResourceLocation ITEM_TEXTURE = TextureMap.locationItemsTexture;
private static Map<Fluid, int[]> flowingRenderCache = new HashMap<Fluid, int[]>();
private static Map<Fluid, int[]> stillRenderCache = new HashMap<Fluid, int[]>();
public static final int DISPLAY_STAGES = 100;
@ -58,7 +59,10 @@ public class FluidRenderer {
}
public static ResourceLocation getFluidSheet(Fluid liquid) {
if (liquid.canBePlacedInWorld())
return BLOCK_TEXTURE;
else
return ITEM_TEXTURE;
}
public static void setColorForFluidStack(FluidStack fluidstack) {