From 3ba4f0ea12322315d23d3ef307a69a1343ca1b8a Mon Sep 17 00:00:00 2001
From: Wynd <wyndmaster@gmail.com>
Date: Mon, 3 Apr 2023 01:26:58 +0300
Subject: [PATCH] Fixed sound3 being used in places where it shouldn't and
 tweaked a bit minecart's sounds

---
 README.md                                                 | 2 +-
 src/main/java/xyz/pixelatedw/betterbeta/WyHelper.java     | 8 +++++---
 .../xyz/pixelatedw/betterbeta/mixin/MinecartMixin.java    | 2 +-
 .../xyz/pixelatedw/betterbeta/mixin/MinecraftMixin.java   | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b1b9e1f..0d0b2b4 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ After:<br>
 
 </details>
 
-<details><summary>Fixed leg armor not being updated while riding</summary>
+<details><summary>Fixes leg armor not being updated while riding</summary>
 
 Before:<br>
 <video controls src="https://i.imgur.com/UX9nfs8.mp4" />
diff --git a/src/main/java/xyz/pixelatedw/betterbeta/WyHelper.java b/src/main/java/xyz/pixelatedw/betterbeta/WyHelper.java
index c4946ea..ca1ca8b 100644
--- a/src/main/java/xyz/pixelatedw/betterbeta/WyHelper.java
+++ b/src/main/java/xyz/pixelatedw/betterbeta/WyHelper.java
@@ -5,7 +5,7 @@ import java.util.Random;
 
 import net.minecraft.entity.player.Player;
 import net.minecraft.item.ItemInstance;
-import net.minecraft.item.ItemType;
+import net.minecraft.tile.Tile;
 
 public class WyHelper {
 	
@@ -31,8 +31,10 @@ public class WyHelper {
 		
 //		player.level.playLevelEvent((Player)null, 1005, (int)player.x, (int)player.y, (int)player.z, 0);
 		
-		player.dropItem(new ItemInstance(ItemType.boat, 1), false);
-
+		player.dropItem(new ItemInstance(Tile.REDSTONE_TORCH_LIT, 64), false);
+		player.dropItem(new ItemInstance(Tile.RAIL, 64), false);
+		player.dropItem(new ItemInstance(Tile.GOLDEN_RAIL, 64), false);
+		
 //		Skeleton enemy = new Skeleton(player.level);
 //		enemy.setPositionAndAngles(player.x + 2, player.y, player.z, 0.0f, 0.0f);
 //		player.level.spawnEntity(enemy);
diff --git a/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecartMixin.java b/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecartMixin.java
index 045dd4d..50c68f9 100644
--- a/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecartMixin.java
+++ b/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecartMixin.java
@@ -34,7 +34,7 @@ public class MinecartMixin {
 			}
 
 			if (speed >= 0.01D) {
-				if (minecart.field_1645 % 25 == 1) {
+				if (minecart.field_1645 % 34 == 1) {
 					minecart.level.playSound(x, y, z, "minecart.base", volume, pitch);
 				}
 			}
diff --git a/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecraftMixin.java b/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecraftMixin.java
index 53260d6..1b63a36 100644
--- a/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecraftMixin.java
+++ b/src/main/java/xyz/pixelatedw/betterbeta/mixin/MinecraftMixin.java
@@ -17,7 +17,8 @@ public class MinecraftMixin {
 		int split = string.indexOf("/");
 		String type = string.substring(0, split);
 		String newSound = string.substring(split + 1);
-		if (type.equalsIgnoreCase("sound3")) {
+		// For now only allow the minecart sounds, allowing all of them causes weird effects with same name sounds when the game decides which one to use
+		if (type.equalsIgnoreCase("sound3") && newSound.startsWith("minecart/")) {
 			mc.soundHelper.method_2011(newSound, file);
 		}
 	}