Itemstack damage

Electro593 · Electro593 · commit f5996cb5c0c1 · 2024-11-12T00:34:13.000-05:00
diff --git a/src/main/java/de/dafuqs/spectrum/blocks/deeper_down/flora/SawbladeHollyBushBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/deeper_down/flora/SawbladeHollyBushBlock.java
@@ -109,7 +109,7 @@ public ItemActionResult onUseWithItem(ItemStack handStack, BlockState state, Wor
 				for (ItemStack stack : JadeVinePlantBlock.getHarvestedStacks(state, (ServerWorld) world, pos, world.getBlockEntity(pos), player, player.getMainHandStack(), SpectrumLootTables.SAWBLADE_HOLLY_SHEARING)) {
                     dropStack(world, pos, stack);
                 }
-                handStack.damage(1, player, (p) -> p.sendToolBreakStatus(hand));
+                handStack.damage(1, player, LivingEntity.getSlotForHand(hand));
             }
             
             BlockState newState = state.with(AGE, state.get(AGE) - 1);
diff --git a/src/main/java/de/dafuqs/spectrum/blocks/deeper_down/flora/TriStateVineBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/deeper_down/flora/TriStateVineBlock.java
@@ -5,6 +5,7 @@
 import de.dafuqs.spectrum.registries.*;
 import net.fabricmc.fabric.api.tag.convention.v1.*;
 import net.minecraft.block.*;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.*;
 import net.minecraft.item.*;
 import net.minecraft.server.world.*;
@@ -51,7 +52,7 @@ public ItemActionResult onUseWithItem(ItemStack handStack, BlockState state, Wor
                 return ItemActionResult.FAIL;
 
             if (!creative)
-                handStack.damage(1, player, p -> p.sendToolBreakStatus(hand));
+                handStack.damage(1, player, LivingEntity.getSlotForHand(hand));
 
             reference.setProperty(LIFE_STAGE, LifeStage.MATURE);
             reference.update(world);
@@ -262,4 +263,4 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po
         Vec3d vec3d = state.getModelOffset(world, pos);
         return super.getOutlineShape(state, world, pos, context).offset(vec3d.x, vec3d.y, vec3d.z);
     }
-}
+}
diff --git a/src/main/java/de/dafuqs/spectrum/blocks/jade_vines/JadeiteLotusStemBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/jade_vines/JadeiteLotusStemBlock.java
@@ -4,6 +4,7 @@
 import de.dafuqs.spectrum.registries.*;
 import net.fabricmc.fabric.api.tag.convention.v1.*;
 import net.minecraft.block.*;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.*;
 import net.minecraft.item.*;
 import net.minecraft.server.world.*;
@@ -50,7 +51,7 @@ public ItemActionResult onUseWithItem(ItemStack handStack, BlockState state, Wor
 			BlockState newState = state.with(STEM_PART, StemComponent.STEM);
 			world.setBlockState(pos, newState);
 			player.playSoundToPlayer(SoundEvents.ENTITY_MOOSHROOM_SHEAR, SoundCategory.BLOCKS, 1, 0.9F + player.getRandom().nextFloat() * 0.2F);
-			handStack.damage(1, player, (p) -> p.sendToolBreakStatus(hand));
+			handStack.damage(1, player, LivingEntity.getSlotForHand(hand));
             world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(newState));
     
             return ItemActionResult.success(world.isClient());
diff --git a/src/main/java/de/dafuqs/spectrum/blocks/jade_vines/NephriteBlossomStemBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/jade_vines/NephriteBlossomStemBlock.java
@@ -4,6 +4,7 @@
 import de.dafuqs.spectrum.registries.*;
 import net.fabricmc.fabric.api.tag.convention.v1.*;
 import net.minecraft.block.*;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.*;
 import net.minecraft.item.*;
 import net.minecraft.server.world.*;
