Fixed pipe crash, fixed Logistical Sorter render

This commit is contained in:
aidancbrady committed 2016-07-20 14:32:33 -04:00
1 parent ce0b46b4cb
commit a0d2d2f505
4 files changed
+21 -40

No files matched your search

@@ -3,6 +3,7 @@ package mekanism.client.model;
import mekanism.client.render.MekanismRenderer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -201,44 +202,19 @@ public class ModelLogisticalSorter extends ModelBase
public void render(float size, boolean active)
{
portBack.render(size);
portBackLarge.render(size);
connectorBack.render(size);
portFront.render(size);
ring1.render(size);
ring2.render(size);
ring3.render(size);
ring4.render(size);
ring5.render(size);
ring6.render(size);
ring7.render(size);
pistonBar1.render(size);
pipe.render(size);
pistonBase1.render(size);
pistonBrace1.render(size);
pistonConnector1.render(size);
pistonBrace2.render(size);
pistonConnector2.render(size);
pistonBar2.render(size);
pistonBase2.render(size);
panel2.render(size);
MekanismRenderer.glowOn();
MekanismRenderer.blendOn();
if(active)
{
MekanismRenderer.glowOn();
}
GlStateManager.scale(1.001F, 1.001F, 1.001F);
GlStateManager.translate(0, -0.0011F, 0);
led4.render(size);
led3.render(size);
led2.render(size);
led1.render(size);
if(active)
{
MekanismRenderer.glowOff();
}
panel1.render(size);
MekanismRenderer.blendOff();
MekanismRenderer.glowOff();
}
private void setRotation(ModelRenderer model, float x, float y, float z)
@@ -17,12 +17,17 @@ public class RenderLogisticalSorter extends TileEntitySpecialRenderer<TileEntity
@Override
public void renderTileEntityAt(TileEntityLogisticalSorter tileEntity, double x, double y, double z, float partialTick, int destroyStage)
{
if(!tileEntity.isActive)
{
return;
}
GlStateManager.pushMatrix();
GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F);
GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter" + (tileEntity.isActive ? "On" : "") + ".png"));
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorterOn.png"));
switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/
switch(tileEntity.facing.ordinal())
{
case 0:
{
@@ -393,12 +393,6 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
filters.add(TransporterFilter.readFromPacket(dataStream));
}
}
if(clientActive != isActive)
{
isActive = clientActive;
MekanismUtils.updateBlock(worldObj, getPos());
}
}
}
@@ -30,6 +30,12 @@ public final class PipeUtils
}
IFluidHandler container = CapabilityUtils.getCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite());
if(container == null)
{
return false;
}
IFluidTankProperties[] infoArray = container.getTankProperties();
if(infoArray != null && infoArray.length > 0)