diff --git a/src/main/java/mekanism/api/ISalinationSolar.java b/src/main/java/mekanism/api/IEvaporationSolar.java similarity index 84% rename from src/main/java/mekanism/api/ISalinationSolar.java rename to src/main/java/mekanism/api/IEvaporationSolar.java index 20e3e1ecf..fd5d2cf7d 100644 --- a/src/main/java/mekanism/api/ISalinationSolar.java +++ b/src/main/java/mekanism/api/IEvaporationSolar.java @@ -5,7 +5,7 @@ package mekanism.api; * @author aidancbrady * */ -public interface ISalinationSolar +public interface IEvaporationSolar { public boolean seesSun(); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 379bf95f2..e5e5c50fb 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -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); } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java index da4fc578d..d255fc370 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java @@ -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(); + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 9f424f021..a479ea440 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -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 tankParts = new HashSet(); - 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 diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index f0db0eeaa..4b718e927 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -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() {