Skip to content

Commit

Permalink
Merge branch '1.6.4' of https://github.com/Dolu1990/eln into 1.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dolu1990
Dolu1990 committed Mar 21, 2014
2 parents 95bd3d5 + 8229f4a commit 1276ec6
Show file tree
Hide file tree
Showing 39 changed files with 84 additions and 85 deletions.
2 changes: 1 addition & 1 deletion mods/eln/generic/GenericItemBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion mods/eln/generic/GenericItemBlockUsingDamage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion mods/eln/groundcable/GroundCableContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions mods/eln/groundcable/GroundCableDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}

}
4 changes: 2 additions & 2 deletions mods/eln/groundcable/GroundCableElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -169,7 +169,7 @@ else if(currentItemStack != null)
}
else
{
entityPlayer.addChatMessage("Brush is empty");
entityPlayer.addChatMessage("Brush is empty!");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions mods/eln/gui/GuiVerticalVoltageSupplyBar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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));
}


Expand Down
8 changes: 4 additions & 4 deletions mods/eln/heatfurnace/HeatFurnaceContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions mods/eln/heatfurnace/HeatFurnaceDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion mods/eln/heatfurnace/HeatFurnaceElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions mods/eln/heatfurnace/HeatFurnaceGuiDraw.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

/*
Expand All @@ -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;


Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions mods/eln/intelligenttransformer/IntelligentTransformerContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)})
});
Expand Down
10 changes: 5 additions & 5 deletions mods/eln/intelligenttransformer/IntelligentTransformerElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/BrushDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"));

}

Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/CombustionChamber.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
}
8 changes: 4 additions & 4 deletions mods/eln/item/ElectricalDrillDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}


Expand Down
4 changes: 2 additions & 2 deletions mods/eln/item/HeatingCorpElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/LampDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));

}
}
2 changes: 1 addition & 1 deletion mods/eln/item/LampSlot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions mods/eln/item/OreScanner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");

}

Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/OverHeatingProtectionDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
2 changes: 1 addition & 1 deletion mods/eln/item/OverVoltageProtectionDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
2 changes: 1 addition & 1 deletion mods/eln/item/SolarTrackerDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
}
2 changes: 1 addition & 1 deletion mods/eln/item/electricalitem/BatteryItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) + "%)");
}


Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/electricalitem/ElectricalArmor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}

Expand Down
4 changes: 2 additions & 2 deletions mods/eln/item/electricalitem/ElectricalLampItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/electricalitem/ElectricalTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}

Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/electricalitem/PortableOreScannerItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) + "%)");
}


Expand Down
2 changes: 1 addition & 1 deletion mods/eln/item/regulator/RegulatorSlot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion mods/eln/lampsocket/LampSocketContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions mods/eln/lampsocket/LampSocketDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions mods/eln/lampsocket/LampSocketElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 1276ec6

Please sign in to comment.