Fixed glowing tanks, fixed blend screwup when in toolbar, quick cleanup

This commit is contained in:
Aidan C. Brady committed 2014-06-19 01:41:07 +02:00
1 parent 7924531a4e
commit d7b0899f38
3 files changed
+8 -5

No files matched your search

@@ -1,5 +1,6 @@
package mekanism.client.model;
import mekanism.client.render.MekanismRenderer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
@@ -94,10 +95,13 @@ public class ModelPortableTank extends ModelBase
PoleBR.render(size);
PoleRF.render(size);
Top.render(size);
MekanismRenderer.blendOn();
FrontGlass.render(size);
BackGlass.render(size);
RightGlass.render(size);
LeftGlass.render(size);
MekanismRenderer.blendOff();
}
private void setRotation(ModelRenderer model, float x, float y, float z)
@@ -43,7 +43,7 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
public void render(Fluid fluid, float fluidScale, boolean active, double x, double y, double z)
{
if(fluidScale > 0)
if(fluid != null && fluidScale > 0)
{
push();
@@ -80,7 +80,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
private void pop()
{
GL11.glPopAttrib();
MekanismRenderer.glowOff();
MekanismRenderer.blendOff();
GL11.glPopMatrix();
}
@@ -91,7 +90,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_LIGHTING);
MekanismRenderer.glowOn();
MekanismRenderer.blendOn();
}
@@ -350,8 +350,9 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
}
}
if (networkChanged) {
this.updateCapacity();
if(networkChanged)
{
updateCapacity();
}
needsUpdate = true;