Merge pull request #20 from romangraef/feat/hypefixes

Various fixes for hype sound effects

2 files changed, 19 insertions, 1 deletions

diff --git a/src/main/java/dulkirmod/mixins/MixinItem.java b/src/main/java/dulkirmod/mixins/MixinItem.java
index 62ae99d..8f14151 100644
--- a/src/main/java/dulkirmod/mixins/MixinItem.java
+++ b/src/main/java/dulkirmod/mixins/MixinItem.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(value = {Item.class})
+@Mixin(Item.class)
 public class MixinItem {
 
     @Inject(method = "shouldCauseReequipAnimation", at = @At("HEAD"), cancellable = true, remap = false)
diff --git a/src/main/java/dulkirmod/mixins/MixinSoundManager.java b/src/main/java/dulkirmod/mixins/MixinSoundManager.java
new file mode 100644
index 0000000..f4e228f
--- /dev/null
+++ b/src/main/java/dulkirmod/mixins/MixinSoundManager.java
@@ -0,0 +1,18 @@
+package dulkirmod.mixins;
+
+import dulkirmod.events.AlwaysPlaySoundEvent;
+import net.minecraft.client.audio.ISound;
+import net.minecraft.client.audio.SoundManager;
+import net.minecraftforge.common.MinecraftForge;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(SoundManager.class)
+public class MixinSoundManager {
+    @Inject(at = @At("HEAD"), method = "playSound")
+    public void onSound(ISound p_sound, CallbackInfo ci) {
+        MinecraftForge.EVENT_BUS.post(new AlwaysPlaySoundEvent(p_sound, (SoundManager) (Object) this));
+    }
+}