refactor: port to mojmaps

1 files changed, 15 insertions, 15 deletions

diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockHitSoundPatch.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockHitSoundPatch.java
index 95e7dce..7718735 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockHitSoundPatch.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceBlockHitSoundPatch.java
@@ -4,27 +4,27 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import moe.nea.firmament.features.texturepack.CustomBlockTextures;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.network.ClientPlayerInteractionManager;
-import net.minecraft.client.sound.PositionedSoundInstance;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvent;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.random.Random;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.client.multiplayer.MultiPlayerGameMode;
+import net.minecraft.client.resources.sounds.SimpleSoundInstance;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.RandomSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(ClientPlayerInteractionManager.class)
+@Mixin(MultiPlayerGameMode.class)
 public class ReplaceBlockHitSoundPatch {
-    @WrapOperation(method = "updateBlockBreakingProgress",
-		at = @At(value = "NEW", target = "(Lnet/minecraft/sound/SoundEvent;Lnet/minecraft/sound/SoundCategory;FFLnet/minecraft/util/math/random/Random;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/client/sound/PositionedSoundInstance;"))
-    private PositionedSoundInstance replaceSound(
-        SoundEvent sound, SoundCategory category, float volume, float pitch,
-        Random random, BlockPos pos, Operation<PositionedSoundInstance> original,
-        @Local BlockState blockState) {
+    @WrapOperation(method = "continueDestroyBlock",
+		at = @At(value = "NEW", target = "(Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;FFLnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/client/resources/sounds/SimpleSoundInstance;"))
+    private SimpleSoundInstance replaceSound(
+            SoundEvent sound, SoundSource category, float volume, float pitch,
+            RandomSource random, BlockPos pos, Operation<SimpleSoundInstance> original,
+            @Local BlockState blockState) {
         var replacement = CustomBlockTextures.getReplacement(blockState, pos);
         if (replacement != null && replacement.getSound() != null) {
-            sound = SoundEvent.of(replacement.getSound());
+            sound = SoundEvent.createVariableRangeEvent(replacement.getSound());
         }
         return original.call(sound, category, volume, pitch, random, pos);
     }