Skip to content

Move broken tool head drop from DamageItem to DestroyItem #139

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

Open
MetaflameDragon wants to merge 2 commits into
base: master
Choose a base branch
from
+122 −104
Open

Move broken tool head drop from DamageItem to DestroyItem #139

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
7fb14d0
Move broken tool head drop from DamageItem to DestroyItem
MetaflameDragon Aug 2, 2026
629f6c5
Move Prefix_DestroyItem patch to an OnDestroyItem override
MetaflameDragon Aug 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
6 changes: 3 additions & 3 deletions SmithingPlus/Core.Cache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public partial class Core
public static Dictionary<int, int> RecipeVoxelCountCache =>
ObjectCacheUtil.GetOrCreate(Api, RecipeVoxelCountCacheKey, () => new Dictionary<int, int>());

public static Dictionary<string, SmithingRecipe> ToolToRecipeCache =>
ObjectCacheUtil.GetOrCreate(Api, ToolToRecipeCacheKey, () => new Dictionary<string, SmithingRecipe>());
public static Dictionary<string, SmithingRecipe?> ToolToRecipeCache =>
ObjectCacheUtil.GetOrCreate(Api, ToolToRecipeCacheKey, () => new Dictionary<string, SmithingRecipe?>());

public static Dictionary<string, MetalMaterial?> MetalMaterialCache =>
ObjectCacheUtil.GetOrCreate(Api, MetalMaterialCacheKey, () => new Dictionary<string, MetalMaterial?>());
Expand All @@ -50,4 +50,4 @@ public static string[]? CastableMetalVariantsCache
get => Api.ObjectCache.TryGetValue(CastableMetalVariantsCacheKey, out var variants) ? (string[])variants : null;
set => Api.ObjectCache[CastableMetalVariantsCacheKey] = value;
}
}
}
121 changes: 118 additions & 3 deletions SmithingPlus/ToolRecovery/CollectibleBehaviorRepairableTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
#nullable enable
using System.Linq;
using System.Text;

using SmithingPlus.Common.Metal;
using SmithingPlus.Util;

using Vintagestory.API.Common;
using Vintagestory.API.Common.Entities;
using Vintagestory.API.Config;
using Vintagestory.API.Util;
using Vintagestory.GameContent;

namespace SmithingPlus.ToolRecovery;

Expand Down Expand Up @@ -32,10 +38,119 @@ public override void GetHeldItemInfo(ItemSlot? inSlot, StringBuilder dsc, IWorld

if (!WildcardUtil.Match(Core.Config.RepairableToolSelector, code.ToString()))
return;
var brokenCount = inSlot.Itemstack.GetBrokenCount();

var brokenCount = itemstack!.GetBrokenCount();
if (brokenCount <= 0) return;

if (Core.Config.ShowRepairedCount) dsc.AppendLine(Lang.Get($"{LangKey} {{0}} times", brokenCount));
if (Core.Config.ShowRepairSmithName && inSlot.Itemstack.GetRepairSmith() is { } repairSmith)
if (Core.Config.ShowRepairSmithName && itemstack!.GetRepairSmith() is { } repairSmith)
dsc.AppendLine(Lang.Get("Last repaired by {0}", repairSmith));
}
}

