diff --git a/src/main/java/mekanism/api/gas/GasTank.java b/src/main/java/mekanism/api/gas/GasTank.java index b78f5a0e7..7aa5ad5ba 100644 --- a/src/main/java/mekanism/api/gas/GasTank.java +++ b/src/main/java/mekanism/api/gas/GasTank.java @@ -171,6 +171,15 @@ public class GasTank { return stored; } + + /** + * Gets the type of gas currently stored in this GasTank. + * @return gas type contained + */ + public Gas getGasType() + { + return stored != null ? stored.getGas() : null; + } /** * Gets the amount of gas stored by this GasTank. diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index fea455d77..b2ed84332 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -48,7 +48,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper element.renderForeground(xAxis, yAxis); } - if(tileEntity != null) + if(tileEntity instanceof IInvConfiguration) { Slot hovering = null; diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index 273f749c1..d5d39da21 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; @@ -30,7 +31,7 @@ public final class MinerVisualRenderer GL11.glTranslated(getX(miner.xCoord), getY(miner.yCoord), getZ(miner.zCoord)); MekanismRenderer.blendOn(); GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.8F); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); getList(new MinerRenderData(miner)).render(); MekanismRenderer.blendOff(); @@ -49,39 +50,18 @@ public final class MinerVisualRenderer List models = new ArrayList(); - if(data.radius == 0) + for(int x = -data.radius; x <= data.radius; x++) { - //Single vertical render - models.add(createModel(-offset, (data.minY-data.yCoord)-offset, -offset, 1+offset, (data.maxY-data.yCoord)+1+offset, 1+offset)); - } - else if(data.maxY-data.minY == 0) - { - //Flat panel render - models.add(createModel(-data.radius-offset, (data.minY-data.yCoord)-offset, -data.radius-offset, data.radius+1+offset, (data.maxY-data.yCoord)+1+offset, data.radius+1+offset)); - } - else { - //Complete render: Top face - models.add(createModel(-data.radius-offset+1, (data.maxY-data.yCoord)-offset, -data.radius-offset+1, data.radius+offset, (data.maxY-data.yCoord)+1+offset, data.radius+offset, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST)); - //Bottom face - models.add(createModel(-data.radius-offset+1, (data.minY-data.yCoord)-offset, -data.radius-offset+1, data.radius+offset, (data.minY-data.yCoord)+1+offset, data.radius+offset, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST)); - - //Northwest strip - models.add(createModel(-data.radius-offset, (data.minY-data.yCoord)-offset, -data.radius-offset, -data.radius+1+offset, (data.maxY-data.yCoord)+1+offset, -data.radius+1+offset, ForgeDirection.SOUTH, ForgeDirection.EAST)); - //Northeast strip - models.add(createModel(data.radius-offset, (data.minY-data.yCoord)-offset, -data.radius-offset, data.radius+1+offset, (data.maxY-data.yCoord)+1+offset, -data.radius+1+offset, ForgeDirection.SOUTH, ForgeDirection.WEST)); - //Southwest strip - models.add(createModel(-data.radius-offset, (data.minY-data.yCoord)-offset, data.radius-offset, -data.radius+1+offset, (data.maxY-data.yCoord)+1+offset, data.radius+1+offset, ForgeDirection.NORTH, ForgeDirection.EAST)); - //Southeast strip - models.add(createModel(data.radius-offset, (data.minY-data.yCoord)-offset, data.radius-offset, data.radius+1+offset, (data.maxY-data.yCoord)+1+offset, data.radius+1+offset, ForgeDirection.NORTH, ForgeDirection.WEST)); - - //North face - models.add(createModel(-data.radius-offset+1, (data.minY-data.yCoord)-offset, -data.radius-offset, data.radius+offset, (data.maxY-data.yCoord)+1+offset, -data.radius+1+offset, ForgeDirection.EAST, ForgeDirection.WEST)); - //South face - models.add(createModel(-data.radius-offset+1, (data.minY-data.yCoord)-offset, data.radius-offset, data.radius+offset, (data.maxY-data.yCoord)+1+offset, data.radius+1+offset, ForgeDirection.EAST, ForgeDirection.WEST)); - //West face - models.add(createModel(-data.radius-offset, (data.minY-data.yCoord)-offset, -data.radius-offset+1, -data.radius+1+offset, (data.maxY-data.yCoord)+1+offset, data.radius+offset, ForgeDirection.NORTH, ForgeDirection.SOUTH)); - //East face - models.add(createModel(data.radius-offset, (data.minY-data.yCoord)-offset, -data.radius-offset+1, data.radius+1+offset, (data.maxY-data.yCoord)+1+offset, data.radius+offset, ForgeDirection.NORTH, ForgeDirection.SOUTH)); + for(int y = data.minY-data.yCoord; y <= data.maxY-data.yCoord; y++) + { + for(int z = -data.radius; z <= data.radius; z++) + { + if(x == -data.radius || x == data.radius || y == data.minY-data.yCoord || y == data.maxY-data.yCoord || z == -data.radius || z == data.radius) + { + models.add(createModel(new Coord4D(x, y, z, mc.theWorld.provider.dimensionId))); + } + } + } } for(Model3D model : models) @@ -94,16 +74,11 @@ public final class MinerVisualRenderer return display; } - private static Model3D createModel(double minX, double minY, double minZ, double maxX, double maxY, double maxZ, ForgeDirection... ignoreDirs) + private static Model3D createModel(Coord4D rel) { Model3D toReturn = new Model3D(); - for(ForgeDirection dir : ignoreDirs) - { - toReturn.setSideRender(dir, false); - } - - toReturn.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ); + toReturn.setBlockBounds(rel.xCoord + 0.4, rel.yCoord + 0.4, rel.zCoord + 0.4, rel.xCoord + 0.6, rel.yCoord + 0.6, rel.zCoord + 0.6); toReturn.baseBlock = Blocks.water; toReturn.setTexture(MekanismRenderer.getColorIcon(EnumColor.WHITE)); @@ -148,7 +123,7 @@ public final class MinerVisualRenderer @Override public boolean equals(Object data) { - return data instanceof MinerRenderData && super.equals(data) && ((MinerRenderData)data).minY == minY && + return data instanceof MinerRenderData && ((MinerRenderData)data).minY == minY && ((MinerRenderData)data).maxY == maxY && ((MinerRenderData)data).radius == radius && ((MinerRenderData)data).yCoord == yCoord; } @@ -157,7 +132,6 @@ public final class MinerVisualRenderer public int hashCode() { int code = 1; - code = 31 * code + super.hashCode(); code = 31 * code + minY; code = 31 * code + maxY; code = 31 * code + radius; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index 6cbc4f668..0d1375db4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -43,6 +43,9 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer model.render(0.0625F, tileEntity.isActive); GL11.glPopMatrix(); - MinerVisualRenderer.render(tileEntity); + if(tileEntity.clientRendering) + { + MinerVisualRenderer.render(tileEntity); + } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 25aa1ed3e..505b41bdf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -125,7 +125,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityElectricBlock impl if(inventory[0] != null && (inputTank.getGas() == null || inputTank.getStored() < inputTank.getMaxGas())) { - inputTank.receive(GasTransmission.removeGas(inventory[0], null, inputTank.getNeeded()), true); + inputTank.receive(GasTransmission.removeGas(inventory[0], inputTank.getGasType(), inputTank.getNeeded()), true); } if(canOperate() && MekanismUtils.canFunction(this) && getEnergy() >= MekanismUtils.getEnergyPerTick(this, ENERGY_USAGE)) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 8747b3266..3be93a045 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -94,12 +94,12 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement if(inventory[0] != null && (leftTank.getGas() == null || leftTank.getStored() < leftTank.getMaxGas())) { - leftTank.receive(GasTransmission.removeGas(inventory[0], null, leftTank.getNeeded()), true); + leftTank.receive(GasTransmission.removeGas(inventory[0], leftTank.getGasType(), leftTank.getNeeded()), true); } if(inventory[1] != null && (rightTank.getGas() == null || rightTank.getStored() < rightTank.getMaxGas())) { - rightTank.receive(GasTransmission.removeGas(inventory[1], null, rightTank.getNeeded()), true); + rightTank.receive(GasTransmission.removeGas(inventory[1], leftTank.getGasType(), rightTank.getNeeded()), true); } if(inventory[2] != null && centerTank.getGas() != null) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index aabd82050..9af94baac 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -67,7 +67,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr if(gas != null && isValidGas(gas.getGas())) { - GasStack removed = GasTransmission.removeGas(inventory[1], gasTank.getGas() != null ? gasTank.getGas().getGas() : null, gasTank.getNeeded()); + GasStack removed = GasTransmission.removeGas(inventory[1], gasTank.getGasType(), gasTank.getNeeded()); gasTank.receive(removed, true); } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 3ca5704c6..a1d34582d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -100,6 +100,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public boolean initCalc = false; public int numPowering; + + public boolean clientRendering = false; /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -1377,9 +1379,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public boolean onSneakRightClick(EntityPlayer player, int side) { - //TODO - - return true; + return clientRendering = !clientRendering; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 72eb40401..ee2f59b2e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -361,7 +361,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip if(gas != null && RecipeType.values()[recipeType].isValidGas(gas.getGas())) { - GasStack removed = GasTransmission.removeGas(inventory[4], gasTank.getGas() != null ? gasTank.getGas().getGas() : null, gasTank.getNeeded()); + GasStack removed = GasTransmission.removeGas(inventory[4], gasTank.getGasType(), gasTank.getNeeded()); gasTank.receive(removed, true); } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index ac90ace80..dfde63c43 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -56,7 +56,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH if(inventory[1] != null && (gasTank.getGas() == null || gasTank.getGas().amount < gasTank.getMaxGas())) { - gasTank.receive(GasTransmission.removeGas(inventory[1], gasTank.getGas() != null ? gasTank.getGas().getGas() : null, gasTank.getNeeded()), true); + gasTank.receive(GasTransmission.removeGas(inventory[1], gasTank.getGasType(), gasTank.getNeeded()), true); } if(!worldObj.isRemote && gasTank.getGas() != null && MekanismUtils.canFunction(this)) diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 4d70b8990..b03858927 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -103,7 +103,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { if(inventory[1] != null && (gasTank.getGas() == null || gasTank.getStored() < gasTank.getMaxGas())) { - gasTank.receive(GasTransmission.removeGas(inventory[1], null, gasTank.getNeeded()), true); + gasTank.receive(GasTransmission.removeGas(inventory[1], gasTank.getGasType(), gasTank.getNeeded()), true); } if(inventory[2] != null)