Accept integer names (#1110)

SkyblockerMod · Dec 27, 2024 · 4434668 · 4434668
1 parent 4185b2c
commit 4434668
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 6 deletions.
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java
@@ -19,6 +19,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalDouble;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 public class NamedWaypoint extends Waypoint {
@@ -36,7 +37,7 @@ public class NamedWaypoint extends Waypoint {
             Codec.INT.fieldOf("x").forGetter(waypoint -> waypoint.pos.getX()),
             Codec.INT.fieldOf("y").forGetter(waypoint -> waypoint.pos.getY()),
             Codec.INT.fieldOf("z").forGetter(waypoint -> waypoint.pos.getZ()),
-            Codec.either(Codec.STRING, Codec.INT).xmap(either -> either.map(str -> str, Object::toString), Either::left).fieldOf("name").forGetter(waypoint -> waypoint.name.getString()),
+            Codec.either(Codec.STRING, Codec.INT).xmap(either -> either.map(Function.identity(), Object::toString), Either::left).fieldOf("name").forGetter(waypoint -> waypoint.name.getString()),
             Codec.INT.optionalFieldOf("color", ColorHelper.getArgb(128, 0, 255, 0)).forGetter(waypoint -> (int) (waypoint.alpha * 255) << 24 | (int) (waypoint.colorComponents[0] * 255) << 16 | (int) (waypoint.colorComponents[1] * 255) << 8 | (int) (waypoint.colorComponents[2] * 255)),
             Codec.BOOL.fieldOf("enabled").forGetter(Waypoint::isEnabled)
     ).apply(instance, NamedWaypoint::fromSkytils));
@@ -159,7 +160,7 @@ public boolean equals(Object obj) {
 
     private record ColeweightOptions(Optional<String> name) {
         public static final Codec<ColeweightOptions> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-                Codec.STRING.optionalFieldOf("name").forGetter(ColeweightOptions::name)
+                Codec.either(Codec.STRING, Codec.INT).xmap(either -> either.map(Function.identity(), Object::toString), Either::left).optionalFieldOf("name").forGetter(ColeweightOptions::name)
         ).apply(instance, ColeweightOptions::new));
     }
 }