public override void OnDestroyItem(IWorldAccessor world, Entity byEntity, ItemSlot itemSlot, ref EnumHandling bhHandling)
{
if (world.Api.Side.IsClient())
return;

var durability = itemSlot.Itemstack?.GetRemainingDurability();
if (durability is null or > 0) return; // Was this item (likely) destroyed due to its durability reaching zero?

Core.Logger.VerboseDebug(
"Broken tool in InventoryID: {0}, Entity: {1}",
itemSlot.Inventory?.InventoryID,
byEntity.GetName()
);
var entityPlayer = byEntity as EntityPlayer;
var itemStack = itemSlot.Itemstack;
if (itemStack is null) return;

var toolCode = itemStack.Collectible.Code.ToString();
var smithingRecipe = CacheHelper.GetOrAdd(
Core.ToolToRecipeCache,
toolCode,
() => GetHeadSmithingRecipe(world.Api, itemStack)
);

if (smithingRecipe == null)
{
Core.Logger.VerboseDebug("Head or tool smithing recipe not found for: {0}", toolCode);
return;
}

var metalMaterial = itemStack.GetOrCacheMetalMaterial(byEntity.Api);
var workItem = metalMaterial?.WorkItem;

if (workItem is null)
{
Core.Logger.VerboseDebug(
$"Work item not found. Metal material: {metalMaterial?.IngotCode}, " + $"collectible: {itemStack.Collectible.Code}"
);
return;
}

Core.Logger.VerboseDebug("Found work item: {0}", workItem.Code);
var wItemStack = new ItemStack(workItem);
Core.Logger.VerboseDebug(
"Found smithing recipe: {0}",
smithingRecipe.Output.ResolvedItemstack!.Collectible.Code
);
var byteVoxels = ByteVoxelsFromRecipe(smithingRecipe, smithingRecipe.Output.ResolvedItemstack.StackSize);
wItemStack.Attributes.SetBytes("voxels", BlockEntityAnvil.serializeVoxels(byteVoxels));
wItemStack.Attributes.SetInt("selectedRecipeId", smithingRecipe.RecipeId);
var cloneStack = itemStack.Clone();
cloneStack.CloneBrokenCount(itemStack, 1);
wItemStack.SetRepairedToolStack(cloneStack);

var gaveStack = false;
if (entityPlayer != null) gaveStack = entityPlayer.TryGiveItemStack(wItemStack);
if (!gaveStack) world.SpawnItemEntity(wItemStack, byEntity.Pos.XYZ);
Core.Logger.VerboseDebug(
gaveStack ? "Gave work item {0} to player {1}" : "Dropped work item {0} to player {1}",
wItemStack.Collectible.Code,
entityPlayer?.Player.PlayerName
);
itemSlot.MarkDirty();
}

private static SmithingRecipe? GetHeadSmithingRecipe(ICoreAPI api, ItemStack itemStack)
{
var toolHead = GetToolHead(api, itemStack);
var smithingRecipe = toolHead.GetSmithingRecipe(api);
return smithingRecipe;
}

private static ItemStack GetToolHead(ICoreAPI api, ItemStack itemStack)
{
var toolRecipe = itemStack
.GetGridRecipes(api)
.FirstOrDefault(r =>
r.Output?.ResolvedItemStack?.StackSize == 1
);
var toolHead = toolRecipe?.RecipeIngredients
.FirstOrDefault(k =>
k.ResolvedItemStack?.Collectible?.HasBehavior<CollectibleBehaviorRepairableToolHead>() ?? false
)
?.ResolvedItemStack;

if (toolHead == null)
{
toolHead = itemStack;
Core.Logger.VerboseDebug("Tool head not found for: {0}", itemStack);
}

Core.Logger.VerboseDebug("Tool head: {0}", toolHead);
return toolHead;
}

private static byte[,,] ByteVoxelsFromRecipe(SmithingRecipe recipe, int stackSize = 1)
{
var recipeVoxels = recipe.Voxels;
if (Core.Config.BrokenToolVoxelPercent < 0.2)
Core.Logger.Warning(
$"[ItemDamagedPatches#ByteVoxelsFromRecipe] Config setting {nameof(Core.Config.BrokenToolVoxelPercent)}"
+ $"has a very low value, your broken tools well be almost or fully empty."
);
var byteVoxels = recipeVoxels.ErodeToPercentage(Core.Config.BrokenToolVoxelPercent);
return byteVoxels;
}
}
99 changes: 1 addition & 98 deletions SmithingPlus/ToolRecovery/ItemDamagedPatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,101 +51,4 @@ public static void Postfix_OnCreatedByCrafting(
foreach (var attribute in repairedAttributes)
outputAttributes[attribute.Key] = attribute.Value;
}

