Modified to follow NeoForge's source instead of Forge

StarSNG25 · Feb 27, 2024 · 5ce008c · 5ce008c
1 parent 133c176
commit 5ce008c
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/main/java/com/starsng/sng_arsenal/item/ModFlintAndSteelItem.java b/src/main/java/com/starsng/sng_arsenal/item/ModFlintAndSteelItem.java
@@ -36,8 +36,7 @@ public InteractionResult useOn(UseOnContext context) //From FlintAndSteelItem
 		BlockPos blockPos = context.getClickedPos();
 		BlockState blockState = level.getBlockState(blockPos);
 
-		// || blockState.getMaterial() == Material.EXPLOSIVE //From 1.19.4, Material class missing in newer version, MapColor doesn't have EXPLOSIVE
-		if (blockState.getBlock() instanceof TntBlock) //To prime/ignite TNT
+		if (blockState.getBlock() instanceof TntBlock) //To prime/ignite TNT // || blockState.getMaterial() == Material.EXPLOSIVE //From 1.19.4, Material class missing in newer version
 		{
 			blockState.getBlock().onCaughtFire(blockState, level, blockPos, null, player);
 			level.setBlock(blockPos, Blocks.AIR.defaultBlockState(), 11);
@@ -57,10 +56,7 @@ else if (!CampfireBlock.canLight(blockState) && !CandleBlock.canLight(blockState
 				if (player instanceof ServerPlayer)
 				{
 					CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) player, blockPos1, itemStack);
-					itemStack.hurtAndBreak(1, player, (livingEntity) ->
-					{
-						livingEntity.broadcastBreakEvent(context.getHand());
-					});
+					itemStack.hurtAndBreak(1, player, livingEntity -> livingEntity.broadcastBreakEvent(context.getHand()));
 				}
 			}
 			else
@@ -73,10 +69,7 @@ else if (!CampfireBlock.canLight(blockState) && !CandleBlock.canLight(blockState
 			level.gameEvent(player, GameEvent.BLOCK_CHANGE, blockPos);
 
 			if (player != null)
-				context.getItemInHand().hurtAndBreak(1, player, (livingEntity) ->
-				{
-					livingEntity.broadcastBreakEvent(context.getHand());
-				});
+				context.getItemInHand().hurtAndBreak(1, player, livingEntity -> livingEntity.broadcastBreakEvent(context.getHand()));
 		}
 
 		return InteractionResult.sidedSuccess(level.isClientSide());