Implement Auditory sounds

Author: ACGaming

build.gradle

@@ -18,7 +18,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.spongepowered.mixin'
 
-version = "1.12.2-1.1.1"
+version = "1.12.2-1.2.0"
 group = "mod.acgaming.extrasounds"
 archivesBaseName = "ExtraSounds"
 
@@ -67,7 +67,7 @@ repositories {
 }
 
 dependencies {
-	deobfCompile "zone.rong:mixinbooter:4.2"
+    deobfCompile "zone.rong:mixinbooter:5.0"
 	deobfCompile "curse.maven:jei-238222:3043174"
 	//deobfCompile "curse.maven:had-enough-items-557549:3801373"
 }

src/main/java/mod/acgaming/extrasounds/ExtraSounds.java

@@ -14,7 +14,7 @@ public class ExtraSounds
 {
     public static final String MODID = "extrasounds";
     public static final String NAME = "Extra Sounds";
-    public static final String VERSION = "1.12.2-1.1.1";
+    public static final String VERSION = "1.12.2-1.2.0";
     public static final String DEPENDENCIES = "required-after:mixinbooter;after:jei";
     public static final Logger LOGGER = LogManager.getLogger("ES");
 

src/main/java/mod/acgaming/extrasounds/config/ESConfig.java

@@ -62,6 +62,34 @@ public static class SoundToggles
         @Config.Name("Swap Hands Sound")
         @Config.Comment("Play a sound when swapping hands to hold an item")
         public boolean esSwapHandsSound = true;
+
+        @Config.Name("Pull Bow Sound")
+        @Config.Comment("Play a sound when pulling a bow")
+        public boolean esPullBowSound = true;
+
+        @Config.Name("Ender Pearl Teleport Sound")
+        @Config.Comment("Play a sound when teleporting via ender pearls")
+        public boolean esEnderPearlTeleportSound = true;
+
+        @Config.Name("Place Boat Sound")
+        @Config.Comment("Play a sound when placing a boat")
+        public boolean esPlaceBoatSound = true;
+
+        @Config.Name("Place Minecart Sound")
+        @Config.Comment("Play a sound when placing a minecart")
+        public boolean esPlaceMinecartSound = true;
+
+        @Config.Name("Jukebox Interact Sound")
+        @Config.Comment("Play a sound when interacting with a jukebox")
+        public boolean esJukeboxInteractSound = true;
+
+        @Config.Name("Flower Pot Plant Sound")
+        @Config.Comment("Play a sound when planting flowers in a flower pot")
+        public boolean esFlowerPotPlantSound = true;
+
+        @Config.Name("Spawn Egg Sound")
+        @Config.Comment("Play a sound when spawning an entity with a spawn egg")
+        public boolean esUseSpawnEggSound = true;
     }
 
     public static class SoundVolume

src/main/java/mod/acgaming/extrasounds/mixin/BlockFlowerPotMixin.java

