Sort inventory no longer makes noises if not necessary (#23)

Signed-off-by: Hendrix-Shen <[email protected]>

Author: Hendrix-Shen

src/main/java/com/plusls/ommc/config/Configs.java

@@ -13,9 +13,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.MultiPlayerGameMode;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.core.BlockPos;
-import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
@@ -36,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 public class Configs {
     private static final List<String> OLD_WORLD_EATER_MINE_HELPER_WHITELIST = new ArrayList<>();
@@ -282,11 +281,7 @@ public static void init(@NotNull ConfigManager cm) {
         sortInventory.getKeybind().setSettings(KeybindSettings.GUI);
 
         sortInventory.getKeybind().setCallback((keyAction, iKeybind) -> {
-            if (SortInventoryUtil.sort()) {
-                Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));
-            } else {
-                Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.DISPENSER_FAIL, 1.0F));
-            }
+            Optional.ofNullable(SortInventoryUtil.sort()).ifPresent(Runnable::run);
             return false;
         });
 

src/main/java/com/plusls/ommc/feature/sortInventory/SortInventoryUtil.java

@@ -11,7 +11,9 @@
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
 import net.minecraft.client.multiplayer.MultiPlayerGameMode;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -155,12 +157,12 @@ public static Tuple<Integer, Integer> getSortRange(AbstractContainerMenu screenH
         return new Tuple<>(l, r);
     }
 
-    public static boolean sort() {
+    public static @Nullable Runnable sort() {
         Minecraft client = Minecraft.getInstance();
 
         if (!(client.screen instanceof AbstractContainerScreen<?>) ||
                 client.screen instanceof CreativeModeInventoryScreen) {
-            return false;
+            return null;
         }
 
         AbstractContainerScreen<?> handledScreen = (AbstractContainerScreen<?>) client.screen;
@@ -170,20 +172,20 @@ public static boolean sort() {
         Slot mouseSlot = ((AccessorAbstractContainerScreen) handledScreen).invokeFindSlot(x, y);
 
         if (mouseSlot == null) {
-            return false;
+            return null;
         }
 
         LocalPlayer player = client.player;
 
         if (client.gameMode == null || player == null) {
-            return false;
+            return null;
         }
 
         AbstractContainerMenu screenHandler = player.containerMenu;
         Tuple<Integer, Integer> sortRange = SortInventoryUtil.getSortRange(screenHandler, mouseSlot);
 
         if (sortRange == null) {
-            return false;
+            return null;
         }
 
         List<ItemStack> itemStacks = Lists.newArrayList();
@@ -199,7 +201,11 @@ public static boolean sort() {
         List<Tuple<Integer, Integer>> swapQueue = SortInventoryUtil.quickSort(itemStacks, sortRange.getA(),
                 sortRange.getB());
         SortInventoryUtil.doClick(player, screenHandler.containerId, client.gameMode, mergeQueue, swapQueue);
-        return !mergeQueue.isEmpty() || !swapQueue.isEmpty();
+        return (!mergeQueue.isEmpty() || !swapQueue.isEmpty()) ?
+                () -> Minecraft.getInstance().getSoundManager()
+                        .play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)) :
+                () -> Minecraft.getInstance().getSoundManager()
+                        .play(SimpleSoundInstance.forUI(SoundEvents.DISPENSER_FAIL, 1.0F));
     }
 
     public static void doClick(Player player, int syncId, @NotNull MultiPlayerGameMode interactionManager,