RealisticSound Try

build.gradle.kts

@@ -23,7 +23,7 @@ val mixinBooterVersion = "10.2"
 
 minecraft {
     mcVersion = "1.12.2"
-    username = "Desoroxxx"
+    username = "_Chapy_"
     extraRunJvmArguments = listOf("-Dforge.logging.console.level=debug", "-Dfml.coreMods.load=${plugin}", "-Dmixin.hotSwap=true", "-Dmixin.checks.mixininterfaces=true", "-Dmixin.debug.export=true")
 }
 

src/main/java/com/paneedah/mwc/MWC.java

@@ -15,11 +15,9 @@
 import com.paneedah.weaponlib.command.CraftingFileCommand;
 import com.paneedah.weaponlib.command.DebugCommand;
 import com.paneedah.weaponlib.config.BalancePackManager;
-import com.paneedah.weaponlib.config.ModernConfigManager;
 import io.redstudioragnarok.redcore.RedCore;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
@@ -125,6 +123,7 @@ public void init(FMLInitializationEvent initializationEvent) {
         CHANNEL.registerMessage(new VehicleClientMessageHandler(), VehicleClientMessage.class, -13, Side.CLIENT);
         CHANNEL.registerMessage(new EntityInventorySyncMessageClientHandler(modContext), EntityInventorySyncMessage.class, -14, Side.CLIENT);
         CHANNEL.registerMessage(new ExposureMessageHandler(), ExposureMessage.class, -15, Side.CLIENT);
+        CHANNEL.registerMessage(new RealisticSoundClientHandler(), RealisticSoundClientMessage.class, -16, Side.CLIENT);
 
         CHANNEL.registerMessage(new TryFireMessageHandler(modContext.getWeaponFireAspect()), TryFireMessage.class, 1, Side.SERVER);
         CHANNEL.registerMessage(new PermitMessageServerHandler((CommonModContext) modContext), PermitMessage.class, 2, Side.SERVER);
@@ -139,6 +138,7 @@ public void init(FMLInitializationEvent initializationEvent) {
         CHANNEL.registerMessage(new WorkbenchServerMessageHandler(), WorkbenchServerMessage.class, 11, Side.SERVER);
         CHANNEL.registerMessage(new CraftingServerMessageHandler(), CraftingServerMessage.class, 12, Side.SERVER);
         CHANNEL.registerMessage(new EntityPickupMessageHandler(), EntityPickupMessage.class, 13, Side.SERVER);
+        CHANNEL.registerMessage(new RealisticSoundHandler(), RealisticSoundMessage.class, 14, Side.SERVER);
     }
 
     @Mod.EventHandler

src/main/java/com/paneedah/mwc/network/handlers/RealisticSoundClientHandler.java

@@ -0,0 +1,24 @@
+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(RealisticSoundClientMessage message, MessageContext ctx) {
+        Minecraft.getMinecraft().addScheduledTask(() -> {
+            Minecraft minecraft = Minecraft.getMinecraft();
+            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());
+            }
+        });
+        return null;
+    }
+}

src/main/java/com/paneedah/mwc/network/handlers/RealisticSoundHandler.java

@@ -0,0 +1,42 @@
+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> {
+
+    @Override
+    public IMessage onMessage(RealisticSoundMessage message, MessageContext ctx) {
+        ctx.getServerHandler().player.getServerWorld().addScheduledTask(() -> {
+            EntityPlayer player = ctx.getServerHandler().player;
+            World world = player.getEntityWorld();
+            for (EntityPlayer playerInWorld : world.playerEntities) {
+                double distance = Math.sqrt(message.getPos().distanceSq(playerInWorld.getPosition()));
+                RealisticSound sound = RealisticSound.createSound(message.getSilencer(), message.getSound(), message.getPos(), playerInWorld.getPosition());
+                if (sound.getVolumeIn() > 0.0F) {
+                    if (playerInWorld instanceof EntityPlayerMP) {
+                    EntityPlayerMP playerMP = (EntityPlayerMP) playerInWorld;
+                    playerMP.getServerWorld().addScheduledTask(() -> {
+                        CHANNEL.sendTo(
+                                new RealisticSoundClientMessage(sound.getSound(), message.getPos(), sound.getVolumeIn(), sound.getPitchIn(), distance),
+                                playerMP
+                        );
+                    });
+                    }
+                }
+            }
+        });
+        return null;
+    }
+}

