From 8ebb8969a0d9408738a51b2cd96cc36f218876a6 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Tue, 2 Jan 2024 02:56:14 +0100 Subject: [PATCH] Clean assets folder --- .../fixes/minecraft/entity/MixinPlayerEntity.java | 4 ++-- src/main/resources/assets/viafabricplus/sounds.json | 4 ++-- .../sounds/{random/hurt.ogg => oof_hurt.ogg} | Bin 3 files changed, 4 insertions(+), 4 deletions(-) rename src/main/resources/assets/viafabricplus/sounds/{random/hurt.ogg => oof_hurt.ogg} (100%) diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java index 79ee0a4d..e5ed0f3e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java @@ -64,7 +64,7 @@ public abstract class MixinPlayerEntity extends LivingEntity { private static final EntityDimensions viaFabricPlus$sneaking_dimensions_v1_13_2 = EntityDimensions.changing(0.6f, 1.65f); @Unique - private static final SoundEvent viaFabricPlus$random_hurt = SoundEvent.of(new Identifier("viafabricplus", "random.hurt")); + private static final SoundEvent viaFabricPlus$oof_hurt = SoundEvent.of(new Identifier("viafabricplus", "oof.hurt")); @Unique public boolean viaFabricPlus$isSprinting; @@ -180,7 +180,7 @@ public abstract class MixinPlayerEntity extends LivingEntity { @Inject(method = "getHurtSound", at = @At("HEAD"), cancellable = true) private void replaceSound(DamageSource source, CallbackInfoReturnable cir) { if (VisualSettings.global().replaceHurtSoundWithOOFSound.isEnabled()) { - cir.setReturnValue(viaFabricPlus$random_hurt); + cir.setReturnValue(viaFabricPlus$oof_hurt); } } diff --git a/src/main/resources/assets/viafabricplus/sounds.json b/src/main/resources/assets/viafabricplus/sounds.json index ccedb447..9ac967bc 100644 --- a/src/main/resources/assets/viafabricplus/sounds.json +++ b/src/main/resources/assets/viafabricplus/sounds.json @@ -1,7 +1,7 @@ { - "random.hurt": { + "oof.hurt": { "sounds": [ - "viafabricplus:random/hurt" + "viafabricplus:oof_hurt" ] } } \ No newline at end of file diff --git a/src/main/resources/assets/viafabricplus/sounds/random/hurt.ogg b/src/main/resources/assets/viafabricplus/sounds/oof_hurt.ogg similarity index 100% rename from src/main/resources/assets/viafabricplus/sounds/random/hurt.ogg rename to src/main/resources/assets/viafabricplus/sounds/oof_hurt.ogg