Add Willows To 1.21.2+ Boat Split Fix

FrozenBlock · Jan 31, 2025 · 31b5aee · 31b5aee
1 parent 1094f49
commit 31b5aee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/datafix/boat/BoatSplitFixMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/datafix/boat/BoatSplitFixMixin.java
@@ -33,14 +33,12 @@ public class BoatSplitFixMixin {
 		cancellable = true
 	)
 	private static void wilderWild$mapVariantToNormalBoat(String string, CallbackInfoReturnable<String> info) {
-		if (string.equals("wilderwildbaobab")) {
-			info.setReturnValue("wilderwild:baobab_boat");
-		} else if (string.equals("wilderwildcypress")) {
-			info.setReturnValue("wilderwild:cypress_boat");
-		} else if (string.equals("wilderwildpalm")) {
-			info.setReturnValue("wilderwild:palm_boat");
-		} else if (string.equals("wilderwildmaple")) {
-			info.setReturnValue("wilderwild:maple_boat");
+		switch (string) {
+			case "wilderwildbaobab" -> info.setReturnValue("wilderwild:baobab_boat");
+			case "wilderwildcypress" -> info.setReturnValue("wilderwild:cypress_boat");
+			case "wilderwildpalm" -> info.setReturnValue("wilderwild:palm_boat");
+			case "wilderwildmaple" -> info.setReturnValue("wilderwild:maple_boat");
+			case "wilderwildwillow" -> info.setReturnValue("wilderwild:willow_boat");
 		}
 	}
 
@@ -50,14 +48,12 @@ public class BoatSplitFixMixin {
 		cancellable = true
 	)
 	private static void wilderWild$mapVariantToChestBoat(String string, CallbackInfoReturnable<String> info) {
-		if (string.equals("wilderwildbaobab")) {
-			info.setReturnValue("wilderwild:baobab_chest_boat");
-		} else if (string.equals("wilderwildcypress")) {
-			info.setReturnValue("wilderwild:cypress_chest_boat");
-		} else if (string.equals("wilderwildpalm")) {
-			info.setReturnValue("wilderwild:palm_chest_boat");
-		} else if (string.equals("wilderwildmaple")) {
-			info.setReturnValue("wilderwild:maple_chest_boat");
+		switch (string) {
+			case "wilderwildbaobab" -> info.setReturnValue("wilderwild:baobab_chest_boat");
+			case "wilderwildcypress" -> info.setReturnValue("wilderwild:cypress_chest_boat");
+			case "wilderwildpalm" -> info.setReturnValue("wilderwild:palm_chest_boat");
+			case "wilderwildmaple" -> info.setReturnValue("wilderwild:maple_chest_boat");
+			case "wilderwildwillow" -> info.setReturnValue("wilderwild:willow_chest_boat");
 		}
 	}
 

diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/datafix/boat/V4067Mixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/datafix/boat/V4067Mixin.java
@@ -49,11 +49,13 @@ public abstract class V4067Mixin {
 		schema.registerSimple(map, "wilderwild:cypress_boat");
 		schema.registerSimple(map, "wilderwild:palm_boat");
 		schema.registerSimple(map, "wilderwild:maple_boat");
+		schema.registerSimple(map, "wilderwild:willow_boat");
 
 		this.registerChestBoat(map, "wilderwild:boabab_chest_boat");
 		this.registerChestBoat(map, "wilderwild:cypress_chest_boat");
 		this.registerChestBoat(map, "wilderwild:palm_chest_boat");
 		this.registerChestBoat(map, "wilderwild:maple_chest_boat");
+		this.registerChestBoat(map, "wilderwild:willow_chest_boat");
 		return map;
 	}