Limit potion effect sounds to players

Fixes #8

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.3.1'
+version = '1.12.2-1.3.2'
 group = 'mod.acgaming.extrasounds'
 archivesBaseName = 'ExtraSounds'
 

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

@@ -17,7 +17,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.3.1";
+    public static final String VERSION = "1.12.2-1.3.2";
     public static final String DEPENDENCIES = "required-after:mixinbooter;required-after:assetmover;after:jei;after:asmc;after:dsurround";
     public static final Logger LOGGER = LogManager.getLogger(NAME);
     public static boolean asmc = false;

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

@@ -1,8 +1,11 @@
 package mod.acgaming.extrasounds.mixin;
 
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.world.World;
 
 import mod.acgaming.extrasounds.config.ESConfig;
 import mod.acgaming.extrasounds.sound.ESSoundEvents;
@@ -13,8 +16,13 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(EntityPlayer.class)
-public class EntityPlayerMixin
+public abstract class EntityPlayerMixin extends EntityLivingBase
 {
+    public EntityPlayerMixin(World worldIn)
+    {
+        super(worldIn);
+    }
+
     @Inject(at = @At("TAIL"), method = "dropItem(Lnet/minecraft/item/ItemStack;ZZ)Lnet/minecraft/entity/item/EntityItem;")
     public void esDropItemSound(ItemStack droppedItem, boolean dropAround, boolean traceItem, CallbackInfoReturnable<EntityItem> cir)
     {
@@ -28,4 +36,42 @@ public void esDropItemSound(ItemStack droppedItem, boolean dropAround, boolean t
             }
         }
     }
+
+    @Override
+    public void onNewPotionEffect(PotionEffect id)
+    {
+        super.onNewPotionEffect(id);
+        if (ESConfig.soundToggles.esPotionSound)
+        {
+            if (id.getPotion().isBadEffect())
+            {
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_add_negative, this.getPosition());
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_add_negative, this.getPosition());
+            }
+            else
+            {
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_add_positive, this.getPosition());
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_add_positive, this.getPosition());
+            }
+        }
+    }
+
+    @Override
+    public void onFinishedPotionEffect(PotionEffect effect)
+    {
+        super.onFinishedPotionEffect(effect);
+        if (ESConfig.soundToggles.esPotionSound)
+        {
+            if (effect.getPotion().isBadEffect())
+            {
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_remove_negative, this.getPosition());
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_remove_negative, this.getPosition());
+            }
+            else
+            {
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_remove_positive, this.getPosition());
+                ESSoundManager.playSoundWorld(ESSoundEvents.effect_remove_positive, this.getPosition());
+            }
+        }
+    }
 }

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

@@ -203,6 +203,7 @@ public static void playSoundPlayer(SoundEvent soundEvent)
 
     public static void playSoundWorld(SoundEvent soundEvent, BlockPos blockPos, float pitch, float volume)
     {
+        if (Minecraft.getMinecraft().world == null) return;
         long now = System.currentTimeMillis();
         if (now - lastPlayed > 5)
         {
@@ -213,6 +214,7 @@ public static void playSoundWorld(SoundEvent soundEvent, BlockPos blockPos, floa
 
     public static void playSoundWorld(SoundEvent soundEvent, BlockPos blockPos)
     {
+        if (Minecraft.getMinecraft().world == null) return;
         long now = System.currentTimeMillis();
         if (now - lastPlayed > 5)
         {

src/main/java/mod/acgaming/extrasounds/sound/ESSoundManager.java

@@ -3,6 +3,6 @@
   "refmap": "extrasounds.refmap.json",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
-  "mixins": ["BlockFlowerPotMixin", "BlockJukeboxMixin", "BlockPortalMixin", "EntityEnderPearlMixin", "EntityLivingBaseMixin", "EntityPlayerMixin", "InventoryPlayerMixin", "ItemBoatMixin", "ItemBowMixin", "ItemDyeMixin", "ItemMinecartMixin", "ItemMonsterPlacerMixin", "ItemSeedsMixin", "MobSpawnerBaseLogicMixin", "SlotCraftingMixin", "TileEntityBeaconMixin"],
+  "mixins": ["BlockFlowerPotMixin", "BlockJukeboxMixin", "BlockPortalMixin", "EntityEnderPearlMixin", "EntityPlayerMixin", "InventoryPlayerMixin", "ItemBoatMixin", "ItemBowMixin", "ItemDyeMixin", "ItemMinecartMixin", "ItemMonsterPlacerMixin", "ItemSeedsMixin", "MobSpawnerBaseLogicMixin", "SlotCraftingMixin", "TileEntityBeaconMixin"],
   "client": ["GuiContainerCreativeMixin", "GuiContainerMixin", "GuiInventoryMixin", "GuiNewChatMixin", "GuiRecipeBookMixin", "GuiScreenBookMixin", "GuiTextFieldMixin", "MinecraftMixin"]
 }