diff --git a/mods/eln/generic/GenericItemBlock.java b/mods/eln/generic/GenericItemBlock.java index 75079da79..f50b88313 100644 --- a/mods/eln/generic/GenericItemBlock.java +++ b/mods/eln/generic/GenericItemBlock.java @@ -9,7 +9,7 @@ public class GenericItemBlock extends ItemBlock { int textureIdOffset; public String[] subNames = { - "Cooper", "Silver", "Gold" + "Copper", "Silver", "Gold" }; public GenericItemBlock(int id,int textureIdOffset,String ItemName,String[] subNames) { diff --git a/mods/eln/generic/GenericItemBlockUsingDamage.java b/mods/eln/generic/GenericItemBlockUsingDamage.java index 94a92f29c..20f04bb5f 100644 --- a/mods/eln/generic/GenericItemBlockUsingDamage.java +++ b/mods/eln/generic/GenericItemBlockUsingDamage.java @@ -88,7 +88,7 @@ public String getItemNameIS(ItemStack itemstack) { public String getItemDisplayName(ItemStack par1ItemStack) { Descriptor desc = getDescriptor(par1ItemStack); - if(desc == null) return "Unknow"; + if(desc == null) return "Unknown"; return desc.getName(par1ItemStack); } diff --git a/mods/eln/groundcable/GroundCableContainer.java b/mods/eln/groundcable/GroundCableContainer.java index 4711c33c7..2acd9456a 100644 --- a/mods/eln/groundcable/GroundCableContainer.java +++ b/mods/eln/groundcable/GroundCableContainer.java @@ -15,7 +15,7 @@ public class GroundCableContainer extends BasicContainer { public GroundCableContainer(EntityPlayer player, IInventory inventory) { super(player, inventory,new Slot[]{ - new SixNodeItemSlot(inventory,cableSlotId,176/2-8,8,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical cable slot"}) + new SixNodeItemSlot(inventory,cableSlotId,176/2-8,8,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical Cable Slot"}) }); // TODO Auto-generated constructor stub diff --git a/mods/eln/groundcable/GroundCableDescriptor.java b/mods/eln/groundcable/GroundCableDescriptor.java index 82da8f1ed..c95ec51b8 100644 --- a/mods/eln/groundcable/GroundCableDescriptor.java +++ b/mods/eln/groundcable/GroundCableDescriptor.java @@ -39,9 +39,9 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4) { // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Provide a zero volt reference"); - list.add("Can be used to put negative"); - list.add("battery pin to the ground"); + list.add("Provides a zero volt reference."); + list.add("Can be used to ground negative"); + list.add("battery pins."); } } diff --git a/mods/eln/groundcable/GroundCableElement.java b/mods/eln/groundcable/GroundCableElement.java index df67cd57f..14b13bd51 100644 --- a/mods/eln/groundcable/GroundCableElement.java +++ b/mods/eln/groundcable/GroundCableElement.java @@ -103,7 +103,7 @@ public int getConnectionMask(LRDU lrdu) { @Override public String multiMeterString() { // TODO Auto-generated method stub - return Utils.plotVolt("U",electricalLoad.Uc) + Utils.plotAmpere("I",electricalLoad.getCurrent()); + return Utils.plotVolt("U:",electricalLoad.Uc) + Utils.plotAmpere("I:",electricalLoad.getCurrent()); } @Override @@ -169,7 +169,7 @@ else if(currentItemStack != null) } else { - entityPlayer.addChatMessage("Brush is empty"); + entityPlayer.addChatMessage("Brush is empty!"); } } } diff --git a/mods/eln/gui/GuiVerticalVoltageSupplyBar.java b/mods/eln/gui/GuiVerticalVoltageSupplyBar.java index 27b936b42..83c2f7e33 100644 --- a/mods/eln/gui/GuiVerticalVoltageSupplyBar.java +++ b/mods/eln/gui/GuiVerticalVoltageSupplyBar.java @@ -26,7 +26,7 @@ public void setNominalU(float nominalU) public void setVoltage(float value) { // TODO Auto-generated method stub super.setValue(value/nominalU); - setComment(0,Utils.plotVolt("Voltage supply :",value)); + setComment(0,Utils.plotVolt("Voltage Supply :",value)); } @Override @@ -37,7 +37,7 @@ public void setValue(float value) { public void setPower(float f) { // TODO Auto-generated method stub - setComment(1,Utils.plotPower("Power supply :",f)); + setComment(1,Utils.plotPower("Power Supply :",f)); } diff --git a/mods/eln/heatfurnace/HeatFurnaceContainer.java b/mods/eln/heatfurnace/HeatFurnaceContainer.java index 657e7cfb0..84ca7b2b1 100644 --- a/mods/eln/heatfurnace/HeatFurnaceContainer.java +++ b/mods/eln/heatfurnace/HeatFurnaceContainer.java @@ -27,11 +27,11 @@ public class HeatFurnaceContainer extends BasicContainer implements INodeContain NodeBase node; public HeatFurnaceContainer(NodeBase node,EntityPlayer player, IInventory inventory,HeatFurnaceDescriptor descriptor) { super(player, inventory,new Slot[]{ - new SlotWithSkinAndComment(inventory,combustibleId,70 ,58,SlotSkin.medium,new String[]{"Fuel slot"}), + new SlotWithSkinAndComment(inventory,combustibleId,70 ,58,SlotSkin.medium,new String[]{"Fuel Slot"}), // new RegulatorSlot(inventory,regulatorId,62 + 0,17+18,1,new RegulatorType[]{), - new GenericItemUsingDamageSlot(inventory,regulatorId, 8,58,1, IRegulatorDescriptor.class,SlotSkin.medium,new String[]{"Regulator slot"}), - new GenericItemUsingDamageSlot(inventory, isolatorId,8 + 18,-2000,1, ThermalIsolatorElement.class,SlotSkin.medium,new String[]{"Thermal isolator slot"}), - new GenericItemUsingDamageSlot(inventory, combustrionChamberId,8+ 18,58,descriptor.combustionChamberMax, CombustionChamber.class,SlotSkin.medium,new String[]{"Combustion chamber slot"}), + new GenericItemUsingDamageSlot(inventory,regulatorId, 8,58,1, IRegulatorDescriptor.class,SlotSkin.medium,new String[]{"Regulator Slot"}), + new GenericItemUsingDamageSlot(inventory, isolatorId,8 + 18,-2000,1, ThermalIsolatorElement.class,SlotSkin.medium,new String[]{"Thermal Isolator Slot"}), + new GenericItemUsingDamageSlot(inventory, combustrionChamberId,8+ 18,58,descriptor.combustionChamberMax, CombustionChamber.class,SlotSkin.medium,new String[]{"Combustion Chamber Slot"}), }); this.node = node; // TODO Auto-generated constructor stub diff --git a/mods/eln/heatfurnace/HeatFurnaceDescriptor.java b/mods/eln/heatfurnace/HeatFurnaceDescriptor.java index fad0b5790..fc4dcdbf6 100644 --- a/mods/eln/heatfurnace/HeatFurnaceDescriptor.java +++ b/mods/eln/heatfurnace/HeatFurnaceDescriptor.java @@ -138,8 +138,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4) { // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Provide heat when"); - list.add("consume fuel"); + list.add("Provides heat when fuelled."); list.add(Utils.plotPower("Power :", nominalPower)); list.add(Utils.plotCelsius("Tmax :",thermal.warmLimit)); } diff --git a/mods/eln/heatfurnace/HeatFurnaceElement.java b/mods/eln/heatfurnace/HeatFurnaceElement.java index b80674ee1..529ae1264 100644 --- a/mods/eln/heatfurnace/HeatFurnaceElement.java +++ b/mods/eln/heatfurnace/HeatFurnaceElement.java @@ -95,7 +95,7 @@ public String multiMeterString(Direction side) { @Override public String thermoMeterString(Direction side) { // TODO Auto-generated method stub - return Utils.plotCelsius("T", thermalLoad.Tc); + return Utils.plotCelsius("T:", thermalLoad.Tc); } @Override diff --git a/mods/eln/heatfurnace/HeatFurnaceGuiDraw.java b/mods/eln/heatfurnace/HeatFurnaceGuiDraw.java index 6c7520d56..5a3bba73a 100644 --- a/mods/eln/heatfurnace/HeatFurnaceGuiDraw.java +++ b/mods/eln/heatfurnace/HeatFurnaceGuiDraw.java @@ -71,7 +71,7 @@ public void initGui() vuMeterHeat.setStepIdMax(98); vuMeterHeat.setEnable(true); vuMeterHeat.setRange(0.0f,980.0f); - vuMeterHeat.setComment(0,"Temperature gauge"); + vuMeterHeat.setComment(0,"Temperature Gauge"); syncVumeterHeat(); /* @@ -98,14 +98,14 @@ protected void preDraw(float f, int x, int y) { // TODO Auto-generated method stub super.preDraw(f, x, y); if(render.controleExternal) - externalControl.displayString = "Internal control"; + externalControl.displayString = "Internal Control"; else - externalControl.displayString = "External control"; + externalControl.displayString = "External Control"; //externalControl.displayString = "External control : " + render.controleExternal; if(render.takeFuel) - takeFuel.displayString = "Take fuel"; + takeFuel.displayString = "Take Fuel"; else - takeFuel.displayString = "Decline fuel"; + takeFuel.displayString = "Decline Fuel"; takeFuel.enabled = !render.controleExternal; @@ -119,13 +119,13 @@ protected void preDraw(float f, int x, int y) { //vuMeterHeat.setVisible(render.controleExternal == false); vuMeterHeat.setComment(new String[]{}); - vuMeterHeat.setComment(0,"Temperature gauge"); - vuMeterHeat.setComment(1,Utils.plotCelsius("Current", render.temperature)); + vuMeterHeat.setComment(0,"Temperature Gauge"); + vuMeterHeat.setComment(1,Utils.plotCelsius("Current:", render.temperature)); if(render.controleExternal == false) - vuMeterHeat.setComment(2,Utils.plotCelsius("Target", vuMeterHeat.getValue())); - vuMeterGain.setComment(0,"Control gauge at " +(int)(vuMeterGain.getValue()*100) + "%"); + vuMeterHeat.setComment(2,Utils.plotCelsius("Target:", vuMeterHeat.getValue())); + vuMeterGain.setComment(0,"Control Gauge at " +(int)(vuMeterGain.getValue()*100) + "%"); - vuMeterGain.setComment(1, Utils.plotPower("Power", render.power)); + vuMeterGain.setComment(1, Utils.plotPower("Power:", render.power)); } @Override diff --git a/mods/eln/intelligenttransformer/IntelligentTransformerContainer.java b/mods/eln/intelligenttransformer/IntelligentTransformerContainer.java index c8b8d6321..52ea2f948 100644 --- a/mods/eln/intelligenttransformer/IntelligentTransformerContainer.java +++ b/mods/eln/intelligenttransformer/IntelligentTransformerContainer.java @@ -15,9 +15,9 @@ public class IntelligentTransformerContainer extends BasicContainer { public IntelligentTransformerContainer(EntityPlayer player, IInventory inventory) { super(player, inventory,new Slot[]{ - new SixNodeItemSlot(inventory,0,62 + 0,17,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical cable slot"}), - new SixNodeItemSlot(inventory,1,62 + 18,17,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical cable slot"}), - new GenericItemUsingDamageSlot(inventory,2,62 + 0,17 + 18,1,new Class[]{FerromagneticCoreDescriptor.class},SlotSkin.medium,new String[]{"Ferromagnetic core slot"}) + new SixNodeItemSlot(inventory,0,62 + 0,17,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical Cable Slot"}), + new SixNodeItemSlot(inventory,1,62 + 18,17,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical Cable Slot"}), + new GenericItemUsingDamageSlot(inventory,2,62 + 0,17 + 18,1,new Class[]{FerromagneticCoreDescriptor.class},SlotSkin.medium,new String[]{"Ferromagnetic Core Slot"}) // new SlotFilter(inventory,1,62 + 18,17,1,new ItemStackFilter[]{new ItemStackFilter(Eln.sixNodeBlock,0xFF,Eln.electricalCableId)}) }); diff --git a/mods/eln/intelligenttransformer/IntelligentTransformerElement.java b/mods/eln/intelligenttransformer/IntelligentTransformerElement.java index cb4988ee3..9f2555c2b 100644 --- a/mods/eln/intelligenttransformer/IntelligentTransformerElement.java +++ b/mods/eln/intelligenttransformer/IntelligentTransformerElement.java @@ -121,17 +121,17 @@ public String currentMeterString(Direction side) { @Override public String multiMeterString(Direction side) { - if(side == front)return Utils.plotVolt("UP+",positivePrimaryLoad.Uc) + Utils.plotAmpere("IP+",positivePrimaryLoad.getCurrent()); - if(side == front.back())return Utils.plotVolt("US+",positiveSecondaryLoad.Uc) + Utils.plotAmpere("IS+",positiveSecondaryLoad.getCurrent()); - if(side == front.left() && grounded == false)return Utils.plotVolt("UP-",negativePrimaryLoad.Uc) + Utils.plotAmpere("IP-",negativePrimaryLoad.getCurrent()); - if(side == front.right() && grounded == false)return Utils.plotVolt("US-",negativeSecondaryLoad.Uc) + Utils.plotAmpere("IS-",negativeSecondaryLoad.getCurrent()); + if(side == front)return Utils.plotVolt("UP+:",positivePrimaryLoad.Uc) + Utils.plotAmpere("IP+:",positivePrimaryLoad.getCurrent()); + if(side == front.back())return Utils.plotVolt("US+:",positiveSecondaryLoad.Uc) + Utils.plotAmpere("IS+:",positiveSecondaryLoad.getCurrent()); + if(side == front.left() && grounded == false)return Utils.plotVolt("UP-:",negativePrimaryLoad.Uc) + Utils.plotAmpere("IP-:",negativePrimaryLoad.getCurrent()); + if(side == front.right() && grounded == false)return Utils.plotVolt("US-:",negativeSecondaryLoad.Uc) + Utils.plotAmpere("IS-:",negativeSecondaryLoad.getCurrent()); return ""; } @Override public String thermoMeterString(Direction side) { - return Utils.plotCelsius("T",thermalLoad.Tc); + return Utils.plotCelsius("T:",thermalLoad.Tc); } diff --git a/mods/eln/item/BrushDescriptor.java b/mods/eln/item/BrushDescriptor.java index 006aa3a9d..61f3392b5 100644 --- a/mods/eln/item/BrushDescriptor.java +++ b/mods/eln/item/BrushDescriptor.java @@ -83,7 +83,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("life : " + itemStack.getTagCompound().getInteger("life")); + list.add("Life : " + itemStack.getTagCompound().getInteger("life")); } diff --git a/mods/eln/item/CombustionChamber.java b/mods/eln/item/CombustionChamber.java index 1d46732d2..f2bdc87f0 100644 --- a/mods/eln/item/CombustionChamber.java +++ b/mods/eln/item/CombustionChamber.java @@ -18,6 +18,6 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4) { // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Can be used to extande heat furnace"); + list.add("Upgrade for the Stone Heat Furnace."); } } diff --git a/mods/eln/item/ElectricalDrillDescriptor.java b/mods/eln/item/ElectricalDrillDescriptor.java index d25f717d3..d2e4e1ff3 100644 --- a/mods/eln/item/ElectricalDrillDescriptor.java +++ b/mods/eln/item/ElectricalDrillDescriptor.java @@ -37,10 +37,10 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, super.addInformation(itemStack, entityPlayer, list, par4); list.add("Nominal :"); - list.add(Utils.plotVolt(" voltage",nominalVoltage)); - list.add(Utils.plotPower(" power",nominalPower)); - list.add(Utils.plotTime(" time per operation",operationTime)); - list.add(Utils.plotEnergy("Energy per operation",OperationEnergy)); + list.add(Utils.plotVolt(" Voltage :",nominalVoltage)); + list.add(Utils.plotPower(" Power :",nominalPower)); + list.add(Utils.plotTime(" Time per Operation :",operationTime)); + list.add(Utils.plotEnergy("Energy per Operation :",OperationEnergy)); } diff --git a/mods/eln/item/HeatingCorpElement.java b/mods/eln/item/HeatingCorpElement.java index 0828709f5..3a0c0f3ac 100644 --- a/mods/eln/item/HeatingCorpElement.java +++ b/mods/eln/item/HeatingCorpElement.java @@ -63,8 +63,8 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, super.addInformation(itemStack, entityPlayer, list, par4); list.add("Nominal :"); - list.add(Utils.plotVolt( " voltage", electricalNominalU)); - list.add(Utils.plotPower(" power ", electricalNominalP)); + list.add(Utils.plotVolt( " Voltage :", electricalNominalU)); + list.add(Utils.plotPower(" Power :", electricalNominalP)); } @Override diff --git a/mods/eln/item/LampDescriptor.java b/mods/eln/item/LampDescriptor.java index eedaab0b5..d70041b55 100644 --- a/mods/eln/item/LampDescriptor.java +++ b/mods/eln/item/LampDescriptor.java @@ -115,7 +115,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, list.add("Socket : " + socket); list.add("Techno : " + type); - list.add(Utils.plotTime("Life",getLifeInTag(itemStack)*nominalLife)); + list.add(Utils.plotTime("Life : ",getLifeInTag(itemStack)*nominalLife)); } } diff --git a/mods/eln/item/LampSlot.java b/mods/eln/item/LampSlot.java index 522ebec44..a0afb420a 100644 --- a/mods/eln/item/LampSlot.java +++ b/mods/eln/item/LampSlot.java @@ -11,7 +11,7 @@ public class LampSlot extends GenericItemUsingDamageSlot{ LampSocketType socket; public LampSlot(IInventory inventory, int slot, int x, int y, int stackLimit,LampSocketType socket) { - super(inventory, slot, x, y, stackLimit, LampDescriptor.class,SlotSkin.medium,new String[]{"Lamp slot"}); + super(inventory, slot, x, y, stackLimit, LampDescriptor.class,SlotSkin.medium,new String[]{"Lamp Slot"}); this.socket = socket; // TODO Auto-generated constructor stub diff --git a/mods/eln/item/OreScanner.java b/mods/eln/item/OreScanner.java index ef201a4ec..ebc1a7ee3 100644 --- a/mods/eln/item/OreScanner.java +++ b/mods/eln/item/OreScanner.java @@ -39,9 +39,9 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, super.addInformation(itemStack, entityPlayer, list, par4); list.add("Nominal :"); - list.add(Utils.plotVolt(" voltage",nominalVoltage)); - list.add(Utils.plotEnergy("Energy per operation",OperationEnergy)); - list.add("Scann area " + (radius*2 +1)*(radius*2 +1) + " blocks"); + list.add(Utils.plotVolt(" Voltage :",nominalVoltage)); + list.add(Utils.plotEnergy("Energy per Operation :",OperationEnergy)); + list.add("Scan Area :" + (radius*2 +1)*(radius*2 +1) + " blocks"); } diff --git a/mods/eln/item/OverHeatingProtectionDescriptor.java b/mods/eln/item/OverHeatingProtectionDescriptor.java index 2ad92cf7c..ade8934a2 100644 --- a/mods/eln/item/OverHeatingProtectionDescriptor.java +++ b/mods/eln/item/OverHeatingProtectionDescriptor.java @@ -19,7 +19,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4) { // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Useful to prevent overheating on :"); + list.add("Useful to prevent overheating with:"); list.add(" Battery"); } } diff --git a/mods/eln/item/OverVoltageProtectionDescriptor.java b/mods/eln/item/OverVoltageProtectionDescriptor.java index dd3ca2dd8..71c9d3e34 100644 --- a/mods/eln/item/OverVoltageProtectionDescriptor.java +++ b/mods/eln/item/OverVoltageProtectionDescriptor.java @@ -19,7 +19,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4) { // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Useful to prevent overvoltage on :"); + list.add("Useful to prevent overvoltage with:"); list.add(" Battery"); } } diff --git a/mods/eln/item/SolarTrackerDescriptor.java b/mods/eln/item/SolarTrackerDescriptor.java index 7e84ab12c..eed17f389 100644 --- a/mods/eln/item/SolarTrackerDescriptor.java +++ b/mods/eln/item/SolarTrackerDescriptor.java @@ -29,6 +29,6 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4) { // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Usefull to upgrade solarPannel"); + list.add("Upgrade for the Solar Panel."); } } diff --git a/mods/eln/item/electricalitem/BatteryItem.java b/mods/eln/item/electricalitem/BatteryItem.java index d13768379..10eeb8f82 100644 --- a/mods/eln/item/electricalitem/BatteryItem.java +++ b/mods/eln/item/electricalitem/BatteryItem.java @@ -66,7 +66,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add(Utils.plotEnergy("Energy stored", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); + list.add(Utils.plotEnergy("Energy Stored:", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); } diff --git a/mods/eln/item/electricalitem/ElectricalArmor.java b/mods/eln/item/electricalitem/ElectricalArmor.java index 7e9264128..cb9743f71 100644 --- a/mods/eln/item/electricalitem/ElectricalArmor.java +++ b/mods/eln/item/electricalitem/ElectricalArmor.java @@ -123,7 +123,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add(Utils.plotEnergy("Energy stored", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); + list.add(Utils.plotEnergy("Energy Stored:", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); //list.add("Power button is " + (getPowerOn(itemStack) ? "ON" : "OFF")); } diff --git a/mods/eln/item/electricalitem/ElectricalLampItem.java b/mods/eln/item/electricalitem/ElectricalLampItem.java index 0df1779f6..167162ef3 100644 --- a/mods/eln/item/electricalitem/ElectricalLampItem.java +++ b/mods/eln/item/electricalitem/ElectricalLampItem.java @@ -140,8 +140,8 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add(Utils.plotEnergy("Energy stored", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); - list.add("Power button is " + (getLightState(itemStack) != 0 ? "ON" : "OFF")); + list.add(Utils.plotEnergy("Energy Stored:", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); + list.add("Power: " + (getLightState(itemStack) != 0 ? "ON" : "OFF")); } /* @Override diff --git a/mods/eln/item/electricalitem/ElectricalTool.java b/mods/eln/item/electricalitem/ElectricalTool.java index 284b82421..98bc8e1e3 100644 --- a/mods/eln/item/electricalitem/ElectricalTool.java +++ b/mods/eln/item/electricalitem/ElectricalTool.java @@ -115,7 +115,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add(Utils.plotEnergy("Energy stored", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); + list.add(Utils.plotEnergy("Energy Stored:", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); //list.add("Power button is " + (getPowerOn(itemStack) ? "ON" : "OFF")); } diff --git a/mods/eln/item/electricalitem/PortableOreScannerItem.java b/mods/eln/item/electricalitem/PortableOreScannerItem.java index 2401627dc..cf6ac94be 100644 --- a/mods/eln/item/electricalitem/PortableOreScannerItem.java +++ b/mods/eln/item/electricalitem/PortableOreScannerItem.java @@ -170,7 +170,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add(Utils.plotEnergy("Energy stored", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); + list.add(Utils.plotEnergy("Energy Stored:", getEnergy(itemStack)) + "(" + (int)(getEnergy(itemStack)/energyStorage*100) + "%)"); } diff --git a/mods/eln/item/regulator/RegulatorSlot.java b/mods/eln/item/regulator/RegulatorSlot.java index 3c2727462..f8ea03581 100644 --- a/mods/eln/item/regulator/RegulatorSlot.java +++ b/mods/eln/item/regulator/RegulatorSlot.java @@ -14,7 +14,7 @@ public class RegulatorSlot extends GenericItemUsingDamageSlot{ RegulatorType[] type; public RegulatorSlot(IInventory inventory, int slot, int x, int y, int stackLimit,RegulatorType[] type,SlotSkin skin) { - super(inventory, slot, x, y, stackLimit, IRegulatorDescriptor.class,skin,new String[]{"Regulator slot"}); + super(inventory, slot, x, y, stackLimit, IRegulatorDescriptor.class,skin,new String[]{"Regulator Slot"}); this.type = type; } diff --git a/mods/eln/lampsocket/LampSocketContainer.java b/mods/eln/lampsocket/LampSocketContainer.java index 33d891083..25610d9a4 100644 --- a/mods/eln/lampsocket/LampSocketContainer.java +++ b/mods/eln/lampsocket/LampSocketContainer.java @@ -18,7 +18,7 @@ public LampSocketContainer(EntityPlayer player, IInventory inventory,LampSocketD super(player, inventory,new Slot[]{ new LampSlot(inventory,lampSlotId,70 + 0,57,1,descriptor.socketType), //new SixNodeItemSlot(inventory,0,1,62 + 0,17,new Class[]{ElectricalCableDescriptor.class}), - new SixNodeItemSlot(inventory,cableSlotId,70 + 18,57,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical cable slot"}) + new SixNodeItemSlot(inventory,cableSlotId,70 + 18,57,1,new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical Cable Slot"}) }); // TODO Auto-generated constructor stub diff --git a/mods/eln/lampsocket/LampSocketDescriptor.java b/mods/eln/lampsocket/LampSocketDescriptor.java index 38a3d50b4..ff5dc69aa 100644 --- a/mods/eln/lampsocket/LampSocketDescriptor.java +++ b/mods/eln/lampsocket/LampSocketDescriptor.java @@ -82,15 +82,15 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4) { // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Socket type : " + socketType.toString()); + list.add("Socket Type : " + socketType.toString()); if(range != 0 || alphaZMin != alphaZMax){ list.add("Projector"); if(range != 0){ - list.add(" range : " + range + " Blocks"); + list.add(" Range : " + range + " Blocks"); } if(alphaZMin != alphaZMax){ - list.add(" angle : " + ((int)alphaZMin) + "\u00B0 to " + ((int)alphaZMax) + "\u00B0"); + list.add(" Angle : " + ((int)alphaZMin) + "\u00B0 to " + ((int)alphaZMax) + "\u00B0"); } } } diff --git a/mods/eln/lampsocket/LampSocketElement.java b/mods/eln/lampsocket/LampSocketElement.java index b8fa34fe6..a01e2f226 100644 --- a/mods/eln/lampsocket/LampSocketElement.java +++ b/mods/eln/lampsocket/LampSocketElement.java @@ -198,13 +198,13 @@ public int getConnectionMask(LRDU lrdu) { @Override public String multiMeterString() { // TODO Auto-generated method stub - return Utils.plotVolt("U",positiveLoad.Uc - negativeLoad.Uc) + Utils.plotAmpere("I",positiveLoad.getCurrent()); + return Utils.plotVolt("U:",positiveLoad.Uc - negativeLoad.Uc) + Utils.plotAmpere("I:",positiveLoad.getCurrent()); } @Override public String thermoMeterString() { // TODO Auto-generated method stub - return Utils.plotCelsius("T",thermalLoad.Tc); + return Utils.plotCelsius("T:",thermalLoad.Tc); } @Override diff --git a/mods/eln/lampsocket/LampSocketGuiDraw.java b/mods/eln/lampsocket/LampSocketGuiDraw.java index f1002d928..458210932 100644 --- a/mods/eln/lampsocket/LampSocketGuiDraw.java +++ b/mods/eln/lampsocket/LampSocketGuiDraw.java @@ -133,20 +133,20 @@ protected void preDraw(float f, int x, int y) { buttonGrounded.displayString = "Serial"; if(lampRender.poweredByLampSupply){ - buttonSupplyType.displayString = "Powered by a lamp supply"; + buttonSupplyType.displayString = "Powered by Lamp Supply"; channel.setVisible(true); if(inventory.getStackInSlot(LampSocketContainer.cableSlotId) == null) channel.setComment(1,"\u00a74Cable slot empty"); else if(lampRender.isConnectedToLampSupply) channel.setComment(1,"\u00a72connected to " + lampRender.channel); else - channel.setComment(1,"\u00a74" + lampRender.channel + " is not in range"); + channel.setComment(1,"\u00a74" + lampRender.channel + " is not in range!"); } else{ channel.setVisible(false); - buttonSupplyType.displayString = "powered by a cable"; + buttonSupplyType.displayString = "Powered by Cable"; } - alphaZ.setComment(0, "Orientation " + (int)alphaZ.getValue()+" degree"); + alphaZ.setComment(0, "Orientation: " + (int)alphaZ.getValue()+"\u00B0"); } } diff --git a/mods/eln/lampsupply/LampSupplyContainer.java b/mods/eln/lampsupply/LampSupplyContainer.java index 9ae0869b6..08408d857 100644 --- a/mods/eln/lampsupply/LampSupplyContainer.java +++ b/mods/eln/lampsupply/LampSupplyContainer.java @@ -16,7 +16,7 @@ public class LampSupplyContainer extends BasicContainer { public LampSupplyContainer(EntityPlayer player, IInventory inventory) { super(player, inventory,new Slot[]{ - new SixNodeItemSlot(inventory,cableSlotId,151,6,1, new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical cable slot"}) + new SixNodeItemSlot(inventory,cableSlotId,151,6,1, new Class[]{ElectricalCableDescriptor.class},SlotSkin.medium,new String[]{"Electrical Cable Slot"}) }); // TODO Auto-generated constructor stub diff --git a/mods/eln/modbusrtu/ModbusRtuGui.java b/mods/eln/modbusrtu/ModbusRtuGui.java index 63e236c6b..1570fe1fc 100644 --- a/mods/eln/modbusrtu/ModbusRtuGui.java +++ b/mods/eln/modbusrtu/ModbusRtuGui.java @@ -84,7 +84,7 @@ int generateTxRd(int x, int y){ if(render.station != -1) station.setText(render.station); station.setObserver(this); - station.setComment(0, "Station id"); + station.setComment(0, "Station ID"); extender.add(station); name = new GuiTextFieldEln(fontRenderer,2+station.getWidth() + 12, y, 101,helper); y+= name.getHeight(); diff --git a/mods/eln/mppt/MpptElement.java b/mods/eln/mppt/MpptElement.java index 9ebad07fe..28ceb7ae4 100644 --- a/mods/eln/mppt/MpptElement.java +++ b/mods/eln/mppt/MpptElement.java @@ -121,17 +121,17 @@ public int getConnectionMask(Direction side, LRDU lrdu) { @Override public String multiMeterString(Direction side) { - if(side == front)return Utils.plotVolt("UP+",positivePrimaryLoad.Uc) + Utils.plotAmpere("IP+",positivePrimaryLoad.getCurrent()); - if(side == front.back())return Utils.plotVolt("US+",positiveSecondaryLoad.Uc) + Utils.plotAmpere("IS+",positiveSecondaryLoad.getCurrent()); - if(side == front.left() && grounded == false)return Utils.plotVolt("UP-",negativePrimaryLoad.Uc) + Utils.plotAmpere("IP-",negativePrimaryLoad.getCurrent()); - if(side == front.right() && grounded == false)return Utils.plotVolt("US-",negativeSecondaryLoad.Uc) + Utils.plotAmpere("IS-",negativeSecondaryLoad.getCurrent()); + if(side == front)return Utils.plotVolt("UP+:",positivePrimaryLoad.Uc) + Utils.plotAmpere("IP+:",positivePrimaryLoad.getCurrent()); + if(side == front.back())return Utils.plotVolt("US+:",positiveSecondaryLoad.Uc) + Utils.plotAmpere("IS+:",positiveSecondaryLoad.getCurrent()); + if(side == front.left() && grounded == false)return Utils.plotVolt("UP-:",negativePrimaryLoad.Uc) + Utils.plotAmpere("IP-:",negativePrimaryLoad.getCurrent()); + if(side == front.right() && grounded == false)return Utils.plotVolt("US-:",negativeSecondaryLoad.Uc) + Utils.plotAmpere("IS-:",negativeSecondaryLoad.getCurrent()); return ""; } @Override public String thermoMeterString(Direction side) { - return Utils.plotCelsius("T",thermalLoad.Tc); + return Utils.plotCelsius("T:",thermalLoad.Tc); } diff --git a/mods/eln/solarpannel/SolarPannelContainer.java b/mods/eln/solarpannel/SolarPannelContainer.java index 3d4ea981a..4ec0fbef8 100644 --- a/mods/eln/solarpannel/SolarPannelContainer.java +++ b/mods/eln/solarpannel/SolarPannelContainer.java @@ -24,7 +24,7 @@ public class SolarPannelContainer extends BasicContainer implements INodeContain public SolarPannelContainer(NodeBase node,EntityPlayer player, IInventory inventory) { super(player, inventory,new Slot[]{ - new GenericItemUsingDamageSlot(inventory, trackerSlotId, 176/2-20 + 0,35,1, SolarTrackerDescriptor.class,SlotSkin.medium,new String[]{"Solar tracker slot"}) + new GenericItemUsingDamageSlot(inventory, trackerSlotId, 176/2-20 + 0,35,1, SolarTrackerDescriptor.class,SlotSkin.medium,new String[]{"Solar Tracker Slot"}) }); this.node = node; diff --git a/mods/eln/solarpannel/SolarPannelDescriptor.java b/mods/eln/solarpannel/SolarPannelDescriptor.java index cc25d29d7..425e2df95 100644 --- a/mods/eln/solarpannel/SolarPannelDescriptor.java +++ b/mods/eln/solarpannel/SolarPannelDescriptor.java @@ -165,9 +165,9 @@ public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, // TODO Auto-generated method stub super.addInformation(itemStack, entityPlayer, list, par4); - list.add("Product power from daylight"); - list.add(Utils.plotVolt("Voltage max:", electricalUmax)); - list.add(Utils.plotPower("Power max:", electricalPmax)); - if(canRotate) list.add("Can be oriented"); + list.add("Produces power from daylight."); + list.add(Utils.plotVolt("Voltage Max:", electricalUmax)); + list.add(Utils.plotPower("Power Max:", electricalPmax)); + if(canRotate) list.add("Can be oriented."); } } diff --git a/mods/eln/solarpannel/SolarPannelGuiDraw.java b/mods/eln/solarpannel/SolarPannelGuiDraw.java index a3fa1d709..5196cc0a6 100644 --- a/mods/eln/solarpannel/SolarPannelGuiDraw.java +++ b/mods/eln/solarpannel/SolarPannelGuiDraw.java @@ -83,7 +83,7 @@ protected void preDraw(float f, int x, int y) { vuMeterTemperature.setEnable(! render.hasTracker); int sunAlpha = ((int)(180/Math.PI * SolarPannelSlowProcess.getSolarAlpha(render.tileEntity.worldObj))-90); - vuMeterTemperature.setComment(0,"Solar pannel alpha : " + ((int)(180/Math.PI * vuMeterTemperature.getValue())-90) + "\u00B0"); + vuMeterTemperature.setComment(0,"Solar Panel alpha : " + ((int)(180/Math.PI * vuMeterTemperature.getValue())-90) + "\u00B0"); if(Math.abs(sunAlpha)>90) vuMeterTemperature.setComment(1,"It's the night"); else diff --git a/mods/eln/teleporter/TeleporterGui.java b/mods/eln/teleporter/TeleporterGui.java index 60a59513d..79ed00167 100644 --- a/mods/eln/teleporter/TeleporterGui.java +++ b/mods/eln/teleporter/TeleporterGui.java @@ -55,9 +55,9 @@ public void initGui() { target.setText(render.targetName); chargePower.setValue(render.chargePower); - name.setComment(0, "Self transporter name"); - target.setComment(0, "target transporter name"); - chargePower.setComment(0, "Power sink"); + name.setComment(0, "Current Transporter"); + target.setComment(0, "Target Transporter"); + chargePower.setComment(0, "Power Sink:"); } @@ -88,7 +88,7 @@ protected void preDraw(float f, int x, int y) { chargePower.setValue(render.chargePower); render.chargePowerNew = false; } - chargePower.setComment(0, Utils.plotPower("Power sink", chargePower.getValue())); + chargePower.setComment(0, Utils.plotPower("Power Sink:", chargePower.getValue())); start.enabled = render.state == TeleporterElement.StateIdle; /* if(render.defaultOutput)