Removed SoundProvider.java

DaFuqs · Oct 5, 2024 · 1f611fb · 1f611fb
1 parent 5e3a4dc
commit 1f611fb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/src/main/java/de/dafuqs/spectrum/api/item/MergeableItem.java b/src/main/java/de/dafuqs/spectrum/api/item/MergeableItem.java
@@ -21,6 +21,6 @@ default boolean verify(ItemStack parent, ItemStack other) {
 			return parNbt.getLong("pairSignature") == otherNbt.getLong("pairSignature");
 		return false;
 	}
-	
-	SoundProvider getMergeSound();
+
+	void playSound(ServerPlayerEntity player);
 }
diff --git a/src/main/java/de/dafuqs/spectrum/api/item/SoundProvider.java b/src/main/java/de/dafuqs/spectrum/api/item/SoundProvider.java
diff --git a/src/main/java/de/dafuqs/spectrum/api/item/SplittableItem.java b/src/main/java/de/dafuqs/spectrum/api/item/SplittableItem.java
@@ -14,5 +14,5 @@ default void sign(ServerPlayerEntity player, ItemStack stack) {
 		stack.getOrCreateNbt().putLong("pairSignature", player.getWorld().getTime() + player.getUuid().getMostSignificantBits());
 	}
 
-	SoundProvider getSplitSound();
+	void playSound(ServerPlayerEntity player);
 }
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/DraconicTwinswordItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/DraconicTwinswordItem.java
@@ -172,10 +172,10 @@ public boolean canSplit(ServerPlayerEntity player, Hand occupiedHand, ItemStack
 			case OFF_HAND -> player.getStackInHand(Hand.MAIN_HAND).isEmpty();
 		};
 	}
-	
+
 	@Override
-	public SoundProvider getSplitSound() {
-		return (player -> player.playSound(SpectrumSoundEvents.METALLIC_UNSHEATHE, SoundCategory.PLAYERS, 0.5F, 0.8F + player.getRandom().nextFloat() * 0.4F));
+	public void playSound(ServerPlayerEntity player) {
+		player.playSound(SpectrumSoundEvents.METALLIC_UNSHEATHE, SoundCategory.PLAYERS, 0.5F, 0.8F + player.getRandom().nextFloat() * 0.4F);
 	}
 
 	@Override

diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/DragonTalonItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/DragonTalonItem.java
@@ -153,10 +153,10 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
 			return TypedActionResult.fail(user.getStackInHand(hand));
 		return super.use(world, user, hand);
 	}
-	
+
 	@Override
-	public SoundProvider getMergeSound() {
-		return (player -> player.playSound(SpectrumSoundEvents.METALLIC_UNSHEATHE, SoundCategory.PLAYERS, 0.3F, 0.4F + player.getRandom().nextFloat() * 0.2F));
+	public void playSound(ServerPlayerEntity player) {
+		player.playSound(SpectrumSoundEvents.METALLIC_UNSHEATHE, SoundCategory.PLAYERS, 0.5F, 0.8F + player.getRandom().nextFloat() * 0.4F);
 	}
 
 	@Override

diff --git a/src/main/java/de/dafuqs/spectrum/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/de/dafuqs/spectrum/mixin/ServerPlayNetworkHandlerMixin.java
@@ -64,7 +64,7 @@ private void splitItem(ItemStack stack, SplittableItem splittable) {
 		player.setStackInHand(Hand.MAIN_HAND, split);
 		player.setStackInHand(Hand.OFF_HAND, split.copy());
 		player.clearActiveItem();
-		splittable.getSplitSound().playSound(player);
+		splittable.playSound(player);
 	}
 
 	@Unique
@@ -73,6 +73,6 @@ private void mergeItems(ItemStack firstHalf, ItemStack secondHalf, MergeableItem
 		player.setStackInHand(Hand.OFF_HAND, ItemStack.EMPTY);
 		player.setStackInHand(Hand.MAIN_HAND, mergeable.getResult(player, firstHalf, secondHalf));
 		player.clearActiveItem();
-		mergeable.getMergeSound().playSound(player);
+		mergeable.playSound(player);
 	}
 }