Fixed dyed color display name from showing.
This commit is contained in:
parent
e20d593c7f
commit
cd87139168
|
@ -11,7 +11,7 @@ namespace Revitalize.Framework.Illuminate
|
|||
{
|
||||
public static NamedColor AliceBlue = new NamedColor("Alice Blue", new Color(15, 7, 0, 255).Invert());
|
||||
|
||||
public static NamedColor AntiqueWhite = new NamedColor("Antique White", 5, 20, 40, 255);
|
||||
public static NamedColor AntiqueWhite = new NamedColor("Antique White", 5, 20, 40, 255);
|
||||
|
||||
public static NamedColor Aqua = new NamedColor("Aqua", 255, 0, 0, 255);
|
||||
|
||||
|
|
|
@ -434,7 +434,7 @@ namespace Revitalize.Framework.Objects
|
|||
/// <returns></returns>
|
||||
public BasicItemInformation Copy()
|
||||
{
|
||||
return new BasicItemInformation(this.name, this.id,this.description, this.categoryName, this.categoryColor, this.edibility, this.fragility, this.isLamp, this.price, this.canBeSetOutdoors, this.canBeSetIndoors, this.animationManager.getTexture(), this.animationManager, this.DrawColor, this.ignoreBoundingBox, this._inventory.Copy(), this._lightManager.Copy(),this._energyManager.Copy(),this.AlwaysDrawAbovePlayer);
|
||||
return new BasicItemInformation(this.name, this.id,this.description, this.categoryName, this.categoryColor, this.edibility, this.fragility, this.isLamp, this.price, this.canBeSetOutdoors, this.canBeSetIndoors, this.animationManager.getTexture(), this.animationManager, this.DrawColor, this.ignoreBoundingBox, this._inventory.Copy(), this._lightManager.Copy(),this._energyManager.Copy(),this.AlwaysDrawAbovePlayer,this.DyedColor);
|
||||
}
|
||||
|
||||
public bool requiresSyncUpdate()
|
||||
|
|
|
@ -90,7 +90,7 @@ namespace Revitalize.Framework.Objects
|
|||
{
|
||||
if (this.info != null)
|
||||
{
|
||||
return this.info.name;
|
||||
return this.getDisplayNameFromStringsFile(this.info.id);
|
||||
}
|
||||
return this.netName.Value.Split('>')[0];
|
||||
}
|
||||
|
@ -666,7 +666,7 @@ namespace Revitalize.Framework.Objects
|
|||
{
|
||||
if (ModCore.Configs.objectsConfig.showDyedColorName)
|
||||
{
|
||||
return this.info.getDyedColorName() + this.info.name;
|
||||
return this.info.getDyedColorName() +" "+ this.info.name;
|
||||
}
|
||||
//Load in a file that has all object names referenced here or something.
|
||||
return this.info.name;
|
||||
|
|
Loading…
Reference in New Issue