[HarmonyPrefix]
[HarmonyPatch(nameof(CollectibleObject.DamageItem))]
private static void Prefix_DamageItem(
IWorldAccessor world,
Entity byEntity,
ItemSlot itemSlot,
int amount = 1,
bool destroyOnZeroDurability = true)
{
if (world.Api.Side.IsClient())
return;
if (!destroyOnZeroDurability)
return;
var durability = itemSlot?.Itemstack?.GetRemainingDurability();
if (!durability.HasValue || durability > amount) return;
if (itemSlot.Itemstack?.Collectible.HasBehavior<CollectibleBehaviorRepairableTool>() != true) return;
Core.Logger.VerboseDebug("Broken tool in InventoryID: {0}, Entity: {1}", itemSlot.Inventory?.InventoryID,
byEntity.GetName());
var entityPlayer = byEntity as EntityPlayer;
var itemStack = itemSlot.Itemstack;
var toolCode = itemStack?.Collectible.Code.ToString();
var smithingRecipe = CacheHelper.GetOrAdd(Core.ToolToRecipeCache, toolCode,
() => GetHeadSmithingRecipe(world.Api, itemStack));
if (smithingRecipe == null)
{
Core.Logger.VerboseDebug("Head or tool smithing recipe not found for: {0}", toolCode);
return;
}

var metalMaterial = itemStack?.GetOrCacheMetalMaterial(byEntity.Api);
var workItem = metalMaterial?.WorkItem;
if (workItem is null)
{
Core.Logger.VerboseDebug(
$"Work item not found. Metal material: {metalMaterial?.IngotCode}, " +
$"collectible: {itemStack?.Collectible.Code}");
return;
}

Core.Logger.VerboseDebug("Found work item: {0}", workItem.Code);
var wItemStack = new ItemStack(workItem);
Core.Logger.VerboseDebug("Found smithing recipe: {0}",
smithingRecipe.Output.ResolvedItemstack.Collectible.Code);
var byteVoxels = ByteVoxelsFromRecipe(smithingRecipe, smithingRecipe.Output.ResolvedItemstack.StackSize);
wItemStack.Attributes.SetBytes("voxels", BlockEntityAnvil.serializeVoxels(byteVoxels));
wItemStack.Attributes.SetInt("selectedRecipeId", smithingRecipe.RecipeId);
var cloneStack = itemStack?.Clone();
cloneStack.CloneBrokenCount(itemStack, 1);
wItemStack.SetRepairedToolStack(cloneStack);

var gaveStack = false;
if (entityPlayer != null) gaveStack = entityPlayer.TryGiveItemStack(wItemStack);
if (!gaveStack) world.SpawnItemEntity(wItemStack, byEntity.Pos.XYZ);
Core.Logger.VerboseDebug(gaveStack ? "Gave work item {0} to player {1}" : "Dropped work item {0} to player {1}",
wItemStack.Collectible.Code, entityPlayer?.Player.PlayerName);
itemSlot.MarkDirty();
}

private static SmithingRecipe GetHeadSmithingRecipe(ICoreAPI api, ItemStack itemStack)
{
var toolHead = GetToolHead(api, itemStack);
var smithingRecipe = toolHead.GetSmithingRecipe(api);
return smithingRecipe;
}

private static ItemStack GetToolHead(ICoreAPI api, ItemStack itemStack)
{
var toolRecipe = itemStack
.GetGridRecipes(api)
.FirstOrDefault(r =>
r.Output?.ResolvedItemStack?.StackSize == 1);
var toolHead = toolRecipe?.RecipeIngredients
.FirstOrDefault(k =>
k?.ResolvedItemStack?.Collectible?.HasBehavior<CollectibleBehaviorRepairableToolHead>() ?? false)
?.ResolvedItemStack;
if (toolHead == null)
{
toolHead = itemStack;
Core.Logger.VerboseDebug("Tool head not found for: {0}", itemStack);
}

Core.Logger.VerboseDebug("Tool head: {0}", toolHead);
return toolHead;
}

private static byte[,,] ByteVoxelsFromRecipe(SmithingRecipe recipe, int stackSize = 1)
{
var recipeVoxels = recipe.Voxels;
if (Core.Config.BrokenToolVoxelPercent < 0.2)
Core.Logger.Warning(
$"[ItemDamagedPatches#ByteVoxelsFromRecipe] Config setting {nameof(Core.Config.BrokenToolVoxelPercent)}" +
$"has a very low value, your broken tools well be almost or fully empty.");
;
var byteVoxels = recipeVoxels.ErodeToPercentage(Core.Config.BrokenToolVoxelPercent);
return byteVoxels;
}
}
}