Implement combination step 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.4.0'
+version = '1.12.2-1.4.1'
 group = 'mod.acgaming.extrasounds'
 archivesBaseName = 'ExtraSounds'
 

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

@@ -21,7 +21,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.4.0";
+    public static final String VERSION = "1.12.2-1.4.1";
     public static final String DEPENDENCIES = "required-after:mixinbooter;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/config/ESConfig.java

@@ -122,18 +122,27 @@ public static class SoundToggles
         @Config.Name("Potion Sound")
         @Config.Comment("Play a sound when potion effects get added or removed from the player")
         public boolean esPotionSound = false;
+
+        @Config.Name("Combination Step Sound")
+        @Config.Comment
+            ({
+                "Recreates the combination step sound introduced in snapshot 23w12a",
+                "Plays an additional muffled step sound for blocks beneath carpets and snow"
+            })
+        public boolean esCombinationStepSound = true;
     }
 
     public static class SoundCategories
     {
         @Config.Name("Pick/Place Sounds")
-        @Config.Comment({
-            "Categories of sounds when picking and placing items in GUIs",
-            "Available categories: dirt, dust, gem, grass, gravel, ingot, nugget, sand, snow, stone, wood, wool",
-            "Syntax: CATEGORY;REGISTRY_NAME",
-            "Use * for ore dictionary wildcards",
-            "Examples | ingot;ore:example_ore | gem;mod_id:example_item"
-        })
+        @Config.Comment
+            ({
+                "Categories of sounds when picking and placing items in GUIs",
+                "Available categories: dirt, dust, gem, grass, gravel, ingot, nugget, sand, snow, stone, wood, wool",
+                "Syntax: CATEGORY;REGISTRY_NAME",
+                "Use * for ore dictionary wildcards",
+                "Examples | ingot;ore:example_ore | gem;mod_id:example_item"
+            })
         public String[] soundArray = new String[]
             {
                 "dust;ore:dust*",
@@ -173,10 +182,11 @@ public static class SoundCategories
     public static class MiscSettings
     {
         @Config.Name("Increase Sound Channels")
-        @Config.Comment({
-            "Increase sound channels to improve audio playback",
-            "Disable this if you're facing sound issues or have another mod installed handling this"
-        })
+        @Config.Comment
+            ({
+                "Increase sound channels to improve audio playback",
+                "Disable this if you're facing sound issues or have another mod installed handling this"
+            })
         public boolean esSoundChannels = true;
     }
 

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

@@ -0,0 +1,47 @@
+package mod.acgaming.extrasounds.mixin;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.SoundEvent;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import mod.acgaming.extrasounds.config.ESConfig;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+@Mixin(Entity.class)
+public abstract class EntityMixin
+{
+    @Shadow
+    public World world;
+
+    @Shadow
+    public abstract void playSound(SoundEvent soundIn, float volume, float pitch);
+
+    @Inject(method = "playStepSound", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;getSoundType()Lnet/minecraft/block/SoundType;"), locals = LocalCapture.CAPTURE_FAILSOFT)
+    public void esPlayStepSoundSnow(BlockPos pos, Block blockIn, CallbackInfo ci, SoundType soundtype)
+    {
+        if (!ESConfig.soundToggles.esCombinationStepSound) return;
+        this.playSound(soundtype.getStepSound(), soundtype.getVolume() * 0.08F, soundtype.getPitch() - 0.3F);
+    }
+
+    @Inject(method = "playStepSound", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/state/IBlockState;", ordinal = 1), locals = LocalCapture.CAPTURE_FAILSOFT, cancellable = true)
+    public void esPlayStepSoundCarpet(BlockPos pos, Block blockIn, CallbackInfo ci, SoundType soundtype)
+    {
+        if (!ESConfig.soundToggles.esCombinationStepSound) return;
+        if (this.world.getBlockState(pos.up()).getBlock() == Blocks.CARPET)
+        {
+            this.playSound(soundtype.getStepSound(), soundtype.getVolume() * 0.08F, soundtype.getPitch() - 0.3F);
+            SoundType soundtypeCarpet = Blocks.CARPET.getSoundType();
+            this.playSound(soundtypeCarpet.getStepSound(), soundtypeCarpet.getVolume() * 0.15F, soundtypeCarpet.getPitch());
+            ci.cancel();
+        }
+    }
+}

src/main/resources/extrasounds.server.mixins.json

@@ -3,5 +3,5 @@
   "refmap": "extrasounds.refmap.json",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
-  "mixins": ["BlockFlowerPotMixin", "BlockJukeboxMixin", "BlockPortalMixin", "EntityEnderPearlMixin", "EntityPlayerMixin", "InventoryPlayerMixin", "ItemBoatMixin", "ItemBowMixin", "ItemMinecartMixin", "ItemMonsterPlacerMixin", "ItemSeedsMixin", "MobSpawnerBaseLogicMixin", "SlotCraftingMixin", "TileEntityBeaconMixin"]
+  "mixins": ["BlockFlowerPotMixin", "BlockJukeboxMixin", "BlockPortalMixin", "EntityEnderPearlMixin", "EntityMixin", "EntityPlayerMixin", "InventoryPlayerMixin", "ItemBoatMixin", "ItemBowMixin", "ItemMinecartMixin", "ItemMonsterPlacerMixin", "ItemSeedsMixin", "MobSpawnerBaseLogicMixin", "SlotCraftingMixin", "TileEntityBeaconMixin"]
 }