added new fart sounds

and increased the volume
NicosaurusRex99 · Jan 7, 2018 · d144d28 · d144d28
1 parent 189739c
commit d144d28
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 3 deletions.
diff --git a/src/main/java/naturix/farts/FartsMod.java b/src/main/java/naturix/farts/FartsMod.java
@@ -10,7 +10,7 @@
 @Mod(modid = FartsMod.MODID, version = FartsMod.VERSION, name = FartsMod.NAME)
 public class FartsMod {
 	public static final String MODID = "farts";
-	public static final String VERSION = "1.12.2.1";
+	public static final String VERSION = "1.12.2.2";
 	public static final String NAME = "Farts";
 
 	@SidedProxy(serverSide = "naturix.farts.proxy.CommonProxy", clientSide = "naturix.farts.proxy.ClientProxy")

diff --git a/src/main/java/naturix/farts/init/ModSounds.java b/src/main/java/naturix/farts/init/ModSounds.java
@@ -19,6 +19,17 @@ public static List<SoundEvent> getList() {
 		if (FARTS_LIST.isEmpty()) {
 			registerSound("fartsound1");
 			registerSound("fartsound2");
+			registerSound("fartsound3");
+			registerSound("fartsound4");
+			registerSound("fartsound5");
+			registerSound("fartsound6");
+			registerSound("fartsound7");
+			registerSound("fartsound8");
+			registerSound("fartsound9");
+			registerSound("fartsound10");
+			registerSound("fartsound11");
+			registerSound("fartsound12");
+			registerSound("fartsound13");
 		}
 		return FARTS_LIST;
 	}

diff --git a/src/main/java/naturix/farts/network/PacketPlayFart.java b/src/main/java/naturix/farts/network/PacketPlayFart.java
@@ -28,7 +28,7 @@ public static class Handler implements IMessageHandler<PacketPlayFart, IMessage>
 		public IMessage onMessage(PacketPlayFart message, MessageContext ctx) {
 			EntityPlayerMP player = ctx.getServerHandler().player;
 			World world = player.getEntityWorld();
-			world.playSound(null, player.getPosition(), FartUtils.getRandomFart(world.rand), SoundCategory.PLAYERS, 0.2F, 1.0F);
+			world.playSound(null, player.getPosition(), FartUtils.getRandomFart(world.rand), SoundCategory.PLAYERS, 0.8F, 1.0F);
 			return null;
 		}
 

diff --git a/src/main/java/naturix/farts/utils/FartUtils.java b/src/main/java/naturix/farts/utils/FartUtils.java
@@ -12,7 +12,7 @@
 public class FartUtils {
 
 	public static SoundEvent getRandomFart(Random rand) {
-		int num = ModSounds.getList().size();
+		int num = rand.nextInt(13);
 		return ModSounds.getList().get(num);
 	}
 

diff --git a/src/main/resources/assets/farts/sounds.json b/src/main/resources/assets/farts/sounds.json
@@ -10,5 +10,71 @@
         "sounds": ["farts:fartsound2"], 
         "subtitle": "farts.subtitle.fartsound" ,
         "stream": true
+    },
+    "fartsound3": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound3"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound4": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound4"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound5": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound5"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound6": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound6"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound7": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound7"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound8": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound8"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound9": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound9"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound10": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound10"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound11": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound11"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound12": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound12"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
+    },
+    "fartsound13": { 
+        "category": "player", 
+        "sounds": ["farts:fartsound13"], 
+        "subtitle": "farts.subtitle.fartsound" ,
+        "stream": true
     }
 }
diff --git a/src/main/resources/assets/farts/sounds/fartsound10.ogg b/src/main/resources/assets/farts/sounds/fartsound10.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound11.ogg b/src/main/resources/assets/farts/sounds/fartsound11.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound12.ogg b/src/main/resources/assets/farts/sounds/fartsound12.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound13.ogg b/src/main/resources/assets/farts/sounds/fartsound13.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound3.ogg b/src/main/resources/assets/farts/sounds/fartsound3.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound4.ogg b/src/main/resources/assets/farts/sounds/fartsound4.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound5.ogg b/src/main/resources/assets/farts/sounds/fartsound5.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound6.ogg b/src/main/resources/assets/farts/sounds/fartsound6.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound7.ogg b/src/main/resources/assets/farts/sounds/fartsound7.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound8.ogg b/src/main/resources/assets/farts/sounds/fartsound8.ogg
diff --git a/src/main/resources/assets/farts/sounds/fartsound9.ogg b/src/main/resources/assets/farts/sounds/fartsound9.ogg