Skip to content

refactor: make tools data tools #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Floogen merged 2 commits into from
Jan 2, 2026
Merged

refactor: make tools data tools #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e02d6e6
refactor: make tools data tools
Mushymato Jan 1, 2026
870752f
Set LangVersion to preview to handle Utility.ForEachItemContext
Floogen Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 65 additions & 75 deletions AlternativeTextures/AlternativeTextures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using AlternativeTextures.Framework.Patches.Buildings;
using AlternativeTextures.Framework.Patches.Entities;
using AlternativeTextures.Framework.Patches.GameLocations;
using AlternativeTextures.Framework.Patches.ShopLocations;
using AlternativeTextures.Framework.Patches.SpecialObjects;
using AlternativeTextures.Framework.Patches.StandardObjects;
using AlternativeTextures.Framework.Patches.Tools;
Expand Down Expand Up @@ -47,8 +46,9 @@ public class AlternativeTextures : Mod
internal const string ENABLED_SPRAY_CAN_TEXTURES = "Stardew.Default";

// Compatibility keys
internal const string TOOL_CONVERSION_COMPATIBILITY = "AlternativeTextures.HasConvertedMilkPails";
internal const string TOOL_CONVERSION_COMPATIBILITY_OLD_PAINT_BUCKET = "AlternativeTextures.HasConvertedMilkPails";
internal const string TYPE_FIX_COMPATIBILITY = "AlternativeTextures.HasFixedBadObjectTyping";
internal const string TOOL_CONVERSION_COMPATIBILITY_DATA_TOOLS = "AlternativeTextures.HasConvertedToDataTools";

// Tool related keys
internal const string PAINT_BUCKET_FLAG = "AlternativeTextures.PaintBucketFlag";
Expand All @@ -61,6 +61,9 @@ public class AlternativeTextures : Mod
internal const string SPRAY_CAN_RADIUS = "AlternativeTextures.SprayCanRadius";
internal const string CATALOGUE_FLAG = "AlternativeTextures.CatalogueFlag";

// Mod ID const
internal const string MOD_ID = "PeacefulEnd.AlternativeTextures";

// Shared static helpers
internal static IMonitor monitor;
internal static IModHelper modHelper;
Expand All @@ -71,7 +74,7 @@ public class AlternativeTextures : Mod
internal static TextureManager textureManager;
internal static MessageManager messageManager;
internal static ApiManager apiManager;
internal static AssetManager assetManager;
internal static ToolManager toolManager;

// Utilities
internal static FpsCounter fpsCounter;
Expand All @@ -94,7 +97,7 @@ public override void Entry(IModHelper helper)
textureManager = new TextureManager(monitor, helper);
messageManager = new MessageManager(monitor, helper, ModManifest.UniqueID);
apiManager = new ApiManager(monitor);
assetManager = new AssetManager(helper);
toolManager = new ToolManager(helper);

// Setup our utilities
fpsCounter = new FpsCounter();
Expand Down Expand Up @@ -144,7 +147,6 @@ public override void Entry(IModHelper helper)

// Start of location patches
new GameLocationPatch(monitor, helper).Apply(harmony);
new ShopBuilderPatch(monitor, helper).Apply(harmony);

// Paint tool related patches
new ToolPatch(monitor, helper).Apply(harmony);
Expand All @@ -169,7 +171,7 @@ public override void Entry(IModHelper helper)

// Hook into GameLoop events
helper.Events.GameLoop.GameLaunched += this.OnGameLaunched;
helper.Events.GameLoop.DayStarted += this.OnDayStarted;
helper.Events.GameLoop.SaveLoaded += this.OnSaveLoaded;

// Hook into Input events
helper.Events.Input.ButtonsChanged += OnButtonChanged;
Expand Down Expand Up @@ -197,11 +199,7 @@ private void OnModMessageReceived(object sender, ModMessageReceivedEventArgs e)
private void OnContentAssetReady(object sender, AssetReadyEventArgs e)
{
var asset = e.Name;
if (assetManager.toolKeyToData.ContainsKey(asset.Name))
{
assetManager.toolKeyToData[asset.Name].Texture = Helper.GameContent.Load<Texture2D>(asset);
}
else if (textureManager.GetTextureByToken(asset.Name) is Texture2D texture && texture is not null)
if (textureManager.GetTextureByToken(asset.Name) is Texture2D texture && texture is not null)
{
var loadedTexture = Helper.GameContent.Load<Texture2D>(asset.Name);

Expand All @@ -220,9 +218,9 @@ private void OnContentAssetRequested(object sender, AssetRequestedEventArgs e)
var clonedTexture = originalTexture.CreateSelectiveCopy(Game1.graphics.GraphicsDevice, new Rectangle(0, 0, originalTexture.Width, originalTexture.Height));
e.LoadFrom(() => clonedTexture, AssetLoadPriority.Exclusive);
}
else if (assetManager.toolKeyToData.ContainsKey(asset.Name))
else if (toolManager.toolKeyToData.ContainsKey(asset.Name))
{
e.LoadFromModFile<Texture2D>(assetManager.toolKeyToData[asset.Name].FilePath, AssetLoadPriority.Exclusive);
e.LoadFromModFile<Texture2D>(toolManager.toolKeyToData[asset.Name], AssetLoadPriority.Exclusive);
}
}
else if (e.NameWithoutLocale.IsEquivalentTo("Data/AdditionalWallpaperFlooring") && textureManager.GetValidTextureNamesWithSeason().Count > 0)
Expand All @@ -245,6 +243,14 @@ private void OnContentAssetRequested(object sender, AssetRequestedEventArgs e)
}
});
}
else if (e.NameWithoutLocale.IsEquivalentTo("Data/Tools"))
{
e.Edit(toolManager.Edit_DataTools, AssetEditPriority.Early);
}
else if (e.NameWithoutLocale.IsEquivalentTo("Data/Shops"))
{
e.Edit(toolManager.Edit_DataShops, AssetEditPriority.Early);
}
}

