mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fixed glass render, added new Thermal Evaporation Plant computer integration
This commit is contained in:
1 parent
5ed86f3f01
commit
5dcddaf25b
5 files changed
+47
-11
No files matched your search
+1
-1
@@ -5,7 +5,7 @@ package mekanism.api;
|
||||
* @author aidancbrady
|
||||
*
|
||||
*/
|
||||
public interface ISalinationSolar
|
||||
public interface IEvaporationSolar
|
||||
{
|
||||
public boolean seesSun();
|
||||
}
|
||||
@@ -942,7 +942,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
{
|
||||
Coord4D obj = new Coord4D(x, y, z).getFromSide(ForgeDirection.getOrientation(side).getOpposite());
|
||||
|
||||
if(BasicType.get(this, world.getBlockMetadata(x, y, z)) == BasicType.STRUCTURAL_GLASS)
|
||||
if(BasicType.get(this, obj.getMetadata(world)) == BasicType.STRUCTURAL_GLASS)
|
||||
{
|
||||
return ctms[10][0].shouldRenderSide(world, x, y, z, side);
|
||||
}
|
||||
|
||||
@@ -4,12 +4,13 @@ import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.common.integration.IComputerIntegration;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock
|
||||
public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock implements IComputerIntegration
|
||||
{
|
||||
public Coord4D master;
|
||||
|
||||
@@ -154,4 +155,39 @@ public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock
|
||||
return found;
|
||||
}
|
||||
}
|
||||
|
||||
private static final String[] methods = new String[] {"getTemperature", "getHeight", "isFormed", "getInput", "getOutput"};
|
||||
|
||||
@Override
|
||||
public String[] getMethods()
|
||||
{
|
||||
return methods;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object[] invoke(int method, Object[] args) throws Exception
|
||||
{
|
||||
TileEntityThermalEvaporationController controller = getController();
|
||||
|
||||
if(controller == null)
|
||||
{
|
||||
return new Object[] {"Unformed."};
|
||||
}
|
||||
|
||||
switch(method)
|
||||
{
|
||||
case 0:
|
||||
return new Object[] {controller.temperature};
|
||||
case 1:
|
||||
return new Object[] {controller.height};
|
||||
case 2:
|
||||
return new Object[] {controller.structured};
|
||||
case 3:
|
||||
return new Object[] {controller.inputTank.getFluidAmount()};
|
||||
case 4:
|
||||
return new Object[] {controller.outputTank.getFluidAmount()};
|
||||
default:
|
||||
throw new NoSuchMethodException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.ISalinationSolar;
|
||||
import mekanism.api.IEvaporationSolar;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.client.SparkleAnimation.INodeChecker;
|
||||
@@ -47,7 +47,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva
|
||||
public FluidTank outputTank = new FluidTank(MAX_OUTPUT);
|
||||
|
||||
public Set<Coord4D> tankParts = new HashSet<Coord4D>();
|
||||
public ISalinationSolar[] solars = new ISalinationSolar[4];
|
||||
public IEvaporationSolar[] solars = new IEvaporationSolar[4];
|
||||
|
||||
public boolean temperatureSet = false;
|
||||
|
||||
@@ -324,7 +324,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva
|
||||
|
||||
int ret = 0;
|
||||
|
||||
for(ISalinationSolar solar : solars)
|
||||
for(IEvaporationSolar solar : solars)
|
||||
{
|
||||
if(solar != null && solar.seesSun())
|
||||
{
|
||||
@@ -533,9 +533,9 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva
|
||||
|
||||
public boolean addSolarPanel(TileEntity tile, int i)
|
||||
{
|
||||
if(tile instanceof ISalinationSolar && !tile.isInvalid())
|
||||
if(tile instanceof IEvaporationSolar && !tile.isInvalid())
|
||||
{
|
||||
solars[i] = (ISalinationSolar)tile;
|
||||
solars[i] = (IEvaporationSolar)tile;
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
@@ -713,7 +713,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva
|
||||
}
|
||||
|
||||
tankParts.clear();
|
||||
solars = new ISalinationSolar[] {null, null, null, null};
|
||||
solars = new IEvaporationSolar[] {null, null, null, null};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,13 +3,13 @@ package mekanism.generators.common.tile;
|
||||
import java.util.EnumSet;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.ISalinationSolar;
|
||||
import mekanism.api.IEvaporationSolar;
|
||||
import mekanism.api.MekanismConfig.generators;
|
||||
import mekanism.common.base.IBoundingBlock;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar
|
||||
public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, IEvaporationSolar
|
||||
{
|
||||
public TileEntityAdvancedSolarGenerator()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user