@@ -49,7 +50,7 @@ public ItemActionResult onUseWithItem(ItemStack handStack, BlockState state, Wor
 			BlockState newState = state.with(STEM_PART, StemComponent.STEM);
 			world.setBlockState(pos, newState);
 			player.playSoundToPlayer(SoundEvents.ENTITY_MOOSHROOM_SHEAR, SoundCategory.BLOCKS, 1, 0.9F + player.getRandom().nextFloat() * 0.2F);
-			handStack.damage(1, player, (p) -> p.sendToolBreakStatus(hand));
+			handStack.damage(1, player, LivingEntity.getSlotForHand(hand));
 			world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(newState));
     
             return ItemActionResult.success(world.isClient());
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/EggLayingWoolyPigEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/EggLayingWoolyPigEntity.java
@@ -71,7 +71,7 @@ public ActionResult interactMob(PlayerEntity player, Hand hand) {
 			if (!world.isClient() && this.isShearable()) {
 				this.sheared(SoundCategory.PLAYERS);
 				this.emitGameEvent(GameEvent.SHEAR, player);
-				handStack.damage(1, player, (p) -> p.sendToolBreakStatus(hand));
+				handStack.damage(1, player, LivingEntity.getSlotForHand(hand)));
 				return ActionResult.SUCCESS;
 			} else {
 				return ActionResult.CONSUME;
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/KindlingEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/KindlingEntity.java
@@ -509,7 +509,7 @@ public ActionResult interactMob(PlayerEntity player, Hand hand) {
 				this.sheared(SoundCategory.PLAYERS);
 				this.emitGameEvent(GameEvent.SHEAR, player);
 				if (!this.getWorld().isClient) {
-					handStack.damage(1, player, (p) -> p.sendToolBreakStatus(hand));
+					handStack.damage(1, player, LivingEntity.getSlotForHand(hand));
 				}
 			}
 			
diff --git a/src/main/java/de/dafuqs/spectrum/items/armor/GemstoneArmorItem.java b/src/main/java/de/dafuqs/spectrum/items/armor/GemstoneArmorItem.java
@@ -30,7 +30,7 @@ public void onHit(ItemStack itemStack, DamageSource source, LivingEntity targetE
 		targetEntity.getWorld().playSound(null, targetEntity.getBlockPos(), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT, SoundCategory.PLAYERS, 1.0F, 1.0F);
 		targetEntity.getWorld().playSound(null, targetEntity.getBlockPos(), SoundEvents.ENTITY_SPLASH_POTION_BREAK, SoundCategory.PLAYERS, 1.0F, 1.0F);
 		
-		itemStack.damage(2, targetEntity, (e) -> e.sendEquipmentBreakStatus(type.getEquipmentSlot()));
+		itemStack.damage(2, targetEntity, type.getEquipmentSlot());
 	}
 
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/DraconicTwinswordItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/DraconicTwinswordItem.java
@@ -67,7 +67,7 @@ public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int
 		nbt.putUuid("lastTwinsword", twinsword.getUuid());
 		
 		if (!world.isClient())
-			stack.damage(1, user, (p) -> p.sendToolBreakStatus(user.getActiveHand()));
+			stack.damage(1, user, LivingEntity.getSlotForHand(user.getActiveHand()));
 		
 		
 		super.onStoppedUsing(stack, world, user, remainingUseTicks);
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/FerociousBidentItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/FerociousBidentItem.java
@@ -48,7 +48,7 @@ public void usageTick(World world, LivingEntity user, ItemStack stack, int remai
 			int useTime = this.getMaxUseTime(stack, user) - remainingUseTicks;
 			if (useTime % 10 == 0) {
 				if (InkPowered.tryDrainEnergy(player, RIPTIDE_COST)) {
-					stack.damage(1, user, (p) -> p.sendToolBreakStatus(user.getActiveHand()));
+					stack.damage(1, user, LivingEntity.getSlotForHand(user.getActiveHand()));
 				} else {
 					user.stopUsingItem();
 					return;
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/GlassCrestGreatswordItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/GlassCrestGreatswordItem.java
@@ -86,7 +86,7 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) {
 			int groundSlamStrength = getGroundSlamStrength(stack);
 			if (groundSlamStrength > 0) {
 				performGroundSlam(world, user.getPos(), user, groundSlamStrength);
-				stack.damage(1, user, (p) -> p.sendToolBreakStatus(user.getActiveHand()));
+				stack.damage(1, user, LivingEntity.getSlotForHand(user.getActiveHand()));
 			}
 		}
 		
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/GlassCrestWorkstaffItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/GlassCrestWorkstaffItem.java
@@ -46,7 +46,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
                     user.playSoundToPlayer(SpectrumSoundEvents.LIGHT_CRYSTAL_RING, SoundCategory.PLAYERS, 0.5F, 0.75F + user.getRandom().nextFloat());
                     MiningProjectileEntity.shoot(world, user, user.getStackInHand(hand));
                 }
-                stack.damage(2, user, (e) -> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND));
+                stack.damage(2, user, EquipmentSlot.MAINHAND);
                 
                 return TypedActionResult.consume(stack);
             } else {
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/MalachiteBidentItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/MalachiteBidentItem.java
@@ -79,7 +79,7 @@ public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int
 				if (canStartRiptide(player, stack)) {
 					riptide(world, player, getRiptideLevel(stack));
 				} else if (!world.isClient) {
-					stack.damage(1, player, (p) -> p.sendToolBreakStatus(user.getActiveHand()));
+					stack.damage(1, player, LivingEntity.getSlotForHand(user.getActiveHand()));
 					throwBident(stack, (ServerWorld) world, player);
 				}
 			}
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/OblivionPickaxeItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/OblivionPickaxeItem.java
@@ -23,7 +23,7 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos
 		// Break the tool if it is used without the voiding enchantment
 		// Otherwise this would be a VERY cheap early game diamond tier tool
 		if (!world.isClient && !EnchantmentHelper.get(stack).containsKey(SpectrumEnchantments.VOIDING)) {
-			stack.damage(5000, miner, (e) -> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND));
+			stack.damage(5000, miner, EquipmentSlot.MAINHAND);
 		}
 		
 		return true;
