kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

调整滋崩音效

Browse source
This commit is contained in:
Atsuihsio 2024-12-03 01:55:51 +08:00
parent 03805792c5
commit 8a11dfcc8a
11 changed files with 43 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java
View file

@ -350,7 +350,7 @@ public class ClientEventHandler {
}
public static void beamShoot(Player player, ItemStack stack) {
if (stack.is(ModItems.BEAM_TEST.get()) && stack.getOrCreateTag().getBoolean("LaserFiring")) {
if (stack.is(ModItems.BEAM_TEST.get()) && player.getUseItem() == stack) {
Entity lookingEntity = TraceTool.laserfindLookingEntity(player, 512);
if (player.isCrouching()) {

3
src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java
View file

@ -334,4 +334,7 @@ public class ModSounds {
public static final RegistryObject<SoundEvent> CHARGE_RIFLE_FIRE_1P = REGISTRY.register("charge_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "charge_rifle_fire_1p")));
public static final RegistryObject<SoundEvent> CHARGE_RIFLE_FIRE_3P = REGISTRY.register("charge_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "charge_rifle_fire_3p")));
public static final RegistryObject<SoundEvent> CHARGE_RIFLE_FIRE_BOOM_1P = REGISTRY.register("charge_rifle_fire_boom_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "charge_rifle_fire_boom_1p")));
public static final RegistryObject<SoundEvent> CHARGE_RIFLE_FIRE_BOOM_3P = REGISTRY.register("charge_rifle_fire_boom_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "charge_rifle_fire_boom_3p")));
}

41
src/main/java/com/atsuishio/superbwarfare/item/BeamTest.java
View file

@ -10,7 +10,6 @@ import com.atsuishio.superbwarfare.network.message.LaserShootMessage;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
import com.atsuishio.superbwarfare.tools.TraceTool;
import net.minecraft.network.protocol.game.ClientboundStopSoundPacket;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundSource;
@ -22,9 +21,11 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.network.PacketDistributor;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.Comparator;
import java.util.Set;
public class BeamTest extends Item {
@ -35,15 +36,10 @@ public class BeamTest extends Item {
@Override
public InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand hand) {
ItemStack stack = player.getItemInHand(hand);
player.getCapability(ModCapabilities.LASER_CAPABILITY).ifPresent(capability -> {
player.startUsingItem(hand);
SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, "charge_rifle_fire_1p"));
if (sound1p != null) {
player.playSound(sound1p, 1f, 1);
}
player.playSound(ModSounds.CHARGE_RIFLE_FIRE_1P.get(), 1, 1);
if (!level.isClientSide) {
double px = player.getX();
@ -54,15 +50,7 @@ public class BeamTest extends Item {
LaserEntity laserEntity = new LaserEntity(player.level(), player, px, py, pz, yHeadRotAngle, xHeadRotAngle, 6000);
capability.init(new LaserHandler(player, laserEntity));
capability.start();
if (!stack.getOrCreateTag().getBoolean("LaserFiring") && !(player.getCooldowns().isOnCooldown(stack.getItem()))) {
stack.getOrCreateTag().putBoolean("LaserFiring", true);
}
SoundEvent sound3p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, "charge_rifle_fire_3p"));
if (sound3p != null) {
player.playSound(sound3p, 4, 1f);
}
player.playSound(ModSounds.CHARGE_RIFLE_FIRE_3P.get(), 1, 1);
}
});
@ -73,7 +61,6 @@ public class BeamTest extends Item {
public void releaseUsing(ItemStack stack, Level level, LivingEntity livingEntity, int timeCharged) {
if (livingEntity instanceof Player player) {
player.getCapability(ModCapabilities.LASER_CAPABILITY).ifPresent(LaserCapability.ILaserCapability::stop);
stack.getOrCreateTag().putBoolean("LaserFiring", false);
}
if (livingEntity instanceof ServerPlayer serverPlayer && stack.getItem() instanceof BeamTest beamTest) {
stopGunChargeSound(serverPlayer,beamTest);
@ -86,7 +73,10 @@ public class BeamTest extends Item {
private static void stopGunChargeSound(ServerPlayer player, BeamTest beamTest) {
beamTest.getChargeSound().forEach(sound -> {
var clientboundstopsoundpacket = new ClientboundStopSoundPacket(sound.getLocation(), SoundSource.PLAYERS);
player.connection.send(clientboundstopsoundpacket);
final Vec3 center = new Vec3(player.getX(), player.getY(), player.getZ());
for (ServerPlayer player1 : player.level().getEntitiesOfClass(ServerPlayer.class, new AABB(center, center).inflate(32), e -> true).stream().sorted(Comparator.comparingDouble(e -> e.distanceToSqr(center))).toList()) {
player1.connection.send(clientboundstopsoundpacket);
}
});
}
@ -98,14 +88,17 @@ public class BeamTest extends Item {
public ItemStack finishUsingItem(ItemStack pStack, Level pLevel, LivingEntity pLivingEntity) {
if (pLivingEntity instanceof Player player) {
player.getCapability(ModCapabilities.LASER_CAPABILITY).ifPresent(LaserCapability.ILaserCapability::stop);
pStack.getOrCreateTag().putBoolean("LaserFiring", false);
if (player instanceof ServerPlayer serverPlayer) {
ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> serverPlayer), new ShakeClientMessage(30,10,20, serverPlayer.getX(), serverPlayer.getEyeY(), serverPlayer.getZ()));
}
player.getCooldowns().addCooldown(pStack.getItem(), 20);
if (player.level().isClientSide()) {
beamShoot(player);
player.playSound(ModSounds.CHARGE_RIFLE_FIRE_BOOM_1P.get(), 1, 1);
}
if (!player.level().isClientSide) {
player.playSound(ModSounds.CHARGE_RIFLE_FIRE_BOOM_3P.get(), 4, 1);
}
if (player instanceof ServerPlayer serverPlayer) {
ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> serverPlayer), new ShakeClientMessage(10,10,30, serverPlayer.getX(), serverPlayer.getEyeY(), serverPlayer.getZ()));
}
}
return super.finishUsingItem(pStack, pLevel, pLivingEntity);
@ -128,7 +121,7 @@ public class BeamTest extends Item {
@Override
public int getUseDuration(ItemStack stack) {
return 10;
return 11;
}
@Override

6
src/main/java/com/atsuishio/superbwarfare/mixins/LivingEntityMixin.java
View file

@ -25,10 +25,12 @@ public class LivingEntityMixin {
private double modifyApplyKnockbackArgs(double original) {
if (this.target$source.is(ModDamageTypes.GUN_FIRE) || this.target$source.is(ModDamageTypes.GUN_FIRE_HEADSHOT)
|| this.target$source.is(ModDamageTypes.SHOCK) || this.target$source.is(ModDamageTypes.GUN_FIRE_ABSOLUTE)
|| this.target$source.is(ModDamageTypes.GUN_FIRE_HEADSHOT_ABSOLUTE) || this.target$source.is(ModDamageTypes.BURN)
|| this.target$source.is(ModDamageTypes.LASER)) {
|| this.target$source.is(ModDamageTypes.GUN_FIRE_HEADSHOT_ABSOLUTE) || this.target$source.is(ModDamageTypes.BURN)) {
return 0.05 * original;
}
if (this.target$source.is(ModDamageTypes.LASER)) {
return -original;
}
return original;
}
}

2
src/main/resources/assets/superbwarfare/lang/en_us.json
View file

@ -328,7 +328,7 @@
"death.attack.drone_hit.item": "%1$s被%2$s用无人机叶片切碎了",
"death.attack.laser": "%1$s被激光射穿了",
"death.attack.laser.entity": "%1$s被%2$s用激光射穿了",
"death.attack.laser.item": "%1$s被%2$s用激光射穿了",
"death.attack.laser.item": "%1$s被%2$s用%3$s激光射穿了",
"gui.superbwarfare.mortar_gui.button_set": "Confirm",

2
src/main/resources/assets/superbwarfare/lang/zh_cn.json
View file

@ -328,7 +328,7 @@
"death.attack.drone_hit.item": "%1$s被%2$s用无人机叶片切碎了",
"death.attack.laser": "%1$s被激光射穿了",
"death.attack.laser.entity": "%1$s被%2$s用激光射穿了",
"death.attack.laser.item": "%1$s被%2$s用激光射穿了",
"death.attack.laser.item": "%1$s被%2$s用%3$s激光射穿了",
"gui.superbwarfare.mortar_gui.button_set": "确认",

16
src/main/resources/assets/superbwarfare/sounds.json
View file

@ -2373,5 +2373,21 @@
"stream": false
}
]
},
"charge_rifle_fire_boom_1p": {
"sounds": [
{
"name": "superbwarfare:charge_rifle/charge_rifle_fire_boom_1p",
"stream": false
}
]
},
"charge_rifle_fire_boom_3p": {
"sounds": [
{
"name": "superbwarfare:charge_rifle/charge_rifle_fire_boom_3p",
"stream": false
}
]
}
}

BIN
src/main/resources/assets/superbwarfare/sounds/charge_rifle/charge_rifle_fire_1p.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/charge_rifle/charge_rifle_fire_3p.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/charge_rifle/charge_rifle_fire_boom_1p.ogg Normal file
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/charge_rifle/charge_rifle_fire_boom_3p.ogg Normal file
View file

Binary file not shown.