src/main/java/com/paneedah/mwc/network/messages/RealisticSoundClientMessage.java

@@ -0,0 +1,62 @@
+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 class RealisticSoundClientMessage implements IMessage {
+
+    private SoundEvent sound;
+    private BlockPos pos;
+    private float volume;
+    private float pitch;
+    private double distance;
+
+    @Override
+    public void fromBytes(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));
+
+        int x = buf.readInt();
+        int y = buf.readInt();
+        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);
+
+        buf.writeInt(pos.getX());
+        buf.writeInt(pos.getY());
+        buf.writeInt(pos.getZ());
+
+        buf.writeFloat(volume);
+        buf.writeFloat(pitch);
+        buf.writeDouble(distance);
+    }
+
+    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;}
+}

src/main/java/com/paneedah/mwc/network/messages/RealisticSoundMessage.java

@@ -0,0 +1,52 @@
+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 class RealisticSoundMessage implements IMessage {
+    boolean silencer;
+    private SoundEvent sound;
+    private BlockPos pos;
+    private int dimensionId;
+
+    @Override
+    public void fromBytes(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));
+        int x = buf.readInt();
+        int y = buf.readInt();
+        int z = buf.readInt();
+        pos = new BlockPos(x, y, z);
+        dimensionId = buf.readInt();
+        silencer = buf.readBoolean();
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        String soundName = sound.getRegistryName().toString();
+        byte[] soundBytes = soundName.getBytes();
+        buf.writeInt(soundBytes.length);
+        buf.writeBytes(soundBytes);
+        buf.writeInt(pos.getX());
+        buf.writeInt(pos.getY());
+        buf.writeInt(pos.getZ());
+        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;}
+}

src/main/java/com/paneedah/weaponlib/WeaponFireAspect.java

@@ -4,6 +4,7 @@
 import com.paneedah.mwc.instancing.Tags;
 import com.paneedah.mwc.network.NetworkPermitManager;
 import com.paneedah.mwc.network.messages.MuzzleFlashMessage;
+import com.paneedah.mwc.network.messages.RealisticSoundMessage;
 import com.paneedah.mwc.network.messages.ShellMessageClient;
 import com.paneedah.mwc.network.messages.TryFireMessage;
 import com.paneedah.weaponlib.animation.ClientValueRepo;