@@ -43,4 +43,4 @@ public ItemStack getDefaultStack() {
 	public boolean hasGlint(ItemStack stack) {
 		return false;
 	}
-}
+}
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/ParryingSwordItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/ParryingSwordItem.java
@@ -70,7 +70,7 @@ private void cooldownAndDamage(ItemStack stack, PlayerEntity player, int usedTim
 		if (usedTime > 1) {
 			player.getItemCooldownManager().set(this, Math.max(usedTime, 10));
 		}
-		stack.damage(1, player, p -> p.sendToolBreakStatus(player.getActiveHand()));
+		stack.damage(1, player, LivingEntity.getSlotForHand(player.getActiveHand()));
 	}
 
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/PrimordialLighterItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/PrimordialLighterItem.java
@@ -6,6 +6,7 @@
 import net.minecraft.advancement.criterion.*;
 import net.minecraft.block.*;
 import net.minecraft.block.dispenser.*;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.*;
 import net.minecraft.item.*;
 import net.minecraft.item.tooltip.TooltipType;
@@ -64,9 +65,7 @@ public ActionResult useOnBlock(ItemUsageContext context) {
 			ItemStack stack = context.getStack();
 			if (player instanceof ServerPlayerEntity serverPlayerEntity) {
 				Criteria.PLACED_BLOCK.trigger(serverPlayerEntity, blockOnSide, stack);
-				stack.damage(1, world, serverPlayerEntity, (p) -> {
-					p.sendToolBreakStatus(context.getHand());
-				});
+				stack.damage(1, serverPlayerEntity, LivingEntity.getSlotForHand(context.getHand()));
 			}
 			
 			return ActionResult.success(world.isClient());
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/SpectrumFishingRodItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/SpectrumFishingRodItem.java
@@ -5,6 +5,7 @@
 import de.dafuqs.spectrum.helpers.*;
 import de.dafuqs.spectrum.registries.*;
 import net.minecraft.enchantment.*;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.*;
 import net.minecraft.fluid.*;
 import net.minecraft.item.*;
@@ -33,7 +34,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
 		if (playerEntityAccessor.getSpectrumBobber() != null) {
 			if (!world.isClient) {
 				int damage = playerEntityAccessor.getSpectrumBobber().use(itemStack);
-				itemStack.damage(damage, world, user, p -> p.sendToolBreakStatus(hand));
+				itemStack.damage(damage, user, LivingEntity.getSlotForHand(hand));
 			}
 			
 			world.playSound(null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENTITY_FISHING_BOBBER_RETRIEVE, SoundCategory.NEUTRAL, 1.0F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public ItemActionResult onUseWithItem(ItemStack handStack, BlockState state, Wor`
`109`	`109`	`for (ItemStack stack : JadeVinePlantBlock.getHarvestedStacks(state, (ServerWorld) world, pos, world.getBlockEntity(pos), player, player.getMainHandStack(), SpectrumLootTables.SAWBLADE_HOLLY_SHEARING)) {`
`110`	`110`	`dropStack(world, pos, stack);`
`111`	`111`	`}`
`112`		`- handStack.damage(1, player, (p) -> p.sendToolBreakStatus(hand));`
	`112`	`+ handStack.damage(1, player, LivingEntity.getSlotForHand(hand));`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`BlockState newState = state.with(AGE, state.get(AGE) - 1);`
Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ public ActionResult interactMob(PlayerEntity player, Hand hand) {`
`509`	`509`	`this.sheared(SoundCategory.PLAYERS);`
`510`	`510`	`this.emitGameEvent(GameEvent.SHEAR, player);`
`511`	`511`	`if (!this.getWorld().isClient) {`
`512`		`- handStack.damage(1, player, (p) -> p.sendToolBreakStatus(hand));`
	`512`	`+ handStack.damage(1, player, LivingEntity.getSlotForHand(hand));`
`513`	`513`	`}`
`514`	`514`	`}`
`515`	`515`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public void onHit(ItemStack itemStack, DamageSource source, LivingEntity targetE`
`30`	`30`	`targetEntity.getWorld().playSound(null, targetEntity.getBlockPos(), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT, SoundCategory.PLAYERS, 1.0F, 1.0F);`
`31`	`31`	`targetEntity.getWorld().playSound(null, targetEntity.getBlockPos(), SoundEvents.ENTITY_SPLASH_POTION_BREAK, SoundCategory.PLAYERS, 1.0F, 1.0F);`
`32`	`32`
`33`		`- itemStack.damage(2, targetEntity, (e) -> e.sendEquipmentBreakStatus(type.getEquipmentSlot()));`
	`33`	`+ itemStack.damage(2, targetEntity, type.getEquipmentSlot());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) {`
`86`	`86`	`int groundSlamStrength = getGroundSlamStrength(stack);`
`87`	`87`	`if (groundSlamStrength > 0) {`
`88`	`88`	`performGroundSlam(world, user.getPos(), user, groundSlamStrength);`
`89`		`- stack.damage(1, user, (p) -> p.sendToolBreakStatus(user.getActiveHand()));`
	`89`	`+ stack.damage(1, user, LivingEntity.getSlotForHand(user.getActiveHand()));`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`