From 98d1a647cbd891ce25e8930b97d3e8e42a4252c2 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 23 Feb 2015 08:08:54 -0500 Subject: [PATCH] Rename Salination Plant to Solar Evaporation Plant --- .../java/mekanism/client/ClientProxy.java | 6 +- .../client/gui/GuiRotaryCondensentrator.java | 3 +- .../client/gui/GuiSalinationController.java | 6 +- .../RenderSalinationController.java | 6 +- .../java/mekanism/common/CommonProxy.java | 6 +- src/main/java/mekanism/common/Mekanism.java | 8 +-- .../mekanism/common/block/BlockBasic.java | 28 ++++---- .../ContainerSalinationController.java | 6 +- .../common/tile/TileEntityChemicalWasher.java | 1 - .../tile/TileEntityRotaryCondensentrator.java | 60 +++++++++++++++--- ...a => TileEntitySolarEvaporationBlock.java} | 28 ++++---- ...TileEntitySolarEvaporationController.java} | 20 +++--- ...a => TileEntitySolarEvaporationValve.java} | 4 +- .../resources/assets/mekanism/lang/en_US.lang | 6 +- .../textures/blocks/SeismicVibrator.png | Bin 1588 -> 0 bytes ...ionBlock.png => SolarEvaporationBlock.png} | Bin ...ler.png => SolarEvaporationController.png} | Bin ...n.png => SolarEvaporationControllerOn.png} | Bin ...> SolarEvaporationControllerOn.png.mcmeta} | 0 ...ionValve.png => SolarEvaporationValve.png} | Bin ...-ctm.png => SolarEvaporationBlock-ctm.png} | Bin ...ionBlock.png => SolarEvaporationBlock.png} | Bin ...png => SolarEvaporationController-ctm.png} | Bin ...ler.png => SolarEvaporationController.png} | Bin ...g => SolarEvaporationControllerOn-ctm.png} | Bin ...larEvaporationControllerOn-ctm.png.mcmeta} | 0 ...n.png => SolarEvaporationControllerOn.png} | Bin ...> SolarEvaporationControllerOn.png.mcmeta} | 0 ...-ctm.png => SolarEvaporationValve-ctm.png} | Bin ...ionValve.png => SolarEvaporationValve.png} | Bin 30 files changed, 114 insertions(+), 74 deletions(-) rename src/main/java/mekanism/common/tile/{TileEntitySalinationBlock.java => TileEntitySolarEvaporationBlock.java} (63%) rename src/main/java/mekanism/common/tile/{TileEntitySalinationController.java => TileEntitySolarEvaporationController.java} (95%) rename src/main/java/mekanism/common/tile/{TileEntitySalinationValve.java => TileEntitySolarEvaporationValve.java} (92%) delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SeismicVibrator.png rename src/main/resources/assets/mekanism/textures/blocks/{SalinationBlock.png => SolarEvaporationBlock.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/{SalinationController.png => SolarEvaporationController.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/{SalinationControllerOn.png => SolarEvaporationControllerOn.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/{SalinationControllerOn.png.mcmeta => SolarEvaporationControllerOn.png.mcmeta} (100%) rename src/main/resources/assets/mekanism/textures/blocks/{SalinationValve.png => SolarEvaporationValve.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationBlock-ctm.png => SolarEvaporationBlock-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationBlock.png => SolarEvaporationBlock.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationController-ctm.png => SolarEvaporationController-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationController.png => SolarEvaporationController.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationControllerOn-ctm.png => SolarEvaporationControllerOn-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationControllerOn-ctm.png.mcmeta => SolarEvaporationControllerOn-ctm.png.mcmeta} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationControllerOn.png => SolarEvaporationControllerOn.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationControllerOn.png.mcmeta => SolarEvaporationControllerOn.png.mcmeta} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationValve-ctm.png => SolarEvaporationValve-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SalinationValve.png => SolarEvaporationValve.png} (100%) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 6975d1452..9d4c4da68 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -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: diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index c250e1efe..1254b000c 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -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 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"))); diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSalinationController.java index 6022d8415..17f7564db 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSalinationController.java @@ -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; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java index 8fed1e948..fe3346b34 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java @@ -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) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 42e87c5c0..f1defe82b 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -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: diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 90bfe42a7..eb896ee18 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -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"); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index ed5485773..26d152ccc 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -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: diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java index aa3bf9759..825f7127f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java @@ -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; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 3045a2299..176dd1726 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -313,7 +313,6 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple outputTank.setGas(null); } - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); } diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 6876d171d..8fcc37889 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -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); + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationBlock.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java similarity index 63% rename from src/main/java/mekanism/common/tile/TileEntitySalinationBlock.java rename to src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java index 2c5861b9c..838456dcd 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java @@ -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 iterated = new HashSet(); @@ -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; } diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java similarity index 95% rename from src/main/java/mekanism/common/tile/TileEntitySalinationController.java rename to src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java index e1f25a8bd..a2a1e4661 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java @@ -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 tankParts = new HashSet(); + public Set tankParts = new HashSet(); 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(); } diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationValve.java similarity index 92% rename from src/main/java/mekanism/common/tile/TileEntitySalinationValve.java rename to src/main/java/mekanism/common/tile/TileEntitySolarEvaporationValve.java index 46f95a699..648b2615a 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationValve.java @@ -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); } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 9fcc00c43..c87a471c5 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/SeismicVibrator.png b/src/main/resources/assets/mekanism/textures/blocks/SeismicVibrator.png deleted file mode 100644 index 811db6eb17e0b26012f775428c196f31b50a4df1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1588 zcmV-42Fv-0P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0005YNkl9EttUWk|xYXnh(B^u*rf`yZu~_u# zdIo@&W!WPgYf%)1S8DJIyo@7n^bCaV`}%2EHHBkUVFNMok4NWX0>Dx@Q3DouiaqXt zB}OL$7CPZrj@F49(BvuBrU9Hvo{WTb7Y^l6J3`#&w&25`j4=_Z>yGPz#@&^OA)4;o`I^W2pgQK zTVrzYXP6wG0e}zXyX187ox5~z?u+-IiyMv+SUEkyenC0g?UteBw?K+>whCZU4!s5@ z#j!R!@aevRjT*?&d3tRXjCSDOU0FFt-HRG{aXS_xGc*Ih(=MNQiG^Y=_!mSCNHUqB zSz;7REEE%$X7d?%Ep7=