RealisticSound Try #551
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package com.paneedah.mwc.network.handlers; | ||
|
|
||
| import com.paneedah.mwc.network.messages.RealisticSoundClientMessage; | ||
| import com.paneedah.weaponlib.sound.ClientSoundPlayer; | ||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.util.SoundCategory; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.IMessage; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; | ||
|
|
||
| public class RealisticSoundClientHandler implements IMessageHandler<RealisticSoundClientMessage, IMessage> { | ||
|
|
||
| @Override | ||
| public IMessage onMessage(final RealisticSoundClientMessage message, final MessageContext ctx) { | ||
| Minecraft.getMinecraft().addScheduledTask(() -> { | ||
|
Member
There was a problem hiding this comment. Use |
||
| Minecraft minecraft = Minecraft.getMinecraft(); | ||
|
Member
There was a problem hiding this comment. Use the constant |
||
| if (minecraft.world != null) { | ||
| ClientSoundPlayer csp = new ClientSoundPlayer(); | ||
| csp.PlaySoundClient(message.getDistance(), message.getSound(), SoundCategory.PLAYERS, message.getVolume(), message.getPitch(), (float)message.getPos().getX(), (float)message.getPos().getY(), (float)message.getPos().getZ()); | ||
|
Comment on lines
+18
to
+19
Member
There was a problem hiding this comment. In this case using a local variable is useless as you aren't using it twice, simply do Although for better performance get rid of |
||
| } | ||
|
Desoroxxx marked this conversation as resolved.
|
||
| }); | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package com.paneedah.mwc.network.handlers; | ||
|
|
||
| import com.paneedah.mwc.network.messages.RealisticSoundClientMessage; | ||
| import com.paneedah.mwc.network.messages.RealisticSoundMessage; | ||
| import com.paneedah.weaponlib.sound.RealisticSound; | ||
| import net.minecraft.entity.player.EntityPlayer; | ||
| import net.minecraft.entity.player.EntityPlayerMP; | ||
| import net.minecraft.world.World; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.IMessage; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| import static com.paneedah.mwc.MWC.CHANNEL; | ||
|
|
||
| public class RealisticSoundHandler implements IMessageHandler<RealisticSoundMessage, IMessage> { | ||
|
Member
There was a problem hiding this comment. Should be |
||
|
|
||
| @Override | ||
| public IMessage onMessage(final RealisticSoundMessage message, final MessageContext ctx) { | ||
| ctx.getServerHandler().player.getServerWorld().addScheduledTask(() -> { | ||
|
strubium marked this conversation as resolved.
Member
There was a problem hiding this comment. Use |
||
| final EntityPlayer player = ctx.getServerHandler().player; | ||
| final World world = player.getEntityWorld(); | ||
| for (EntityPlayer playerInWorld : world.playerEntities) { | ||
| final double distance = Math.sqrt(message.getPos().distanceSq(playerInWorld.getPosition())); | ||
| final RealisticSound sound = RealisticSound.createSound(message.getSilencer(), message.getSound(), message.getPos(), playerInWorld.getPosition()); | ||
| if (sound.getVolumeIn() > 0) { | ||
| if (playerInWorld instanceof EntityPlayerMP) { | ||
|
|
||
| EntityPlayerMP playerMP = (EntityPlayerMP) playerInWorld; | ||
This comment was marked as off-topic.
Sorry, something went wrong. |
||
| playerMP.getServerWorld().addScheduledTask(() -> { | ||
| CHANNEL.sendTo(new RealisticSoundClientMessage(sound.getSound(), message.getPos(), sound.getVolumeIn(), sound.getPitchIn(), distance), playerMP); | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package com.paneedah.mwc.network.messages; | ||
|
|
||
| import io.netty.buffer.ByteBuf; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import net.minecraft.util.ResourceLocation; | ||
| import net.minecraft.util.SoundEvent; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.IMessage; | ||
|
|
||
|
|
||
| @Getter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public final class RealisticSoundClientMessage implements IMessage { | ||
|
|
||
| private float volume; | ||
| private float pitch; | ||
|
|
||
| private double distance; | ||
|
|
||
| private SoundEvent sound; | ||
| private BlockPos pos; | ||
|
|
||
| @Override | ||
| public void fromBytes(final ByteBuf buf) { | ||
| int length = buf.readInt(); | ||
| byte[] soundBytes = new byte[length]; | ||
| buf.readBytes(soundBytes); | ||
| String soundName = new String(soundBytes); | ||
| sound = SoundEvent.REGISTRY.getObject(new ResourceLocation(soundName)); | ||
|
Comment on lines
+28
to
+32
Member
There was a problem hiding this comment. Use sound event ID instead |
||
|
|
||
| final int x = buf.readInt(); | ||
| final int y = buf.readInt(); | ||
| final int z = buf.readInt(); | ||
| pos = new BlockPos(x, y, z); | ||
|
|
||
| volume = buf.readFloat(); | ||
| pitch = buf.readFloat(); | ||
| distance = buf.readDouble(); | ||
| } | ||
|
|
||
| @Override | ||
| public void toBytes(ByteBuf buf) { | ||
| String soundName = sound.getRegistryName().toString(); | ||
| byte[] soundBytes = soundName.getBytes(); | ||
| buf.writeInt(soundBytes.length); | ||
| buf.writeBytes(soundBytes); | ||
|
Comment on lines
+46
to
+49
Member
There was a problem hiding this comment. Use sound event ID instead |
||
|
|
||
| buf.writeInt(pos.getX()); | ||
| buf.writeInt(pos.getY()); | ||
| buf.writeInt(pos.getZ()); | ||
|
|
||
| buf.writeFloat(volume); | ||
| buf.writeFloat(pitch); | ||
| buf.writeDouble(distance); | ||
| } | ||
|
Desoroxxx marked this conversation as resolved.
|
||
|
|
||
| public SoundEvent getSound() {return this.sound;} | ||
| public BlockPos getPos() { return this.pos;} | ||
| public float getVolume() {return this.volume;} | ||
| public float getPitch() {return this.pitch;} | ||
| public double getDistance() {return this.distance;} | ||
|
Desoroxxx marked this conversation as resolved.
Comment on lines
+60
to
+64
Member
There was a problem hiding this comment. Useless because of the |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.paneedah.mwc.network.messages; | ||
|
|
||
| import io.netty.buffer.ByteBuf; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import net.minecraft.util.ResourceLocation; | ||
| import net.minecraft.util.SoundEvent; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraftforge.fml.common.network.simpleimpl.IMessage; | ||
|
|
||
| @Getter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public final class RealisticSoundMessage implements IMessage { | ||
| private boolean silencer; | ||
|
|
||
| private int dimensionId; | ||
|
|
||
| private SoundEvent sound; | ||
| private BlockPos pos; | ||
|
|
||
| @Override | ||
| public void fromBytes(final ByteBuf buf) { | ||
| int length = buf.readInt(); | ||
| byte[] soundBytes = new byte[length]; | ||
| buf.readBytes(soundBytes); | ||
| String soundName = new String(soundBytes); | ||
| sound = SoundEvent.REGISTRY.getObject(new ResourceLocation(soundName)); | ||
|
Desoroxxx marked this conversation as resolved.
Comment on lines
+25
to
+29
Member
There was a problem hiding this comment. Use sound event ID instead |
||
| final int x = buf.readInt(); | ||
| final int y = buf.readInt(); | ||
| final int z = buf.readInt(); | ||
| pos = new BlockPos(x, y, z); | ||
|
|
||
| dimensionId = buf.readInt(); | ||
| silencer = buf.readBoolean(); | ||
| } | ||
|
|
||
| @Override | ||
| public void toBytes(final ByteBuf buf) { | ||
| String soundName = sound.getRegistryName().toString(); | ||
| byte[] soundBytes = soundName.getBytes(); | ||
|
Desoroxxx marked this conversation as resolved.
|
||
| buf.writeInt(soundBytes.length); | ||
| buf.writeBytes(soundBytes); | ||
|
Comment on lines
+41
to
+44
Member
There was a problem hiding this comment. Use sound event ID instead |
||
|
|
||
| buf.writeInt(pos.getX()); | ||
| buf.writeInt(pos.getY()); | ||
| buf.writeInt(pos.getZ()); | ||
|
Desoroxxx marked this conversation as resolved.
|
||
|
|
||
| buf.writeInt(dimensionId); | ||
| buf.writeBoolean(silencer); | ||
| } | ||
| public SoundEvent getSound() {return this.sound;} | ||
| public BlockPos getPos() { return this.pos;} | ||
| public int getWorldId() {return this.dimensionId;} | ||
| public boolean getSilencer() {return this.silencer;} | ||
|
Comment on lines
+53
to
+56
Member
There was a problem hiding this comment. Useless because of the |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package com.paneedah.weaponlib.sound; | ||
|
|
||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.client.audio.ISound; | ||
| import net.minecraft.client.audio.PositionedSoundRecord; | ||
| import net.minecraft.util.SoundCategory; | ||
| import net.minecraft.util.SoundEvent; | ||
| import net.minecraftforge.fml.relauncher.Side; | ||
| import net.minecraftforge.fml.relauncher.SideOnly; | ||
|
|
||
| public final class ClientSoundPlayer { | ||
|
|
||
| @SideOnly(Side.CLIENT) | ||
| public void PlaySoundClient(double distance, SoundEvent soundIn, SoundCategory categoryIn, float volumeIn, float pitchIn, float xIn, float yIn, float zIn) { | ||
|
Comment on lines
+13
to
+14
Member
There was a problem hiding this comment. final, too much to do in GitHub |
||
| Minecraft mc = Minecraft.getMinecraft(); | ||
|
Member
There was a problem hiding this comment. Use the constant |
||
| PositionedSoundRecord positionedsoundrecord = new PositionedSoundRecord(soundIn.getSoundName(), categoryIn, volumeIn, pitchIn, false, 0, ISound.AttenuationType.NONE, xIn,yIn, zIn); | ||
|
|
||
| if (distance > 100.0D) | ||
| { | ||
| final double d1 = Math.sqrt(distance) / 40D; | ||
| mc.getSoundHandler().playDelayedSound(positionedsoundrecord, (int)(d1 * 20.0D)); | ||
|
Member
There was a problem hiding this comment. Double mathed, you first diveded it by 40 and then multiplied by 20, justice for poor CPU |
||
| } else { | ||
| mc.getSoundHandler().playSound(positionedsoundrecord); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package com.paneedah.weaponlib.sound; | ||
|
|
||
| import net.minecraft.util.SoundCategory; | ||
| import net.minecraft.util.SoundEvent; | ||
| import net.minecraft.util.math.BlockPos; | ||
|
|
||
| public final class RealisticSound { | ||
|
|
||
| private static final double MAX_DISTANCE = 400D; | ||
| private static final double MAX_DISTANCE_SILENCER = 100D; | ||
|
|
||
| private final float volumeIn; | ||
| private final float pitchIn; | ||
|
|
||
| private final SoundEvent sound; | ||
|
|
||
| public RealisticSound(SoundEvent sound, float volumeIn, float pitchIn) { | ||
| this.sound = sound; | ||
| this.volumeIn = volumeIn; | ||
| this.pitchIn = pitchIn; | ||
| } | ||
|
Comment on lines
+17
to
+21
Member
There was a problem hiding this comment. Use an |
||
|
|
||
| public static RealisticSound createSound(Boolean silencer, SoundEvent soundIn, BlockPos origin, BlockPos playercoord) { | ||
|
|
||
| double distance = Math.sqrt(playercoord.distanceSq(origin)); | ||
| float volume = (float) adjustVolumeForDistance(silencer, distance); | ||
| return new RealisticSound(soundIn, volume, 1.0F); | ||
|
Comment on lines
+24
to
+26
Member
There was a problem hiding this comment. local variables are unecessary here |
||
| } | ||
|
|
||
| public static double adjustVolumeForDistance(final boolean silencer, final double distance) { | ||
| final double maxDistance = silencer ? MAX_DISTANCE_SILENCER : MAX_DISTANCE; | ||
| if (distance >= maxDistance) | ||
| return 0; | ||
|
|
||
| if (distance <= 0) | ||
| return 1; | ||
|
|
||
| return 1 - (distance / maxDistance); | ||
| } | ||
|
|
||
| public SoundEvent getSound() { | ||
| return sound; | ||
| } | ||
|
|
||
| public float getVolumeIn() { | ||
| return volumeIn; | ||
| } | ||
|
|
||
| public float getPitchIn() { | ||
| return pitchIn; | ||
| } | ||
|
Comment on lines
+40
to
+50
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be
RealisticSoundClientMessageHandler, also should befinal