Pressurized Tubes now render gas in connected block bounds dynamically
This commit is contained in:
parent
afae26f9b8
commit
fea5e8dab7
|
@ -46,6 +46,11 @@ public class GuiFactory extends GuiMekanism
|
||||||
{
|
{
|
||||||
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
|
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(xAxis >= 8 && xAxis <= 168 && yAxis >= 78 && yAxis <= 83)
|
||||||
|
{
|
||||||
|
drawCreativeTabHoveringText("Secondary energy: " + tileEntity.secondaryEnergyStored, xAxis, yAxis);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -59,7 +59,7 @@ public class ModelTransmitter extends ModelBase
|
||||||
setRotation(Front, 0F, 1.570796F, 0F);
|
setRotation(Front, 0F, 1.570796F, 0F);
|
||||||
Back = new ModelRendererSelectiveFace(this, 0, 49);
|
Back = new ModelRendererSelectiveFace(this, 0, 49);
|
||||||
Back.addBox(0F, 0F, 0F, 4, 8, 8);
|
Back.addBox(0F, 0F, 0F, 4, 8, 8);
|
||||||
Back.setRotationPoint(-4F, 12F, 8F);//
|
Back.setRotationPoint(-4F, 12F, 8F);
|
||||||
Back.setTextureSize(64, 64);
|
Back.setTextureSize(64, 64);
|
||||||
Back.mirror = true;
|
Back.mirror = true;
|
||||||
setRotation(Back, 0F, 1.570796F, 0F);
|
setRotation(Back, 0F, 1.570796F, 0F);
|
||||||
|
|
|
@ -13,6 +13,7 @@ import mekanism.client.render.MekanismRenderer;
|
||||||
import mekanism.client.render.MekanismRenderer.BooleanArray;
|
import mekanism.client.render.MekanismRenderer.BooleanArray;
|
||||||
import mekanism.client.render.MekanismRenderer.DisplayInteger;
|
import mekanism.client.render.MekanismRenderer.DisplayInteger;
|
||||||
import mekanism.client.render.MekanismRenderer.Model3D;
|
import mekanism.client.render.MekanismRenderer.Model3D;
|
||||||
|
import mekanism.common.Mekanism;
|
||||||
import mekanism.common.tileentity.TileEntityGasTank;
|
import mekanism.common.tileentity.TileEntityGasTank;
|
||||||
import mekanism.common.tileentity.TileEntityPressurizedTube;
|
import mekanism.common.tileentity.TileEntityPressurizedTube;
|
||||||
import mekanism.common.util.MekanismUtils;
|
import mekanism.common.util.MekanismUtils;
|
||||||
|
@ -34,7 +35,6 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
|
|
||||||
private boolean[] connectable;
|
private boolean[] connectable;
|
||||||
|
|
||||||
private HashMap<ForgeDirection, HashMap<EnumGas, DisplayInteger>> cachedSideGasses = new HashMap<ForgeDirection, HashMap<EnumGas, DisplayInteger>>();
|
|
||||||
private HashMap<BooleanArray, HashMap<EnumGas, DisplayInteger>> cachedCenterGasses = new HashMap<BooleanArray, HashMap<EnumGas, DisplayInteger>>();
|
private HashMap<BooleanArray, HashMap<EnumGas, DisplayInteger>> cachedCenterGasses = new HashMap<BooleanArray, HashMap<EnumGas, DisplayInteger>>();
|
||||||
|
|
||||||
private static final double offset = 0.015;
|
private static final double offset = 0.015;
|
||||||
|
@ -121,6 +121,8 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
bindTexture(MekanismRenderer.getBlocksTexture());
|
bindTexture(MekanismRenderer.getBlocksTexture());
|
||||||
GL11.glTranslatef((float)x, (float)y, (float)z);
|
GL11.glTranslatef((float)x, (float)y, (float)z);
|
||||||
|
|
||||||
|
if(!Mekanism.proxy.isPaused())
|
||||||
|
{
|
||||||
if(tileEntity.gasScale > 0)
|
if(tileEntity.gasScale > 0)
|
||||||
{
|
{
|
||||||
tileEntity.gasScale = Math.max(0, tileEntity.gasScale - .008F);
|
tileEntity.gasScale = Math.max(0, tileEntity.gasScale - .008F);
|
||||||
|
@ -128,16 +130,18 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
else {
|
else {
|
||||||
tileEntity.refGas = null;
|
tileEntity.refGas = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for(int i = 0; i < 6; i++)
|
for(int i = 0; i < 6; i++)
|
||||||
{
|
{
|
||||||
if(connectable[i])
|
if(connectable[i])
|
||||||
{
|
{
|
||||||
getListAndRender(ForgeDirection.getOrientation(i), tileEntity.refGas).render();
|
Block b = Block.blocksList[Object3D.get(tileEntity).getFromSide(ForgeDirection.getOrientation(i)).getBlockId(tileEntity.worldObj)];
|
||||||
|
getListAndRender(ForgeDirection.getOrientation(i), tileEntity.refGas, b).render();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
getListAndRender(ForgeDirection.UNKNOWN, tileEntity.refGas).render();
|
getListAndRender(ForgeDirection.UNKNOWN, tileEntity.refGas, null).render();
|
||||||
|
|
||||||
pop();
|
pop();
|
||||||
}
|
}
|
||||||
|
@ -160,7 +164,7 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("incomplete-switch")
|
@SuppressWarnings("incomplete-switch")
|
||||||
private DisplayInteger getListAndRender(ForgeDirection side, EnumGas type)
|
private DisplayInteger getListAndRender(ForgeDirection side, EnumGas type, Block block)
|
||||||
{
|
{
|
||||||
if(side == ForgeDirection.UNKNOWN)
|
if(side == ForgeDirection.UNKNOWN)
|
||||||
{
|
{
|
||||||
|
@ -205,11 +209,6 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
return display;
|
return display;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cachedSideGasses.containsKey(side) && cachedSideGasses.get(side).containsKey(type))
|
|
||||||
{
|
|
||||||
return cachedSideGasses.get(side).get(type);
|
|
||||||
}
|
|
||||||
|
|
||||||
Model3D toReturn = new Model3D();
|
Model3D toReturn = new Model3D();
|
||||||
toReturn.baseBlock = Block.waterStill;
|
toReturn.baseBlock = Block.waterStill;
|
||||||
toReturn.setTexture(type.gasIcon);
|
toReturn.setTexture(type.gasIcon);
|
||||||
|
@ -219,22 +218,12 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
|
|
||||||
DisplayInteger display = DisplayInteger.createAndStart();
|
DisplayInteger display = DisplayInteger.createAndStart();
|
||||||
|
|
||||||
if(cachedSideGasses.containsKey(side))
|
|
||||||
{
|
|
||||||
cachedSideGasses.get(side).put(type, display);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
HashMap<EnumGas, DisplayInteger> map = new HashMap<EnumGas, DisplayInteger>();
|
|
||||||
map.put(type, display);
|
|
||||||
cachedSideGasses.put(side, map);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(side)
|
switch(side)
|
||||||
{
|
{
|
||||||
case DOWN:
|
case DOWN:
|
||||||
{
|
{
|
||||||
toReturn.minX = 0.3 + offset;
|
toReturn.minX = 0.3 + offset;
|
||||||
toReturn.minY = 0.0;
|
toReturn.minY = 0.0 - (1-block.getBlockBoundsMaxY());
|
||||||
toReturn.minZ = 0.3 + offset;
|
toReturn.minZ = 0.3 + offset;
|
||||||
|
|
||||||
toReturn.maxX = 0.7 - offset;
|
toReturn.maxX = 0.7 - offset;
|
||||||
|
@ -249,7 +238,7 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
toReturn.minZ = 0.3 + offset;
|
toReturn.minZ = 0.3 + offset;
|
||||||
|
|
||||||
toReturn.maxX = 0.7 - offset;
|
toReturn.maxX = 0.7 - offset;
|
||||||
toReturn.maxY = 1.0;
|
toReturn.maxY = 1.0 + block.getBlockBoundsMinY();
|
||||||
toReturn.maxZ = 0.7 - offset;
|
toReturn.maxZ = 0.7 - offset;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -257,7 +246,7 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
{
|
{
|
||||||
toReturn.minX = 0.3 + offset;
|
toReturn.minX = 0.3 + offset;
|
||||||
toReturn.minY = 0.3 + offset;
|
toReturn.minY = 0.3 + offset;
|
||||||
toReturn.minZ = 0.0;
|
toReturn.minZ = 0.0 - (1-block.getBlockBoundsMaxZ());
|
||||||
|
|
||||||
toReturn.maxX = 0.7 - offset;
|
toReturn.maxX = 0.7 - offset;
|
||||||
toReturn.maxY = 0.7 - offset;
|
toReturn.maxY = 0.7 - offset;
|
||||||
|
@ -272,12 +261,12 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
|
|
||||||
toReturn.maxX = 0.7 - offset;
|
toReturn.maxX = 0.7 - offset;
|
||||||
toReturn.maxY = 0.7 - offset;
|
toReturn.maxY = 0.7 - offset;
|
||||||
toReturn.maxZ = 1.0;
|
toReturn.maxZ = 1.0 + block.getBlockBoundsMinZ();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WEST:
|
case WEST:
|
||||||
{
|
{
|
||||||
toReturn.minX = 0.0;
|
toReturn.minX = 0.0 - (1-block.getBlockBoundsMaxX());
|
||||||
toReturn.minY = 0.3 + offset;
|
toReturn.minY = 0.3 + offset;
|
||||||
toReturn.minZ = 0.3 + offset;
|
toReturn.minZ = 0.3 + offset;
|
||||||
|
|
||||||
|
@ -292,7 +281,7 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
|
||||||
toReturn.minY = 0.3 + offset;
|
toReturn.minY = 0.3 + offset;
|
||||||
toReturn.minZ = 0.3 + offset;
|
toReturn.minZ = 0.3 + offset;
|
||||||
|
|
||||||
toReturn.maxX = 1.0;
|
toReturn.maxX = 1.0 + block.getBlockBoundsMinX();
|
||||||
toReturn.maxY = 0.7 - offset;
|
toReturn.maxY = 0.7 - offset;
|
||||||
toReturn.maxZ = 0.7 - offset;
|
toReturn.maxZ = 0.7 - offset;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -112,7 +112,7 @@ import cpw.mods.fml.common.registry.EntityRegistry;
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mekanism - the mod in which no true definition fits.
|
* Mekanism - the mod that doesn't have a category.
|
||||||
* @author AidanBrady
|
* @author AidanBrady
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue