StardewValley
/
Stardew_Valley_Mods
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed searching when not supposed to.

This commit is contained in:
JoshuaNavarro 2019-05-21 12:19:29 -07:00
parent 03d230c4af
commit d3fc042b82
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GeneralMods/Revitalize/Framework/Graphics/TextureManager.cs
View File

@ -24,19 +24,12 @@ namespace Revitalize.Framework.Graphics
{ {
this.name = Name; this.name = Name;
this.textures = new Dictionary<string, Texture2DExtended>(); this.textures = new Dictionary<string, Texture2DExtended>();
this.searchForTextures();
} }
public TextureManager(bool doNothing=false) public TextureManager(string Name,IContentPack ContentPack)
{ {
this.name = Name;
this.textures = new Dictionary<string, Texture2DExtended>(); this.textures = new Dictionary<string, Texture2DExtended>();
//
}
public TextureManager(IContentPack ContentPack)
{
this.textures = new Dictionary<string, Texture2DExtended>();
this.searchForTextures(ContentPack);
} }
public void addTexture(string name, Texture2DExtended texture) public void addTexture(string name, Texture2DExtended texture)

6
GeneralMods/Revitalize/ModCore.cs
View File

@ -140,19 +140,17 @@ namespace Revitalize
ModHelper.Events.GameLoop.ReturnedToTitle += this.GameLoop_ReturnedToTitle; ModHelper.Events.GameLoop.ReturnedToTitle += this.GameLoop_ReturnedToTitle;
playerInfo = new PlayerInfo(); playerInfo = new PlayerInfo();
<<<<<<< HEAD
Framework.Graphics.TextureManager.AddTextureManager(Manifest,"Furniture"); Framework.Graphics.TextureManager.AddTextureManager(Manifest,"Furniture");
TextureManager.GetTextureManager(Manifest,"Furniture").searchForTextures(); TextureManager.GetTextureManager(Manifest,"Furniture").searchForTextures();
//TextureManager.addTexture("Furniture","Oak Chair", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content","Graphics","Furniture", "Chairs", "Oak Chair.png"))); //TextureManager.addTexture("Furniture","Oak Chair", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content","Graphics","Furniture", "Chairs", "Oak Chair.png")));
=======
//Framework.Graphics.TextureManager.TextureManagers.Add("Furniture", new TextureManager(this.Helper.DirectoryPath, Path.Combine("Content", "Graphics", "Furniture"))); //Framework.Graphics.TextureManager.TextureManagers.Add("Furniture", new TextureManager(this.Helper.DirectoryPath, Path.Combine("Content", "Graphics", "Furniture")));
Framework.Graphics.TextureManager.TextureManagers.Add("Furniture", new TextureManager());
//Rename graphic files tohave spaces and comment out below lines //Rename graphic files tohave spaces and comment out below lines
//TextureManager.addTexture("Furniture","Oak Chair", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content","Graphics","Furniture", "Chairs", "Oak Chair.png"))); //TextureManager.addTexture("Furniture","Oak Chair", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content","Graphics","Furniture", "Chairs", "Oak Chair.png")));
// //
>>>>>>> 596aedac77fc182f58bd38415ed86de0b1a6483e
//TextureManager.addTexture("Furniture", "Oak Table", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content", "Graphics", "Furniture", "Tables", "Oak Table.png"))); //TextureManager.addTexture("Furniture", "Oak Table", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content", "Graphics", "Furniture", "Tables", "Oak Table.png")));
//TextureManager.addTexture("Furniture", "Oak Lamp", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content", "Graphics", "Furniture", "Lamps", "Oak Lamp.png"))); //TextureManager.addTexture("Furniture", "Oak Lamp", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content", "Graphics", "Furniture", "Lamps", "Oak Lamp.png")));
customObjects = new Dictionary<string, CustomObject>(); customObjects = new Dictionary<string, CustomObject>();