diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 2d06353ce..487a15a04 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -140,7 +140,7 @@ public class ClientProxy extends CommonProxy MekanismClient.enableSounds = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSounds", true).getBoolean(true); MekanismClient.fancyUniversalCableRender = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "FancyUniversalCableRender", true).getBoolean(true); MekanismClient.holidays = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Holidays", true).getBoolean(true); - MekanismClient.baseSoundVolume = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SoundVolume", 1).getDouble(1); + MekanismClient.baseSoundVolume = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SoundVolume", 1D).getDouble(1D); Mekanism.configuration.save(); } diff --git a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java index ba2a156c9..a8281286a 100644 --- a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -1,5 +1,9 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.ListUtils; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; @@ -23,6 +27,14 @@ public class GuiAdvancedElectricMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeManagement(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiConfigurationTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity.getSpeedMultiplier(), tileEntity.getEnergyMultiplier(), tileEntity.ENERGY_PER_TICK)); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, tileEntity.guiLocation)); } @Override diff --git a/common/mekanism/client/gui/GuiChemicalInfuser.java b/common/mekanism/client/gui/GuiChemicalInfuser.java index 22d49149f..65bf675b1 100644 --- a/common/mekanism/client/gui/GuiChemicalInfuser.java +++ b/common/mekanism/client/gui/GuiChemicalInfuser.java @@ -1,9 +1,12 @@ package mekanism.client.gui; import java.util.ArrayList; +import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -31,6 +34,14 @@ public class GuiChemicalInfuser extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.ENERGY_USAGE); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); } @Override diff --git a/common/mekanism/client/gui/GuiChemicalOxidizer.java b/common/mekanism/client/gui/GuiChemicalOxidizer.java index af8939978..2d7c7f18a 100644 --- a/common/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/common/mekanism/client/gui/GuiChemicalOxidizer.java @@ -1,6 +1,10 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; @@ -25,6 +29,14 @@ public class GuiChemicalOxidizer extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.ENERGY_USAGE); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); } @Override diff --git a/common/mekanism/client/gui/GuiDigitalMiner.java b/common/mekanism/client/gui/GuiDigitalMiner.java index 20db10a3b..908375589 100644 --- a/common/mekanism/client/gui/GuiDigitalMiner.java +++ b/common/mekanism/client/gui/GuiDigitalMiner.java @@ -1,8 +1,11 @@ package mekanism.client.gui; import java.util.ArrayList; +import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.ListUtils; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerDigitalMiner; @@ -41,6 +44,14 @@ public class GuiDigitalMiner extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiUpgradeManagement(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity.getSpeedMultiplier(), tileEntity.getEnergyMultiplier(), tileEntity.ENERGY_USAGE)); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); ySize+=64; } diff --git a/common/mekanism/client/gui/GuiElectricMachine.java b/common/mekanism/client/gui/GuiElectricMachine.java index e4216958c..45dd880b0 100644 --- a/common/mekanism/client/gui/GuiElectricMachine.java +++ b/common/mekanism/client/gui/GuiElectricMachine.java @@ -1,5 +1,9 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.ListUtils; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; @@ -23,6 +27,14 @@ public class GuiElectricMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeManagement(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiConfigurationTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity.getSpeedMultiplier(), tileEntity.getEnergyMultiplier(), tileEntity.ENERGY_PER_TICK)); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, tileEntity.guiLocation)); } @Override diff --git a/common/mekanism/client/gui/GuiElectrolyticSeparator.java b/common/mekanism/client/gui/GuiElectrolyticSeparator.java index 9ac423ceb..9741171ea 100644 --- a/common/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/common/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -1,10 +1,14 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; +import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.render.MekanismRenderer; +import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; @@ -12,13 +16,13 @@ import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import java.util.ArrayList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiElectrolyticSeparator extends GuiMekanism @@ -28,6 +32,16 @@ public class GuiElectrolyticSeparator extends GuiMekanism public GuiElectrolyticSeparator(InventoryPlayer inventory, TileEntityElectrolyticSeparator tentity) { super(new ContainerElectrolyticSeparator(inventory, tentity)); + + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(Mekanism.electrolyticSeparatorUsage); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); + tileEntity = tentity; } @@ -89,11 +103,15 @@ public class GuiElectrolyticSeparator extends GuiMekanism { drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); } + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; diff --git a/common/mekanism/client/gui/GuiElement.java b/common/mekanism/client/gui/GuiElement.java index 05d3de7ed..5115f1b63 100644 --- a/common/mekanism/client/gui/GuiElement.java +++ b/common/mekanism/client/gui/GuiElement.java @@ -1,7 +1,6 @@ package mekanism.client.gui; -import java.lang.reflect.Field; -import java.lang.reflect.Method; +import java.util.List; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; @@ -11,7 +10,6 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; public abstract class GuiElement { @@ -38,6 +36,11 @@ public abstract class GuiElement guiObj.drawCreativeTabHoveringText(s, xAxis, yAxis); } + protected void displayTooltips(List list, int xAxis, int yAxis) + { + guiObj.func_102021_a(list, xAxis, yAxis); + } + protected void offsetX(int xSize) { if(guiObj instanceof GuiContainer) diff --git a/common/mekanism/client/gui/GuiEnergyInfo.java b/common/mekanism/client/gui/GuiEnergyInfo.java index 46d4d3406..4a65ce617 100644 --- a/common/mekanism/client/gui/GuiEnergyInfo.java +++ b/common/mekanism/client/gui/GuiEnergyInfo.java @@ -1,11 +1,51 @@ package mekanism.client.gui; +import java.util.ArrayList; import java.util.List; -public class GuiEnergyInfo +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +public class GuiEnergyInfo extends GuiElement { - public interface InfoHandler + public IInfoHandler infoHandler; + + public GuiEnergyInfo(IInfoHandler handler, GuiMekanism gui, TileEntity tile, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiEnergyInfo.png"), gui, tile, def); + + infoHandler = handler; + } + + public static interface IInfoHandler { public List getInfo(); } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedModalRect(guiWidth - 26, guiHeight + 138, 0, 0, 26, 26); + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) + { + displayTooltips(infoHandler.getInfo(), xAxis, yAxis); + } + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) {} } diff --git a/common/mekanism/client/gui/GuiFactory.java b/common/mekanism/client/gui/GuiFactory.java index 64f172d70..ff6064e97 100644 --- a/common/mekanism/client/gui/GuiFactory.java +++ b/common/mekanism/client/gui/GuiFactory.java @@ -1,5 +1,9 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.ListUtils; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.common.IFactory.RecipeType; import mekanism.common.Tier.FactoryTier; import mekanism.common.inventory.container.ContainerFactory; @@ -29,6 +33,14 @@ public class GuiFactory extends GuiMekanism guiElements.add(new GuiRecipeType(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiConfigurationTab(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiSortingTab(this, tileEntity, tileEntity.tier.guiLocation)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity.getSpeedMultiplier(), tileEntity.getEnergyMultiplier(), tileEntity.ENERGY_PER_TICK)); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, tileEntity.tier.guiLocation)); } @Override diff --git a/common/mekanism/client/gui/GuiMekanism.java b/common/mekanism/client/gui/GuiMekanism.java index 4477290cf..a2c31a1c6 100644 --- a/common/mekanism/client/gui/GuiMekanism.java +++ b/common/mekanism/client/gui/GuiMekanism.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Set; import mekanism.common.IInvConfiguration; @@ -136,9 +137,15 @@ public abstract class GuiMekanism extends GuiContainer @Override protected void drawCreativeTabHoveringText(String text, int x, int y) + { + func_102021_a(Arrays.asList(new String[] {text}), x, y); + } + + @Override + protected void func_102021_a(List list, int x, int y) { GL11.glPushAttrib(GL11.GL_ENABLE_BIT + GL11.GL_LIGHTING_BIT); - super.drawCreativeTabHoveringText(text, x, y); + super.func_102021_a(list, x, y); GL11.glPopAttrib(); } } diff --git a/common/mekanism/client/gui/GuiMetallurgicInfuser.java b/common/mekanism/client/gui/GuiMetallurgicInfuser.java index 54457668c..bb259b61e 100644 --- a/common/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/common/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -1,8 +1,11 @@ package mekanism.client.gui; import java.util.ArrayList; +import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.ListUtils; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; @@ -30,6 +33,14 @@ public class GuiMetallurgicInfuser extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiUpgradeManagement(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity.getSpeedMultiplier(), tileEntity.getEnergyMultiplier(), tileEntity.ENERGY_PER_TICK)); + return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); } @Override diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index 4522b51d1..b7ab83a91 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -190,18 +190,18 @@ public class CommonProxy Mekanism.FROM_TE = Mekanism.FROM_BC/10; Mekanism.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D); - Mekanism.osmiumCompressorUsage = Mekanism.configuration.get("usage", "OsmiumCompressorUsage", 50D).getDouble(50D); + Mekanism.osmiumCompressorUsage = Mekanism.configuration.get("usage", "OsmiumCompressorUsage", 100D).getDouble(100D); Mekanism.combinerUsage = Mekanism.configuration.get("usage", "CombinerUsage", 50D).getDouble(50D); Mekanism.crusherUsage = Mekanism.configuration.get("usage", "CrusherUsage", 50D).getDouble(50D); Mekanism.factoryUsage = Mekanism.configuration.get("usage", "FactoryUsage", 50D).getDouble(50D); Mekanism.metallurgicInfuserUsage = Mekanism.configuration.get("usage", "MetallurgicInfuserUsage", 50D).getDouble(50D); - Mekanism.purificationChamberUsage = Mekanism.configuration.get("usage", "PurificationChamberUsage", 100D).getDouble(100D); + Mekanism.purificationChamberUsage = Mekanism.configuration.get("usage", "PurificationChamberUsage", 200D).getDouble(200D); Mekanism.energizedSmelterUsage = Mekanism.configuration.get("usage", "EnergizedSmelterUsage", 50D).getDouble(50D); Mekanism.digitalMinerUsage = Mekanism.configuration.get("usage", "DigitalMinerUsage", 100D).getDouble(100D); Mekanism.rotaryCondensentratorUsage = Mekanism.configuration.get("usage", "RotaryCondensentratorUsage", 50D).getDouble(50D); - Mekanism.oxidationChamberUsage = Mekanism.configuration.get("usage", "OxidationChamberUsage", 100D).getDouble(100D); - Mekanism.chemicalInfuserUsage = Mekanism.configuration.get("usage", "ChemicalInfuserUsage", 100D).getDouble(100D); - Mekanism.chemicalInjectionChamberUsage = Mekanism.configuration.get("usage", "ChemicalInjectionChamberUsage", 200D).getDouble(200D); + Mekanism.oxidationChamberUsage = Mekanism.configuration.get("usage", "OxidationChamberUsage", 200D).getDouble(200D); + Mekanism.chemicalInfuserUsage = Mekanism.configuration.get("usage", "ChemicalInfuserUsage", 200D).getDouble(200D); + Mekanism.chemicalInjectionChamberUsage = Mekanism.configuration.get("usage", "ChemicalInjectionChamberUsage", 400D).getDouble(400D); Mekanism.electrolyticSeparatorUsage = Mekanism.configuration.get("usage", "ElectrolyticSeparatorUsage", 50D).getDouble(50D); Mekanism.configuration.save(); } diff --git a/common/mekanism/generators/common/GeneratorsCommonProxy.java b/common/mekanism/generators/common/GeneratorsCommonProxy.java index f8e13c58b..b25ff5298 100644 --- a/common/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/common/mekanism/generators/common/GeneratorsCommonProxy.java @@ -41,12 +41,12 @@ public class GeneratorsCommonProxy { Mekanism.configuration.load(); MekanismGenerators.generatorID = Mekanism.configuration.getBlock("Generator", 3010).getInt(); - MekanismGenerators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D); - MekanismGenerators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 200D).getDouble(200D); - MekanismGenerators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 180D).getDouble(180D); + MekanismGenerators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 400D).getDouble(400D); + MekanismGenerators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 250D).getDouble(250D); + MekanismGenerators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D); MekanismGenerators.hydrogenGeneration = Mekanism.configuration.get("generation", "HydrogenGeneration", 400D).getDouble(400D); MekanismGenerators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(50D); - MekanismGenerators.windGeneration = Mekanism.configuration.get("generation", "WindGeneration", 50D).getDouble(50D); + MekanismGenerators.windGeneration = Mekanism.configuration.get("generation", "WindGeneration", 100D).getDouble(100D); Mekanism.configuration.save(); } diff --git a/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png b/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png index 762058727..595857c14 100644 Binary files a/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png and b/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png differ