tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fixed typo, fixed coloring of fluids in Dynamic Tank, Portable Tank & Mechanical Pipes

Browse source
This commit is contained in:
Aidan C. Brady 2014-11-21 08:13:38 -05:00
parent 6308bf7e2f
commit ec5793dc4d
4 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/client/CapeBufferDownload.java
View file

@ -32,7 +32,7 @@ public class CapeBufferDownload extends Thread
staticCapeUrl = url;
setDaemon(true);
setName("Cape Downlaod Thread");
setName("Cape Download Thread");
}
@Override

6
src/main/java/mekanism/client/render/RenderPartTransmitter.java
View file

@ -279,6 +279,7 @@ public class RenderPartTransmitter implements IIconSelfRegister
push();
MekanismRenderer.glowOn(fluid.getLuminosity());
MekanismRenderer.colorFluid(fluid);
CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture());
GL11.glTranslated(pos.x, pos.y, pos.z);
@ -328,6 +329,7 @@ public class RenderPartTransmitter implements IIconSelfRegister
}
MekanismRenderer.glowOff();
MekanismRenderer.resetColor();
pop();
}
@ -365,8 +367,6 @@ public class RenderPartTransmitter implements IIconSelfRegister
cachedLiquids.put(side, map);
}
MekanismRenderer.colorFluid(fluid);
for(int i = 0; i < stages; i++)
{
displays[i] = DisplayInteger.createAndStart();
@ -456,8 +456,6 @@ public class RenderPartTransmitter implements IIconSelfRegister
displays[i].endList();
}
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
return displays;
}

12
src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java
View file

@ -55,6 +55,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord));
MekanismRenderer.glowOn(tileEntity.structure.fluidStored.getFluid().getLuminosity());
MekanismRenderer.colorFluid(tileEntity.structure.fluidStored.getFluid());
DisplayInteger[] displayList = getListAndRender(data, tileEntity.structure.fluidStored.getFluid(), tileEntity.getWorldObj());
@ -68,6 +69,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
}
MekanismRenderer.glowOff();
MekanismRenderer.resetColor();
pop();
@ -77,6 +79,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
{
push();
MekanismRenderer.glowOn(tileEntity.structure.fluidStored.getFluid().getLuminosity());
GL11.glTranslated(getX(valveData.location.xCoord), getY(valveData.location.yCoord), getZ(valveData.location.zCoord));
MekanismRenderer.glowOn(tileEntity.structure.fluidStored.getFluid().getLuminosity());
@ -84,6 +87,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
getValveDisplay(ValveRenderData.get(data, valveData), tileEntity.structure.fluidStored.getFluid(), tileEntity.getWorldObj()).render();
MekanismRenderer.glowOff();
MekanismRenderer.resetColor();
pop();
}
@ -132,8 +136,6 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
cachedCenterFluids.put(data, map);
}
MekanismRenderer.colorFluid(fluid);
for(int i = 0; i < stages; i++)
{
displays[i] = DisplayInteger.createAndStart();
@ -154,8 +156,6 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
GL11.glEndList();
}
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
return displays;
}
@ -182,8 +182,6 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
cachedValveFluids.put(data, map);
}
MekanismRenderer.colorFluid(fluid);
switch(data.side)
{
case DOWN:
@ -265,8 +263,6 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
display.endList();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
return display;
}

12
src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java
View file

@ -52,6 +52,7 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
GL11.glTranslated(x, y, z);
MekanismRenderer.glowOn(fluid.getLuminosity());
MekanismRenderer.colorFluid(fluid);
DisplayInteger[] displayList = getListAndRender(fluid);
@ -65,6 +66,7 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
}
MekanismRenderer.glowOff();
MekanismRenderer.resetColor();
pop();
}
@ -77,12 +79,14 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
GL11.glTranslated(x, y, z);
MekanismRenderer.glowOn(valveFluid.getLuminosity());
MekanismRenderer.colorFluid(valveFluid);
DisplayInteger[] valveList = getValveRender(valveFluid);
valveList[Math.min(stages-1, (int)(fluidScale*((float)stages-1)))].render();
MekanismRenderer.glowOff();
MekanismRenderer.resetColor();
pop();
}
@ -126,8 +130,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
DisplayInteger[] displays = new DisplayInteger[stages];
cachedValveFluids.put(fluid, displays);
MekanismRenderer.colorFluid(fluid);
for(int i = 0; i < stages; i++)
{
displays[i] = DisplayInteger.createAndStart();
@ -148,8 +150,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
GL11.glEndList();
}
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
return displays;
}
@ -167,8 +167,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
DisplayInteger[] displays = new DisplayInteger[stages];
cachedCenterFluids.put(fluid, displays);
MekanismRenderer.colorFluid(fluid);
for(int i = 0; i < stages; i++)
{
displays[i] = DisplayInteger.createAndStart();
@ -189,8 +187,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
GL11.glEndList();
}
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
return displays;
}