diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index d1e88cf34..e555e62a7 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -45,8 +45,6 @@ public class MekanismConfig public static boolean blacklistIC2; public static boolean blacklistRF; public static boolean destroyDisabledBlocks; - public static boolean enableAmbientLighting; - public static int ambientLightingLevel; public static boolean prefilledPortableTanks; public static double armoredJetpackDamageRatio; public static int armoredJetpackDamageMax; @@ -59,6 +57,10 @@ public class MekanismConfig public static int maxPumpRange; public static boolean pumpWaterSources; public static int maxPlenisherNodes; + public static double evaporationHeatDissipation = 0.02; + public static double evaporationTempMultiplier = 0.1; + public static double evaporationSolarMultiplier = 0.2; + public static double evaporationMaxTemp = 3000; } public static class client @@ -72,6 +74,8 @@ public class MekanismConfig public static boolean oldTransmitterRender = false; public static boolean replaceSoundsWhenResuming = true; public static boolean renderCTM = true; + public static boolean enableAmbientLighting; + public static int ambientLightingLevel; } public static class machines diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 27cd20d43..21f2cb34c 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -161,6 +161,7 @@ import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; @@ -208,6 +209,8 @@ public class ClientProxy extends CommonProxy client.replaceSoundsWhenResuming = Mekanism.configuration.get("client", "ReplaceSoundsWhenResuming", true, "If true, will reduce lagging between player sounds. Setting to false will reduce GC load").getBoolean(); client.renderCTM = Mekanism.configuration.get("client", "CTMRenderer", true).getBoolean(); + client.enableAmbientLighting = Mekanism.configuration.get("general", "EnableAmbientLighting", true).getBoolean(); + client.ambientLightingLevel = Mekanism.configuration.get("general", "AmbientLightingLevel", 15).getInt(); if(Mekanism.configuration.hasChanged()) { @@ -727,4 +730,10 @@ public class ClientProxy extends CommonProxy { Minecraft.getMinecraft().effectRenderer.addEffect(new EntityLaser(world, from, to, direction, energy)); } + + @Override + public FontRenderer getFontRenderer() + { + return Minecraft.getMinecraft().fontRendererObj; + } } diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index b68701c2a..b95a6f92e 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -1,14 +1,19 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.LangUtils; @@ -17,11 +22,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiElectricPump extends GuiMekanism { @@ -45,6 +51,14 @@ public class GuiElectricPump extends GuiMekanism return tileEntity.fluidTank; } }, GuiGauge.Type.STANDARD, this, guiLocation, 6, 13)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, guiLocation)); guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); } diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index e12102285..7effc8322 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -58,7 +58,7 @@ public class GuiFactory extends GuiMekanism @Override public List getInfo() { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick*tileEntity.tier.processes); return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity.tier.guiLocation)); diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 78bde28e3..9bce124bc 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -1,9 +1,15 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -45,6 +51,15 @@ public class GuiFluidicPlenisher extends GuiMekanism return tileEntity.fluidTank; } }, GuiGauge.Type.STANDARD, this, guiLocation, 6, 13)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, guiLocation)); + guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); } diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 367d47329..c229a2530 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -1,5 +1,10 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiMatrixTab; import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.render.MekanismRenderer; @@ -25,6 +30,17 @@ public class GuiInductionMatrix extends GuiMekanism super(tentity, new ContainerInductionMatrix(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiMatrixTab(this, tileEntity, MatrixTab.STAT, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiInductionMatrix.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() + { + @Override + public List getInfo() + { + return ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", + LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiInductionMatrix.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 2e4b912ed..44346b021 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -1,8 +1,14 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.MekanismConfig.generators; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiEnergyGauge; +import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiMatrixTab; import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.gui.element.GuiRateBar; @@ -65,6 +71,17 @@ public class GuiMatrixStats extends GuiMekanism return tileEntity.structure.lastOutput/tileEntity.structure.transferCap; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"), 38, 13)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() + { + @Override + public List getInfo() + { + return ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", + LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 34ca08a15..f9c7e58c8 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -1,5 +1,11 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.MekanismConfig.usage; +import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; @@ -11,11 +17,12 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiSeismicVibrator extends GuiMekanism { @@ -28,6 +35,14 @@ public class GuiSeismicVibrator extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 164, 15)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(usage.seismicVibratorUsage); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 142, 34).with(SlotOverlay.POWER)); } diff --git a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java index facc3f2cb..e0127cbff 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java @@ -1,18 +1,15 @@ package mekanism.client.gui; -import mekanism.api.gas.GasStack; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.render.MekanismRenderer; +import mekanism.client.gui.element.GuiGauge; import mekanism.common.inventory.container.ContainerSolarEvaporationController; import mekanism.common.tile.TileEntitySolarEvaporationController; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; @@ -57,8 +54,8 @@ public class GuiSolarEvaporationController extends GuiMekanism fontRendererObj.drawString(getStruct(), 50, 21, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.height") + ": " + tileEntity.height, 50, 30, 0x00CD00); - fontRendererObj.drawString(LangUtils.localize("gui.mult") + ": " + getTempMult(), 50, 39, 0x00CD00); - fontRendererObj.drawString(LangUtils.localize("gui.max") + ": " + getMaxTemp(), 50, 48, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.temp") + ": " + getTemp(), 50, 39, 0x00CD00); + renderScaledText(LangUtils.localize("gui.production") + ": " + Math.round(tileEntity.lastGain*100D)/100D + " mB/t", 50, 48, 0x00CD00, 76); if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) { @@ -97,25 +94,11 @@ public class GuiSolarEvaporationController extends GuiMekanism private String getTemp() { - float temp = tileEntity.getTemperature()*200; + float temp = tileEntity.getTemperature(); return MekanismUtils.getTemperatureDisplay(temp, TemperatureUnit.AMBIENT); } - private String getMaxTemp() - { - float temp = tileEntity.getMaxTemperature()*200; - - return MekanismUtils.getTemperatureDisplay(temp, TemperatureUnit.AMBIENT); - } - - private String getTempMult() - { - float temp = (float)Math.round((tileEntity.getTempMultiplier())*10)/10F; - - return temp + "x"; - } - @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 249396461..e76ade020 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -18,11 +18,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiUpgradeManagement extends GuiMekanism { @@ -126,7 +127,7 @@ public class GuiUpgradeManagement extends GuiMekanism if(xAxis >= xPos && xAxis <= xPos+58 && yAxis >= yPos && yAxis <= yPos+12) { - drawHoveringText(MekanismUtils.splitLines(upgrade.getDescription()), xAxis, yAxis); + drawHoveringText(MekanismUtils.splitTooltip(upgrade.getDescription(), upgrade.getStack()), xAxis, yAxis); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index 91ddfccce..f658cfbce 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -1,8 +1,12 @@ package mekanism.client.gui.element; +import java.util.ArrayList; import java.util.List; +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.client.gui.IGuiWrapper; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; @@ -48,7 +52,15 @@ public class GuiEnergyInfo extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) { - displayTooltips(infoHandler.getInfo(), xAxis, yAxis); + List info = new ArrayList(); + + for(String s : infoHandler.getInfo()) + { + info.add(s); + } + + info.add(LangUtils.localize("gui.unit") + ": " + general.activeType); + displayTooltips(info, xAxis, yAxis); } } @@ -56,5 +68,11 @@ public class GuiEnergyInfo extends GuiElement public void preMouseClicked(int xAxis, int yAxis, int button) {} @Override - public void mouseClicked(int xAxis, int yAxis, int button) {} + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + general.activeType = EnergyType.values()[(general.activeType.ordinal()+1)%EnergyType.values().length]; + } + } } diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 93fb0d380..a55a19360 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -11,14 +11,13 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.item.ItemConfigurator; -import mekanism.common.multipart.MultipartTransporter; import mekanism.common.multipart.PartDiversionTransporter; -import mekanism.common.multipart.PartHeatTransmitter; import mekanism.common.multipart.PartLogisticalTransporter; import mekanism.common.multipart.PartMechanicalPipe; import mekanism.common.multipart.PartPressurizedTube; import mekanism.common.multipart.PartSidedPipe; import mekanism.common.multipart.PartSidedPipe.ConnectionType; +import mekanism.common.multipart.PartThermodynamicConductor; import mekanism.common.multipart.PartUniversalCable; import mekanism.common.multipart.TransmitterType; import mekanism.common.multipart.TransmitterType.Size; @@ -274,7 +273,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister pop(); } - public void renderContents(PartHeatTransmitter transmitter, Vector3 pos) + public void renderContents(PartThermodynamicConductor transmitter, Vector3 pos) { push(); CCRenderState.reset(); @@ -370,7 +369,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister } } - DisplayInteger[] displayLists = getListAndRender(EnumFacing.null, fluid); + DisplayInteger[] displayLists = getListAndRender(null, fluid); if(displayLists != null) { @@ -605,10 +604,10 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister renderTransparency(MekanismRenderer.energyIcon, cable.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, cable.currentPower)); } - public void renderHeatSide(EnumFacing side, PartHeatTransmitter cable) + public void renderHeatSide(EnumFacing side, PartThermodynamicConductor cable) { CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - renderTransparency(MekanismRenderer.heatIcon, cable.getModelForSide(side, true), ColourTemperature.fromTemperature(cable.getTransmitter().temperature, cable.getBaseColour())); + renderTransparency(MekanismRenderer.heatIcon, cable.getModelForSide(side, true), ColourTemperature.fromTemperature(cable.temperature, cable.getBaseColour())); } public void renderFluidInOut(EnumFacing side, PartMechanicalPipe pipe) @@ -667,7 +666,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister PartMechanicalPipe.registerIcons(register); PartPressurizedTube.registerIcons(register); PartLogisticalTransporter.registerIcons(register); - PartHeatTransmitter.registerIcons(register); + PartThermodynamicConductor.registerIcons(register); } @Override diff --git a/src/main/java/mekanism/client/sound/TileSound.java b/src/main/java/mekanism/client/sound/TileSound.java index 354db237c..1e4c0882b 100644 --- a/src/main/java/mekanism/client/sound/TileSound.java +++ b/src/main/java/mekanism/client/sound/TileSound.java @@ -82,6 +82,11 @@ public class TileSound extends Sound implements IResettableSound @Override public void update() { + if(source instanceof ISoundSource) + { + baseVolume = ((ISoundSource)source).getVolume(); + } + if(!beginFadeOut) { if(ticks < fadeIn) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index f1d227049..9dd0ad21e 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -271,6 +271,10 @@ public class CommonProxy implements IGuiProvider general.maxPumpRange = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxPumpRange", 80).getInt(); general.pumpWaterSources = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "PumpWaterSources", false).getBoolean(); general.maxPlenisherNodes = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxPlenisherNodes", 4000).getInt(); + general.evaporationHeatDissipation = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationHeatDissipation", 0.02D).getDouble(); + general.evaporationTempMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationTempMultiplier", 0.1D).getDouble(); + general.evaporationSolarMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationSolarMultiplier", 0.2D).getDouble(); + general.evaporationMaxTemp = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationMaxTemp", 3000D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); @@ -326,8 +330,7 @@ public class CommonProxy implements IGuiProvider general.laserRange = Mekanism.configuration.get("general", "LaserRange", 64).getInt(); general.laserEnergyNeededPerHardness = Mekanism.configuration.get("general", "LaserDiggingEnergy", 100000).getInt(); general.destroyDisabledBlocks = Mekanism.configuration.get("general", "DestroyDisabledBlocks", true).getBoolean(); - general.enableAmbientLighting = Mekanism.configuration.get("general", "EnableAmbientLighting", true).getBoolean(); - general.ambientLightingLevel = Mekanism.configuration.get("general", "AmbientLightingLevel", 15).getInt(); + for(MachineType type : BlockStateMachine.MachineType.getValidMachines()) { @@ -661,4 +664,9 @@ public class CommonProxy implements IGuiProvider } public void renderLaser(World world, Pos3D from, Pos3D to, EnumFacing direction, double energy) {} + + public Object getFontRenderer() + { + return null; + } } diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index f6bb1a11d..2f4eb7b10 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -1,14 +1,11 @@ package mekanism.common; -import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import java.util.Set; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.transmitters.TransmissionType; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 0eea5ab64..a365d8189 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -308,11 +308,14 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.EnergyUpgrade), " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustGold" )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade), + " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron" + )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustTin" )); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade), - " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron" + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.MufflingUpgrade), + " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustSteel" )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), "AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" @@ -633,6 +636,18 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 17), "RRR", "SBS", "RRR", Character.valueOf('R'), "dustRedstone", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 18), + "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "ingotCopper" + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 19), + "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 18) + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 20), + "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 19) + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 21), + "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 20) + )); */ //Plastic stuff diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index f551dcaf8..e2dca7f93 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -64,6 +64,7 @@ public class MekanismItems public static final Item SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED).setUnlocalizedName("SpeedUpgrade"); public static final Item EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY).setUnlocalizedName("EnergyUpgrade"); public static final Item FilterUpgrade = new ItemUpgrade(Upgrade.FILTER).setUnlocalizedName("FilterUpgrade"); + public static final Item MufflingUpgrade = new ItemUpgrade(Upgrade.MUFFLING).setUnlocalizedName("MufflingUpgrade"); public static final Item GasUpgrade = new ItemUpgrade(Upgrade.GAS).setUnlocalizedName("GasUpgrade"); public static final Item FactoryInstaller = new ItemFactoryInstaller().setUnlocalizedName("FactoryInstaller"); public static final ItemEnergized EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet"); @@ -113,6 +114,7 @@ public class MekanismItems GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade"); GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade"); GameRegistry.registerItem(FilterUpgrade, "FilterUpgrade"); + GameRegistry.registerItem(MufflingUpgrade, "MufflingUpgrade"); GameRegistry.registerItem(GasUpgrade, "GasUpgrade"); GameRegistry.registerItem(Robit, "Robit"); GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler"); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 947831c1f..bf6cd3539 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -495,6 +495,77 @@ public final class Tier } } + public static enum ConductorTier + { + BASIC(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), + ADVANCED(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), + ELITE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), + ULTIMATE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); + + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + public double inverseConduction; + private double baseConduction; + + public double inverseHeatCapacity; + private double baseHeatCapacity; + + public double inverseConductionInsulation; + private double baseConductionInsulation; + + public ColourRGBA baseColour; + + public TransmitterType type; + + private ConductorTier(double inversek, double inverseC, double insulationInversek, ColourRGBA colour, TransmitterType transmitterType) + { + baseConduction = inverseConduction = inversek; + baseHeatCapacity = inverseHeatCapacity = inverseC; + baseConductionInsulation = inverseConductionInsulation = insulationInversek; + + baseColour = colour; + + type = transmitterType; + } + + protected void loadConfig() + { + inverseConduction = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorInverseConduction", baseConduction).getDouble(); + inverseHeatCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorHeatCapacity", baseHeatCapacity).getDouble(); + inverseConductionInsulation = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorConductionInsulation", baseConductionInsulation).getDouble(); + } + + protected void readConfig(ByteBuf dataStream) + { + inverseConduction = dataStream.readDouble(); + inverseHeatCapacity = dataStream.readDouble(); + inverseConductionInsulation = dataStream.readDouble(); + } + + protected void writeConfig(ByteBuf dataStream) + { + dataStream.writeDouble(inverseConduction); + dataStream.writeDouble(inverseHeatCapacity); + dataStream.writeDouble(inverseConductionInsulation); + } + + public static ConductorTier get(BaseTier tier) + { + for(ConductorTier transmitter : values()) + { + if(transmitter.getBaseTier() == tier) + { + return transmitter; + } + } + + return BASIC; + } + } + public static void loadConfig() { for(CableTier tier : CableTier.values()) @@ -531,6 +602,11 @@ public final class Tier { tier.loadConfig(); } + + for(ConductorTier tier : ConductorTier.values()) + { + tier.loadConfig(); + } } public static void readConfig(ByteBuf dataStream) @@ -569,6 +645,11 @@ public final class Tier { tier.readConfig(dataStream); } + + for(ConductorTier tier : ConductorTier.values()) + { + tier.readConfig(dataStream); + } } */ @@ -611,6 +692,11 @@ public final class Tier { tier.writeConfig(dataStream); } + + for(ConductorTier tier : ConductorTier.values()) + { + tier.writeConfig(dataStream); + } */ } } diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index c7ff4eec9..cd8f18689 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -20,7 +20,8 @@ public enum Upgrade SPEED("speed", 8, EnumColor.RED), ENERGY("energy", 8, EnumColor.BRIGHT_GREEN), FILTER("filter", 1, EnumColor.DARK_AQUA), - GAS("gas", 8, EnumColor.YELLOW); + GAS("gas", 8, EnumColor.YELLOW), + MUFFLING("muffling", 4, EnumColor.DARK_GREY); private String name; private int maxStack; @@ -68,6 +69,8 @@ public enum Upgrade return new ItemStack(MekanismItems.EnergyUpgrade); case FILTER: return new ItemStack(MekanismItems.FilterUpgrade); + case MUFFLING: + return new ItemStack(MekanismItems.MufflingUpgrade); case GAS: return new ItemStack(MekanismItems.GasUpgrade); } @@ -139,11 +142,6 @@ public enum Upgrade upgrades.put(upgrade, compound.getInteger("amount")); } } - else if(nbtTags.hasKey("energyMultiplier") && nbtTags.hasKey("speedMultiplier")) //TODO remove soon - { - upgrades.put(Upgrade.ENERGY, nbtTags.getInteger("energyMultiplier")); - upgrades.put(Upgrade.SPEED, nbtTags.getInteger("speedMultiplier")); - } } return upgrades; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 8766d139d..2b6e4bacd 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -394,7 +394,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - if(general.enableAmbientLighting) + if(client.enableAmbientLighting) { TileEntity tileEntity = world.getTileEntity(pos); @@ -402,7 +402,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) { - return general.ambientLightingLevel; + return client.ambientLightingLevel; } } } diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index b9ac26e65..aad4814c1 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -9,7 +9,6 @@ import java.util.Iterator; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; @@ -247,12 +246,12 @@ public class FrequencyManager else { TileEntity tile = coord.getTileEntity(world); - if(!(tile instanceof TileEntityTeleporter)) + if(!(tile instanceof IFrequencyHandler)) { iter.remove(); } else { - Frequency freq = ((TileEntityTeleporter)tile).frequency; + Frequency freq = ((IFrequencyHandler)tile).getFrequency(); if(freq == null || !freq.equals(iterFreq)) { diff --git a/src/main/java/mekanism/common/frequency/IFrequencyHandler.java b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java new file mode 100644 index 000000000..753e99d8f --- /dev/null +++ b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java @@ -0,0 +1,6 @@ +package mekanism.common.frequency; + +public interface IFrequencyHandler +{ + public Frequency getFrequency(); +} diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 8b2ea7045..b8c7757a6 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,15 +1,13 @@ package mekanism.common.item; -import cofh.api.energy.IEnergyContainerItem; -import net.minecraftforge.fml.common.Optional.Interface; -import net.minecraftforge.fml.common.Optional.InterfaceList; -import net.minecraftforge.fml.common.Optional.Method; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; + +import java.util.List; +import java.util.Map; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; @@ -20,15 +18,26 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.Upgrade; -import mekanism.common.base.*; +import mekanism.common.base.IElectricChest; +import mekanism.common.base.IFactory; +import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ISustainedTank; +import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.*; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -56,9 +65,12 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; - -import java.util.List; -import java.util.Map; +import cofh.api.energy.IEnergyContainerItem; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Item class for handling multiple machine block IDs. @@ -225,7 +237,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } else { - list.addAll(MekanismUtils.splitLines(type.getDescription())); + list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack)); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 43b109fc8..094d07fee 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -43,7 +43,7 @@ public class ItemBlockOre extends ItemBlock list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.addAll(MekanismUtils.splitLines(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")))); + list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")), itemstack)); } } diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index 58aaec9ce..d9ff36717 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -34,7 +34,7 @@ public class ItemUpgrade extends ItemMekanism implements IUpgradeItem list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails")); } else { - list.addAll(MekanismUtils.splitLines(getUpgradeType(itemstack).getDescription())); + list.addAll(MekanismUtils.splitTooltip(getUpgradeType(itemstack).getDescription(), itemstack)); } } diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 7476bf2e0..5a1517e49 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -152,6 +152,12 @@ public class ItemPartTransmitter extends JItemMultiPart list.add("- " + EnumColor.DARK_RED + LangUtils.localize("tooltip.diversionDesc")); break; } + case 18: case 19: case 20: case 21: + { + list.add(EnumColor.DARK_GREY + LangUtils.localize("tooltip.capableTrans") + ":"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.heat") + " (Mekanism)"); + break; + } } } } @@ -161,7 +167,6 @@ public class ItemPartTransmitter extends JItemMultiPart { for(TransmitterType type : TransmitterType.values()) { - if(type == TransmitterType.HEAT_TRANSMITTER) continue; //TODO listToAddTo.add(new ItemStack(item, 1, type.ordinal())); } } diff --git a/src/main/java/mekanism/common/multipart/MultipartHeatTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartHeatTransmitter.java deleted file mode 100644 index 87afe63c7..000000000 --- a/src/main/java/mekanism/common/multipart/MultipartHeatTransmitter.java +++ /dev/null @@ -1,116 +0,0 @@ -package mekanism.common.multipart; - -import mekanism.api.IHeatTransfer; -import mekanism.common.HeatNetwork; -import mekanism.common.util.HeatUtils; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import codechicken.lib.colour.ColourRGBA; - -/** - * Created by ben on 01/04/15. - */ -public class MultipartHeatTransmitter extends MultipartTransmitter implements IHeatTransfer -{ - public double temperature = 0; - public double clientTemperature = 0; - public double heatToAbsorb = 0; - - public HeatMaterial material = HeatMaterial.DEFAULT; - - public MultipartHeatTransmitter(PartHeatTransmitter multiPart) - { - super(multiPart); - } - - @Override - public double getTemp() - { - return temperature; - } - - @Override - public double getInverseConductionCoefficient() - { - return material.inverseConduction; - } - - @Override - public double getInsulationCoefficient(ForgeDirection side) - { - return material.inverseConductionInsulation; - } - - @Override - public void transferHeatTo(double heat) - { - heatToAbsorb += heat; - } - - @Override - public double[] simulateHeat() - { - return HeatUtils.simulate(this); - } - - @Override - public double applyTemperatureChange() - { - temperature += material.inverseHeatCapacity * heatToAbsorb; - heatToAbsorb = 0; - - if(Math.abs(temperature - clientTemperature) > (temperature / 100)) - { - clientTemperature = temperature; - getPart().sendTemp(); - } - - return temperature; - } - - @Override - public boolean canConnectHeat(ForgeDirection side) - { - return true; - } - - @Override - public IHeatTransfer getAdjacent(ForgeDirection side) - { - if(getPart().connectionMapContainsSide(getPart().getAllCurrentConnections(), side)) - { - TileEntity adj = coord().offset(side).getTileEntity(world()); - - if(adj instanceof IHeatTransfer) - { - return (IHeatTransfer)adj; - } - } - - return null; - } - - @Override - public PartHeatTransmitter getPart() - { - return (PartHeatTransmitter)containingPart; - } - - public static enum HeatMaterial - { - DEFAULT(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1)); - - double inverseConduction; - double inverseHeatCapacity; - double inverseConductionInsulation; - ColourRGBA baseColour; - - private HeatMaterial(double inversek, double inverseC, double insulationInversek, ColourRGBA colour) - { - inverseConduction = inversek; - inverseHeatCapacity = inverseC; - inverseConductionInsulation = insulationInversek; - baseColour = colour; - } - } -} diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 820c61835..d9aa6d0de 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -1,21 +1,18 @@ package mekanism.common.multipart; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.BlockMachine.MachineType; - import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.event.FMLInterModComms; - import codechicken.microblock.BlockMicroMaterial; import codechicken.microblock.MicroMaterialRegistry; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; import codechicken.multipart.TMultiPart; - -import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1; -import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2; +import net.minecraft.fml.common.event.FMLInterModComms; public class MultipartMekanism implements IPartFactory { @@ -36,7 +33,9 @@ public class MultipartMekanism implements IPartFactory "mekanism:logistical_transporter_basic", "mekanism:logistical_transporter_advanced", "mekanism:logistical_transporter_elite", "mekanism:logistical_transporter_ultimate", "mekanism:restrictive_transporter", "mekanism:diversion_transporter", - "mekanism:heat_transmitter", "mekanism:glow_panel"}); + "mekanism:thermodynamic_conductor_basic", "mekanism:thermodynamic_conductor_advanced", + "mekanism:thermodynamic_conductor_elite", "mekanism:thermodynamic_conductor_ultimate", + "mekanism:glow_panel"}); MultipartGenerator.registerPassThroughInterface("mekanism.api.IConfigurable"); MultipartGenerator.registerPassThroughInterface("mekanism.api.energy.IStrictEnergyAcceptor"); @@ -136,9 +135,21 @@ public class MultipartMekanism implements IPartFactory { return new PartDiversionTransporter(); } - else if(name.equals("mekanism:heat_transmitter")) + else if(name.equals("mekanism:thermodynamic_conductor_basic")) { - return new PartHeatTransmitter(); + return new PartThermodynamicConductor(Tier.ConductorTier.BASIC); + } + else if(name.equals("mekanism:thermodynamic_conductor_advanced")) + { + return new PartThermodynamicConductor(Tier.ConductorTier.ADVANCED); + } + else if(name.equals("mekanism:thermodynamic_conductor_elite")) + { + return new PartThermodynamicConductor(Tier.ConductorTier.ELITE); + } + else if(name.equals("mekanism:thermodynamic_conductor_ultimate")) + { + return new PartThermodynamicConductor(Tier.ConductorTier.ULTIMATE); } else if(name.equals("mekanism:glow_panel")) { diff --git a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java deleted file mode 100644 index 38c9fdf4f..000000000 --- a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java +++ /dev/null @@ -1,179 +0,0 @@ -package mekanism.common.multipart; - -import codechicken.lib.colour.ColourRGBA; -import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.lib.vec.Vector3; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import mekanism.api.IHeatTransfer; -import mekanism.api.transmitters.TransmissionType; -import mekanism.client.render.RenderPartTransmitter; -import mekanism.common.HeatNetwork; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - -import java.util.Collection; - -public class PartHeatTransmitter extends PartTransmitter -{ - public static TransmitterIcons heatIcons = new TransmitterIcons(1, 2); - - public PartHeatTransmitter() - { - transmitterDelegate = new MultipartHeatTransmitter(this); - } - - @Override - public HeatNetwork createNewNetwork() - { - return new HeatNetwork(); - } - - @Override - public HeatNetwork createNetworkByMerging(Collection networks) - { - return new HeatNetwork(networks); - } - - @Override - public int getCapacity() - { - return 0; - } - - @Override - public Object getBuffer() - { - return null; - } - - @Override - public void takeShare() {} - - @Override - public void updateShare() {} - - public static void registerIcons(IIconRegister register) - { - heatIcons.registerCenterIcons(register, new String[] {"HeatTransmitter"}); - heatIcons.registerSideIcons(register, new String[] {"SmallTransmitterVerticalBasic", "SmallTransmitterHorizontalBasic"}); - //TODO tiers - } - - @Override - public IIcon getCenterIcon(boolean opaque) - { - return heatIcons.getCenterIcon(0); - } - - @Override - public IIcon getSideIcon(boolean opaque) - { - return heatIcons.getSideIcon(0); - } - - @Override - public IIcon getSideIconRotated(boolean opaque) - { - return heatIcons.getSideIcon(1); - } - - @Override - public TransmitterType getTransmitterType() - { - return TransmitterType.HEAT_TRANSMITTER; - } - - @Override - public boolean isValidAcceptor(TileEntity tile, ForgeDirection side) - { - return tile instanceof IHeatTransfer && ((IHeatTransfer)tile).canConnectHeat(side.getOpposite()); - } - - @Override - public TransmissionType getTransmissionType() - { - return TransmissionType.HEAT; - } - - @Override - public String getType() - { - return "mekanism:heat_transmitter"; - } - - @Override - protected boolean onConfigure(EntityPlayer player, int part, int side) - { - getTransmitter().temperature += 10000; - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void renderDynamic(Vector3 pos, float f, int pass) - { - if(pass == 0) - { - RenderPartTransmitter.getInstance().renderContents(this, pos); - } - } - - @Override - public void load(NBTTagCompound nbtTags) - { - super.load(nbtTags); - - getTransmitter().temperature = nbtTags.getDouble("temperature"); - } - - @Override - public void save(NBTTagCompound nbtTags) - { - super.save(nbtTags); - - nbtTags.setDouble("temperature", getTransmitter().temperature); - } - - public void sendTemp() - { - MCDataOutput packet = getWriteStream(); - packet.writeBoolean(true); - packet.writeDouble(getTransmitter().temperature); - } - - @Override - public void writeDesc(MCDataOutput packet) - { - packet.writeBoolean(false); - - super.writeDesc(packet); - } - - @Override - public void readDesc(MCDataInput packet) - { - if(packet.readBoolean()) - { - getTransmitter().temperature = packet.readDouble(); - } - else { - super.readDesc(packet); - } - } - - public ColourRGBA getBaseColour() - { - return getTransmitter().material.baseColour; - } - - public MultipartHeatTransmitter getTransmitter() - { - return (MultipartHeatTransmitter)transmitterDelegate; - } -} diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index aa2f75008..995f2b1e7 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -131,8 +131,14 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return new PartRestrictiveTransporter(); case DIVERSION_TRANSPORTER: return new PartDiversionTransporter(); - case HEAT_TRANSMITTER: - return new PartHeatTransmitter(); + case THERMODYNAMIC_CONDUCTOR_BASIC: + return new PartThermodynamicConductor(Tier.ConductorTier.BASIC); + case THERMODYNAMIC_CONDUCTOR_ADVANCED: + return new PartThermodynamicConductor(Tier.ConductorTier.ADVANCED); + case THERMODYNAMIC_CONDUCTOR_ELITE: + return new PartThermodynamicConductor(Tier.ConductorTier.ELITE); + case THERMODYNAMIC_CONDUCTOR_ULTIMATE: + return new PartThermodynamicConductor(Tier.ConductorTier.ULTIMATE); default: return null; } diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java new file mode 100644 index 000000000..bba2e1d22 --- /dev/null +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -0,0 +1,274 @@ +package mekanism.common.multipart; + +import java.util.Collection; + +import mekanism.api.Coord4D; +import mekanism.api.IHeatTransfer; +import mekanism.api.transmitters.TransmissionType; +import mekanism.client.render.RenderPartTransmitter; +import mekanism.common.HeatNetwork; +import mekanism.common.Tier; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.ConductorTier; +import mekanism.common.util.HeatUtils; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; +import codechicken.lib.colour.ColourRGBA; +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.vec.Vector3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class PartThermodynamicConductor extends PartTransmitter implements IHeatTransfer +{ + public Tier.ConductorTier tier; + + public static TransmitterIcons conductorIcons = new TransmitterIcons(4, 8); + + public double temperature = 0; + public double clientTemperature = 0; + public double heatToAbsorb = 0; + + public PartThermodynamicConductor(Tier.ConductorTier conductorTier) + { + super(); + tier = conductorTier; + } + + @Override + public HeatNetwork createNewNetwork() + { + return new HeatNetwork(); + } + + @Override + public HeatNetwork createNetworkByMerging(Collection networks) + { + return new HeatNetwork(networks); + } + + @Override + public int getCapacity() + { + return 0; + } + + @Override + public Object getBuffer() + { + return null; + } + + @Override + public void takeShare() {} + + @Override + public void updateShare() {} + + public static void registerIcons(IIconRegister register) + { + conductorIcons.registerCenterIcons(register, new String[] {"ThermodynamicConductorBasic", "ThermodynamicConductorAdvanced", + "ThermodynamicConductorElite", "ThermodynamicConductorUltimate"}); + conductorIcons.registerSideIcons(register, new String[] {"SmallTransmitterVerticalBasic", "SmallTransmitterVerticalAdvanced", "SmallTransmitterVerticalElite", "SmallTransmitterVerticalUltimate", + "SmallTransmitterHorizontalBasic", "SmallTransmitterHorizontalAdvanced", "SmallTransmitterHorizontalElite", "SmallTransmitterHorizontalUltimate"}); + } + + @Override + public IIcon getCenterIcon(boolean opaque) + { + return conductorIcons.getCenterIcon(tier.ordinal()); + } + + @Override + public IIcon getSideIcon(boolean opaque) + { + return conductorIcons.getSideIcon(tier.ordinal()); + } + + @Override + public IIcon getSideIconRotated(boolean opaque) + { + return conductorIcons.getSideIcon(4+tier.ordinal()); + } + + @Override + public TransmitterType getTransmitterType() + { + return tier.type; + } + + @Override + public boolean isValidAcceptor(TileEntity tile, ForgeDirection side) + { + return tile instanceof IHeatTransfer && ((IHeatTransfer)tile).canConnectHeat(side.getOpposite()); + } + + @Override + public TransmissionType getTransmissionType() + { + return TransmissionType.HEAT; + } + + @Override + public String getType() + { + return "mekanism:thermodynamic_conductor_" + tier.name().toLowerCase(); + } + + @Override + protected boolean onConfigure(EntityPlayer player, int part, int side) + { + temperature += 10000; + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void renderDynamic(Vector3 pos, float f, int pass) + { + if(pass == 0) + { + RenderPartTransmitter.getInstance().renderContents(this, pos); + } + } + + @Override + public void load(NBTTagCompound nbtTags) + { + super.load(nbtTags); + + temperature = nbtTags.getDouble("temperature"); + } + + @Override + public void save(NBTTagCompound nbtTags) + { + super.save(nbtTags); + + nbtTags.setDouble("temperature", temperature); + } + + public void sendTemp() + { + MCDataOutput packet = getWriteStream(); + packet.writeBoolean(true); + packet.writeDouble(temperature); + } + + @Override + public void writeDesc(MCDataOutput packet) + { + packet.writeBoolean(false); + + super.writeDesc(packet); + + packet.writeInt(tier.ordinal()); + } + + @Override + public void readDesc(MCDataInput packet) + { + if(packet.readBoolean()) + { + temperature = packet.readDouble(); + } + else { + super.readDesc(packet); + + tier = ConductorTier.values()[packet.readInt()]; + } + } + + public ColourRGBA getBaseColour() + { + return tier.baseColour; + } + + @Override + public double getTemp() + { + return temperature; + } + + @Override + public double getInverseConductionCoefficient() + { + return tier.inverseConduction; + } + + @Override + public double getInsulationCoefficient(ForgeDirection side) + { + return tier.inverseConductionInsulation; + } + + @Override + public void transferHeatTo(double heat) + { + heatToAbsorb += heat; + } + + @Override + public double[] simulateHeat() + { + return HeatUtils.simulate(this); + } + + @Override + public double applyTemperatureChange() + { + temperature += tier.inverseHeatCapacity * heatToAbsorb; + heatToAbsorb = 0; + + if(Math.abs(temperature - clientTemperature) > (temperature / 100)) + { + clientTemperature = temperature; + sendTemp(); + } + + return temperature; + } + + @Override + public boolean canConnectHeat(ForgeDirection side) + { + return true; + } + + @Override + public IHeatTransfer getAdjacent(ForgeDirection side) + { + if(connectionMapContainsSide(getAllCurrentConnections(), side)) + { + TileEntity adj = Coord4D.get(tile()).getFromSide(side).getTileEntity(world()); + + if(adj instanceof IHeatTransfer) + { + return (IHeatTransfer)adj; + } + } + + return null; + } + + @Override + public boolean upgrade(int tierOrdinal) + { + if(tier.ordinal() < BaseTier.ULTIMATE.ordinal() && tierOrdinal == tier.ordinal()+1) + { + tier = ConductorTier.values()[tier.ordinal()+1]; + + markDirtyTransmitters(); + sendDesc = true; + + return true; + } + + return false; + } +} diff --git a/src/main/java/mekanism/common/multipart/TransmitterType.java b/src/main/java/mekanism/common/multipart/TransmitterType.java index d0c037a9c..ab01b58ea 100644 --- a/src/main/java/mekanism/common/multipart/TransmitterType.java +++ b/src/main/java/mekanism/common/multipart/TransmitterType.java @@ -24,7 +24,10 @@ public enum TransmitterType LOGISTICAL_TRANSPORTER_ULTIMATE("UltimateLogisticalTransporter", BaseTier.ULTIMATE, Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, true, 3, 3, 6, 10), RESTRICTIVE_TRANSPORTER("RestrictiveTransporter", BaseTier.BASIC, Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, false, 4, 8), DIVERSION_TRANSPORTER("DiversionTransporter", BaseTier.BASIC, Size.LARGE, TransmissionType.ITEM, PartLogisticalTransporter.transporterIcons, true, 5, 14, 6, 10), - HEAT_TRANSMITTER("HeatTransmitter", BaseTier.BASIC, Size.SMALL, TransmissionType.HEAT, PartHeatTransmitter.heatIcons, false, 0, 0); + THERMODYNAMIC_CONDUCTOR_BASIC("BasicThermodynamicConductor", BaseTier.BASIC, Size.SMALL, TransmissionType.HEAT, PartThermodynamicConductor.conductorIcons, false, 0, 0), + THERMODYNAMIC_CONDUCTOR_ADVANCED("AdvancedThermodynamicConductor", BaseTier.ADVANCED, Size.SMALL, TransmissionType.HEAT, PartThermodynamicConductor.conductorIcons, false, 1, 1), + THERMODYNAMIC_CONDUCTOR_ELITE("EliteThermodynamicConductor", BaseTier.ELITE, Size.SMALL, TransmissionType.HEAT, PartThermodynamicConductor.conductorIcons, false, 2, 2), + THERMODYNAMIC_CONDUCTOR_ULTIMATE("UltimateThermodynamicConductor", BaseTier.ULTIMATE, Size.SMALL, TransmissionType.HEAT, PartThermodynamicConductor.conductorIcons, false, 3, 3); private String unlocalizedName; private Size size; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 50f6b5936..912343bb8 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -30,7 +30,6 @@ public class PacketConfigSync implements IMessageHandler, public TileEntityBasicMachine(String soundPath, String name, ResourceLocation location, double perTick, int baseTicksRequired, double maxEnergy) { super("machine." + soundPath, name, maxEnergy); + BASE_ENERGY_PER_TICK = perTick; energyPerTick = perTick; BASE_TICKS_REQUIRED = baseTicksRequired; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index a9bbdb1f0..770e3b428 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -1,5 +1,9 @@ package mekanism.common.tile; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -15,7 +19,6 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,15 +27,10 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import cofh.api.energy.IEnergyContainerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; - -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - public class TileEntityChargepad extends TileEntityNoisyElectricBlock { public boolean isActive; @@ -209,7 +207,7 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock @SideOnly(Side.CLIENT) public float getVolume() { - return 0.4F; + return 0.4F*super.getVolume(); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index e2aaec5c5..766ce3316 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -1,16 +1,31 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.Upgrade; -import mekanism.common.base.*; +import mekanism.common.base.IEjector; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; +import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; @@ -26,9 +41,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import java.util.ArrayList; - - public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager { public static final int MAX_GAS = 10000; @@ -88,6 +100,8 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock inventory = new ItemStack[4]; upgradeComponent = new TileComponentUpgrade(this, 3); + upgradeComponent.setSupported(Upgrade.MUFFLING); + ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index a849834ea..22c68955d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -17,9 +17,9 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -79,7 +79,9 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri public TileEntityChemicalDissolutionChamber() { super("machine.dissolution", "ChemicalDissolutionChamber", BlockStateMachine.MachineType.CHEMICAL_DISSOLUTION_CHAMBER.baseEnergy); + inventory = new ItemStack[5]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 012cf5ad8..8ec84b84f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -19,9 +19,9 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -32,7 +32,6 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -73,7 +72,9 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl public TileEntityChemicalInfuser() { super("machine.cheminfuser", "ChemicalInfuser", BlockStateMachine.MachineType.CHEMICAL_INFUSER.baseEnergy); + inventory = new ItemStack[5]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 7dad9856e..672711fba 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -70,7 +70,9 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp public TileEntityChemicalOxidizer() { super("machine.oxidizer", "ChemicalOxidizer", BlockStateMachine.MachineType.CHEMICAL_OXIDIZER.baseEnergy); + inventory = new ItemStack[4]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 77d8bc737..53568c83b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -1,10 +1,21 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; @@ -18,16 +29,24 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.WasherRecipe; import mekanism.common.tile.component.TileComponentUpgrade; -import mekanism.common.util.*; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.InventoryUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; -import java.util.List; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, IFluidHandler, IUpgradeTile, ISustainedData, IUpgradeInfoHandler, ITankManager { @@ -66,7 +85,9 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple public TileEntityChemicalWasher() { super("machine.washer", "ChemicalWasher", BlockStateMachine.MachineType.CHEMICAL_WASHER.baseEnergy); + inventory = new ItemStack[5]; + upgradeComponent.setSupported(Upgrade.MUFFLING); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index 82c5ddced..d40f57293 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -27,6 +27,6 @@ public class TileEntityCrusher extends TileEntityElectricMachine @SideOnly(Side.CLIENT) public float getVolume() { - return 0.5F; + return 0.5F*super.getVolume(); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index de3614a74..fe24677ad 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -1,18 +1,12 @@ package mekanism.common.tile; -import java.util.ArrayList; - -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.Upgrade; import mekanism.common.base.IFactory.RecipeType; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.BasicMachineRecipe; @@ -56,6 +50,8 @@ public abstract class TileEntityElectricMachine= 1) { @@ -118,6 +130,9 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora partialOutput %= 1; } } + else { + lastGain = 0; + } if(structured) { @@ -181,8 +196,6 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora { inputTank.getFluid().amount = Math.min(inputTank.getFluid().amount, getMaxFluid()); } - - temperature = Math.min(getMaxTemperature(), getTemperature()); } else { clearStructure(); @@ -193,7 +206,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora public boolean canOperate(SolarEvaporationRecipe recipe) { - if(!structured || height < 3 || height > 18 || inputTank.getFluid() == null) + if(!structured || height < 3 || height > MAX_HEIGHT || inputTank.getFluid() == null) { return false; } @@ -302,35 +315,6 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora } private void updateTemperature() - { - float max = getMaxTemperature(); - float incr = (max/WARMUP)*getTempMultiplier(); - - if(getTempMultiplier() == 0) - { - temperature = Math.max(0, getTemperature()-(max/(WARMUP*16))); - } - else { - temperature = Math.min(max, getTemperature()+incr); - } - } - - public float getTemperature() - { - return temperature; - } - - public float getMaxTemperature() - { - if(!structured) - { - return 0; - } - - return 1 + (height-3)*(float)general.solarEvaporationSpeed; - } - - public float getTempMultiplier() { if(!temperatureSet) { @@ -338,7 +322,28 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora temperatureSet = true; } - return biomeTemp*((float)getActiveSolars()/MAX_SOLARS); + heatToAbsorb += getActiveSolars()*general.evaporationSolarMultiplier; + temperature += heatToAbsorb/(float)height; + + float biome = biomeTemp-0.5F; + float base = biome > 0 ? biome*20 : biomeTemp*40; + float incr = (float)Math.sqrt(Math.abs(temperature-base))*(float)general.evaporationHeatDissipation; + + if(temperature > base) + { + incr = -incr; + } + + temperature = (float)Math.min(general.evaporationMaxTemp, temperature + incr/(float)height); + + heatToAbsorb = 0; + + MekanismUtils.saveChunk(this); + } + + public float getTemperature() + { + return temperature; } public int getActiveSolars() @@ -396,7 +401,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora middlePointer = middlePointer.offset(EnumFacing.DOWN); } - if(height < 3 || height > 18) + if(height < 3 || height > MAX_HEIGHT) { height = 0; return false; @@ -571,7 +576,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora public int getScaledTempLevel(int i) { - return (int)(getMaxTemperature() == 0 ? 0 : getTemperature()*i/getMaxTemperature()); + return (int)(i*Math.min(1, getTemperature()/general.evaporationMaxTemp)); } public Coord4D getRenderLocation() @@ -620,6 +625,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora temperature = dataStream.readFloat(); biomeTemp = dataStream.readFloat(); isLeftOnFace = dataStream.readBoolean(); + lastGain = dataStream.readFloat(); if(structured != prev) { @@ -673,6 +679,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora data.add(temperature); data.add(biomeTemp); data.add(isLeftOnFace); + data.add(lastGain); return data; } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 1be19041c..9a3f565a5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -1,18 +1,24 @@ package mekanism.common.tile; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.PacketHandler; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; +import mekanism.common.frequency.IFrequencyHandler; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -38,10 +44,11 @@ import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.*; - -public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader +public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader, IFrequencyHandler { private MinecraftServer server = MinecraftServer.getServer(); @@ -143,6 +150,12 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo ChargeUtils.discharge(0, this); } + + @Override + public Frequency getFrequency() + { + return frequency; + } public Coord4D getClosest() { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 4197592c7..26fb14255 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -1,20 +1,23 @@ package mekanism.common.tile.component; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import mekanism.api.Coord4D; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeItem; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class TileComponentUpgrade implements ITileComponent { /** How long it takes this machine to install an upgrade. */ @@ -79,6 +82,7 @@ public class TileComponentUpgrade implements ITileComponent tileEntity.inventory[upgradeSlot] = null; } + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); tileEntity.markDirty(); } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 0437cb0d7..b14a23019 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1,10 +1,20 @@ package mekanism.common.util; -import buildcraft.api.tools.IToolWrench; -import cofh.api.item.IToolHammer; -import net.minecraftforge.fml.common.ModContainer; -import net.minecraftforge.fml.common.registry.GameData; import ic2.api.energy.EnergyNet; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -17,10 +27,24 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.UnitDisplayUtils; import mekanism.api.util.UnitDisplayUtils.ElectricUnit; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; -import mekanism.common.*; -import mekanism.common.Tier.*; -import mekanism.common.base.*; +import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; +import mekanism.common.OreDictCache; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.Tier.FactoryTier; +import mekanism.common.Tier.InductionCellTier; +import mekanism.common.Tier.InductionProviderTier; +import mekanism.common.Upgrade; +import mekanism.common.Version; +import mekanism.common.base.IActiveState; +import mekanism.common.base.IFactory; import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.base.IModule; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.IUpgradeTile; import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockEnergyCube; @@ -33,6 +57,7 @@ import mekanism.common.tile.TileEntityElectricChest; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -54,18 +79,20 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.BlockFluidBase; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.*; +import buildcraft.api.tools.IToolWrench; +import cofh.api.item.IToolHammer; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Utilities used by Mekanism. All miscellaneous methods are located here. @@ -1173,6 +1200,7 @@ public final class MekanismUtils public static String getTemperatureDisplay(double T, TemperatureUnit unit) { double TK = unit.convertToK(T); + switch(general.tempUnit) { case K: @@ -1219,20 +1247,76 @@ public final class MekanismUtils { return "[" + obj.getX() + ", " + obj.getY() + ", " + obj.getZ() + "]"; } - - /** - * Splits a string of text into a list of new segments, using the splitter "!n." - * @param s - string to split - * @return split string - */ - public static List splitLines(String s) + + @SideOnly(Side.CLIENT) + public static List splitTooltip(String s, ItemStack stack) { - ArrayList ret = new ArrayList(); - - String[] split = s.split("!n"); - ret.addAll(Arrays.asList(split)); - - return ret; + s = s.trim(); + + try { + FontRenderer renderer = (FontRenderer)Mekanism.proxy.getFontRenderer(); + + if(stack != null && stack.getItem().getFontRenderer(stack) != null) + { + renderer = stack.getItem().getFontRenderer(stack); + } + + List words = new ArrayList(); + List lines = new ArrayList(); + + String currentWord = ""; + + for(Character c : s.toCharArray()) + { + if(c.equals(' ')) + { + words.add(currentWord); + currentWord = ""; + } + else { + currentWord += c; + } + } + + if(!currentWord.isEmpty()) + { + words.add(currentWord); + } + + String currentLine = ""; + + for(String word : words) + { + if(currentLine.isEmpty() || renderer.getStringWidth(currentLine + " " + word) <= 200) + { + if(currentLine.length() > 0) + { + currentLine += " "; + } + + currentLine += word; + + continue; + } + else { + lines.add(currentLine); + currentLine = word; + + continue; + } + } + + if(!currentLine.isEmpty()) + { + lines.add(currentLine); + } + + return lines; + } catch(Throwable t) { + t.printStackTrace(); + } + + return new ArrayList(); } /** diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index ddf4f5aac..cf2cdca37 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -1,7 +1,12 @@ package mekanism.generators.client.gui; +import java.util.List; + import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; @@ -49,6 +54,18 @@ public class GuiIndustrialTurbine extends GuiMekanism return (double)tileEntity.structure.lastSteamInput/rate; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"), 40, 13)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() + { + @Override + public List getInfo() + { + double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + + return ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 4b0c94b58..b2c19f9ec 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -32,6 +32,7 @@ public class GuiReactorController extends GuiMekanism { super(new ContainerReactorController(inventory, tentity)); tileEntity = tentity; + if(tileEntity.isFormed()) { guiElements.add(new GuiEnergyInfo(new IInfoHandler() diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index da11a1fcb..b5fe772cf 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -8,24 +8,23 @@ import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiHeatTab; import mekanism.generators.client.gui.element.GuiStatTab; -import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; @@ -160,7 +159,7 @@ public class GuiReactorFuel extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { SoundHandler.playSound("gui.button.press"); - MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10)); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 10)); } } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 6118b046d..e28854255 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -9,36 +9,37 @@ import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiEnergyGauge; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiNumberGauge; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiNumberGauge; import mekanism.client.gui.element.GuiNumberGauge.INumberInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiFuelTab; import mekanism.generators.client.gui.element.GuiStatTab; -import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.block.BlockStaticLiquid; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiReactorHeat extends GuiMekanism { @@ -206,9 +207,8 @@ public class GuiReactorHeat extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { SoundHandler.playSound("gui.button.press"); - MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10)); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 10)); } - } } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index 8254b1932..13420e752 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -56,10 +56,13 @@ public class GuiReactorLogicAdapter extends GuiMekanism GL11.glPopMatrix(); fontRendererObj.drawString(EnumColor.WHITE + type.getLocalizedName(), 46, 34+(22*type.ordinal()), 0x404040); - + } + + for(ReactorLogic type : ReactorLogic.values()) + { if(xAxis >= 24 && xAxis <= 152 && yAxis >= 32+(22*type.ordinal()) && yAxis <= 32+22+(22*type.ordinal())) { - drawCreativeTabHoveringText(type.getDescription(), xAxis, yAxis); + displayTooltips(MekanismUtils.splitTooltip(type.getDescription(), null), xAxis, yAxis); } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index d791aabb5..123c28a8c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -8,25 +8,26 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiMekanism; import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiFuelTab; import mekanism.generators.client.gui.element.GuiHeatTab; -import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiReactorStats extends GuiMekanism { @@ -113,7 +114,7 @@ public class GuiReactorStats extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { SoundHandler.playSound("gui.button.press"); - MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10)); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 10)); } } }} diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index f6337b51c..1d199b517 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -1,8 +1,13 @@ package mekanism.generators.client.gui; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -27,6 +32,18 @@ public class GuiTurbineStats extends GuiMekanism super(tentity, new ContainerNull(inventory.player, tentity)); tileEntity = tentity; guiElements.add(new GuiTurbineTab(this, tileEntity, TurbineTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() + { + @Override + public List getInfo() + { + double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + + return ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java index 96f898870..933586472 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java @@ -4,16 +4,16 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiFuelTab extends GuiElement @@ -74,7 +74,7 @@ public class GuiFuelTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 38 && yAxis <= 56) { - MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 12)); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 12)); SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java index 2da29fc82..39406ded8 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java @@ -4,16 +4,16 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiHeatTab extends GuiElement @@ -74,7 +74,7 @@ public class GuiHeatTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { - MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 11)); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 11)); SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java index f73f45f73..768874dea 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java @@ -4,16 +4,16 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiStatTab extends GuiElement @@ -74,7 +74,7 @@ public class GuiStatTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) { - MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 13)); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 13)); SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java b/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java deleted file mode 100644 index 6869a4592..000000000 --- a/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java +++ /dev/null @@ -1,183 +0,0 @@ -package mekanism.generators.common; - -import java.util.ArrayList; -import java.util.List; - -import mekanism.common.Mekanism; -import mekanism.generators.common.network.PacketGeneratorsGui; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Vec3; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; - -import io.netty.buffer.ByteBuf; - -/** - * Mekanism packet handler. As always, use packets sparingly! - * @author AidanBrady - * - */ -public class GeneratorsPacketHandler -{ - public SimpleNetworkWrapper netHandler = NetworkRegistry.INSTANCE.newSimpleChannel("MEKGEN"); - - public void initialize() - { - netHandler.registerMessage(PacketGeneratorsGui.class, GeneratorsGuiMessage.class, 0, Side.SERVER); - netHandler.registerMessage(PacketGeneratorsGui.class, GeneratorsGuiMessage.class, 0, Side.CLIENT); - } - - /** - * Encodes an Object[] of data into a DataOutputStream. - * @param dataValues - an Object[] of data to encode - * @param output - the output stream to write to - */ - public static void encode(Object[] dataValues, ByteBuf output) - { - try { - for(Object data : dataValues) - { - if(data instanceof Integer) - { - output.writeInt((Integer)data); - } - else if(data instanceof Boolean) - { - output.writeBoolean((Boolean)data); - } - else if(data instanceof Double) - { - output.writeDouble((Double)data); - } - else if(data instanceof Float) - { - output.writeFloat((Float)data); - } - else if(data instanceof String) - { - writeString(output, (String)data); - } - else if(data instanceof Byte) - { - output.writeByte((Byte)data); - } - else if(data instanceof int[]) - { - for(int i : (int[])data) - { - output.writeInt(i); - } - } - else if(data instanceof byte[]) - { - for(byte b : (byte[])data) - { - output.writeByte(b); - } - } - else if(data instanceof ArrayList) - { - encode(((ArrayList)data).toArray(), output); - } - } - } catch(Exception e) { - Mekanism.logger.error("Error while encoding packet data."); - e.printStackTrace(); - } - } - - public static void writeString(ByteBuf output, String s) - { - output.writeInt(s.getBytes().length); - output.writeBytes(s.getBytes()); - } - - public static String readString(ByteBuf input) - { - return new String(input.readBytes(input.readInt()).array()); - } - - public static EntityPlayer getPlayer(MessageContext context) - { - return Mekanism.proxy.getPlayer(context); - } - - /** - * Send this message to everyone. - * @param message - the message to send - */ - public void sendToAll(IMessage message) - { - netHandler.sendToAll(message); - } - - /** - * Send this message to the specified player. - * @param message - the message to send - * @param player - the player to send it to - */ - public void sendTo(IMessage message, EntityPlayerMP player) - { - netHandler.sendTo(message, player); - } - - /** - * Send this message to everyone within a certain range of a point. - * - * @param message - the message to send - * @param point - the TargetPoint around which to send - */ - public void sendToAllAround(IMessage message, NetworkRegistry.TargetPoint point) - { - netHandler.sendToAllAround(message, point); - } - - /** - * Send this message to everyone within the supplied dimension. - * @param message - the message to send - * @param dimensionId - the dimension id to target - */ - public void sendToDimension(IMessage message, int dimensionId) - { - netHandler.sendToDimension(message, dimensionId); - } - - /** - * Send this message to the server. - * @param message - the message to send - */ - public void sendToServer(IMessage message) - { - netHandler.sendToServer(message); - } - - /** - * Send this message to all players within a defined AABB cuboid. - * @param message - the message to send - * @param cuboid - the AABB cuboid to send the packet in - * @param dimId - the dimension the cuboid is in - */ - public void sendToCuboid(IMessage message, AxisAlignedBB cuboid, int dimId) - { - MinecraftServer server = MinecraftServer.getServer(); - - if(server != null && cuboid != null) - { - for(EntityPlayerMP player : (List)server.getConfigurationManager().playerEntityList) - { - if(player.dimension == dimId && cuboid.isVecInside(Vec3.createVectorHelper(player.posX, player.posY, player.posZ))) - { - sendTo(message, player); - } - } - } - } -} diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index bab4edee5..c93df9e98 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -45,9 +45,6 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; @Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { - /** Mekanism Generators Packet Pipeline */ - public static GeneratorsPacketHandler packetHandler = new GeneratorsPacketHandler(); - @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") public static GeneratorsCommonProxy proxy; @@ -71,8 +68,6 @@ public class MekanismGenerators implements IModule { //Add this module to the core list Mekanism.modulesLoaded.add(this); - - packetHandler.initialize(); //Register this module's GUI handler in the simple packet protocol PacketSimpleGui.handlers.add(1, proxy); @@ -207,10 +202,17 @@ public class MekanismGenerators implements IModule dataStream.writeDouble(generators.heatGenerationLava); dataStream.writeDouble(generators.heatGenerationNether); dataStream.writeDouble(generators.solarGeneration); + dataStream.writeDouble(generators.windGenerationMin); dataStream.writeDouble(generators.windGenerationMax); + dataStream.writeInt(generators.windGenerationMinY); dataStream.writeInt(generators.windGenerationMaxY); + + dataStream.writeInt(generators.turbineBladesPerCoil); + dataStream.writeDouble(generators.turbineBaseEnergyPerSteam); + dataStream.writeDouble(generators.turbineVentGasFlow); + dataStream.writeDouble(generators.turbineDisperserGasFlow); } @Override @@ -222,10 +224,17 @@ public class MekanismGenerators implements IModule generators.heatGenerationLava = dataStream.readDouble(); generators.heatGenerationNether = dataStream.readDouble(); generators.solarGeneration = dataStream.readDouble(); + generators.windGenerationMin = dataStream.readDouble(); generators.windGenerationMax = dataStream.readDouble(); + generators.windGenerationMinY = dataStream.readInt(); generators.windGenerationMaxY = dataStream.readInt(); + + generators.turbineBladesPerCoil = dataStream.readInt(); + generators.turbineBaseEnergyPerSteam = dataStream.readDouble(); + generators.turbineVentGasFlow = dataStream.readDouble(); + generators.turbineDisperserGasFlow = dataStream.readDouble(); } @SubscribeEvent diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index af01b744f..a72d2d629 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.Random; +import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.CTMData; @@ -231,7 +232,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - if(general.enableAmbientLighting) + if(client.enableAmbientLighting) { TileEntity tileEntity = world.getTileEntity(x, y, z); @@ -239,7 +240,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) { - return general.ambientLightingLevel; + return client.ambientLightingLevel; } } } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 5f65a6d1f..c69064e7a 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -137,11 +137,17 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } else { - list.addAll(MekanismUtils.splitLines(type.getDescription())); + list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack)); } } else { - list.addAll(MekanismUtils.splitLines(type.getDescription())); + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) + { + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); + } + else { + list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack)); + } } } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index e237cf458..68db1c049 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -11,11 +11,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + public class ItemBlockReactor extends ItemBlock { public Block metaBlock; @@ -56,7 +57,7 @@ public class ItemBlockReactor extends ItemBlock list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.addAll(MekanismUtils.splitLines(type.getDescription())); + list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack)); } } } diff --git a/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java b/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java deleted file mode 100644 index 68893e564..000000000 --- a/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java +++ /dev/null @@ -1,115 +0,0 @@ -package mekanism.generators.common.network; - -import mekanism.api.Coord4D; -import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.generators.common.GeneratorsPacketHandler; -import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import io.netty.buffer.ByteBuf; - -public class PacketGeneratorsGui implements IMessageHandler -{ - @Override - public IMessage onMessage(GeneratorsGuiMessage message, MessageContext context) - { - EntityPlayer player = GeneratorsPacketHandler.getPlayer(context); - - if(!player.worldObj.isRemote) - { - World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(message.coord4D.dimensionId); - - if(worldServer != null && message.coord4D.getTileEntity(worldServer) instanceof TileEntityBasicBlock) - { - if(message.guiId == -1) - { - return null; - } - - GeneratorsGuiMessage.openServerGui(message.guiId, (EntityPlayerMP)player, player.worldObj, message.coord4D); - } - } - else { - FMLCommonHandler.instance().showGuiScreen(GeneratorsGuiMessage.getGui(message.guiId, player, player.worldObj, message.coord4D)); - player.openContainer.windowId = message.windowId; - } - - return null; - } - - public static class GeneratorsGuiMessage implements IMessage - { - public Coord4D coord4D; - - public int guiId; - - public int windowId; - - public GeneratorsGuiMessage() {} - - public GeneratorsGuiMessage(Coord4D coord, int gui) - { - coord4D = coord; - guiId = gui; - } - - public GeneratorsGuiMessage(Coord4D coord, int gui, int id) - { - this(coord, gui); - windowId = id; - } - - public static void openServerGui(int id, EntityPlayerMP playerMP, World world, Coord4D obj) - { - playerMP.closeContainer(); - playerMP.getNextWindowId(); - - int window = playerMP.currentWindowId; - - MekanismGenerators.packetHandler.sendTo(new GeneratorsGuiMessage(obj, id, window), playerMP); - - playerMP.openContainer = MekanismGenerators.proxy.getServerGui(id, playerMP, world, obj.xCoord, obj.yCoord, obj.zCoord); - playerMP.openContainer.windowId = window; - playerMP.openContainer.onCraftGuiOpened(playerMP); - } - - @SideOnly(Side.CLIENT) - public static GuiScreen getGui(int id, EntityPlayer player, World world, Coord4D obj) - { - return (GuiScreen)MekanismGenerators.proxy.getClientGui(id, player, world, obj.xCoord, obj.yCoord, obj.zCoord); - } - - @Override - public void toBytes(ByteBuf dataStream) - { - dataStream.writeInt(coord4D.xCoord); - dataStream.writeInt(coord4D.yCoord); - dataStream.writeInt(coord4D.zCoord); - - dataStream.writeInt(coord4D.dimensionId); - - dataStream.writeInt(guiId); - dataStream.writeInt(windowId); - } - - @Override - public void fromBytes(ByteBuf dataStream) - { - coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - - guiId = dataStream.readInt(); - windowId = dataStream.readInt(); - } - } -} diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index a55c47c86..fb6824565 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -45,7 +45,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator @SideOnly(Side.CLIENT) public float getVolume() { - return 0.05F; + return 0.05F*super.getVolume(); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index e8883044a..89a58868f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -68,7 +68,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou @SideOnly(Side.CLIENT) public float getVolume() { - return 1.5F; + return 1.5F*super.getVolume(); } private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getMultiplier"}; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 1f0183f47..9052f335c 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -1,14 +1,15 @@ package mekanism.generators.common.tile.reactor; -import dan200.computercraft.api.lua.LuaException; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.common.integration.IComputerIntegration; import mekanism.common.util.LangUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import java.util.ArrayList; +import dan200.computercraft.api.lua.LuaException; public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implements IComputerIntegration { diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 51383001d..32902aa36 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -11,6 +11,7 @@ item.EnergyTablet.name=Energy Tablet item.SpeedUpgrade.name=Speed Upgrade item.EnergyUpgrade.name=Energy Upgrade item.FilterUpgrade.name=Filter Upgrade +item.MufflingUpgrade.name=Muffling Upgrade item.GasUpgrade.name=Gas Upgrade item.Robit.name=Robit item.AtomicDisassembler.name=Atomic Disassembler @@ -179,6 +180,10 @@ item.MultipartTransmitter.EliteLogisticalTransporter.name=Elite Logistical Trans item.MultipartTransmitter.UltimateLogisticalTransporter.name=Ultimate Logistical Transporter item.MultipartTransmitter.RestrictiveTransporter.name=Restrictive Transporter item.MultipartTransmitter.DiversionTransporter.name=Diversion Transporter +item.MultipartTransmitter.BasicThermodynamicConductor.name=Basic Thermodynamic Conductor +item.MultipartTransmitter.AdvancedThermodynamicConductor.name=Advanced Thermodynamic Conductor +item.MultipartTransmitter.EliteThermodynamicConductor.name=Elite Thermodynamic Conductor +item.MultipartTransmitter.UltimateThermodynamicConductor.name=Ultimate Thermodynamic Conductor //Glow Panel item.GlowPanel.name=Glow Panel @@ -348,13 +353,15 @@ update.outdated=Using outdated version on one or more modules //Upgrades upgrade.energy=Energy -upgrade.energy.desc=Increases energy efficiency !nand capacity of machinery. +upgrade.energy.desc=Increases energy efficiency and capacity of machinery. upgrade.speed=Speed upgrade.speed.desc=Increases speed of machinery. upgrade.filter=Filter -upgrade.filter.desc=A filter that separates !nheavy water from regular water. +upgrade.filter.desc=A filter that separates heavy water from regular water. upgrade.gas=Gas -upgrade.gas.desc=Increases the efficiency !nof gas-using machinery. +upgrade.gas.desc=Increases the efficiency of gas-using machinery. +upgrade.muffling=Muffling +upgrade.muffling.desc=Reduces noise generated by machinery. //Key description text key.mode=Item Mode Switch @@ -380,8 +387,6 @@ mekanism.configgui.ctgy.usage.tooltip=Settings regarding machinery and their ene mekanism.configgui.ctgy.client.tooltip=Client-specific settings regarding Mekanism and all its modules //Gui text -gui.removeSpeedUpgrade=Remove speed upgrade -gui.removeEnergyUpgrade=Remove energy upgrade gui.condensentrating=Condensentrating gui.decondensentrating=Decondensentrating gui.power=Power @@ -497,6 +502,8 @@ gui.maxProduction=Max Production gui.limiting=Limiting gui.steamInput=Steam Input gui.capacity=Capacity +gui.unit=Unit +gui.temp=Temp gui.reactor.injectionRate=Injection Rate @@ -681,6 +688,7 @@ tooltip.insufficientFuel=Insufficient Fuel tooltip.readyForReaction=Ready for Reaction tooltip.speed=Speed tooltip.and=and +tooltip.heat=Heat tooltip.portableTank.bucketMode=Bucket Mode @@ -711,66 +719,64 @@ tooltip.flamethrower.modeBump=Flamethrower mode bumped to tooltip.seismicReader.needsEnergy=Not enough energy to interpret vibration tooltip.seismicReader.noVibrations=Unable to discover any vibrations -tooltip.EnrichmentChamber=A simple machine used to enrich ores into !ntwo of their dust counterparts, as well as !nperform many other operations. -tooltip.OsmiumCompressor=A fairly advanced machine used to compress !nosmium into various dusts in order to create !ntheir ingot counterparts. -tooltip.Combiner=A machine used to combine dusts and cobblestone !nto form their ore counterparts. -tooltip.Crusher=A machine used to crush ingots into their dust counterparts, !nas well as perform many other operations. -tooltip.DigitalMiner=A highly-advanced, filter-based, auto-miner !nthat can mine whatever block you tell it to !nwithin a 32 block (max) radius. -tooltip.BasicFactory=The lowest tier of the line of Factories, !nwhich can be used to process multiple !nmachine operations at once. -tooltip.AdvancedFactory=The middle tier of the line of Factories, !nwhich can be used to process multiple !nmachine operations at once. -tooltip.EliteFactory=The highest tier of the line of Factories, !nwhich can be used to process multiple !nmachine operations at once. -tooltip.MetallurgicInfuser=A machine used to infuse various materials !ninto (generally) metals to create metal alloys !nand other compounds. -tooltip.PurificationChamber=An advanced machine capable of processing !nores into three clumps, serving as the initial !nstage of 300% ore processing. -tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based !nfurnace that runs off of energy. -tooltip.Teleporter=A machine capable of teleporting players to various !nlocations defined by another teleporter. -tooltip.ElectricPump=An advanced pump capable of pumping !nout an entire lava lake. -tooltip.ElectricChest=A portable, 54-slot chest that uses energy to lock !nitself from others by means of password protection. -tooltip.Chargepad=A universal chargepad that can charge !nany energized item from any mod. -tooltip.LogisticalSorter=A filter-based, advanced sorting machine that !ncan auto-eject specified items out of and into !nadjacent inventories and Logistical Transporters. -tooltip.RotaryCondensentrator=A machine capable of converting gasses into !ntheir fluid form and vice versa. -tooltip.ChemicalInjectionChamber=An elite machine capable of processing !nores into four shards, serving as the initial !nstage of 400% ore processing. -tooltip.ElectrolyticSeparator=A machine that uses the process of !nelectrolysis to split apart a certain !ngas into two different gasses. -tooltip.PrecisionSawmill=A machine used to process logs and other !nwood-based items more efficiently, as well !nas to obtain sawdust. -tooltip.ChemicalDissolutionChamber=An ultimate machine used to chemically !ndissolve all impurities of an ore, !nleaving an unprocessed slurry behind. -tooltip.ChemicalWasher=An ultimate machine that cleans unprocessed !nslurry and prepares it for crystallization. -tooltip.ChemicalCrystallizer=An ultimate machine used to crystallize !npurified ore slurry into ore crystals. -tooltip.ChemicalOxidizer=A machine capable of oxidizing !nsolid materials into gas phase. -tooltip.ChemicalInfuser=A machine that produces a new !ngas by infusing two others. -tooltip.SeismicVibrator=A machine that uses seismic vibrations to !nprovide information on differing layers !nof the world. -tooltip.PressurizedReactionChamber=An advanced machine that processes a !nsolid, liquid and gaseous mixture and !ncreates both a gaseous and solid product. -tooltip.PortableTank=A handy, portable tank that lets you !ncarry 14 buckets of fluid wherever you !nplease. Also doubles as a bucket! -tooltip.FluidicPlenisher=A machine that is capable of creating entire !nlakes by filling ravines with fluids. -tooltip.Laser=An advanced form of linear energy!ntransfer that utilizes an extremely!ncollimated beam of light. -tooltip.LaserAmplifier=A block that can be used to merge,!nredirect and amplify laser beams,!nwith fine controls over when to fire. -tooltip.LaserTractorBeam=A block used to merge and!nredirect laser beams. Collects!ndrops from blocks it has broken. -tooltip.SolarNeutronActivator=A machine that directs the neutron radiation !nof the sun into its internal reservoir, allowing !nfor the slow creation of various isotopes. -tooltip.Oredictionificator=A machine used to unify and translate between various items !nand blocks using the Ore Dictionary. +tooltip.EnrichmentChamber=A simple machine used to enrich ores into two of their dust counterparts, as well as perform many other operations. +tooltip.OsmiumCompressor=A fairly advanced machine used to compress osmium into various dusts in order to create their ingot counterparts. +tooltip.Combiner=A machine used to combine dusts and cobblestone to form their ore counterparts. +tooltip.Crusher=A machine used to crush ingots into their dust counterparts, as well as perform many other operations. +tooltip.DigitalMiner=A highly-advanced, filter-based, auto-miner that can mine whatever block you tell it to within a 32 block (max) radius. +tooltip.MetallurgicInfuser=A machine used to infuse various materials into (generally) metals to create metal alloys and other compounds. +tooltip.PurificationChamber=An advanced machine capable of processing ores into three clumps, serving as the initial stage of 300% ore processing. +tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based furnace that runs off of energy. +tooltip.Teleporter=A machine capable of teleporting players to various locations defined by another teleporter. +tooltip.ElectricPump=An advanced, upgradeable pump, capable of extracting any type of fluid. +tooltip.ElectricChest=A portable, 54-slot chest that uses energy to lock itself from others by means of password protection. +tooltip.Chargepad=A universal chargepad that can charge any energized item from any mod. +tooltip.LogisticalSorter=A filter-based, advanced sorting machine that can auto-eject specified items out of and into adjacent inventories and Logistical Transporters. +tooltip.RotaryCondensentrator=A machine capable of converting gasses into their fluid form and vice versa. +tooltip.ChemicalInjectionChamber=An elite machine capable of processing ores into four shards, serving as the initial stage of 400% ore processing. +tooltip.ElectrolyticSeparator=A machine that uses the process of electrolysis to split apart a certain gas into two different gasses. +tooltip.PrecisionSawmill=A machine used to process logs and other wood-based items more efficiently, as well as to obtain sawdust. +tooltip.ChemicalDissolutionChamber=An ultimate machine used to chemically dissolve all impurities of an ore, leaving an unprocessed slurry behind. +tooltip.ChemicalWasher=An ultimate machine that cleans unprocessed slurry and prepares it for crystallization. +tooltip.ChemicalCrystallizer=An ultimate machine used to crystallize purified ore slurry into ore crystals. +tooltip.ChemicalOxidizer=A machine capable of oxidizing solid materials into gas phase. +tooltip.ChemicalInfuser=A machine that produces a new gas by infusing two others. +tooltip.SeismicVibrator=A machine that uses seismic vibrations to provide information on differing layers of the world. +tooltip.PressurizedReactionChamber=An advanced machine that processes a solid, liquid and gaseous mixture and creates both a gaseous and solid product. +tooltip.PortableTank=A handy, sturdy, portable tank that lets you carry 14 buckets of fluid wherever you please. Also doubles as a bucket! +tooltip.FluidicPlenisher=A machine that is capable of creating entire lakes by filling ravines with fluids. +tooltip.Laser=An advanced form of linear energy transfer that utilizes an extremely collimated beam of light. +tooltip.LaserAmplifier=A block that can be used to merge, redirect and amplify laser beams, with fine controls over when to fire. +tooltip.LaserTractorBeam=A block used to merge and redirect laser beams. Collects drops from blocks it has broken. +tooltip.SolarNeutronActivator=A machine that directs the neutron radiation of the sun into its internal reservoir, allowing for the slow creation of various isotopes. +tooltip.Oredictionificator=A machine used to unify and translate between various items and blocks using the Ore Dictionary. +tooltip.Factory=A machine that serves as an upgrade to regular machinery, allowing for multiple processing operations to occur at once. -tooltip.HeatGenerator=A generator that uses the heat of lava or !nother burnable resources to produce energy. -tooltip.SolarGenerator=A generator that uses the power !nof the sun to produce energy. -tooltip.GasGenerator=A generator that harnesses the molecular !nvarying gasses to produce energy. -tooltip.BioGenerator=A generator that burns organic materials of !nthe world to produce energy. -tooltip.AdvancedSolarGenerator=An advanced generator that directly !nabsorbs the sun's rays with little loss !nto produce energy. -tooltip.WindGenerator=A generator that uses the strength of the wind !nto produce energy, with greater efficiency !nat higher levels. -tooltip.TurbineRotor=The steel rod that is used to house !nTurbine Blades within an Industrial Turbine. -tooltip.RotationalComplex=A connector that is placed on the highest !nTurbine Rotor of an Industrial Turbine to !ncarry kinetic energy into its !nElectromagnetic Coils. -tooltip.PressureDisperser=A block used in the Industrial Turbine!n to direct steam outwards. These should !nbe placed just above your turbine rods, forming a !ngapless layer of dispersers surrounding your !nRotational Complex. -tooltip.ElectromagneticCoil=A block that converts kinetic energy from a !nRotational Complex into useable electricity. These can be placed in !nany arrangement above your Rotational Complex, as long !nas they are all touching each other and the !ncomplex itself. -tooltip.TurbineCasing=Pressure-resistant casing used in the !ncreation of an Industrial Turbine. -tooltip.TurbineValve=A type of Turbine Casing that includes a !nport for the transfer of energy and steam. -tooltip.TurbineVent=A type of Turbine Casing with an integrated !nvent for the release of steam. These !nshould be placed on the level of or above the turbine's !nRotational Complex. +tooltip.HeatGenerator=A generator that uses the heat of lava or other burnable resources to produce energy. +tooltip.SolarGenerator=A generator that uses the power of the sun to produce energy. +tooltip.GasGenerator=A generator that harnesses the molecular varying gasses to produce energy. +tooltip.BioGenerator=A generator that burns organic materials of the world to produce energy. +tooltip.AdvancedSolarGenerator=An advanced generator that directly absorbs the sun's rays with little loss to produce energy. +tooltip.WindGenerator=A generator that uses the strength of the wind to produce energy, with greater efficiency at higher levels. +tooltip.TurbineRotor=The steel rod that is used to house Turbine Blades within an Industrial Turbine. +tooltip.RotationalComplex=A connector that is placed on the highest Turbine Rotor of an Industrial Turbine to carry kinetic energy into its Electromagnetic Coils. +tooltip.PressureDisperser=A block used in the Industrial Turbine to direct steam outwards. These should be placed just above your turbine rods, forming a gapless layer of dispersers surrounding your Rotational Complex. +tooltip.ElectromagneticCoil=A block that converts kinetic energy from a Rotational Complex into useable electricity. These can be placed in any arrangement above your Rotational Complex, as long as they are all touching each other and the complex itself. +tooltip.TurbineCasing=Pressure-resistant casing used in the creation of an Industrial Turbine. +tooltip.TurbineValve=A type of Turbine Casing that includes a port for the transfer of energy and steam. +tooltip.TurbineVent=A type of Turbine Casing with an integrated vent for the release of steam. These should be placed on the level of or above the turbine's Rotational Complex. -tooltip.ReactorGlass=Reinforced glass that can be used in !nthe Fusion Reactor multiblock. -tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that !nis capable of absorbing optical energy and !nthereby heating up the Fusion Reactor. -tooltip.ReactorController=The controlling block for the entire !nFusion Reactor structure. -tooltip.ReactorFrame=Reinforced framing that can be used in !nthe Fusion Reactor multiblock. -tooltip.ReactorNeutronCapturePlate=A block that can be used to !nboth block Fusion Reactor radiation and assist !nin the production of Tritium. -tooltip.ReactorPort=A block of reinforced framing that is capable !nof managing both the gas and energy transfer !nof the Fusion Reactor. -tooltip.ReactorLogicAdapter=A block that can be used to !nallow basic monitoring of a reactor using redstone. +tooltip.ReactorGlass=Reinforced glass that can be used in the Fusion Reactor multiblock. +tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that is capable of absorbing optical energy and thereby heating up the Fusion Reactor. +tooltip.ReactorController=The controlling block for the entire Fusion Reactor structure. +tooltip.ReactorFrame=Reinforced framing that can be used in the Fusion Reactor multiblock. +tooltip.ReactorNeutronCapturePlate=A block that can be used to both block Fusion Reactor radiation and assist in the production of Tritium. +tooltip.ReactorPort=A block of reinforced framing that is capable of managing both the gas and energy transfer of the Fusion Reactor. +tooltip.ReactorLogicAdapter=A block that can be used to allow basic monitoring of a reactor using redstone. -tooltip.OsmiumOre=A strong mineral that can be found !nat nearly any height in the world. !nIt is known to have many uses in !nthe construction of machinery. -tooltip.CopperOre=A common, conductive material that !ncan be used in the production of !nwires. Its ability to withstand !nhigh heats also makes it essential !nto advanced machinery. -tooltip.TinOre=A lightweight, yet sturdy, conductive !nmaterial that is found slightly less !ncommonly than Copper. +tooltip.OsmiumOre=A strong mineral that can be found at nearly any height in the world. It is known to have many uses in the construction of machinery. +tooltip.CopperOre=A common, conductive material that can be used in the production of wires. Its ability to withstand high heats also makes it essential to advanced machinery. +tooltip.TinOre=A lightweight, yet sturdy, conductive material that is found slightly less commonly than Copper. //Side data sideData.None=None diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png b/src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png deleted file mode 100644 index cc7b6cddb..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorAdvanced.png new file mode 100644 index 000000000..a9b5da27f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorBasic.png new file mode 100644 index 000000000..357fa8a9f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorElite.png new file mode 100644 index 000000000..cbc8656a9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png new file mode 100644 index 000000000..b6d1157e7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png new file mode 100644 index 000000000..f3a5037d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png differ