Address some reviews

Author: eclipseisoffline

api/src/main/java/org/geysermc/geyser/api/waypoint/CustomWaypointStyle.java

@@ -39,9 +39,9 @@
 
 public interface CustomWaypointStyle {
 
-    String getTexturePath(GeyserConnection connection, Identifier style, float distance);
+    String texturePath(GeyserConnection connection, Identifier style, float distance);
 
-    Vector2f getTextureSize(GeyserConnection connection, Identifier style, float distance);
+    Vector2f textureSize(GeyserConnection connection, Identifier style, float distance);
 
     @ApiStatus.NonExtendable
     interface VanillaBuilder extends GenericBuilder<CustomWaypointStyle> {

core/src/main/java/org/geysermc/geyser/registry/mappings/MappingsType.java

@@ -41,14 +41,12 @@
 
 public record MappingsType<K, V>(String name, Int2ObjectMap<MappingsReader<K, V>> readers) {
     public static final MappingsType<String, CustomBlockMapping> BLOCKS = create("blocks", builder -> builder
-        .with(1, new BlockMappingsReader_v1())
-        .with(2, new BlockMappingsReader_v1()));
+        .with(1, new BlockMappingsReader_v1()));
     public static final MappingsType<Identifier, CustomItemDefinition> ITEMS = create("items", builder -> builder
         .with(1, new ItemMappingsReader_v1())
         .with(2, new ItemMappingsReader_v2()));
     public static final MappingsType<Identifier, CustomWaypointStyle> WAYPOINT_STYLES = create("waypoint_styles", builder -> builder
-        .with(1, new WaypointStyleMappingsReader_v1())
-        .with(2, new WaypointStyleMappingsReader_v1()));
+        .with(1, new WaypointStyleMappingsReader_v1()));
 
     private static <K, V> MappingsType<K, V> create(String name, UnaryOperator<Builder<K, V>> builder) {
         return new MappingsType<>(name, Int2ObjectMaps.unmodifiable(builder.apply(new Builder<>()).readers));

core/src/main/java/org/geysermc/geyser/session/cache/waypoint/GeyserWaypoint.java

@@ -166,8 +166,13 @@ protected void setPosition(Vector3f position) {
         if (uses26_10WaypointPacket) {
             if (uses26_20WaypointPacket) {
                 float distance = session.playerEntity().position().distance(position);
-                String texture = style.getTexturePath(session, styleIdentifier, distance);
-                Vector2f iconSize = style.getTextureSize(session, styleIdentifier, distance);
+                String texture = style.texturePath(session, styleIdentifier, distance);
+                Vector2f iconSize = style.textureSize(session, styleIdentifier, distance);
+
+                if (texture == null) {
+                    GeyserImpl.getInstance().getLogger().warning("custom waypoint style for " + styleIdentifier + " returned null texture!");
+                    texture = "ui/locator_bar_dot_0";
+                }
                 if (iconSize.lengthSquared() < 0.0F) {
                     iconSize = Vector2f.ZERO;
                 }

core/src/main/java/org/geysermc/geyser/session/cache/waypoint/VanillaWaypoint.java

@@ -38,7 +38,7 @@
 public record VanillaWaypoint(int nearDistance, int farDistance, List<String> textures) implements CustomWaypointStyle {
     // Default near and far distance: https://mcsrc.dev/1/26.1.2/net/minecraft/client/resources/WaypointStyle#L15-16
     // Default textures from bedrock's resourcepack (26.20)
-    public static CustomWaypointStyle VANILLA_DEFAULT = new Builder(128, 332)
+    public static final CustomWaypointStyle VANILLA_DEFAULT = new Builder(128, 332)
         .withTexture("ui/locator_bar_dot_0")
         .withTexture("ui/locator_bar_dot_1")
         .withTexture("ui/locator_bar_dot_2")
@@ -51,7 +51,7 @@ public record VanillaWaypoint(int nearDistance, int farDistance, List<String> te
 
     // inspired by: https://mcsrc.dev/1/26.1.2/net/minecraft/client/resources/WaypointStyle#L45-59
     @Override
-    public String getTexturePath(GeyserConnection connection, Identifier style, float distance) {
+    public String texturePath(GeyserConnection connection, Identifier style, float distance) {
         if (distance < nearDistance) {
             return textures.getFirst();
         } else if (distance >= farDistance) {
@@ -67,7 +67,7 @@ public String getTexturePath(GeyserConnection connection, Identifier style, floa
     }
 
     @Override
-    public Vector2f getTextureSize(GeyserConnection connection, Identifier style, float distance) {
+    public Vector2f textureSize(GeyserConnection connection, Identifier style, float distance) {
         if (distance < nearDistance) {
             return Vector2f.ONE;
         } else if (distance >= farDistance) {
@@ -79,7 +79,7 @@ public Vector2f getTextureSize(GeyserConnection connection, Identifier style, fl
     }
 
     // inspired by: https://mcsrc.dev/1/26.1.2/net/minecraft/util/Mth#L523-525
-    private static int lerpInt(final float alpha1, final int p0, final int p1) {
+    private static int lerpInt(float alpha1, int p0, int p1) {
         return p0 + (int) Math.floor(alpha1 * (p1 - p0));
     }