diff options
| author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2024-12-27 18:07:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-28 07:07:13 +0800 |
| commit | 4434668d70d7c63b176a811c2f710c0bcae1db87 (patch) | |
| tree | 27a67c6c7d2229ca409b483395e6990a173051d9 /src/main/java | |
| parent | 4185b2cc025bf9cc55bd4fcd71650415dc234d2c (diff) | |
| download | Skyblocker-4434668d70d7c63b176a811c2f710c0bcae1db87.tar.gz Skyblocker-4434668d70d7c63b176a811c2f710c0bcae1db87.tar.bz2 Skyblocker-4434668d70d7c63b176a811c2f710c0bcae1db87.zip | |
Accept integer names (#1110)
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java | 5 |
1 files changed, 3 insertions, 2 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 index 2b9cb26e..ee3a098b 100644 --- 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 net.minecraft.util.math.Vec3d; 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 class NamedWaypoint extends Waypoint { 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)); } } |