private void OnDisplayRendered(object sender, RenderedEventArgs e)
Expand Down Expand Up @@ -832,21 +838,15 @@ private void OnGameLaunched(object sender, GameLaunchedEventArgs e)

if (Helper.ModRegistry.IsLoaded("Pathoschild.ContentPatcher") && apiManager.HookIntoContentPatcher(Helper))
{
apiManager.GetContentPatcherApi().RegisterToken(ModManifest, "Textures", new TextureToken(textureManager, assetManager));
apiManager.GetContentPatcherApi().RegisterToken(ModManifest, "Tools", new ToolToken(textureManager, assetManager));
apiManager.GetContentPatcherApi().RegisterToken(ModManifest, "Textures", new TextureToken(textureManager, toolManager));
apiManager.GetContentPatcherApi().RegisterToken(ModManifest, "Tools", new ToolToken(textureManager, toolManager));
}

// Load any owned content packs
this.LoadContentPacks();

Monitor.Log($"Finished loading Alternative Textures content packs", LogLevel.Debug);

// Register tools
foreach (var tool in assetManager.toolKeyToData.ToList())
{
assetManager.toolKeyToData[tool.Key].Texture = Helper.GameContent.Load<Texture2D>(tool.Key);
}

// Hook into GMCM, if applicable
if (Helper.ModRegistry.IsLoaded("spacechase0.GenericModConfigMenu") && apiManager.HookIntoGenericModConfigMenu(Helper))
{
Expand Down Expand Up @@ -980,21 +980,27 @@ private void OnGameLaunched(object sender, GameLaunchedEventArgs e)
}
}

private void OnDayStarted(object sender, DayStartedEventArgs e)
private void OnSaveLoaded(object sender, SaveLoadedEventArgs e)
{
// Backwards compatibility logic
if (!Game1.player.modData.ContainsKey(TOOL_CONVERSION_COMPATIBILITY))
if (!Game1.player.modData.ContainsKey(TOOL_CONVERSION_COMPATIBILITY_OLD_PAINT_BUCKET))
{
Monitor.Log($"Converting old Paint Buckets into generic tools...", LogLevel.Debug);
Game1.player.modData[TOOL_CONVERSION_COMPATIBILITY] = true.ToString();
ConvertPaintBucketsToGenericTools(Game1.player);
Monitor.Log("Converting old Paint Buckets into data tools...", LogLevel.Debug);
Game1.player.modData[TOOL_CONVERSION_COMPATIBILITY_OLD_PAINT_BUCKET] = true.ToString();
ConvertPaintBucketsToDataTools(Game1.player);
}
if (!Game1.player.modData.ContainsKey(TYPE_FIX_COMPATIBILITY))
{
Monitor.Log($"Fixing bad object and bigcraftable typings...", LogLevel.Debug);
Monitor.Log("Fixing bad object and bigcraftable typings...", LogLevel.Debug);
Game1.player.modData[TYPE_FIX_COMPATIBILITY] = true.ToString();
FixBadObjectTyping();
}
if (!Game1.player.modData.ContainsKey(TOOL_CONVERSION_COMPATIBILITY_DATA_TOOLS))
{
Monitor.Log("Converting created tools to data tools...", LogLevel.Debug);
Game1.player.modData[TOOL_CONVERSION_COMPATIBILITY_DATA_TOOLS] = true.ToString();
ConvertGenericToolsToDataTools();
}
}

private void LoadContentPacks()
Expand Down Expand Up @@ -1531,68 +1537,52 @@ private string CleanContentPackNameForConfig(string contentPackName)
return contentPackName.Replace("[", String.Empty).Replace("]", String.Empty);
}