@@ -285,11 +286,7 @@ private void fire(PlayerWeaponInstance weaponInstance) {
             // Should prevent sound from being one sided
 
             if (!FMLCommonHandler.instance().getSide().isServer()) {
-
-                //
-                PositionedSoundRecord psr = new PositionedSoundRecord(shootSound, SoundCategory.PLAYERS, silencerOn ? weapon.getSilencedShootSoundVolume() * 0.4f : weapon.getShootSoundVolume() * 0.4f, 1.0F, MC.player.getPosition().up(5));
-                playShootSound(psr);
-                //MC.getSoundHandler().playSound(psr);
+                CHANNEL.sendToServer(new RealisticSoundMessage(silencerOn, shootSound, player.getPosition(), player.getEntityWorld().getWorldType().getId()));
             }
 
 
@@ -300,12 +297,12 @@ private void fire(PlayerWeaponInstance weaponInstance) {
         }
 
         int currentAmmo = weaponInstance.getAmmo();
-        if (currentAmmo == 1 && weapon.getEndOfShootSound() != null && !FMLCommonHandler.instance().getSide().isServer()) {
-            PositionedSoundRecord psr = new PositionedSoundRecord(weapon.getEndOfShootSound(), SoundCategory.PLAYERS, 1.0F, 1.0F, MC.player.getPosition().up(5));
-            playShootSound(psr);
+        if(currentAmmo == 1 && weapon.getEndOfShootSound() != null && !FMLCommonHandler.instance().getSide().isServer()) {
+            CHANNEL.sendToServer(new RealisticSoundMessage(silencerOn,weapon.getEndOfShootSound(), player.getPosition(), player.getEntityWorld().getWorldType().getId()));
+//        	PositionedSoundRecord psr = new PositionedSoundRecord(weapon.getEndOfShootSound(), SoundCategory.PLAYERS, 1.0F, 1.0F, MC.player.getPosition().up(5));
+//        	playShootSound(psr);
             //MC.getSoundHandler().playSound(psr);
         }
-
         if (currentAmmo == 1) {
             weaponInstance.setSlideLock(true);
         }
@@ -353,22 +350,22 @@ private void fire(PlayerWeaponInstance weaponInstance) {
             ClientEventHandler.SHELL_MANAGER.enqueueShell(shell);
 
             //Shell
-        	
+
         	/*
         	// Change the raw position
         	Vec3d rawPosition = new Vec3d(ClientEventHandler.NEW_POS.get(0), ClientEventHandler.NEW_POS.get(1), ClientEventHandler.NEW_POS.get(2));
-        	
-        	
+
+
         	// Calculate the final position of the bullet spawn point
         	// by changing it's position along its own vector
         	double distance = 0.5;
 			Vec3d eyePos = MC.player.getPositionEyes(1.0f);
 			Vec3d finalPosition = rawPosition.subtract(eyePos).normalize().scale(distance).add(eyePos);
-			
+
         	// Calculate velocity as 90 degrees to player
 			Vec3d velocity = new Vec3d(-0.3, 0.1, 0.0);
     		velocity = velocity.rotateYaw((float) Math.toRadians(-MC.player.rotationYaw));
-    		
+
     		// Spawn in shell
     		Shell shell = new Shell(weaponInstance.getWeapon().getShellType(), new Vec3d(finalPosition.x, finalPosition.y, finalPosition.z), new Vec3d(90, 0, 90), velocity);
         	ClientEventHandler.shellManager.enqueueShell(shell);
@@ -393,7 +390,7 @@ private void ejectSpentRound(PlayerWeaponInstance weaponInstance) {
         player.playSound(weaponInstance.getWeapon().getEjectSpentRoundSound(), 1, 1);
     }
 
-    //(weapon, player) 
+    //(weapon, player)
     public void serverFire(EntityLivingBase player, boolean isBurst, boolean isAimed) {
         serverFire(player, player.getHeldItemMainhand(), null, isBurst, isAimed, 1.0f);
     }
@@ -423,7 +420,7 @@ public void serverFire(EntityLivingBase player, ItemStack itemStack, BiFunction<
         }
 
         //System.out.println(isAimed);
-      
+
         /*
         int itemIndex = 0;
         EntityPlayer realPlayer = (EntityPlayer) player;
@@ -432,9 +429,9 @@ public void serverFire(EntityLivingBase player, ItemStack itemStack, BiFunction<
         		itemIndex = i;
         	}
         }
-        
-        
-        
+
+
+
         PlayerWeaponInstance pwi = new PlayerWeaponInstance(itemIndex, player, itemStack);
         System.out.println(pwi.isAimed());
             	*/
@@ -509,4 +506,4 @@ public void serverFire(EntityLivingBase player, ItemStack itemStack, BiFunction<
 
     }
 
-}
+}

src/main/java/com/paneedah/weaponlib/sound/ClientSoundPlayer.java

@@ -0,0 +1,24 @@
+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 class ClientSoundPlayer {
+    @SideOnly(Side.CLIENT)
+    public void PlaySoundClient(double distance, SoundEvent soundIn, SoundCategory categoryIn, float volumeIn, float pitchIn, float xIn, float yIn, float zIn) {
+        Minecraft mc = Minecraft.getMinecraft();
+        PositionedSoundRecord positionedsoundrecord = new PositionedSoundRecord(soundIn.getSoundName(), categoryIn, volumeIn, pitchIn, false, 0, ISound.AttenuationType.NONE, xIn,yIn, zIn);
+        if (distance > 100.0D)
+        {
+            double d1 = Math.sqrt(distance) / 40.0D;
+            mc.getSoundHandler().playDelayedSound(positionedsoundrecord, (int)(d1 * 20.0D));
+        } else {
+            mc.getSoundHandler().playSound(positionedsoundrecord);
+        }
+    }
+}