made the same-stack check item based instead of static

fix: if the ItemStacks are not identical when checked in checkItemValid, but still considered the same, the ItemStack of the sound group updates

src/api/java/blusunrize/immersiveengineering/api/tool/INoisyTool.java

@@ -50,26 +50,23 @@ static boolean isAbleNoisyTool(ItemStack stack)
 	/**
 	 * When an ItemStack gets modified server side (i.e. takes damage, changes tags (i.e. uses fuel), etc.), it creates a new ItemStack on the client side.
 	 * There is no unreasonably involved way to check if the new ItemStack is actually just the old ItemStack, but modified.
-	 * So this for these cases, this checks the next best thing: Item equality and sound equality.
+	 * So this for these cases, this default implementation checks the next best thing: Item equality and sound equality.
+	 *
+	 * It is encouraged to override this with a simpler check.
+	 *
+	 * This check also assumes, that it has already been checked and confirmed, that the stacks are not identical
 	 *
 	 * @param mainStack
 	 * @param otherStack
-	 * @return true if stacks are identical or if stacks  produce the same sounds.
+	 * @return true if stacks are considered the same stack. By default: if stacks  produce the same sounds.
 	 */
-	static boolean acceptableSameStack(ItemStack mainStack, ItemStack otherStack)
+	default boolean noisySameStack(ItemStack mainStack, ItemStack otherStack)
 	{
-		// not making this a single line return..
-		if(mainStack==otherStack)
-			return true;
-
-		if(mainStack.getItem() instanceof INoisyTool noisyTool&&noisyTool.equals(otherStack.getItem()))
-		{
-			return noisyTool.getIdleSound(mainStack).equals(noisyTool.getIdleSound(otherStack))
-					&&noisyTool.getBusySound(mainStack).equals(noisyTool.getBusySound(otherStack))
-					&&noisyTool.getFadingSound(mainStack).equals(noisyTool.getFadingSound(otherStack))
-					&&noisyTool.getAttackSound(mainStack).equals(noisyTool.getAttackSound(otherStack))
-					&&noisyTool.getHarvestSound(mainStack).equals(noisyTool.getHarvestSound(otherStack));
-		}
-		return false;
+		return mainStack.getItem() instanceof INoisyTool noisyTool&&noisyTool.equals(otherStack.getItem())
+				&&noisyTool.getIdleSound(mainStack).equals(noisyTool.getIdleSound(otherStack))
+				&&noisyTool.getBusySound(mainStack).equals(noisyTool.getBusySound(otherStack))
+				&&noisyTool.getFadingSound(mainStack).equals(noisyTool.getFadingSound(otherStack))
+				&&noisyTool.getAttackSound(mainStack).equals(noisyTool.getAttackSound(otherStack))
+				&&noisyTool.getHarvestSound(mainStack).equals(noisyTool.getHarvestSound(otherStack));
 	}
 }

src/main/java/blusunrize/immersiveengineering/common/items/BuzzsawItem.java

@@ -317,7 +317,7 @@ public Holder<SoundEvent> getAttackSound(ItemStack stack)
 	public Holder<SoundEvent> getHarvestSound(ItemStack stack)
 	{
 		Item headitem = getHead(stack).getItem();
-		if (headitem instanceof GrindingDiskItem || headitem instanceof RockcutterItem)
+		if(headitem instanceof GrindingDiskItem||headitem instanceof RockcutterItem)
 			return IESounds.buzzsaw_harvest_grind;
 		return IESounds.buzzsaw_harvest_saw;
 	}
@@ -328,6 +328,12 @@ public boolean ableToMakeNoise(ItemStack stack)
 		return canToolBeUsed(stack);
 	}
 
+	@Override
+	public boolean noisySameStack(ItemStack mainStack, ItemStack otherStack)
+	{
+		return mainStack.getItem() instanceof BuzzsawItem buzzsawItem&&buzzsawItem.equals(otherStack.getItem())&&getHead(mainStack).getItem().equals(getHead(otherStack).getItem());
+	}
+
 	@Override
 	public boolean mineBlock(ItemStack stack, Level world, BlockState state, BlockPos pos, LivingEntity living)
 	{

src/main/java/blusunrize/immersiveengineering/common/items/DrillItem.java

@@ -269,6 +269,12 @@ public boolean ableToMakeNoise(ItemStack stack)
 		return canToolBeUsed(stack);
 	}
 
+	@Override
+	public boolean noisySameStack(ItemStack mainStack, ItemStack otherStack)
+	{
+		return mainStack.getItem() instanceof DrillItem drillItem&&drillItem.equals(otherStack.getItem());
+	}
+
 	@Override
 	public Tier getHarvestLevel(ItemStack stack, @Nullable Player player)
 	{

src/main/java/blusunrize/immersiveengineering/common/util/sound/NoisyToolSoundGroup.java

@@ -28,7 +28,7 @@ public class NoisyToolSoundGroup
 	private static final int ATTACK_DURATION = 7-1;
 	private static final int FADE_DURATION = 20-1;
 	private final INoisyTool noisyToolItem;
-	private final ItemStack noisyToolStack;
+	private ItemStack noisyToolStack;
 	private final int hotbarSlot;
 	private final LivingEntity holder;
 	private final int harvestTimeoutGrace;
@@ -59,16 +59,30 @@ public INoisyTool getItem()
 		return noisyToolItem;
 	}
 
-	public boolean checkItemMatch(ItemStack handItemStack, int hotbarSlot)
+	public boolean checkItemValid(ItemStack handItemStack, int hotbarSlot)
 	{
-		if(this.hotbarSlot!=hotbarSlot||!INoisyTool.acceptableSameStack(noisyToolStack, handItemStack)||!noisyToolItem.ableToMakeNoise(handItemStack))
+		if(this.hotbarSlot!=hotbarSlot||!checkItemMatch(handItemStack)||!noisyToolItem.ableToMakeNoise(handItemStack))
 		{
 			switchMotorOnOff(false);
 			return false;
 		}
 		return true;
 	}
 
+	private boolean checkItemMatch(ItemStack handItemStack)
+	{
+		if (noisyToolStack == handItemStack)
+		{
+			return true;
+		}
+		else if (noisyToolItem.noisySameStack(noisyToolStack, handItemStack))
+		{
+			noisyToolStack = handItemStack;
+			return true;
+		}
+		return false;
+	}
+
 	public enum ToolMotorState
 	{
 		OFF,

src/main/java/blusunrize/immersiveengineering/common/util/sound/NoisyToolSoundHandler.java

@@ -75,7 +75,7 @@ public static NoisyToolSoundGroup getSafeNTSG(LivingEntity entity, EquipmentSlot
 
 		if(soundGroup!=null)
 		{
-			if(!soundGroup.checkItemMatch(handItem, hotbarSlot))
+			if(!soundGroup.checkItemValid(handItem, hotbarSlot))
 			{
 				ntsgs.remove(slot);
 				soundGroup = null;