Rename Salination Plant to Solar Evaporation Plant
|
@ -152,7 +152,7 @@ import mekanism.common.tile.TileEntityPortableTank;
|
|||
import mekanism.common.tile.TileEntityPrecisionSawmill;
|
||||
import mekanism.common.tile.TileEntityPurificationChamber;
|
||||
import mekanism.common.tile.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tile.TileEntitySalinationController;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationController;
|
||||
import mekanism.common.tile.TileEntitySeismicVibrator;
|
||||
import mekanism.common.tile.TileEntityTeleporter;
|
||||
|
||||
|
@ -303,7 +303,7 @@ public class ClientProxy extends CommonProxy
|
|||
ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser());
|
||||
ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine());
|
||||
ClientRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator", new RenderElectrolyticSeparator());
|
||||
ClientRegistry.registerTileEntity(TileEntitySalinationController.class, "SalinationController", new RenderSalinationController());
|
||||
ClientRegistry.registerTileEntity(TileEntitySolarEvaporationController.class, "SalinationController", new RenderSalinationController());
|
||||
ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine());
|
||||
ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber());
|
||||
ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher());
|
||||
|
@ -451,7 +451,7 @@ public class ClientProxy extends CommonProxy
|
|||
case 32:
|
||||
return new GuiElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
|
||||
case 33:
|
||||
return new GuiSalinationController(player.inventory, (TileEntitySalinationController)tileEntity);
|
||||
return new GuiSalinationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity);
|
||||
case 34:
|
||||
return new GuiPrecisionSawmill(player.inventory, (TileEntityPrecisionSawmill)tileEntity);
|
||||
case 35:
|
||||
|
|
|
@ -39,6 +39,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism
|
|||
tileEntity = tentity;
|
||||
|
||||
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png")));
|
||||
guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png")));
|
||||
guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 4, 24).with(SlotOverlay.PLUS));
|
||||
guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 4, 55).with(SlotOverlay.MINUS));
|
||||
|
||||
|
@ -51,7 +52,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism
|
|||
@Override
|
||||
public List<String> getInfo()
|
||||
{
|
||||
String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.ENERGY_USAGE);
|
||||
String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.BASE_ENERGY_USAGE*tileEntity.getUpgradedUsage());
|
||||
return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png")));
|
||||
|
|
|
@ -3,7 +3,7 @@ package mekanism.client.gui;
|
|||
import mekanism.api.gas.GasStack;
|
||||
import mekanism.client.render.MekanismRenderer;
|
||||
import mekanism.common.inventory.container.ContainerSalinationController;
|
||||
import mekanism.common.tile.TileEntitySalinationController;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationController;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
|
@ -18,9 +18,9 @@ import org.lwjgl.opengl.GL11;
|
|||
@SideOnly(Side.CLIENT)
|
||||
public class GuiSalinationController extends GuiMekanism
|
||||
{
|
||||
public TileEntitySalinationController tileEntity;
|
||||
public TileEntitySolarEvaporationController tileEntity;
|
||||
|
||||
public GuiSalinationController(InventoryPlayer inventory, TileEntitySalinationController tentity)
|
||||
public GuiSalinationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity)
|
||||
{
|
||||
super(tentity, new ContainerSalinationController(inventory, tentity));
|
||||
tileEntity = tentity;
|
||||
|
|
|
@ -8,7 +8,7 @@ import mekanism.client.render.MekanismRenderer;
|
|||
import mekanism.client.render.MekanismRenderer.DisplayInteger;
|
||||
import mekanism.client.render.MekanismRenderer.Model3D;
|
||||
import mekanism.common.content.tank.TankUpdateProtocol;
|
||||
import mekanism.common.tile.TileEntitySalinationController;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationController;
|
||||
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
|
@ -29,10 +29,10 @@ public class RenderSalinationController extends TileEntitySpecialRenderer
|
|||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick)
|
||||
{
|
||||
renderAModelAt((TileEntitySalinationController)tileEntity, x, y, z, partialTick);
|
||||
renderAModelAt((TileEntitySolarEvaporationController)tileEntity, x, y, z, partialTick);
|
||||
}
|
||||
|
||||
public void renderAModelAt(TileEntitySalinationController tileEntity, double x, double y, double z, float partialTick)
|
||||
public void renderAModelAt(TileEntitySolarEvaporationController tileEntity, double x, double y, double z, float partialTick)
|
||||
{
|
||||
if(tileEntity.structured && tileEntity.waterTank.getFluid() != null)
|
||||
{
|
||||
|
|
|
@ -87,7 +87,7 @@ import mekanism.common.tile.TileEntityPortableTank;
|
|||
import mekanism.common.tile.TileEntityPrecisionSawmill;
|
||||
import mekanism.common.tile.TileEntityPurificationChamber;
|
||||
import mekanism.common.tile.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tile.TileEntitySalinationController;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationController;
|
||||
import mekanism.common.tile.TileEntitySeismicVibrator;
|
||||
import mekanism.common.tile.TileEntityTeleporter;
|
||||
|
||||
|
@ -143,7 +143,7 @@ public class CommonProxy
|
|||
GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber");
|
||||
GameRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator");
|
||||
GameRegistry.registerTileEntity(TileEntitySalinationController.class, "SalinationController");
|
||||
GameRegistry.registerTileEntity(TileEntitySolarEvaporationController.class, "SalinationController");
|
||||
GameRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher");
|
||||
|
@ -404,7 +404,7 @@ public class CommonProxy
|
|||
case 32:
|
||||
return new ContainerElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
|
||||
case 33:
|
||||
return new ContainerSalinationController(player.inventory, (TileEntitySalinationController)tileEntity);
|
||||
return new ContainerSalinationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity);
|
||||
case 34:
|
||||
return new ContainerChanceMachine(player.inventory, (TileEntityChanceMachine)tileEntity);
|
||||
case 35:
|
||||
|
|
|
@ -68,8 +68,8 @@ import mekanism.common.tile.TileEntityBoundingBlock;
|
|||
import mekanism.common.tile.TileEntityCardboardBox;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import mekanism.common.tile.TileEntityEntangledBlock;
|
||||
import mekanism.common.tile.TileEntitySalinationBlock;
|
||||
import mekanism.common.tile.TileEntitySalinationValve;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationBlock;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationValve;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import mekanism.common.voice.VoiceServerManager;
|
||||
|
@ -953,8 +953,8 @@ public class Mekanism
|
|||
GameRegistry.registerTileEntity(TileEntityBoundingBlock.class, "BoundingBlock");
|
||||
GameRegistry.registerTileEntity(TileEntityAdvancedBoundingBlock.class, "AdvancedBoundingBlock");
|
||||
GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox");
|
||||
GameRegistry.registerTileEntity(TileEntitySalinationValve.class, "SalinationValve");
|
||||
GameRegistry.registerTileEntity(TileEntitySalinationBlock.class, "SalinationTank");
|
||||
GameRegistry.registerTileEntity(TileEntitySolarEvaporationValve.class, "SalinationValve");
|
||||
GameRegistry.registerTileEntity(TileEntitySolarEvaporationBlock.class, "SalinationTank");
|
||||
GameRegistry.registerTileEntity(TileEntityEntangledBlock.class, "EntangledBlock");
|
||||
GameRegistry.registerTileEntity(TileEntityBoiler.class, "SteamBoiler");
|
||||
GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve");
|
||||
|
|
|
@ -24,9 +24,9 @@ import mekanism.common.tile.TileEntityBoiler;
|
|||
import mekanism.common.tile.TileEntityBoilerValve;
|
||||
import mekanism.common.tile.TileEntityDynamicTank;
|
||||
import mekanism.common.tile.TileEntityDynamicValve;
|
||||
import mekanism.common.tile.TileEntitySalinationBlock;
|
||||
import mekanism.common.tile.TileEntitySalinationController;
|
||||
import mekanism.common.tile.TileEntitySalinationValve;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationBlock;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationController;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationValve;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
@ -70,9 +70,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
* 0:11: Dynamic Valve
|
||||
* 0:12: Copper Block
|
||||
* 0:13: Tin Block
|
||||
* 0:14: Salination Controller
|
||||
* 0:15: Salination Valve
|
||||
* 1:0: Salination Block
|
||||
* 0:14: Solar Neutron Controller
|
||||
* 0:15: Solar Neutron Valve
|
||||
* 1:0: Solar Neutron Block
|
||||
* 1:1: Steam Boiler
|
||||
* 1:2: Boiler Valve
|
||||
* @author AidanBrady
|
||||
|
@ -125,9 +125,9 @@ public class BlockBasic extends Block implements IBlockCTM
|
|||
ctms[10][0] = new CTMData("ctm/DynamicGlass", this, Arrays.asList(10)).registerIcons(register);
|
||||
ctms[11][0] = new CTMData("ctm/DynamicValve", this, Arrays.asList(11, 9)).registerIcons(register);
|
||||
|
||||
ctms[14][0] = new CTMData("ctm/SalinationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/SalinationController").registerIcons(register);
|
||||
ctms[14][1] = new CTMData("ctm/SalinationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/SalinationControllerOn").registerIcons(register);
|
||||
ctms[15][0] = new CTMData("ctm/SalinationValve", this, Arrays.asList(15, 14)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).registerIcons(register);
|
||||
ctms[14][0] = new CTMData("ctm/SolarEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/SolarEvaporationController").registerIcons(register);
|
||||
ctms[14][1] = new CTMData("ctm/SolarEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/SolarEvaporationControllerOn").registerIcons(register);
|
||||
ctms[15][0] = new CTMData("ctm/SolarEvaporationValve", this, Arrays.asList(15, 14)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).registerIcons(register);
|
||||
|
||||
icons[0][0] = register.registerIcon("mekanism:OsmiumBlock");
|
||||
icons[1][0] = register.registerIcon("mekanism:BronzeBlock");
|
||||
|
@ -153,7 +153,7 @@ public class BlockBasic extends Block implements IBlockCTM
|
|||
icons[15][0] = ctms[15][0].mainTextureData.icon;
|
||||
break;
|
||||
case BASIC_BLOCK_2:
|
||||
ctms[0][0] = new CTMData("ctm/SalinationBlock", this, Arrays.asList(0)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(14, 15)).registerIcons(register);
|
||||
ctms[0][0] = new CTMData("ctm/SolarEvaporationBlock", this, Arrays.asList(0)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(14, 15)).registerIcons(register);
|
||||
ctms[1][0] = new CTMData("ctm/SteamBoiler", this, Arrays.asList(1, 2)).registerIcons(register);
|
||||
ctms[2][0] = new CTMData("ctm/BoilerValve", this, Arrays.asList(2, 1)).registerIcons(register);
|
||||
|
||||
|
@ -193,7 +193,7 @@ public class BlockBasic extends Block implements IBlockCTM
|
|||
case 11:
|
||||
return ctms[meta][0].getIcon(side);
|
||||
case 14:
|
||||
TileEntitySalinationController tileEntity14 = (TileEntitySalinationController)world.getTileEntity(x, y, z);
|
||||
TileEntitySolarEvaporationController tileEntity14 = (TileEntitySolarEvaporationController)world.getTileEntity(x, y, z);
|
||||
|
||||
if(side == tileEntity14.facing)
|
||||
{
|
||||
|
@ -678,9 +678,9 @@ public class BlockBasic extends Block implements IBlockCTM
|
|||
case 11:
|
||||
return new TileEntityDynamicValve();
|
||||
case 14:
|
||||
return new TileEntitySalinationController();
|
||||
return new TileEntitySolarEvaporationController();
|
||||
case 15:
|
||||
return new TileEntitySalinationValve();
|
||||
return new TileEntitySolarEvaporationValve();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
@ -688,7 +688,7 @@ public class BlockBasic extends Block implements IBlockCTM
|
|||
switch(metadata)
|
||||
{
|
||||
case 0:
|
||||
return new TileEntitySalinationBlock();
|
||||
return new TileEntitySolarEvaporationBlock();
|
||||
case 1:
|
||||
return new TileEntityBoiler();
|
||||
case 2:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package mekanism.common.inventory.container;
|
||||
|
||||
import mekanism.common.inventory.slot.SlotOutput;
|
||||
import mekanism.common.tile.TileEntitySalinationController;
|
||||
import mekanism.common.tile.TileEntitySolarEvaporationController;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
@ -13,9 +13,9 @@ import net.minecraftforge.fluids.FluidRegistry;
|
|||
|
||||
public class ContainerSalinationController extends Container
|
||||
{
|
||||
private TileEntitySalinationController tileEntity;
|
||||
private TileEntitySolarEvaporationController tileEntity;
|
||||
|
||||
public ContainerSalinationController(InventoryPlayer inventory, TileEntitySalinationController tentity)
|
||||
public ContainerSalinationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity)
|
||||
{
|
||||
tileEntity = tentity;
|
||||
|
||||
|
|
|
@ -313,7 +313,6 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
|
|||
outputTank.setGas(null);
|
||||
}
|
||||
|
||||
|
||||
MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
package mekanism.common.tile;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
|
@ -13,16 +15,18 @@ import mekanism.api.gas.GasTransmission;
|
|||
import mekanism.api.gas.IGasHandler;
|
||||
import mekanism.api.gas.ITubeConnection;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Upgrade;
|
||||
import mekanism.common.base.IActiveState;
|
||||
import mekanism.common.base.IRedstoneControl;
|
||||
import mekanism.common.base.ISustainedData;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.tile.component.TileComponentUpgrade;
|
||||
import mekanism.common.util.ChargeUtils;
|
||||
import mekanism.common.util.FluidContainerUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.PipeUtils;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -37,9 +41,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
|
|||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl
|
||||
public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl, IUpgradeTile
|
||||
{
|
||||
public GasTank gasTank = new GasTank(MAX_FLUID);
|
||||
|
||||
|
@ -52,7 +54,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
|
|||
/** 0: gas -> fluid; 1: fluid -> gas */
|
||||
public int mode;
|
||||
|
||||
public int gasOutput = 16;
|
||||
public int gasOutput = 256;
|
||||
|
||||
public boolean isActive;
|
||||
|
||||
|
@ -60,7 +62,9 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
|
|||
|
||||
public double prevEnergy;
|
||||
|
||||
public final double ENERGY_USAGE = usage.rotaryCondensentratorUsage;
|
||||
public final double BASE_ENERGY_USAGE = usage.rotaryCondensentratorUsage;
|
||||
|
||||
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4);
|
||||
|
||||
/** This machine's current RedstoneControl type. */
|
||||
public RedstoneControl controlType = RedstoneControl.DISABLED;
|
||||
|
@ -162,12 +166,12 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
|
|||
}
|
||||
}
|
||||
|
||||
if(getEnergy() >= ENERGY_USAGE && MekanismUtils.canFunction(this) && isValidGas(gasTank.getGas()) && (fluidTank.getFluid() == null || (fluidTank.getFluid().amount < MAX_FLUID && gasEquals(gasTank.getGas(), fluidTank.getFluid()))))
|
||||
if(getEnergy() >= BASE_ENERGY_USAGE && MekanismUtils.canFunction(this) && isValidGas(gasTank.getGas()) && (fluidTank.getFluid() == null || (fluidTank.getFluid().amount < MAX_FLUID && gasEquals(gasTank.getGas(), fluidTank.getFluid()))))
|
||||
{
|
||||
setActive(true);
|
||||
fluidTank.fill(new FluidStack(gasTank.getGas().getGas().getFluid(), 1), true);
|
||||
gasTank.draw(1, true);
|
||||
setEnergy(getEnergy() - ENERGY_USAGE);
|
||||
setEnergy(getEnergy() - BASE_ENERGY_USAGE);
|
||||
}
|
||||
else {
|
||||
if(prevEnergy >= getEnergy())
|
||||
|
@ -267,12 +271,12 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
|
|||
}
|
||||
}
|
||||
|
||||
if(getEnergy() >= ENERGY_USAGE && MekanismUtils.canFunction(this) && isValidFluid(fluidTank.getFluid()) && (gasTank.getGas() == null || (gasTank.getStored() < MAX_FLUID && gasEquals(gasTank.getGas(), fluidTank.getFluid()))))
|
||||
if(getEnergy() >= BASE_ENERGY_USAGE && MekanismUtils.canFunction(this) && isValidFluid(fluidTank.getFluid()) && (gasTank.getGas() == null || (gasTank.getStored() < MAX_FLUID && gasEquals(gasTank.getGas(), fluidTank.getFluid()))))
|
||||
{
|
||||
setActive(true);
|
||||
gasTank.receive(new GasStack(GasRegistry.getGas(fluidTank.getFluid().getFluid()), 1), true);
|
||||
fluidTank.drain(1, true);
|
||||
setEnergy(getEnergy() - ENERGY_USAGE);
|
||||
setEnergy(getEnergy() - BASE_ENERGY_USAGE);
|
||||
}
|
||||
else {
|
||||
if(prevEnergy >= getEnergy())
|
||||
|
@ -285,6 +289,24 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
|
|||
prevEnergy = getEnergy();
|
||||
}
|
||||
}
|
||||
|
||||
public int getUpgradedUsage()
|
||||
{
|
||||
int possibleProcess = 0;
|
||||
|
||||
if(mode == 0) //Gas to fluid
|
||||
{
|
||||
possibleProcess = Math.min(gasTank.getStored(), fluidTank.getCapacity()-fluidTank.getFluidAmount());
|
||||
}
|
||||
else { //Fluid to gas
|
||||
possibleProcess = Math.min(fluidTank.getFluidAmount(), gasTank.getNeeded());
|
||||
}
|
||||
|
||||
possibleProcess = Math.min((int)Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED)), possibleProcess);
|
||||
possibleProcess = Math.min((int)(getEnergy()/BASE_ENERGY_USAGE), possibleProcess);
|
||||
|
||||
return possibleProcess;
|
||||
}
|
||||
|
||||
public boolean isValidGas(GasStack g)
|
||||
{
|
||||
|
@ -600,4 +622,22 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
|
|||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileComponentUpgrade getComponent()
|
||||
{
|
||||
return upgradeComponent;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recalculateUpgradables(Upgrade upgrade)
|
||||
{
|
||||
super.recalculateUpgradables(upgrade);
|
||||
|
||||
switch(upgrade)
|
||||
{
|
||||
case ENERGY:
|
||||
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,20 +9,20 @@ import net.minecraft.block.Block;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class TileEntitySalinationBlock extends TileEntityContainerBlock
|
||||
public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
|
||||
{
|
||||
public TileEntitySalinationController master;
|
||||
public TileEntitySolarEvaporationController master;
|
||||
|
||||
public boolean attempted;
|
||||
|
||||
public TileEntitySalinationBlock()
|
||||
public TileEntitySolarEvaporationBlock()
|
||||
{
|
||||
super("SalinationTank");
|
||||
|
||||
inventory = new ItemStack[0];
|
||||
}
|
||||
|
||||
public TileEntitySalinationBlock(String fullName)
|
||||
public TileEntitySolarEvaporationBlock(String fullName)
|
||||
{
|
||||
super(fullName);
|
||||
|
||||
|
@ -40,7 +40,7 @@ public class TileEntitySalinationBlock extends TileEntityContainerBlock
|
|||
attempted = false;
|
||||
}
|
||||
|
||||
public void addToStructure(TileEntitySalinationController controller)
|
||||
public void addToStructure(TileEntitySolarEvaporationController controller)
|
||||
{
|
||||
master = controller;
|
||||
}
|
||||
|
@ -80,9 +80,9 @@ public class TileEntitySalinationBlock extends TileEntityContainerBlock
|
|||
|
||||
public void updateController()
|
||||
{
|
||||
if(!(this instanceof TileEntitySalinationController))
|
||||
if(!(this instanceof TileEntitySolarEvaporationController))
|
||||
{
|
||||
TileEntitySalinationController found = new ControllerFinder().find();
|
||||
TileEntitySolarEvaporationController found = new ControllerFinder().find();
|
||||
|
||||
if(found != null)
|
||||
{
|
||||
|
@ -93,7 +93,7 @@ public class TileEntitySalinationBlock extends TileEntityContainerBlock
|
|||
|
||||
public class ControllerFinder
|
||||
{
|
||||
public TileEntitySalinationController found;
|
||||
public TileEntitySolarEvaporationController found;
|
||||
|
||||
public Set<Coord4D> iterated = new HashSet<Coord4D>();
|
||||
|
||||
|
@ -110,13 +110,13 @@ public class TileEntitySalinationBlock extends TileEntityContainerBlock
|
|||
{
|
||||
Coord4D coord = pos.getFromSide(side);
|
||||
|
||||
if(!iterated.contains(coord) && coord.getTileEntity(worldObj) instanceof TileEntitySalinationBlock)
|
||||
if(!iterated.contains(coord) && coord.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock)
|
||||
{
|
||||
((TileEntitySalinationBlock)coord.getTileEntity(worldObj)).attempted = true;
|
||||
((TileEntitySolarEvaporationBlock)coord.getTileEntity(worldObj)).attempted = true;
|
||||
|
||||
if(coord.getTileEntity(worldObj) instanceof TileEntitySalinationController)
|
||||
if(coord.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationController)
|
||||
{
|
||||
found = (TileEntitySalinationController)coord.getTileEntity(worldObj);
|
||||
found = (TileEntitySolarEvaporationController)coord.getTileEntity(worldObj);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -125,9 +125,9 @@ public class TileEntitySalinationBlock extends TileEntityContainerBlock
|
|||
}
|
||||
}
|
||||
|
||||
public TileEntitySalinationController find()
|
||||
public TileEntitySolarEvaporationController find()
|
||||
{
|
||||
loop(Coord4D.get(TileEntitySalinationBlock.this));
|
||||
loop(Coord4D.get(TileEntitySolarEvaporationBlock.this));
|
||||
|
||||
return found;
|
||||
}
|
|
@ -28,7 +28,7 @@ import net.minecraftforge.fluids.FluidTank;
|
|||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class TileEntitySalinationController extends TileEntitySalinationBlock implements IActiveState
|
||||
public class TileEntitySolarEvaporationController extends TileEntitySolarEvaporationBlock implements IActiveState
|
||||
{
|
||||
public static final int MAX_BRINE = 10000;
|
||||
public static final int MAX_SOLARS = 4;
|
||||
|
@ -37,7 +37,7 @@ public class TileEntitySalinationController extends TileEntitySalinationBlock im
|
|||
public FluidTank waterTank = new FluidTank(0);
|
||||
public FluidTank brineTank = new FluidTank(MAX_BRINE);
|
||||
|
||||
public Set<TileEntitySalinationBlock> tankParts = new HashSet<TileEntitySalinationBlock>();
|
||||
public Set<TileEntitySolarEvaporationBlock> tankParts = new HashSet<TileEntitySolarEvaporationBlock>();
|
||||
public ISalinationSolar[] solars = new ISalinationSolar[4];
|
||||
|
||||
public boolean temperatureSet = false;
|
||||
|
@ -62,7 +62,7 @@ public class TileEntitySalinationController extends TileEntitySalinationBlock im
|
|||
|
||||
public float prevScale;
|
||||
|
||||
public TileEntitySalinationController()
|
||||
public TileEntitySolarEvaporationController()
|
||||
{
|
||||
super("SalinationController");
|
||||
|
||||
|
@ -361,7 +361,7 @@ public class TileEntitySalinationController extends TileEntitySalinationBlock im
|
|||
Coord4D startPoint = Coord4D.get(this).getFromSide(right);
|
||||
startPoint = isLeftOnFace ? startPoint.getFromSide(right) : startPoint;
|
||||
|
||||
while(startPoint.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySalinationBlock)
|
||||
while(startPoint.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock)
|
||||
{
|
||||
startPoint.step(ForgeDirection.UP);
|
||||
}
|
||||
|
@ -501,7 +501,7 @@ public class TileEntitySalinationController extends TileEntitySalinationBlock im
|
|||
height = 1;
|
||||
Coord4D baseBlock = Coord4D.get(this);
|
||||
|
||||
while(baseBlock.getFromSide(ForgeDirection.DOWN).getTileEntity(worldObj) instanceof TileEntitySalinationBlock)
|
||||
while(baseBlock.getFromSide(ForgeDirection.DOWN).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock)
|
||||
{
|
||||
baseBlock.step(ForgeDirection.DOWN);
|
||||
height++;
|
||||
|
@ -565,18 +565,18 @@ public class TileEntitySalinationController extends TileEntitySalinationBlock im
|
|||
|
||||
public boolean addTankPart(TileEntity tile)
|
||||
{
|
||||
if(tile instanceof TileEntitySalinationBlock && (tile == this || !(tile instanceof TileEntitySalinationController)))
|
||||
if(tile instanceof TileEntitySolarEvaporationBlock && (tile == this || !(tile instanceof TileEntitySolarEvaporationController)))
|
||||
{
|
||||
if(tile != this)
|
||||
{
|
||||
((TileEntitySalinationBlock)tile).addToStructure(this);
|
||||
tankParts.add((TileEntitySalinationBlock)tile);
|
||||
((TileEntitySolarEvaporationBlock)tile).addToStructure(this);
|
||||
tankParts.add((TileEntitySolarEvaporationBlock)tile);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
if(tile != this && tile instanceof TileEntitySalinationController)
|
||||
if(tile != this && tile instanceof TileEntitySolarEvaporationController)
|
||||
{
|
||||
controllerConflict = true;
|
||||
}
|
||||
|
@ -741,7 +741,7 @@ public class TileEntitySalinationController extends TileEntitySalinationBlock im
|
|||
|
||||
public void clearStructure()
|
||||
{
|
||||
for(TileEntitySalinationBlock tankPart : tankParts)
|
||||
for(TileEntitySolarEvaporationBlock tankPart : tankParts)
|
||||
{
|
||||
tankPart.controllerGone();
|
||||
}
|
|
@ -10,7 +10,7 @@ import net.minecraftforge.fluids.FluidStack;
|
|||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
public class TileEntitySalinationValve extends TileEntitySalinationBlock implements IFluidHandler
|
||||
public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationBlock implements IFluidHandler
|
||||
{
|
||||
public boolean prevMaster = false;
|
||||
|
||||
|
@ -27,7 +27,7 @@ public class TileEntitySalinationValve extends TileEntitySalinationBlock impleme
|
|||
{
|
||||
Coord4D obj = Coord4D.get(this).getFromSide(side);
|
||||
|
||||
if(!obj.isAirBlock(worldObj) && !(obj.getTileEntity(worldObj) instanceof TileEntitySalinationBlock))
|
||||
if(!obj.isAirBlock(worldObj) && !(obj.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock))
|
||||
{
|
||||
obj.getBlock(worldObj).onNeighborChange(worldObj, obj.xCoord, obj.yCoord, obj.zCoord, xCoord, yCoord, zCoord);
|
||||
}
|
|
@ -76,11 +76,11 @@ tile.BasicBlock.DynamicGlass.name=Dynamic Glass
|
|||
tile.BasicBlock.DynamicValve.name=Dynamic Valve
|
||||
tile.BasicBlock.CopperBlock.name=Copper Block
|
||||
tile.BasicBlock.TinBlock.name=Tin Block
|
||||
tile.BasicBlock.SalinationController.name=Salination Controller
|
||||
tile.BasicBlock.SalinationValve.name=Salination Valve
|
||||
tile.BasicBlock.SolarEvaporationController.name=Solar Evaporation Controller
|
||||
tile.BasicBlock.SolarEvaporationValve.name=Solar Evaporation Valve
|
||||
|
||||
//Basic Block 2 (second ID iteration)
|
||||
tile.BasicBlock2.SalinationBlock.name=Salination Block
|
||||
tile.BasicBlock2.SolarEvaporationBlock.name=Solar Evaporation Block
|
||||
|
||||
//Machine Block
|
||||
tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber
|
||||
|
|
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |