Anvilcraft/HexCasting
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

casting sounds are back for casting items!

Browse source
This commit is contained in:
Talia-12 2023-06-04 22:49:28 +10:00
parent 3be1da94d4
commit a051f85396
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PackagedItemCastEnv.java vendored
View file

@ -58,4 +58,8 @@ public class PackagedItemCastEnv extends PlayerBasedCastEnv {
var casterHexHolder = IXplatAbstractions.INSTANCE.findHexHolder(casterStack);
return casterHexHolder.getPigment();
}
public EvalSound getSound() {
return sound;
}
}

19
Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemPackagedHex.java
View file

@ -1,5 +1,6 @@
package at.petrak.hexcasting.common.items.magic;
import at.petrak.hexcasting.api.casting.ParticleSpray;
import at.petrak.hexcasting.api.casting.eval.env.PackagedItemCastEnv;
import at.petrak.hexcasting.api.casting.eval.vm.CastingVM;
import at.petrak.hexcasting.api.casting.iota.Iota;
@ -13,6 +14,7 @@ import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundSource;
import net.minecraft.stats.Stat;
import net.minecraft.stats.Stats;
import net.minecraft.world.InteractionHand;
@ -21,6 +23,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.UseAnim;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
@ -123,7 +126,7 @@ public abstract class ItemPackagedHex extends ItemMediaHolder implements HexHold
var sPlayer = (ServerPlayer) player;
var ctx = new PackagedItemCastEnv(sPlayer, usedHand);
var harness = CastingVM.empty(ctx);
harness.queueExecuteAndWrapIotas(instrs, sPlayer.getLevel());
var clientView = harness.queueExecuteAndWrapIotas(instrs, sPlayer.getLevel());
boolean broken = breakAfterDepletion() && getMedia(stack) == 0;
@ -137,6 +140,20 @@ public abstract class ItemPackagedHex extends ItemMediaHolder implements HexHold
sPlayer.getCooldowns().addCooldown(this, this.cooldown());
if (clientView.getResolutionType().getSuccess()) {
// Somehow we lost spraying particles on each new pattern, so do it here
// this also nicely prevents particle spam on trinkets
new ParticleSpray(player.position(), new Vec3(0.0, 1.5, 0.0), 0.4, Math.PI / 3, 30)
.sprayParticles(sPlayer.getLevel(), ctx.getColorizer());
}
var sound = ctx.getSound().sound();
if (sound != null) {
var soundPos = sPlayer.position();
sPlayer.level.playSound(null, soundPos.x, soundPos.y, soundPos.z,
sound, SoundSource.PLAYERS, 1f, 1f);
}
if (broken) {
stack.shrink(1);
player.broadcastBreakEvent(usedHand);