mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch '1.9.4' into 1.10
* 1.9.4: Removed println Wind Generators are now much more efficient
This commit is contained in:
commit
fc1ff9e8f5
3 files changed
+37
-10
No files matched your search
@@ -45,7 +45,7 @@ public class GuiWindGenerator extends GuiMekanism
|
||||
public List<String> getInfo()
|
||||
{
|
||||
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");
|
||||
}
|
||||
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png")));
|
||||
@@ -59,12 +59,12 @@ public class GuiWindGenerator extends GuiMekanism
|
||||
fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
|
||||
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
|
||||
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);
|
||||
|
||||
int size = 44;
|
||||
|
||||
if(!tileEntity.getWorld().canSeeSky(tileEntity.getPos().add(0, 4, 0)))
|
||||
if(!tileEntity.getActive())
|
||||
{
|
||||
size += 9;
|
||||
fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00);
|
||||
|
||||
@@ -29,8 +29,7 @@ public class RenderWindGenerator extends TileEntitySpecialRenderer<TileEntityWin
|
||||
|
||||
GlStateManager.rotate(180, 0F, 0F, 1F);
|
||||
|
||||
if(!Mekanism.proxy.isPaused() &&
|
||||
tileEntity.getWorld().canBlockSeeSky(tileEntity.getPos().add(0, 4, 0)))
|
||||
if(!Mekanism.proxy.isPaused() && tileEntity.getActive())
|
||||
{
|
||||
tileEntity.angle = (tileEntity.angle+((tileEntity.getPos().getY()+4F)/256F)*8) % 360;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package mekanism.generators.common.tile;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.MekanismConfig.generators;
|
||||
import mekanism.common.base.IBoundingBlock;
|
||||
@@ -14,6 +18,8 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou
|
||||
{
|
||||
/** The angle the blades of this Wind Turbine are currently at. */
|
||||
public double angle;
|
||||
|
||||
public float currentMultiplier;
|
||||
|
||||
public TileEntityWindGenerator()
|
||||
{
|
||||
@@ -30,16 +36,38 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou
|
||||
{
|
||||
ChargeUtils.charge(0, this);
|
||||
|
||||
if(canOperate())
|
||||
if(ticker % 20 == 0)
|
||||
{
|
||||
setActive(true);
|
||||
setEnergy(electricityStored + (generators.windGenerationMin*getMultiplier()));
|
||||
setActive((currentMultiplier = getMultiplier()) > 0);
|
||||
}
|
||||
else {
|
||||
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. **/
|
||||
public float getMultiplier()
|
||||
|
||||
Reference in new issue
Block a user