Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

do it regardless + tesla loc

Browse source
This commit is contained in:
Ellpeck 2016-07-21 20:04:10 +02:00
parent 24075e70e9
commit ab0c99cd0b
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java
View file

@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
@ -50,10 +51,8 @@ public class EnergyDisplay extends Gui{
this.outline = outline; this.outline = outline;
this.drawTextNextTo = drawTextNextTo; this.drawTextNextTo = drawTextNextTo;
if(TileEntityBase.teslaLoaded){
this.displayTesla = PlayerData.getDataFromPlayer(Minecraft.getMinecraft().thePlayer).theCompound.getBoolean("DisplayTesla"); this.displayTesla = PlayerData.getDataFromPlayer(Minecraft.getMinecraft().thePlayer).theCompound.getBoolean("DisplayTesla");
} }
}
public void draw(){ public void draw(){
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
@ -87,9 +86,7 @@ public class EnergyDisplay extends Gui{
List<String> text = new ArrayList<String>(); List<String> text = new ArrayList<String>();
text.add(this.getOverlayText()); text.add(this.getOverlayText());
if(TileEntityBase.teslaLoaded){ text.add(TextFormatting.GRAY+""+TextFormatting.ITALIC+StringUtil.localize("info."+ModUtil.MOD_ID+".energy.to"+(this.displayTesla ? "RF" : "T")));
text.add(TextFormatting.GRAY+""+TextFormatting.ITALIC+"Click to change mode!");
}
GuiUtils.drawHoveringText(text, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj); GuiUtils.drawHoveringText(text, mouseX, mouseY, mc.displayWidth, mc.displayHeight, -1, mc.fontRendererObj);
} }
} }
@ -109,7 +106,6 @@ public class EnergyDisplay extends Gui{
} }
private void changeDisplayMode(){ private void changeDisplayMode(){
if(TileEntityBase.teslaLoaded){
NBTTagCompound data = new NBTTagCompound(); NBTTagCompound data = new NBTTagCompound();
this.displayTesla = !this.displayTesla; this.displayTesla = !this.displayTesla;
@ -121,5 +117,4 @@ public class EnergyDisplay extends Gui{
dataToSend.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId()); dataToSend.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId());
PacketHandler.theNetwork.sendToServer(new PacketClientToServer(dataToSend, PacketHandler.CHANGE_PLAYER_DATA_HANDLER)); PacketHandler.theNetwork.sendToServer(new PacketClientToServer(dataToSend, PacketHandler.CHANGE_PLAYER_DATA_HANDLER));
} }
}
} }

2
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -572,6 +572,8 @@ info.actuallyadditions.booklet.edition=Edition
info.actuallyadditions.deathRecorded=Your death has been recorded. Use a Death Tracker to find the death location! info.actuallyadditions.deathRecorded=Your death has been recorded. Use a Death Tracker to find the death location!
info.actuallyadditions.placer.sides.1=Placement Sides info.actuallyadditions.placer.sides.1=Placement Sides
info.actuallyadditions.placer.sides.2=Usually when placing down blocks, they are placed towards the side of another block that you are looking at. Because the Phantom Placer can place blocks in mid-air, it doesn't know that. Usually you should just set it to a solid side. info.actuallyadditions.placer.sides.2=Usually when placing down blocks, they are placed towards the side of another block that you are looking at. Because the Phantom Placer can place blocks in mid-air, it doesn't know that. Usually you should just set it to a solid side.
info.actuallyadditions.energy.toRF=Click for Redstone Flux mode!
info.actuallyadditions.energy.toT=Click for Tesla mode!
#Container Names #Container Names
container.actuallyadditions.inputter.name=ESD container.actuallyadditions.inputter.name=ESD