@@ -0,0 +1,27 @@
+package mod.acgaming.extrasounds.mixin;
+
+import net.minecraft.block.BlockFlowerPot;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import mod.acgaming.extrasounds.config.ESConfig;
+import mod.acgaming.extrasounds.sound.ESSoundEvents;
+import mod.acgaming.extrasounds.sound.ESSoundManager;
+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.CallbackInfoReturnable;
+
+@Mixin(BlockFlowerPot.class)
+public class BlockFlowerPotMixin
+{
+    @Inject(method = "onBlockActivated", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;addStat(Lnet/minecraft/stats/StatBase;)V"))
+    public void esFlowerPotPlant(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ, CallbackInfoReturnable<Boolean> cir)
+    {
+        if (ESConfig.soundToggles.esFlowerPotPlantSound) ESSoundManager.playSound(ESSoundEvents.plant_flower_pot, 1.0F, 0.8F);
+    }
+}

src/main/java/mod/acgaming/extrasounds/mixin/BlockJukeboxMixin.java

@@ -0,0 +1,31 @@
+package mod.acgaming.extrasounds.mixin;
+
+import net.minecraft.block.BlockJukebox;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import mod.acgaming.extrasounds.config.ESConfig;
+import mod.acgaming.extrasounds.sound.ESSoundEvents;
+import mod.acgaming.extrasounds.sound.ESSoundManager;
+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(BlockJukebox.class)
+public class BlockJukeboxMixin
+{
+    @Inject(method = "insertRecord", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockJukebox$TileEntityJukebox;setRecord(Lnet/minecraft/item/ItemStack;)V"))
+    public void esJukeboxInsert(World worldIn, BlockPos pos, IBlockState state, ItemStack recordStack, CallbackInfo ci)
+    {
+        if (ESConfig.soundToggles.esJukeboxInteractSound) ESSoundManager.playSound(ESSoundEvents.jukebox_insert);
+    }
+
+    @Inject(method = "dropRecord", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockJukebox$TileEntityJukebox;setRecord(Lnet/minecraft/item/ItemStack;)V"))
+    public void esJukeboxEject(World worldIn, BlockPos pos, IBlockState state, CallbackInfo ci)
+    {
+        if (ESConfig.soundToggles.esJukeboxInteractSound) ESSoundManager.playSound(ESSoundEvents.jukebox_eject);
+    }
+}

src/main/java/mod/acgaming/extrasounds/mixin/EntityEnderPearlMixin.java

@@ -0,0 +1,22 @@
+package mod.acgaming.extrasounds.mixin;
+
+import net.minecraft.entity.item.EntityEnderPearl;
+import net.minecraft.util.math.RayTraceResult;
+
+import mod.acgaming.extrasounds.config.ESConfig;
+import mod.acgaming.extrasounds.sound.ESSoundEvents;
+import mod.acgaming.extrasounds.sound.ESSoundManager;
+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(EntityEnderPearl.class)
+public class EntityEnderPearlMixin
+{
+    @Inject(method = "onImpact", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/EntityLivingBase;setPositionAndUpdate(DDD)V"))
+    public void esEnderPearlTeleport(RayTraceResult result, CallbackInfo ci)
+    {
+        if (ESConfig.soundToggles.esEnderPearlTeleportSound) ESSoundManager.playSound(ESSoundEvents.teleport_ender_pearl);
+    }
+}

src/main/java/mod/acgaming/extrasounds/mixin/GuiContainerCreativeMixin.java

@@ -18,7 +18,7 @@
 public class GuiContainerCreativeMixin
 {
     @Inject(at = @At("HEAD"), method = "handleMouseClick")
-    protected void esSlotClickSound(Slot slotIn, int slotId, int mouseButton, ClickType type, CallbackInfo ci)
+    public void esSlotClickSound(Slot slotIn, int slotId, int mouseButton, ClickType type, CallbackInfo ci)
     {
         if (ESConfig.soundToggles.esPickPlaceSound)
         {
@@ -34,7 +34,7 @@ protected void esSlotClickSound(Slot slotIn, int slotId, int mouseButton, ClickT
     }
 
     @Inject(at = @At("HEAD"), method = "setCurrentCreativeTab")
-    protected void esTabClickSound(CreativeTabs tab, CallbackInfo ci)
+    public void esTabClickSound(CreativeTabs tab, CallbackInfo ci)
     {
         if (ESConfig.soundToggles.esCreativeTabSound)
         {

src/main/java/mod/acgaming/extrasounds/mixin/GuiContainerMixin.java

@@ -29,7 +29,7 @@ public void esCloseGUISound(CallbackInfo ci)
     }
 
     @Inject(at = @At("HEAD"), method = "handleMouseClick")
-    protected void esSlotClickSound(Slot slotIn, int slotId, int mouseButton, ClickType type, CallbackInfo ci)
+    public void esSlotClickSound(Slot slotIn, int slotId, int mouseButton, ClickType type, CallbackInfo ci)
     {
         if (ESConfig.soundToggles.esPickPlaceSound)
         {

src/main/java/mod/acgaming/extrasounds/mixin/GuiInventoryMixin.java

@@ -16,7 +16,7 @@
 public class GuiInventoryMixin
 {
     @Inject(at = @At("HEAD"), method = "handleMouseClick")
-    protected void esSlotClickSound(Slot slotIn, int slotId, int mouseButton, ClickType type, CallbackInfo ci)
+    public void esSlotClickSound(Slot slotIn, int slotId, int mouseButton, ClickType type, CallbackInfo ci)
     {
         if (ESConfig.soundToggles.esPickPlaceSound)
         {

src/main/java/mod/acgaming/extrasounds/mixin/GuiNewChatMixin.java

@@ -17,7 +17,7 @@
 public class GuiNewChatMixin
 {
     @Inject(at = @At("RETURN"), method = "setChatLine")
-    private void esMessageMentionSound(ITextComponent chatComponent, int chatLineId, int updateCounter, boolean displayOnly, CallbackInfo ci)
+    public void esMessageMentionSound(ITextComponent chatComponent, int chatLineId, int updateCounter, boolean displayOnly, CallbackInfo ci)
     {
         if (Minecraft.getMinecraft().player == null || displayOnly) return;