tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Wind Generators are now much more efficient

Browse source
This commit is contained in:
aidancbrady 2016-07-19 15:43:09 -04:00
parent 0ae477fd01
commit a59ba334ba
3 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
View file

@ -46,7 +46,7 @@ public class GuiWindGenerator extends GuiMekanism
public List<String> getInfo() public List<String> getInfo()
{ {
return ListUtils.asList( return ListUtils.asList(
LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.getMultiplier() : 0) + "/t", LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.currentMultiplier : 0) + "/t",
LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t");
} }
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png")));
@ -62,12 +62,12 @@ public class GuiWindGenerator extends GuiMekanism
fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.getMultiplier())), 51, 35, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.currentMultiplier)), 51, 35, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
int size = 44; int size = 44;
if(!tileEntity.getWorldObj().canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord)) if(!tileEntity.getActive())
{ {
size += 9; size += 9;
fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00); fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00);

3
src/main/java/mekanism/generators/client/render/RenderWindGenerator.java
View file

@ -36,8 +36,7 @@ public class RenderWindGenerator extends TileEntitySpecialRenderer
GL11.glRotatef(180, 0F, 0F, 1F); GL11.glRotatef(180, 0F, 0F, 1F);
if(!Mekanism.proxy.isPaused() && if(!Mekanism.proxy.isPaused() && tileEntity.getActive())
tileEntity.getWorldObj().canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord))
{ {
tileEntity.angle = (tileEntity.angle+((tileEntity.yCoord+4F)/256F)*8) % 360; tileEntity.angle = (tileEntity.angle+((tileEntity.yCoord+4F)/256F)*8) % 360;
} }

38
src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java
View file

@ -1,5 +1,9 @@
package mekanism.generators.common.tile; package mekanism.generators.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.generators; import mekanism.api.MekanismConfig.generators;
import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IBoundingBlock;
@ -15,6 +19,8 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou
/** The angle the blades of this Wind Turbine are currently at. */ /** The angle the blades of this Wind Turbine are currently at. */
public double angle; public double angle;
public float currentMultiplier;
public TileEntityWindGenerator() public TileEntityWindGenerator()
{ {
super("wind", "WindGenerator", 200000, (generators.windGenerationMax)*2); super("wind", "WindGenerator", 200000, (generators.windGenerationMax)*2);
@ -30,17 +36,39 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou
{ {
ChargeUtils.charge(0, this); ChargeUtils.charge(0, this);
if(canOperate()) if(ticker % 20 == 0)
{ {
setActive(true); setActive((currentMultiplier = getMultiplier()) > 0);
setEnergy(electricityStored + (generators.windGenerationMin*getMultiplier()));
} }
else { System.out.println(currentMultiplier + " " + worldObj.canBlockSeeTheSky(xCoord, yCoord+4, zCoord));
setActive(false); if(getActive())
{
setEnergy(electricityStored + (generators.windGenerationMin*currentMultiplier));
} }
} }
} }
@Override
public void handlePacketData(ByteBuf dataStream)
{
super.handlePacketData(dataStream);
if(worldObj.isRemote)
{
currentMultiplier = dataStream.readFloat();
}
}
@Override
public ArrayList getNetworkedData(ArrayList data)
{
super.getNetworkedData(data);
data.add(currentMultiplier);
return data;
}
/** Determines the current output multiplier, taking sky visibility and height into account. **/ /** Determines the current output multiplier, taking sky visibility and height into account. **/
public float getMultiplier() public float getMultiplier()
{ {