private void ConvertPaintBucketsToGenericTools(Farmer who)
private void ConvertPaintBucketsToDataTools(Farmer who)
{
// Check player's inventory first
for (int i = 0; i < who.MaxItems; i++)
{
if (who.Items[i] is MilkPail milkPail && milkPail.modData.ContainsKey(OLD_PAINT_BUCKET_FLAG))
{
who.Items[i] = PatchTemplate.GetPaintBucketTool();
}
}

foreach (var location in Game1.locations)
Utility.ForEachItemContext((in context) =>
{
ConvertStoredPaintBucketsToGenericTools(who, location);

if (location.buildings is not null)
if (context.Item is MilkPail milkPail && milkPail.modData.ContainsKey(OLD_PAINT_BUCKET_FLAG))
{
foreach (var building in location.buildings)
{
GameLocation indoorLocation = building.indoors.Value;
if (indoorLocation is null)
{
continue;
}

ConvertStoredPaintBucketsToGenericTools(who, indoorLocation);
}
context.ReplaceItemWith(PatchTemplate.GetPaintBucketTool());
}
}
return true;
});
}

private void ConvertStoredPaintBucketsToGenericTools(Farmer who, GameLocation location)
private void ConvertGenericToolsToDataTools()
{
foreach (var chest in location.Objects.Pairs.Where(p => p.Value is Chest).Select(p => p.Value as Chest).ToList())
Utility.ForEachItemContext((in context) =>
{
if (chest.isEmpty())
if (context.Item is not GenericTool genericTool || Game1.toolData.ContainsKey(genericTool.ItemId))
{
continue;
return true;
}

if (chest.SpecialChestType == Chest.SpecialChestTypes.JunimoChest)
if (genericTool.modData.ContainsKey(PAINT_BUCKET_FLAG))
{
var actual_items = chest.GetItemsForPlayer(who.UniqueMultiplayerID);
for (int j = actual_items.Count - 1; j >= 0; j--)
{
if (actual_items[j] is MilkPail milkPail && milkPail.modData.ContainsKey(OLD_PAINT_BUCKET_FLAG))
{
actual_items[j] = PatchTemplate.GetPaintBucketTool();
}
}
context.ReplaceItemWith(PatchTemplate.GetPaintBucketTool());
}
else
else if (genericTool.modData.ContainsKey(SCISSORS_FLAG))
{
for (int i = chest.Items.Count - 1; i >= 0; i--)
{
if (chest.Items[i] is MilkPail milkPail && milkPail.modData.ContainsKey(OLD_PAINT_BUCKET_FLAG))
{
chest.Items[i] = PatchTemplate.GetPaintBucketTool();
}
}
context.ReplaceItemWith(PatchTemplate.GetScissorsTool());
}
}
else if (genericTool.modData.ContainsKey(PAINT_BRUSH_FLAG))
{
context.ReplaceItemWith(PatchTemplate.GetPaintBrushTool());
}
else if (genericTool.modData.ContainsKey(SPRAY_CAN_RARE))
{
context.ReplaceItemWith(PatchTemplate.GetSprayCanTool(isRare: true));
}
else if (genericTool.modData.ContainsKey(SPRAY_CAN_FLAG))
{
context.ReplaceItemWith(PatchTemplate.GetSprayCanTool(isRare: false));
}
else if (genericTool.modData.ContainsKey(CATALOGUE_FLAG))
{
context.ReplaceItemWith(PatchTemplate.GetCatalogueTool());
}
return true;
});
}

private void FixBadObjectTyping()
Expand Down
2 changes: 1 addition & 1 deletion AlternativeTextures/AlternativeTextures.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Version>8.0.1</Version>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>latest</LangVersion>
<LangVersion>preview</LangVersion>
<EnableHarmony>true</EnableHarmony>
<EnableModZip>false</EnableModZip>
<EnableModDeploy>false</EnableModDeploy>
Expand Down
4 changes: 2 additions & 2 deletions AlternativeTextures/Framework/External/ContentPatcher/TextureToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ namespace AlternativeTextures.Framework.External.ContentPatcher
internal class TextureToken
{
private TextureManager _textureManager;
private AssetManager _assetManager;
private ToolManager _assetManager;

public TextureToken(TextureManager textureManager, AssetManager assetManager)
public TextureToken(TextureManager textureManager, ToolManager assetManager)
{
_textureManager = textureManager;
_assetManager = assetManager;
Expand Down
4 changes: 2 additions & 2 deletions AlternativeTextures/Framework/External/ContentPatcher/ToolToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ namespace AlternativeTextures.Framework.External.ContentPatcher
internal class ToolToken
{
private TextureManager _textureManager;
private AssetManager _assetManager;
private ToolManager _assetManager;

public ToolToken(TextureManager textureManager, AssetManager assetManager)
public ToolToken(TextureManager textureManager, ToolManager assetManager)
{
_textureManager = textureManager;
_assetManager = assetManager;
Expand Down
68 changes: 0 additions & 68 deletions AlternativeTextures/Framework/Managers/AssetManager.cs
View file
Open in desktop

This file was deleted.

Loading