PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 05:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Mixed multiple sounds playing when interacting with the spellbook's crafting grid

Browse source
This commit is contained in:
Sollace 2022-08-28 18:47:33 +02:00
parent 6ed0bb1859
commit 3d704b7def
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/com/minelittlepony/unicopia/client/sound/BufferedExecutor.java Normal file
View file

@ -0,0 +1,21 @@
package com.minelittlepony.unicopia.client.sound;
import java.util.*;
import java.util.concurrent.*;
public class BufferedExecutor {
private static final Executor EXECUTOR = CompletableFuture.delayedExecutor(50, TimeUnit.MILLISECONDS);
private static final Map<Integer, CompletableFuture<?>> PENDING_EXECUTIONS = new HashMap<>();
public static void bufferExecution(Object obj, Runnable action) {
synchronized (PENDING_EXECUTIONS) {
PENDING_EXECUTIONS.computeIfAbsent(obj.hashCode(), hash -> {
return CompletableFuture.runAsync(action, EXECUTOR).thenRun(() -> {
synchronized (PENDING_EXECUTIONS) {
PENDING_EXECUTIONS.remove(hash);
}
});
});
}
}
}

5
src/main/java/com/minelittlepony/unicopia/container/SpellbookScreenHandler.java
View file

@ -6,6 +6,7 @@ import com.minelittlepony.unicopia.EquinePredicates;
import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe; import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe;
import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits;
import com.minelittlepony.unicopia.client.sound.BufferedExecutor;
import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.URecipes; import com.minelittlepony.unicopia.item.URecipes;
@ -442,7 +443,9 @@ public class SpellbookScreenHandler extends ScreenHandler {
@Override @Override
public void setStack(ItemStack stack) { public void setStack(ItemStack stack) {
if (!stack.isEmpty() && !ItemStack.areEqual(stack, getStack())) { if (!stack.isEmpty() && !ItemStack.areEqual(stack, getStack())) {
player.playSound(stack.getItem() == UItems.BOTCHED_GEM ? USounds.GUI_ABILITY_FAIL : USounds.GUI_SPELL_CRAFT_SUCCESS, SoundCategory.MASTER, 1, 0.3F); BufferedExecutor.bufferExecution(player, () -> {
player.playSound(stack.getItem() == UItems.BOTCHED_GEM ? USounds.GUI_ABILITY_FAIL : USounds.GUI_SPELL_CRAFT_SUCCESS, SoundCategory.MASTER, 1, 0.3F);
});
} }
super.setStack(stack); super.setStack(stack);
} }